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

difftreelog

misc: Use PascalCase in OptionGeneric name

Trubnikov Sergey2023-01-11parent: #3006d97.patch.diff
in: master

17 files changed

modifiedcrates/evm-coder/src/solidity/impls.rsdiffbeforeafterboth
--- a/crates/evm-coder/src/solidity/impls.rs
+++ b/crates/evm-coder/src/solidity/impls.rs
@@ -141,12 +141,29 @@
 
 impl<T: SolidityTypeName> super::SolidityStructTy for Option<T> {
 	fn generate_solidity_interface(tc: &TypeCollector) -> String {
-		let mut solidity_name = "Option_".to_string();
+		const option_name: &str = "Option";
+		const option_name_len: usize = option_name.len();
+
+		let to_upper_case_generic_type_name = |s: &mut String| {
+			let c = s
+				.chars()
+				.skip(option_name_len)
+				.next()
+				.expect("Ethereum name must be presented");
+			if c.is_ascii_uppercase() {
+				return;
+			}
+			let uc = String::from(c.to_ascii_uppercase());
+			s.replace_range(option_name_len..option_name_len + 1, uc.as_str());
+		};
+
+		let mut solidity_name = option_name.to_string();
 		T::solidity_name(&mut solidity_name, tc);
-		let solidity_name_str = solidity_name.as_str();
+		to_upper_case_generic_type_name(&mut solidity_name);
+
 		let interface = super::SolidityStruct {
 			docs: &[" Optional value"],
-			name: solidity_name_str,
+			name: solidity_name.as_str(),
 			fields: (
 				super::SolidityStructField::<bool> {
 					docs: &[" Shows the status of accessibility of value"],
modifiedpallets/evm-contract-helpers/src/stubs/ContractHelpers.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/evm-contract-helpers/src/stubs/ContractHelpers.soldiffbeforeafterboth
--- a/pallets/evm-contract-helpers/src/stubs/ContractHelpers.sol
+++ b/pallets/evm-contract-helpers/src/stubs/ContractHelpers.sol
@@ -96,11 +96,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: 0x766c4f37,
 	///  or in textual repr: sponsor(address)
-	function sponsor(address contractAddress) public view returns (Option_CrossAddress memory) {
+	function sponsor(address contractAddress) public view returns (OptionCrossAddress memory) {
 		require(false, stub_error);
 		contractAddress;
 		dummy;
-		return Option_CrossAddress(false, CrossAddress(0x0000000000000000000000000000000000000000, 0));
+		return OptionCrossAddress(false, CrossAddress(0x0000000000000000000000000000000000000000, 0));
 	}
 
 	/// Check tat contract has confirmed sponsor.
@@ -282,7 +282,7 @@
 }
 
 /// Optional value
-struct Option_CrossAddress {
+struct OptionCrossAddress {
 	/// Shows the status of accessibility of value
 	bool status;
 	/// Actual value if `status` is true
modifiedpallets/fungible/src/stubs/UniqueFungible.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/fungible/src/stubs/UniqueFungible.soldiffbeforeafterboth
--- a/pallets/fungible/src/stubs/UniqueFungible.sol
+++ b/pallets/fungible/src/stubs/UniqueFungible.sol
@@ -466,11 +466,11 @@
 /// [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
 struct CollectionLimit {
 	CollectionLimitField field;
-	Option_uint256 value;
+	OptionUint256 value;
 }
 
 /// Optional value
-struct Option_uint256 {
+struct OptionUint256 {
 	/// Shows the status of accessibility of value
 	bool status;
 	/// Actual value if `status` is true
modifiedpallets/nonfungible/src/stubs/UniqueNFT.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth
--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -608,11 +608,11 @@
 /// [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
 struct CollectionLimit {
 	CollectionLimitField field;
-	Option_uint256 value;
+	OptionUint256 value;
 }
 
 /// Optional value
-struct Option_uint256 {
+struct OptionUint256 {
 	/// Shows the status of accessibility of value
 	bool status;
 	/// Actual value if `status` is true
modifiedpallets/refungible/src/stubs/UniqueRefungible.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth
after · 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(TokenPropertyPermission[] 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 (TokenPropertyPermission[] memory) {55		require(false, stub_error);56		dummy;57		return new TokenPropertyPermission[](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/// Ethereum representation of collection [`PropertyKey`](up_data_structs::PropertyKey) and [`PropertyValue`](up_data_structs::PropertyValue).131struct Property {132	string key;133	bytes value;134}135136/// Ethereum representation of Token Property Permissions.137struct TokenPropertyPermission {138	/// Token property key.139	string key;140	/// Token property permissions.141	PropertyPermission[] permissions;142}143144/// Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) as an key and value.145struct PropertyPermission {146	/// TokenPermission field.147	TokenPermissionField code;148	/// TokenPermission value.149	bool value;150}151152/// Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) fields as an enumeration.153enum TokenPermissionField {154	/// Permission to change the property and property permission. See [`up_data_structs::PropertyPermission::mutable`]155	Mutable,156	/// Change permission for the collection administrator. See [`up_data_structs::PropertyPermission::token_owner`]157	TokenOwner,158	/// Permission to change the property for the owner of the token. See [`up_data_structs::PropertyPermission::collection_admin`]159	CollectionAdmin160}161162/// @title A contract that allows you to work with collections.163/// @dev the ERC-165 identifier for this interface is 0x2a14cfd1164contract Collection is Dummy, ERC165 {165	// /// Set collection property.166	// ///167	// /// @param key Property key.168	// /// @param value Propery value.169	// /// @dev EVM selector for this function is: 0x2f073f66,170	// ///  or in textual repr: setCollectionProperty(string,bytes)171	// function setCollectionProperty(string memory key, bytes memory value) public {172	// 	require(false, stub_error);173	// 	key;174	// 	value;175	// 	dummy = 0;176	// }177178	/// Set collection properties.179	///180	/// @param properties Vector of properties key/value pair.181	/// @dev EVM selector for this function is: 0x50b26b2a,182	///  or in textual repr: setCollectionProperties((string,bytes)[])183	function setCollectionProperties(Property[] memory properties) public {184		require(false, stub_error);185		properties;186		dummy = 0;187	}188189	// /// Delete collection property.190	// ///191	// /// @param key Property key.192	// /// @dev EVM selector for this function is: 0x7b7debce,193	// ///  or in textual repr: deleteCollectionProperty(string)194	// function deleteCollectionProperty(string memory key) public {195	// 	require(false, stub_error);196	// 	key;197	// 	dummy = 0;198	// }199200	/// Delete collection properties.201	///202	/// @param keys Properties keys.203	/// @dev EVM selector for this function is: 0xee206ee3,204	///  or in textual repr: deleteCollectionProperties(string[])205	function deleteCollectionProperties(string[] memory keys) public {206		require(false, stub_error);207		keys;208		dummy = 0;209	}210211	/// Get collection property.212	///213	/// @dev Throws error if key not found.214	///215	/// @param key Property key.216	/// @return bytes The property corresponding to the key.217	/// @dev EVM selector for this function is: 0xcf24fd6d,218	///  or in textual repr: collectionProperty(string)219	function collectionProperty(string memory key) public view returns (bytes memory) {220		require(false, stub_error);221		key;222		dummy;223		return hex"";224	}225226	/// Get collection properties.227	///228	/// @param keys Properties keys. Empty keys for all propertyes.229	/// @return Vector of properties key/value pairs.230	/// @dev EVM selector for this function is: 0x285fb8e6,231	///  or in textual repr: collectionProperties(string[])232	function collectionProperties(string[] memory keys) public view returns (Property[] memory) {233		require(false, stub_error);234		keys;235		dummy;236		return new Property[](0);237	}238239	// /// Set the sponsor of the collection.240	// ///241	// /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.242	// ///243	// /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.244	// /// @dev EVM selector for this function is: 0x7623402e,245	// ///  or in textual repr: setCollectionSponsor(address)246	// function setCollectionSponsor(address sponsor) public {247	// 	require(false, stub_error);248	// 	sponsor;249	// 	dummy = 0;250	// }251252	/// Set the sponsor of the collection.253	///254	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.255	///256	/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.257	/// @dev EVM selector for this function is: 0x84a1d5a8,258	///  or in textual repr: setCollectionSponsorCross((address,uint256))259	function setCollectionSponsorCross(CrossAddress memory sponsor) public {260		require(false, stub_error);261		sponsor;262		dummy = 0;263	}264265	/// Whether there is a pending sponsor.266	/// @dev EVM selector for this function is: 0x058ac185,267	///  or in textual repr: hasCollectionPendingSponsor()268	function hasCollectionPendingSponsor() public view returns (bool) {269		require(false, stub_error);270		dummy;271		return false;272	}273274	/// Collection sponsorship confirmation.275	///276	/// @dev After setting the sponsor for the collection, it must be confirmed with this function.277	/// @dev EVM selector for this function is: 0x3c50e97a,278	///  or in textual repr: confirmCollectionSponsorship()279	function confirmCollectionSponsorship() public {280		require(false, stub_error);281		dummy = 0;282	}283284	/// Remove collection sponsor.285	/// @dev EVM selector for this function is: 0x6e0326a3,286	///  or in textual repr: removeCollectionSponsor()287	function removeCollectionSponsor() public {288		require(false, stub_error);289		dummy = 0;290	}291292	/// Get current sponsor.293	///294	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.295	/// @dev EVM selector for this function is: 0x6ec0a9f1,296	///  or in textual repr: collectionSponsor()297	function collectionSponsor() public view returns (CrossAddress memory) {298		require(false, stub_error);299		dummy;300		return CrossAddress(0x0000000000000000000000000000000000000000, 0);301	}302303	/// Get current collection limits.304	///305	/// @return Array of collection limits306	/// @dev EVM selector for this function is: 0xf63bc572,307	///  or in textual repr: collectionLimits()308	function collectionLimits() public view returns (CollectionLimit[] memory) {309		require(false, stub_error);310		dummy;311		return new CollectionLimit[](0);312	}313314	/// Set limits for the collection.315	/// @dev Throws error if limit not found.316	/// @param limit Some limit.317	/// @dev EVM selector for this function is: 0x2316ee74,318	///  or in textual repr: setCollectionLimit((uint8,(bool,uint256)))319	function setCollectionLimit(CollectionLimit memory limit) public {320		require(false, stub_error);321		limit;322		dummy = 0;323	}324325	/// Get contract address.326	/// @dev EVM selector for this function is: 0xf6b4dfb4,327	///  or in textual repr: contractAddress()328	function contractAddress() public view returns (address) {329		require(false, stub_error);330		dummy;331		return 0x0000000000000000000000000000000000000000;332	}333334	/// Add collection admin.335	/// @param newAdmin Cross account administrator address.336	/// @dev EVM selector for this function is: 0x859aa7d6,337	///  or in textual repr: addCollectionAdminCross((address,uint256))338	function addCollectionAdminCross(CrossAddress memory newAdmin) public {339		require(false, stub_error);340		newAdmin;341		dummy = 0;342	}343344	/// Remove collection admin.345	/// @param admin Cross account administrator address.346	/// @dev EVM selector for this function is: 0x6c0cd173,347	///  or in textual repr: removeCollectionAdminCross((address,uint256))348	function removeCollectionAdminCross(CrossAddress memory admin) public {349		require(false, stub_error);350		admin;351		dummy = 0;352	}353354	// /// Add collection admin.355	// /// @param newAdmin Address of the added administrator.356	// /// @dev EVM selector for this function is: 0x92e462c7,357	// ///  or in textual repr: addCollectionAdmin(address)358	// function addCollectionAdmin(address newAdmin) public {359	// 	require(false, stub_error);360	// 	newAdmin;361	// 	dummy = 0;362	// }363364	// /// Remove collection admin.365	// ///366	// /// @param admin Address of the removed administrator.367	// /// @dev EVM selector for this function is: 0xfafd7b42,368	// ///  or in textual repr: removeCollectionAdmin(address)369	// function removeCollectionAdmin(address admin) public {370	// 	require(false, stub_error);371	// 	admin;372	// 	dummy = 0;373	// }374375	/// Toggle accessibility of collection nesting.376	///377	/// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'378	/// @dev EVM selector for this function is: 0x112d4586,379	///  or in textual repr: setCollectionNesting(bool)380	function setCollectionNesting(bool enable) public {381		require(false, stub_error);382		enable;383		dummy = 0;384	}385386	/// Toggle accessibility of collection nesting.387	///388	/// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'389	/// @param collections Addresses of collections that will be available for nesting.390	/// @dev EVM selector for this function is: 0x64872396,391	///  or in textual repr: setCollectionNesting(bool,address[])392	function setCollectionNesting(bool enable, address[] memory collections) public {393		require(false, stub_error);394		enable;395		collections;396		dummy = 0;397	}398399	/// Returns nesting for a collection400	/// @dev EVM selector for this function is: 0x22d25bfe,401	///  or in textual repr: collectionNestingRestrictedCollectionIds()402	function collectionNestingRestrictedCollectionIds() public view returns (CollectionNesting memory) {403		require(false, stub_error);404		dummy;405		return CollectionNesting(false, new uint256[](0));406	}407408	/// Returns permissions for a collection409	/// @dev EVM selector for this function is: 0x5b2eaf4b,410	///  or in textual repr: collectionNestingPermissions()411	function collectionNestingPermissions() public view returns (CollectionNestingPermission[] memory) {412		require(false, stub_error);413		dummy;414		return new CollectionNestingPermission[](0);415	}416417	/// Set the collection access method.418	/// @param mode Access mode419	/// 	0 for Normal420	/// 	1 for AllowList421	/// @dev EVM selector for this function is: 0x41835d4c,422	///  or in textual repr: setCollectionAccess(uint8)423	function setCollectionAccess(uint8 mode) public {424		require(false, stub_error);425		mode;426		dummy = 0;427	}428429	/// Checks that user allowed to operate with collection.430	///431	/// @param user User address to check.432	/// @dev EVM selector for this function is: 0x91b6df49,433	///  or in textual repr: allowlistedCross((address,uint256))434	function allowlistedCross(CrossAddress memory user) public view returns (bool) {435		require(false, stub_error);436		user;437		dummy;438		return false;439	}440441	// /// Add the user to the allowed list.442	// ///443	// /// @param user Address of a trusted user.444	// /// @dev EVM selector for this function is: 0x67844fe6,445	// ///  or in textual repr: addToCollectionAllowList(address)446	// function addToCollectionAllowList(address user) public {447	// 	require(false, stub_error);448	// 	user;449	// 	dummy = 0;450	// }451452	/// Add user to allowed list.453	///454	/// @param user User cross account address.455	/// @dev EVM selector for this function is: 0xa0184a3a,456	///  or in textual repr: addToCollectionAllowListCross((address,uint256))457	function addToCollectionAllowListCross(CrossAddress memory user) public {458		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	/// @dev EVM selector for this function is: 0x09ba452a,478	///  or in textual repr: removeFromCollectionAllowListCross((address,uint256))479	function removeFromCollectionAllowListCross(CrossAddress memory user) public {480		require(false, stub_error);481		user;482		dummy = 0;483	}484485	/// Switch permission for minting.486	///487	/// @param mode Enable if "true".488	/// @dev EVM selector for this function is: 0x00018e84,489	///  or in textual repr: setCollectionMintMode(bool)490	function setCollectionMintMode(bool mode) public {491		require(false, stub_error);492		mode;493		dummy = 0;494	}495496	// /// Check that account is the owner or admin of the collection497	// ///498	// /// @param user account to verify499	// /// @return "true" if account is the owner or admin500	// /// @dev EVM selector for this function is: 0x9811b0c7,501	// ///  or in textual repr: isOwnerOrAdmin(address)502	// function isOwnerOrAdmin(address user) public view returns (bool) {503	// 	require(false, stub_error);504	// 	user;505	// 	dummy;506	// 	return false;507	// }508509	/// Check that account is the owner or admin of the collection510	///511	/// @param user User cross account to verify512	/// @return "true" if account is the owner or admin513	/// @dev EVM selector for this function is: 0x3e75a905,514	///  or in textual repr: isOwnerOrAdminCross((address,uint256))515	function isOwnerOrAdminCross(CrossAddress memory user) public view returns (bool) {516		require(false, stub_error);517		user;518		dummy;519		return false;520	}521522	/// Returns collection type523	///524	/// @return `Fungible` or `NFT` or `ReFungible`525	/// @dev EVM selector for this function is: 0xd34b55b8,526	///  or in textual repr: uniqueCollectionType()527	function uniqueCollectionType() public view returns (string memory) {528		require(false, stub_error);529		dummy;530		return "";531	}532533	/// Get collection owner.534	///535	/// @return Tuble with sponsor address and his substrate mirror.536	/// If address is canonical then substrate mirror is zero and vice versa.537	/// @dev EVM selector for this function is: 0xdf727d3b,538	///  or in textual repr: collectionOwner()539	function collectionOwner() public view returns (CrossAddress memory) {540		require(false, stub_error);541		dummy;542		return CrossAddress(0x0000000000000000000000000000000000000000, 0);543	}544545	// /// Changes collection owner to another account546	// ///547	// /// @dev Owner can be changed only by current owner548	// /// @param newOwner new owner account549	// /// @dev EVM selector for this function is: 0x4f53e226,550	// ///  or in textual repr: changeCollectionOwner(address)551	// function changeCollectionOwner(address newOwner) public {552	// 	require(false, stub_error);553	// 	newOwner;554	// 	dummy = 0;555	// }556557	/// Get collection administrators558	///559	/// @return Vector of tuples with admins address and his substrate mirror.560	/// If address is canonical then substrate mirror is zero and vice versa.561	/// @dev EVM selector for this function is: 0x5813216b,562	///  or in textual repr: collectionAdmins()563	function collectionAdmins() public view returns (CrossAddress[] memory) {564		require(false, stub_error);565		dummy;566		return new CrossAddress[](0);567	}568569	/// Changes collection owner to another account570	///571	/// @dev Owner can be changed only by current owner572	/// @param newOwner new owner cross account573	/// @dev EVM selector for this function is: 0x6496c497,574	///  or in textual repr: changeCollectionOwnerCross((address,uint256))575	function changeCollectionOwnerCross(CrossAddress memory newOwner) public {576		require(false, stub_error);577		newOwner;578		dummy = 0;579	}580}581582/// Cross account struct583struct CrossAddress {584	address eth;585	uint256 sub;586}587588/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) field.589struct CollectionNestingPermission {590	CollectionPermissionField field;591	bool value;592}593594/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.595enum CollectionPermissionField {596	/// Owner of token can nest tokens under it.597	TokenOwner,598	/// Admin of token collection can nest tokens under token.599	CollectionAdmin600}601602/// Nested collections.603struct CollectionNesting {604	bool token_owner;605	uint256[] ids;606}607608/// [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.609struct CollectionLimit {610	CollectionLimitField field;611	OptionUint256 value;612}613614/// Optional value615struct OptionUint256 {616	/// Shows the status of accessibility of value617	bool status;618	/// Actual value if `status` is true619	uint256 value;620}621622/// [`CollectionLimits`](up_data_structs::CollectionLimits) fields representation for EVM.623enum CollectionLimitField {624	/// How many tokens can a user have on one account.625	AccountTokenOwnership,626	/// How many bytes of data are available for sponsorship.627	SponsoredDataSize,628	/// In any case, chain default: [`SponsoringRateLimit::SponsoringDisabled`]629	SponsoredDataRateLimit,630	/// How many tokens can be mined into this collection.631	TokenLimit,632	/// Timeouts for transfer sponsoring.633	SponsorTransferTimeout,634	/// Timeout for sponsoring an approval in passed blocks.635	SponsorApproveTimeout,636	/// Whether the collection owner of the collection can send tokens (which belong to other users).637	OwnerCanTransfer,638	/// Can the collection owner burn other people's tokens.639	OwnerCanDestroy,640	/// Is it possible to send tokens from this collection between users.641	TransferEnabled642}643644/// @dev the ERC-165 identifier for this interface is 0x5b5e139f645contract ERC721Metadata is Dummy, ERC165 {646	// /// @notice A descriptive name for a collection of NFTs in this contract647	// /// @dev real implementation of this function lies in `ERC721UniqueExtensions`648	// /// @dev EVM selector for this function is: 0x06fdde03,649	// ///  or in textual repr: name()650	// function name() public view returns (string memory) {651	// 	require(false, stub_error);652	// 	dummy;653	// 	return "";654	// }655656	// /// @notice An abbreviated name for NFTs in this contract657	// /// @dev real implementation of this function lies in `ERC721UniqueExtensions`658	// /// @dev EVM selector for this function is: 0x95d89b41,659	// ///  or in textual repr: symbol()660	// function symbol() public view returns (string memory) {661	// 	require(false, stub_error);662	// 	dummy;663	// 	return "";664	// }665666	/// @notice A distinct Uniform Resource Identifier (URI) for a given asset.667	///668	/// @dev If the token has a `url` property and it is not empty, it is returned.669	///  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`.670	///  If the collection property `baseURI` is empty or absent, return "" (empty string)671	///  otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix672	///  otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).673	///674	/// @return token's const_metadata675	/// @dev EVM selector for this function is: 0xc87b56dd,676	///  or in textual repr: tokenURI(uint256)677	function tokenURI(uint256 tokenId) public view returns (string memory) {678		require(false, stub_error);679		tokenId;680		dummy;681		return "";682	}683}684685/// @title ERC721 Token that can be irreversibly burned (destroyed).686/// @dev the ERC-165 identifier for this interface is 0x42966c68687contract ERC721Burnable is Dummy, ERC165 {688	/// @notice Burns a specific ERC721 token.689	/// @dev Throws unless `msg.sender` is the current RFT owner, or an authorized690	///  operator of the current owner.691	/// @param tokenId The RFT to approve692	/// @dev EVM selector for this function is: 0x42966c68,693	///  or in textual repr: burn(uint256)694	function burn(uint256 tokenId) public {695		require(false, stub_error);696		tokenId;697		dummy = 0;698	}699}700701/// @dev inlined interface702contract ERC721UniqueMintableEvents {703	event MintingFinished();704}705706/// @title ERC721 minting logic.707/// @dev the ERC-165 identifier for this interface is 0x476ff149708contract ERC721UniqueMintable is Dummy, ERC165, ERC721UniqueMintableEvents {709	/// @dev EVM selector for this function is: 0x05d2035b,710	///  or in textual repr: mintingFinished()711	function mintingFinished() public view returns (bool) {712		require(false, stub_error);713		dummy;714		return false;715	}716717	/// @notice Function to mint a token.718	/// @param to The new owner719	/// @return uint256 The id of the newly minted token720	/// @dev EVM selector for this function is: 0x6a627842,721	///  or in textual repr: mint(address)722	function mint(address to) public returns (uint256) {723		require(false, stub_error);724		to;725		dummy = 0;726		return 0;727	}728729	// /// @notice Function to mint a token.730	// /// @dev `tokenId` should be obtained with `nextTokenId` method,731	// ///  unlike standard, you can't specify it manually732	// /// @param to The new owner733	// /// @param tokenId ID of the minted RFT734	// /// @dev EVM selector for this function is: 0x40c10f19,735	// ///  or in textual repr: mint(address,uint256)736	// function mint(address to, uint256 tokenId) public returns (bool) {737	// 	require(false, stub_error);738	// 	to;739	// 	tokenId;740	// 	dummy = 0;741	// 	return false;742	// }743744	/// @notice Function to mint token with the given tokenUri.745	/// @param to The new owner746	/// @param tokenUri Token URI that would be stored in the NFT properties747	/// @return uint256 The id of the newly minted token748	/// @dev EVM selector for this function is: 0x45c17782,749	///  or in textual repr: mintWithTokenURI(address,string)750	function mintWithTokenURI(address to, string memory tokenUri) public returns (uint256) {751		require(false, stub_error);752		to;753		tokenUri;754		dummy = 0;755		return 0;756	}757758	// /// @notice Function to mint token with the given tokenUri.759	// /// @dev `tokenId` should be obtained with `nextTokenId` method,760	// ///  unlike standard, you can't specify it manually761	// /// @param to The new owner762	// /// @param tokenId ID of the minted RFT763	// /// @param tokenUri Token URI that would be stored in the RFT properties764	// /// @dev EVM selector for this function is: 0x50bb4e7f,765	// ///  or in textual repr: mintWithTokenURI(address,uint256,string)766	// function mintWithTokenURI(address to, uint256 tokenId, string memory tokenUri) public returns (bool) {767	// 	require(false, stub_error);768	// 	to;769	// 	tokenId;770	// 	tokenUri;771	// 	dummy = 0;772	// 	return false;773	// }774775	/// @dev Not implemented776	/// @dev EVM selector for this function is: 0x7d64bcb4,777	///  or in textual repr: finishMinting()778	function finishMinting() public returns (bool) {779		require(false, stub_error);780		dummy = 0;781		return false;782	}783}784785/// @title Unique extensions for ERC721.786/// @dev the ERC-165 identifier for this interface is 0xabf30dc2787contract ERC721UniqueExtensions is Dummy, ERC165 {788	/// @notice A descriptive name for a collection of NFTs in this contract789	/// @dev EVM selector for this function is: 0x06fdde03,790	///  or in textual repr: name()791	function name() public view returns (string memory) {792		require(false, stub_error);793		dummy;794		return "";795	}796797	/// @notice An abbreviated name for NFTs in this contract798	/// @dev EVM selector for this function is: 0x95d89b41,799	///  or in textual repr: symbol()800	function symbol() public view returns (string memory) {801		require(false, stub_error);802		dummy;803		return "";804	}805806	/// @notice A description for the collection.807	/// @dev EVM selector for this function is: 0x7284e416,808	///  or in textual repr: description()809	function description() public view returns (string memory) {810		require(false, stub_error);811		dummy;812		return "";813	}814815	/// Returns the owner (in cross format) of the token.816	///817	/// @param tokenId Id for the token.818	/// @dev EVM selector for this function is: 0x2b29dace,819	///  or in textual repr: crossOwnerOf(uint256)820	function crossOwnerOf(uint256 tokenId) public view returns (CrossAddress memory) {821		require(false, stub_error);822		tokenId;823		dummy;824		return CrossAddress(0x0000000000000000000000000000000000000000, 0);825	}826827	/// Returns the token properties.828	///829	/// @param tokenId Id for the token.830	/// @param keys Properties keys. Empty keys for all propertyes.831	/// @return Vector of properties key/value pairs.832	/// @dev EVM selector for this function is: 0xe07ede7e,833	///  or in textual repr: properties(uint256,string[])834	function properties(uint256 tokenId, string[] memory keys) public view returns (Property[] memory) {835		require(false, stub_error);836		tokenId;837		keys;838		dummy;839		return new Property[](0);840	}841842	/// @notice Transfer ownership of an RFT843	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`844	///  is the zero address. Throws if `tokenId` is not a valid RFT.845	///  Throws if RFT pieces have multiple owners.846	/// @param to The new owner847	/// @param tokenId The RFT to transfer848	/// @dev EVM selector for this function is: 0xa9059cbb,849	///  or in textual repr: transfer(address,uint256)850	function transfer(address to, uint256 tokenId) public {851		require(false, stub_error);852		to;853		tokenId;854		dummy = 0;855	}856857	/// @notice Transfer ownership of an RFT858	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`859	///  is the zero address. Throws if `tokenId` is not a valid RFT.860	///  Throws if RFT pieces have multiple owners.861	/// @param to The new owner862	/// @param tokenId The RFT to transfer863	/// @dev EVM selector for this function is: 0x2ada85ff,864	///  or in textual repr: transferCross((address,uint256),uint256)865	function transferCross(CrossAddress memory to, uint256 tokenId) public {866		require(false, stub_error);867		to;868		tokenId;869		dummy = 0;870	}871872	/// @notice Transfer ownership of an RFT873	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`874	///  is the zero address. Throws if `tokenId` is not a valid RFT.875	///  Throws if RFT pieces have multiple owners.876	/// @param to The new owner877	/// @param tokenId The RFT to transfer878	/// @dev EVM selector for this function is: 0xd5cf430b,879	///  or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)880	function transferFromCross(881		CrossAddress memory from,882		CrossAddress memory to,883		uint256 tokenId884	) public {885		require(false, stub_error);886		from;887		to;888		tokenId;889		dummy = 0;890	}891892	// /// @notice Burns a specific ERC721 token.893	// /// @dev Throws unless `msg.sender` is the current owner or an authorized894	// ///  operator for this RFT. Throws if `from` is not the current owner. Throws895	// ///  if `to` is the zero address. Throws if `tokenId` is not a valid RFT.896	// ///  Throws if RFT pieces have multiple owners.897	// /// @param from The current owner of the RFT898	// /// @param tokenId The RFT to transfer899	// /// @dev EVM selector for this function is: 0x79cc6790,900	// ///  or in textual repr: burnFrom(address,uint256)901	// function burnFrom(address from, uint256 tokenId) public {902	// 	require(false, stub_error);903	// 	from;904	// 	tokenId;905	// 	dummy = 0;906	// }907908	/// @notice Burns a specific ERC721 token.909	/// @dev Throws unless `msg.sender` is the current owner or an authorized910	///  operator for this RFT. Throws if `from` is not the current owner. Throws911	///  if `to` is the zero address. Throws if `tokenId` is not a valid RFT.912	///  Throws if RFT pieces have multiple owners.913	/// @param from The current owner of the RFT914	/// @param tokenId The RFT to transfer915	/// @dev EVM selector for this function is: 0xbb2f5a58,916	///  or in textual repr: burnFromCross((address,uint256),uint256)917	function burnFromCross(CrossAddress memory from, uint256 tokenId) public {918		require(false, stub_error);919		from;920		tokenId;921		dummy = 0;922	}923924	/// @notice Returns next free RFT ID.925	/// @dev EVM selector for this function is: 0x75794a3c,926	///  or in textual repr: nextTokenId()927	function nextTokenId() public view returns (uint256) {928		require(false, stub_error);929		dummy;930		return 0;931	}932933	// /// @notice Function to mint multiple tokens.934	// /// @dev `tokenIds` should be an array of consecutive numbers and first number935	// ///  should be obtained with `nextTokenId` method936	// /// @param to The new owner937	// /// @param tokenIds IDs of the minted RFTs938	// /// @dev EVM selector for this function is: 0x44a9945e,939	// ///  or in textual repr: mintBulk(address,uint256[])940	// function mintBulk(address to, uint256[] memory tokenIds) public returns (bool) {941	// 	require(false, stub_error);942	// 	to;943	// 	tokenIds;944	// 	dummy = 0;945	// 	return false;946	// }947948	// /// @notice Function to mint multiple tokens with the given tokenUris.949	// /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive950	// ///  numbers and first number should be obtained with `nextTokenId` method951	// /// @param to The new owner952	// /// @param tokens array of pairs of token ID and token URI for minted tokens953	// /// @dev EVM selector for this function is: 0x36543006,954	// ///  or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])955	// function mintBulkWithTokenURI(address to, Tuple14[] memory tokens) public returns (bool) {956	// 	require(false, stub_error);957	// 	to;958	// 	tokens;959	// 	dummy = 0;960	// 	return false;961	// }962963	/// @notice Function to mint a token.964	/// @param to The new owner crossAccountId965	/// @param properties Properties of minted token966	/// @return uint256 The id of the newly minted token967	/// @dev EVM selector for this function is: 0xb904db03,968	///  or in textual repr: mintCross((address,uint256),(string,bytes)[])969	function mintCross(CrossAddress memory to, Property[] memory properties) public returns (uint256) {970		require(false, stub_error);971		to;972		properties;973		dummy = 0;974		return 0;975	}976977	/// Returns EVM address for refungible token978	///979	/// @param token ID of the token980	/// @dev EVM selector for this function is: 0xab76fac6,981	///  or in textual repr: tokenContractAddress(uint256)982	function tokenContractAddress(uint256 token) public view returns (address) {983		require(false, stub_error);984		token;985		dummy;986		return 0x0000000000000000000000000000000000000000;987	}988}989990/// @dev anonymous struct991struct Tuple14 {992	uint256 field_0;993	string field_1;994}995996/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension997/// @dev See https://eips.ethereum.org/EIPS/eip-721998/// @dev the ERC-165 identifier for this interface is 0x780e9d63999contract ERC721Enumerable is Dummy, ERC165 {1000	/// @notice Enumerate valid RFTs1001	/// @param index A counter less than `totalSupply()`1002	/// @return The token identifier for the `index`th NFT,1003	///  (sort order not specified)1004	/// @dev EVM selector for this function is: 0x4f6ccce7,1005	///  or in textual repr: tokenByIndex(uint256)1006	function tokenByIndex(uint256 index) public view returns (uint256) {1007		require(false, stub_error);1008		index;1009		dummy;1010		return 0;1011	}10121013	/// Not implemented1014	/// @dev EVM selector for this function is: 0x2f745c59,1015	///  or in textual repr: tokenOfOwnerByIndex(address,uint256)1016	function tokenOfOwnerByIndex(address owner, uint256 index) public view returns (uint256) {1017		require(false, stub_error);1018		owner;1019		index;1020		dummy;1021		return 0;1022	}10231024	/// @notice Count RFTs tracked by this contract1025	/// @return A count of valid RFTs tracked by this contract, where each one of1026	///  them has an assigned and queryable owner not equal to the zero address1027	/// @dev EVM selector for this function is: 0x18160ddd,1028	///  or in textual repr: totalSupply()1029	function totalSupply() public view returns (uint256) {1030		require(false, stub_error);1031		dummy;1032		return 0;1033	}1034}10351036/// @dev inlined interface1037contract ERC721Events {1038	event Transfer(address indexed from, address indexed to, uint256 indexed tokenId);1039	event Approval(address indexed owner, address indexed approved, uint256 indexed tokenId);1040	event ApprovalForAll(address indexed owner, address indexed operator, bool approved);1041}10421043/// @title ERC-721 Non-Fungible Token Standard1044/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md1045/// @dev the ERC-165 identifier for this interface is 0x4016cd871046contract ERC721 is Dummy, ERC165, ERC721Events {1047	/// @notice Count all RFTs assigned to an owner1048	/// @dev RFTs assigned to the zero address are considered invalid, and this1049	///  function throws for queries about the zero address.1050	/// @param owner An address for whom to query the balance1051	/// @return The number of RFTs owned by `owner`, possibly zero1052	/// @dev EVM selector for this function is: 0x70a08231,1053	///  or in textual repr: balanceOf(address)1054	function balanceOf(address owner) public view returns (uint256) {1055		require(false, stub_error);1056		owner;1057		dummy;1058		return 0;1059	}10601061	/// @notice Find the owner of an RFT1062	/// @dev RFTs assigned to zero address are considered invalid, and queries1063	///  about them do throw.1064	///  Returns special 0xffffffffffffffffffffffffffffffffffffffff address for1065	///  the tokens that are partially owned.1066	/// @param tokenId The identifier for an RFT1067	/// @return The address of the owner of the RFT1068	/// @dev EVM selector for this function is: 0x6352211e,1069	///  or in textual repr: ownerOf(uint256)1070	function ownerOf(uint256 tokenId) public view returns (address) {1071		require(false, stub_error);1072		tokenId;1073		dummy;1074		return 0x0000000000000000000000000000000000000000;1075	}10761077	/// @dev Not implemented1078	/// @dev EVM selector for this function is: 0x60a11672,1079	///  or in textual repr: safeTransferFromWithData(address,address,uint256,bytes)1080	function safeTransferFromWithData(1081		address from,1082		address to,1083		uint256 tokenId,1084		bytes memory data1085	) public {1086		require(false, stub_error);1087		from;1088		to;1089		tokenId;1090		data;1091		dummy = 0;1092	}10931094	/// @dev Not implemented1095	/// @dev EVM selector for this function is: 0x42842e0e,1096	///  or in textual repr: safeTransferFrom(address,address,uint256)1097	function safeTransferFrom(1098		address from,1099		address to,1100		uint256 tokenId1101	) public {1102		require(false, stub_error);1103		from;1104		to;1105		tokenId;1106		dummy = 0;1107	}11081109	/// @notice Transfer ownership of an RFT -- THE CALLER IS RESPONSIBLE1110	///  TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE1111	///  THEY MAY BE PERMANENTLY LOST1112	/// @dev Throws unless `msg.sender` is the current owner or an authorized1113	///  operator for this RFT. Throws if `from` is not the current owner. Throws1114	///  if `to` is the zero address. Throws if `tokenId` is not a valid RFT.1115	///  Throws if RFT pieces have multiple owners.1116	/// @param from The current owner of the NFT1117	/// @param to The new owner1118	/// @param tokenId The NFT to transfer1119	/// @dev EVM selector for this function is: 0x23b872dd,1120	///  or in textual repr: transferFrom(address,address,uint256)1121	function transferFrom(1122		address from,1123		address to,1124		uint256 tokenId1125	) public {1126		require(false, stub_error);1127		from;1128		to;1129		tokenId;1130		dummy = 0;1131	}11321133	/// @dev Not implemented1134	/// @dev EVM selector for this function is: 0x095ea7b3,1135	///  or in textual repr: approve(address,uint256)1136	function approve(address approved, uint256 tokenId) public {1137		require(false, stub_error);1138		approved;1139		tokenId;1140		dummy = 0;1141	}11421143	/// @notice Sets or unsets the approval of a given operator.1144	///  The `operator` is allowed to transfer all token pieces of the `caller` on their behalf.1145	/// @param operator Operator1146	/// @param approved Should operator status be granted or revoked?1147	/// @dev EVM selector for this function is: 0xa22cb465,1148	///  or in textual repr: setApprovalForAll(address,bool)1149	function setApprovalForAll(address operator, bool approved) public {1150		require(false, stub_error);1151		operator;1152		approved;1153		dummy = 0;1154	}11551156	/// @dev Not implemented1157	/// @dev EVM selector for this function is: 0x081812fc,1158	///  or in textual repr: getApproved(uint256)1159	function getApproved(uint256 tokenId) public view returns (address) {1160		require(false, stub_error);1161		tokenId;1162		dummy;1163		return 0x0000000000000000000000000000000000000000;1164	}11651166	/// @notice Tells whether the given `owner` approves the `operator`.1167	/// @dev EVM selector for this function is: 0xe985e9c5,1168	///  or in textual repr: isApprovedForAll(address,address)1169	function isApprovedForAll(address owner, address operator) public view returns (bool) {1170		require(false, stub_error);1171		owner;1172		operator;1173		dummy;1174		return false;1175	}11761177	/// @notice Returns collection helper contract address1178	/// @dev EVM selector for this function is: 0x1896cce6,1179	///  or in textual repr: collectionHelperAddress()1180	function collectionHelperAddress() public view returns (address) {1181		require(false, stub_error);1182		dummy;1183		return 0x0000000000000000000000000000000000000000;1184	}1185}11861187contract UniqueRefungible is1188	Dummy,1189	ERC165,1190	ERC721,1191	ERC721Enumerable,1192	ERC721UniqueExtensions,1193	ERC721UniqueMintable,1194	ERC721Burnable,1195	ERC721Metadata,1196	Collection,1197	TokenProperties1198{}
modifiedtests/src/eth/abi/contractHelpers.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/contractHelpers.json
+++ b/tests/src/eth/abi/contractHelpers.json
@@ -238,7 +238,7 @@
             "type": "tuple"
           }
         ],
-        "internalType": "struct Option_CrossAddress",
+        "internalType": "struct OptionCrossAddress",
         "name": "",
         "type": "tuple"
       }
modifiedtests/src/eth/abi/fungible.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/fungible.json
+++ b/tests/src/eth/abi/fungible.json
@@ -222,7 +222,7 @@
               { "internalType": "bool", "name": "status", "type": "bool" },
               { "internalType": "uint256", "name": "value", "type": "uint256" }
             ],
-            "internalType": "struct Option_uint256",
+            "internalType": "struct OptionUint256",
             "name": "value",
             "type": "tuple"
           }
@@ -508,7 +508,7 @@
               { "internalType": "bool", "name": "status", "type": "bool" },
               { "internalType": "uint256", "name": "value", "type": "uint256" }
             ],
-            "internalType": "struct Option_uint256",
+            "internalType": "struct OptionUint256",
             "name": "value",
             "type": "tuple"
           }
modifiedtests/src/eth/abi/nonFungible.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/nonFungible.json
+++ b/tests/src/eth/abi/nonFungible.json
@@ -252,7 +252,7 @@
               { "internalType": "bool", "name": "status", "type": "bool" },
               { "internalType": "uint256", "name": "value", "type": "uint256" }
             ],
-            "internalType": "struct Option_uint256",
+            "internalType": "struct OptionUint256",
             "name": "value",
             "type": "tuple"
           }
@@ -670,7 +670,7 @@
               { "internalType": "bool", "name": "status", "type": "bool" },
               { "internalType": "uint256", "name": "value", "type": "uint256" }
             ],
-            "internalType": "struct Option_uint256",
+            "internalType": "struct OptionUint256",
             "name": "value",
             "type": "tuple"
           }
modifiedtests/src/eth/abi/reFungible.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/reFungible.json
+++ b/tests/src/eth/abi/reFungible.json
@@ -234,7 +234,7 @@
               { "internalType": "bool", "name": "status", "type": "bool" },
               { "internalType": "uint256", "name": "value", "type": "uint256" }
             ],
-            "internalType": "struct Option_uint256",
+            "internalType": "struct OptionUint256",
             "name": "value",
             "type": "tuple"
           }
@@ -652,7 +652,7 @@
               { "internalType": "bool", "name": "status", "type": "bool" },
               { "internalType": "uint256", "name": "value", "type": "uint256" }
             ],
-            "internalType": "struct Option_uint256",
+            "internalType": "struct OptionUint256",
             "name": "value",
             "type": "tuple"
           }
modifiedtests/src/eth/api/ContractHelpers.soldiffbeforeafterboth
--- a/tests/src/eth/api/ContractHelpers.sol
+++ b/tests/src/eth/api/ContractHelpers.sol
@@ -69,7 +69,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: 0x766c4f37,
 	///  or in textual repr: sponsor(address)
-	function sponsor(address contractAddress) external view returns (Option_CrossAddress memory);
+	function sponsor(address contractAddress) external view returns (OptionCrossAddress memory);
 
 	/// Check tat contract has confirmed sponsor.
 	///
@@ -182,7 +182,7 @@
 }
 
 /// Optional value
-struct Option_CrossAddress {
+struct OptionCrossAddress {
 	/// Shows the status of accessibility of value
 	bool status;
 	/// Actual value if `status` is true
modifiedtests/src/eth/api/UniqueFungible.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueFungible.sol
+++ b/tests/src/eth/api/UniqueFungible.sol
@@ -308,11 +308,11 @@
 /// [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
 struct CollectionLimit {
 	CollectionLimitField field;
-	Option_uint256 value;
+	OptionUint256 value;
 }
 
 /// Optional value
-struct Option_uint256 {
+struct OptionUint256 {
 	/// Shows the status of accessibility of value
 	bool status;
 	/// Actual value if `status` is true
modifiedtests/src/eth/api/UniqueNFT.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -408,11 +408,11 @@
 /// [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
 struct CollectionLimit {
 	CollectionLimitField field;
-	Option_uint256 value;
+	OptionUint256 value;
 }
 
 /// Optional value
-struct Option_uint256 {
+struct OptionUint256 {
 	/// Shows the status of accessibility of value
 	bool status;
 	/// Actual value if `status` is true
modifiedtests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -408,11 +408,11 @@
 /// [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
 struct CollectionLimit {
 	CollectionLimitField field;
-	Option_uint256 value;
+	OptionUint256 value;
 }
 
 /// Optional value
-struct Option_uint256 {
+struct OptionUint256 {
 	/// Shows the status of accessibility of value
 	bool status;
 	/// Actual value if `status` is true