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

difftreelog

name anonymous tuples

Trubnikov Sergey2023-02-01parent: #55aed0d.patch.diff
in: master

15 files changed

modifiedpallets/common/src/eth.rsdiffbeforeafterboth
--- a/pallets/common/src/eth.rs
+++ b/pallets/common/src/eth.rs
@@ -18,7 +18,10 @@
 
 use alloc::format;
 use sp_std::{vec, vec::Vec};
-use evm_coder::{AbiCoder, types::Address};
+use evm_coder::{
+	AbiCoder,
+	types::{Address, String},
+};
 pub use pallet_evm::{Config, account::CrossAccountId};
 use sp_core::{H160, U256};
 use up_data_structs::CollectionId;
@@ -390,6 +393,16 @@
 	}
 }
 
+/// Data for creation token with uri.
+#[derive(Debug, AbiCoder)]
+pub struct TokenUri {
+	/// Id of new token.
+	pub id: U256,
+
+	/// Uri of new token.
+	pub uri: String,
+}
+
 /// Nested collections.
 #[derive(Debug, Default, AbiCoder)]
 pub struct CollectionNesting {
modifiedpallets/fungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/fungible/src/erc.rs
+++ b/pallets/fungible/src/erc.rs
@@ -6,7 +6,7 @@
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Unique Network is distributed in the hope that it will be useful,
+// Unique Network is disaddress: tod in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
@@ -19,6 +19,7 @@
 extern crate alloc;
 use core::char::{REPLACEMENT_CHARACTER, decode_utf16};
 use core::convert::TryInto;
+use evm_coder::AbiCoder;
 use evm_coder::{
 	abi::AbiType, ToLog, execution::*, generate_stubgen, solidity, solidity_interface, types::*,
 	weight,
@@ -57,6 +58,12 @@
 	},
 }
 
+#[derive(AbiCoder, Debug)]
+pub struct AmountForAddress {
+	to: Address,
+	amount: U256,
+}
+
 #[solidity_interface(name = ERC20, events(ERC20Events), expect_selector = 0x942e8b22)]
 impl<T: Config> FungibleHandle<T> {
 	fn name(&self) -> Result<String> {
@@ -264,14 +271,14 @@
 	/// Mint tokens for multiple accounts.
 	/// @param amounts array of pairs of account address and amount
 	#[weight(<SelfWeightOf<T>>::create_multiple_items_ex(amounts.len() as u32))]
-	fn mint_bulk(&mut self, caller: Caller, amounts: Vec<(Address, U256)>) -> Result<bool> {
+	fn mint_bulk(&mut self, caller: Caller, amounts: Vec<AmountForAddress>) -> Result<bool> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let budget = self
 			.recorder
 			.weight_calls_budget(<StructureWeight<T>>::find_parent());
 		let amounts = amounts
 			.into_iter()
-			.map(|(to, amount)| {
+			.map(|AmountForAddress { to, amount }| {
 				Ok((
 					T::CrossAccountId::from_eth(to),
 					amount.try_into().map_err(|_| "amount overflow")?,
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
@@ -590,7 +590,7 @@
 	/// @param amounts array of pairs of account address and amount
 	/// @dev EVM selector for this function is: 0x1acf2d55,
 	///  or in textual repr: mintBulk((address,uint256)[])
-	function mintBulk(Tuple11[] memory amounts) public returns (bool) {
+	function mintBulk(AmountForAddress[] memory amounts) public returns (bool) {
 		require(false, stub_error);
 		amounts;
 		dummy = 0;
@@ -632,10 +632,9 @@
 	}
 }
 
-/// @dev anonymous struct
-struct Tuple11 {
-	address field_0;
-	uint256 field_1;
+struct AmountForAddress {
+	address to;
+	uint256 amount;
 }
 
 /// @dev the ERC-165 identifier for this interface is 0x40c10f19
modifiedpallets/nonfungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -38,7 +38,7 @@
 use pallet_common::{
 	CollectionHandle, CollectionPropertyPermissions, CommonCollectionOperations,
 	erc::{CommonEvmHandler, PrecompileResult, CollectionCall, static_property::key},
-	eth,
+	eth::{self, TokenUri},
 };
 use pallet_evm::{account::CrossAccountId, PrecompileHandle};
 use pallet_evm_coder_substrate::call;
@@ -948,7 +948,7 @@
 		&mut self,
 		caller: Caller,
 		to: Address,
-		tokens: Vec<(U256, String)>,
+		tokens: Vec<TokenUri>,
 	) -> Result<bool> {
 		let key = key::url();
 		let caller = T::CrossAccountId::from_eth(caller);
@@ -961,7 +961,7 @@
 			.weight_calls_budget(<StructureWeight<T>>::find_parent());
 
 		let mut data = Vec::with_capacity(tokens.len());
-		for (id, token_uri) in tokens {
+		for TokenUri { id, uri } in tokens {
 			let id: u32 = id.try_into().map_err(|_| "token id overflow")?;
 			if id != expected_index {
 				return Err("item id should be next".into());
@@ -972,7 +972,7 @@
 			properties
 				.try_push(Property {
 					key: key.clone(),
-					value: token_uri
+					value: uri
 						.into_bytes()
 						.try_into()
 						.map_err(|_| "token uri is too long")?,
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
@@ -949,7 +949,7 @@
 	// /// @param tokens array of pairs of token ID and token URI for minted tokens
 	// /// @dev EVM selector for this function is: 0x36543006,
 	// ///  or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])
-	// function mintBulkWithTokenURI(address to, Tuple15[] memory tokens) public returns (bool) {
+	// function mintBulkWithTokenURI(address to, TokenUri[] memory tokens) public returns (bool) {
 	// 	require(false, stub_error);
 	// 	to;
 	// 	tokens;
@@ -981,10 +981,12 @@
 	}
 }
 
-/// @dev anonymous struct
-struct Tuple15 {
-	uint256 field_0;
-	string field_1;
+/// Data for creation token with uri.
+struct TokenUri {
+	/// Id of new token.
+	uint256 id;
+	/// Uri of new token.
+	string uri;
 }
 
 /// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension
modifiedpallets/refungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -34,7 +34,7 @@
 	CollectionHandle, CollectionPropertyPermissions, CommonCollectionOperations,
 	Error as CommonError,
 	erc::{CommonEvmHandler, CollectionCall, static_property::key},
-	eth,
+	eth::{self, TokenUri},
 };
 use pallet_evm::{account::CrossAccountId, PrecompileHandle};
 use pallet_evm_coder_substrate::{call, dispatch_to_evm};
@@ -999,7 +999,7 @@
 		&mut self,
 		caller: Caller,
 		to: Address,
-		tokens: Vec<(U256, String)>,
+		tokens: Vec<TokenUri>,
 	) -> Result<bool> {
 		let key = key::url();
 		let caller = T::CrossAccountId::from_eth(caller);
@@ -1017,7 +1017,7 @@
 			.collect::<BTreeMap<_, _>>()
 			.try_into()
 			.unwrap();
-		for (id, token_uri) in tokens {
+		for TokenUri { id, uri } in tokens {
 			let id: u32 = id.try_into().map_err(|_| "token id overflow")?;
 			if id != expected_index {
 				return Err("item id should be next".into());
@@ -1028,7 +1028,7 @@
 			properties
 				.try_push(Property {
 					key: key.clone(),
-					value: token_uri
+					value: uri
 						.into_bytes()
 						.try_into()
 						.map_err(|_| "token uri is too long")?,
modifiedpallets/refungible/src/stubs/UniqueRefungible.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth
--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -938,7 +938,7 @@
 	// /// @param tokens array of pairs of token ID and token URI for minted tokens
 	// /// @dev EVM selector for this function is: 0x36543006,
 	// ///  or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])
-	// function mintBulkWithTokenURI(address to, Tuple14[] memory tokens) public returns (bool) {
+	// function mintBulkWithTokenURI(address to, TokenUri[] memory tokens) public returns (bool) {
 	// 	require(false, stub_error);
 	// 	to;
 	// 	tokens;
@@ -982,10 +982,12 @@
 	}
 }
 
-/// @dev anonymous struct
-struct Tuple14 {
-	uint256 field_0;
-	string field_1;
+/// Data for creation token with uri.
+struct TokenUri {
+	/// Id of new token.
+	uint256 id;
+	/// Uri of new token.
+	string uri;
 }
 
 /// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension
modifiedtests/src/eth/abi/fungible.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/fungible.json
+++ b/tests/src/eth/abi/fungible.json
@@ -434,10 +434,10 @@
     "inputs": [
       {
         "components": [
-          { "internalType": "address", "name": "field_0", "type": "address" },
-          { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+          { "internalType": "address", "name": "to", "type": "address" },
+          { "internalType": "uint256", "name": "amount", "type": "uint256" }
         ],
-        "internalType": "struct Tuple11[]",
+        "internalType": "struct AmountForAddress[]",
         "name": "amounts",
         "type": "tuple[]"
       }
modifiedtests/src/eth/api/UniqueFungible.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueFungible.sol
+++ b/tests/src/eth/api/UniqueFungible.sol
@@ -398,7 +398,7 @@
 	/// @param amounts array of pairs of account address and amount
 	/// @dev EVM selector for this function is: 0x1acf2d55,
 	///  or in textual repr: mintBulk((address,uint256)[])
-	function mintBulk(Tuple11[] memory amounts) external returns (bool);
+	function mintBulk(AmountForAddress[] memory amounts) external returns (bool);
 
 	/// @dev EVM selector for this function is: 0x2ada85ff,
 	///  or in textual repr: transferCross((address,uint256),uint256)
@@ -418,10 +418,9 @@
 	function collectionHelperAddress() external view returns (address);
 }
 
-/// @dev anonymous struct
-struct Tuple11 {
-	address field_0;
-	uint256 field_1;
+struct AmountForAddress {
+	address to;
+	uint256 amount;
 }
 
 /// @dev the ERC-165 identifier for this interface is 0x40c10f19
modifiedtests/src/eth/api/UniqueNFT.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -644,7 +644,7 @@
 	// /// @param tokens array of pairs of token ID and token URI for minted tokens
 	// /// @dev EVM selector for this function is: 0x36543006,
 	// ///  or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])
-	// function mintBulkWithTokenURI(address to, Tuple13[] memory tokens) external returns (bool);
+	// function mintBulkWithTokenURI(address to, TokenUri[] memory tokens) external returns (bool);
 
 	/// @notice Function to mint a token.
 	/// @param to The new owner crossAccountId
@@ -660,10 +660,12 @@
 	function collectionHelperAddress() external view returns (address);
 }
 
-/// @dev anonymous struct
-struct Tuple13 {
-	uint256 field_0;
-	string field_1;
+/// Data for creation token with uri.
+struct TokenUri {
+	/// Id of new token.
+	uint256 id;
+	/// Uri of new token.
+	string uri;
 }
 
 /// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension
modifiedtests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth
after · tests/src/eth/api/UniqueRefungible.sol
1// SPDX-License-Identifier: OTHER2// This code is automatically generated34pragma solidity >=0.8.0 <0.9.0;56/// @dev common stubs holder7interface Dummy {89}1011interface ERC165 is Dummy {12	function supportsInterface(bytes4 interfaceID) external view returns (bool);13}1415/// @title A contract that allows to set and delete token properties and change token property permissions.16/// @dev the ERC-165 identifier for this interface is 0xde0695c217interface TokenProperties is Dummy, ERC165 {18	// /// @notice Set permissions for token property.19	// /// @dev Throws error if `msg.sender` is not admin or owner of the collection.20	// /// @param key Property key.21	// /// @param isMutable Permission to mutate property.22	// /// @param collectionAdmin Permission to mutate property by collection admin if property is mutable.23	// /// @param tokenOwner Permission to mutate property by token owner if property is mutable.24	// /// @dev EVM selector for this function is: 0x222d97fa,25	// ///  or in textual repr: setTokenPropertyPermission(string,bool,bool,bool)26	// function setTokenPropertyPermission(string memory key, bool isMutable, bool collectionAdmin, bool tokenOwner) external;2728	/// @notice Set permissions for token property.29	/// @dev Throws error if `msg.sender` is not admin or owner of the collection.30	/// @param permissions Permissions for keys.31	/// @dev EVM selector for this function is: 0xbd92983a,32	///  or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[])33	function setTokenPropertyPermissions(TokenPropertyPermission[] memory permissions) external;3435	/// @notice Get permissions for token properties.36	/// @dev EVM selector for this function is: 0xf23d7790,37	///  or in textual repr: tokenPropertyPermissions()38	function tokenPropertyPermissions() external view returns (TokenPropertyPermission[] memory);3940	// /// @notice Set token property value.41	// /// @dev Throws error if `msg.sender` has no permission to edit the property.42	// /// @param tokenId ID of the token.43	// /// @param key Property key.44	// /// @param value Property value.45	// /// @dev EVM selector for this function is: 0x1752d67b,46	// ///  or in textual repr: setProperty(uint256,string,bytes)47	// function setProperty(uint256 tokenId, string memory key, bytes memory value) external;4849	/// @notice Set token properties value.50	/// @dev Throws error if `msg.sender` has no permission to edit the property.51	/// @param tokenId ID of the token.52	/// @param properties settable properties53	/// @dev EVM selector for this function is: 0x14ed3a6e,54	///  or in textual repr: setProperties(uint256,(string,bytes)[])55	function setProperties(uint256 tokenId, Property[] memory properties) external;5657	// /// @notice Delete token property value.58	// /// @dev Throws error if `msg.sender` has no permission to edit the property.59	// /// @param tokenId ID of the token.60	// /// @param key Property key.61	// /// @dev EVM selector for this function is: 0x066111d1,62	// ///  or in textual repr: deleteProperty(uint256,string)63	// function deleteProperty(uint256 tokenId, string memory key) external;6465	/// @notice Delete token properties value.66	/// @dev Throws error if `msg.sender` has no permission to edit the property.67	/// @param tokenId ID of the token.68	/// @param keys Properties key.69	/// @dev EVM selector for this function is: 0xc472d371,70	///  or in textual repr: deleteProperties(uint256,string[])71	function deleteProperties(uint256 tokenId, string[] memory keys) external;7273	/// @notice Get token property value.74	/// @dev Throws error if key not found75	/// @param tokenId ID of the token.76	/// @param key Property key.77	/// @return Property value bytes78	/// @dev EVM selector for this function is: 0x7228c327,79	///  or in textual repr: property(uint256,string)80	function property(uint256 tokenId, string memory key) external view returns (bytes memory);81}8283/// Ethereum representation of collection [`PropertyKey`](up_data_structs::PropertyKey) and [`PropertyValue`](up_data_structs::PropertyValue).84struct Property {85	string key;86	bytes value;87}8889/// Ethereum representation of Token Property Permissions.90struct TokenPropertyPermission {91	/// Token property key.92	string key;93	/// Token property permissions.94	PropertyPermission[] permissions;95}9697/// Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) as an key and value.98struct PropertyPermission {99	/// TokenPermission field.100	TokenPermissionField code;101	/// TokenPermission value.102	bool value;103}104105/// Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) fields as an enumeration.106enum TokenPermissionField {107	/// Permission to change the property and property permission. See [`up_data_structs::PropertyPermission::mutable`]108	Mutable,109	/// Change permission for the collection administrator. See [`up_data_structs::PropertyPermission::token_owner`]110	TokenOwner,111	/// Permission to change the property for the owner of the token. See [`up_data_structs::PropertyPermission::collection_admin`]112	CollectionAdmin113}114115/// @title A contract that allows you to work with collections.116/// @dev the ERC-165 identifier for this interface is 0x2a14cfd1117interface Collection is Dummy, ERC165 {118	// /// Set collection property.119	// ///120	// /// @param key Property key.121	// /// @param value Propery value.122	// /// @dev EVM selector for this function is: 0x2f073f66,123	// ///  or in textual repr: setCollectionProperty(string,bytes)124	// function setCollectionProperty(string memory key, bytes memory value) external;125126	/// Set collection properties.127	///128	/// @param properties Vector of properties key/value pair.129	/// @dev EVM selector for this function is: 0x50b26b2a,130	///  or in textual repr: setCollectionProperties((string,bytes)[])131	function setCollectionProperties(Property[] memory properties) external;132133	// /// Delete collection property.134	// ///135	// /// @param key Property key.136	// /// @dev EVM selector for this function is: 0x7b7debce,137	// ///  or in textual repr: deleteCollectionProperty(string)138	// function deleteCollectionProperty(string memory key) external;139140	/// Delete collection properties.141	///142	/// @param keys Properties keys.143	/// @dev EVM selector for this function is: 0xee206ee3,144	///  or in textual repr: deleteCollectionProperties(string[])145	function deleteCollectionProperties(string[] memory keys) external;146147	/// Get collection property.148	///149	/// @dev Throws error if key not found.150	///151	/// @param key Property key.152	/// @return bytes The property corresponding to the key.153	/// @dev EVM selector for this function is: 0xcf24fd6d,154	///  or in textual repr: collectionProperty(string)155	function collectionProperty(string memory key) external view returns (bytes memory);156157	/// Get collection properties.158	///159	/// @param keys Properties keys. Empty keys for all propertyes.160	/// @return Vector of properties key/value pairs.161	/// @dev EVM selector for this function is: 0x285fb8e6,162	///  or in textual repr: collectionProperties(string[])163	function collectionProperties(string[] memory keys) external view returns (Property[] memory);164165	// /// Set the sponsor of the collection.166	// ///167	// /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.168	// ///169	// /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.170	// /// @dev EVM selector for this function is: 0x7623402e,171	// ///  or in textual repr: setCollectionSponsor(address)172	// function setCollectionSponsor(address sponsor) external;173174	/// Set the sponsor of the collection.175	///176	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.177	///178	/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.179	/// @dev EVM selector for this function is: 0x84a1d5a8,180	///  or in textual repr: setCollectionSponsorCross((address,uint256))181	function setCollectionSponsorCross(CrossAddress memory sponsor) external;182183	/// Whether there is a pending sponsor.184	/// @dev EVM selector for this function is: 0x058ac185,185	///  or in textual repr: hasCollectionPendingSponsor()186	function hasCollectionPendingSponsor() external view returns (bool);187188	/// Collection sponsorship confirmation.189	///190	/// @dev After setting the sponsor for the collection, it must be confirmed with this function.191	/// @dev EVM selector for this function is: 0x3c50e97a,192	///  or in textual repr: confirmCollectionSponsorship()193	function confirmCollectionSponsorship() external;194195	/// Remove collection sponsor.196	/// @dev EVM selector for this function is: 0x6e0326a3,197	///  or in textual repr: removeCollectionSponsor()198	function removeCollectionSponsor() external;199200	/// Get current sponsor.201	///202	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.203	/// @dev EVM selector for this function is: 0x6ec0a9f1,204	///  or in textual repr: collectionSponsor()205	function collectionSponsor() external view returns (CrossAddress memory);206207	/// Get current collection limits.208	///209	/// @return Array of collection limits210	/// @dev EVM selector for this function is: 0xf63bc572,211	///  or in textual repr: collectionLimits()212	function collectionLimits() external view returns (CollectionLimit[] memory);213214	/// Set limits for the collection.215	/// @dev Throws error if limit not found.216	/// @param limit Some limit.217	/// @dev EVM selector for this function is: 0x2316ee74,218	///  or in textual repr: setCollectionLimit((uint8,(bool,uint256)))219	function setCollectionLimit(CollectionLimit memory limit) external;220221	/// Get contract address.222	/// @dev EVM selector for this function is: 0xf6b4dfb4,223	///  or in textual repr: contractAddress()224	function contractAddress() external view returns (address);225226	/// Add collection admin.227	/// @param newAdmin Cross account administrator address.228	/// @dev EVM selector for this function is: 0x859aa7d6,229	///  or in textual repr: addCollectionAdminCross((address,uint256))230	function addCollectionAdminCross(CrossAddress memory newAdmin) external;231232	/// Remove collection admin.233	/// @param admin Cross account administrator address.234	/// @dev EVM selector for this function is: 0x6c0cd173,235	///  or in textual repr: removeCollectionAdminCross((address,uint256))236	function removeCollectionAdminCross(CrossAddress memory admin) external;237238	// /// Add collection admin.239	// /// @param newAdmin Address of the added administrator.240	// /// @dev EVM selector for this function is: 0x92e462c7,241	// ///  or in textual repr: addCollectionAdmin(address)242	// function addCollectionAdmin(address newAdmin) external;243244	// /// Remove collection admin.245	// ///246	// /// @param admin Address of the removed administrator.247	// /// @dev EVM selector for this function is: 0xfafd7b42,248	// ///  or in textual repr: removeCollectionAdmin(address)249	// function removeCollectionAdmin(address admin) external;250251	/// Toggle accessibility of collection nesting.252	///253	/// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'254	/// @dev EVM selector for this function is: 0x112d4586,255	///  or in textual repr: setCollectionNesting(bool)256	function setCollectionNesting(bool enable) external;257258	/// Toggle accessibility of collection nesting.259	///260	/// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'261	/// @param collections Addresses of collections that will be available for nesting.262	/// @dev EVM selector for this function is: 0x64872396,263	///  or in textual repr: setCollectionNesting(bool,address[])264	function setCollectionNesting(bool enable, address[] memory collections) external;265266	/// Returns nesting for a collection267	/// @dev EVM selector for this function is: 0x22d25bfe,268	///  or in textual repr: collectionNestingRestrictedCollectionIds()269	function collectionNestingRestrictedCollectionIds() external view returns (CollectionNesting memory);270271	/// Returns permissions for a collection272	/// @dev EVM selector for this function is: 0x5b2eaf4b,273	///  or in textual repr: collectionNestingPermissions()274	function collectionNestingPermissions() external view returns (CollectionNestingPermission[] memory);275276	/// Set the collection access method.277	/// @param mode Access mode278	/// @dev EVM selector for this function is: 0x41835d4c,279	///  or in textual repr: setCollectionAccess(uint8)280	function setCollectionAccess(AccessMode mode) external;281282	/// Checks that user allowed to operate with collection.283	///284	/// @param user User address to check.285	/// @dev EVM selector for this function is: 0x91b6df49,286	///  or in textual repr: allowlistedCross((address,uint256))287	function allowlistedCross(CrossAddress memory user) external view returns (bool);288289	// /// Add the user to the allowed list.290	// ///291	// /// @param user Address of a trusted user.292	// /// @dev EVM selector for this function is: 0x67844fe6,293	// ///  or in textual repr: addToCollectionAllowList(address)294	// function addToCollectionAllowList(address user) external;295296	/// Add user to allowed list.297	///298	/// @param user User cross account address.299	/// @dev EVM selector for this function is: 0xa0184a3a,300	///  or in textual repr: addToCollectionAllowListCross((address,uint256))301	function addToCollectionAllowListCross(CrossAddress memory user) external;302303	// /// Remove the user from the allowed list.304	// ///305	// /// @param user Address of a removed user.306	// /// @dev EVM selector for this function is: 0x85c51acb,307	// ///  or in textual repr: removeFromCollectionAllowList(address)308	// function removeFromCollectionAllowList(address user) external;309310	/// Remove user from allowed list.311	///312	/// @param user User cross account address.313	/// @dev EVM selector for this function is: 0x09ba452a,314	///  or in textual repr: removeFromCollectionAllowListCross((address,uint256))315	function removeFromCollectionAllowListCross(CrossAddress memory user) external;316317	/// Switch permission for minting.318	///319	/// @param mode Enable if "true".320	/// @dev EVM selector for this function is: 0x00018e84,321	///  or in textual repr: setCollectionMintMode(bool)322	function setCollectionMintMode(bool mode) external;323324	// /// Check that account is the owner or admin of the collection325	// ///326	// /// @param user account to verify327	// /// @return "true" if account is the owner or admin328	// /// @dev EVM selector for this function is: 0x9811b0c7,329	// ///  or in textual repr: isOwnerOrAdmin(address)330	// function isOwnerOrAdmin(address user) external view returns (bool);331332	/// Check that account is the owner or admin of the collection333	///334	/// @param user User cross account to verify335	/// @return "true" if account is the owner or admin336	/// @dev EVM selector for this function is: 0x3e75a905,337	///  or in textual repr: isOwnerOrAdminCross((address,uint256))338	function isOwnerOrAdminCross(CrossAddress memory user) external view returns (bool);339340	/// Returns collection type341	///342	/// @return `Fungible` or `NFT` or `ReFungible`343	/// @dev EVM selector for this function is: 0xd34b55b8,344	///  or in textual repr: uniqueCollectionType()345	function uniqueCollectionType() external view returns (string memory);346347	/// Get collection owner.348	///349	/// @return Tuble with sponsor address and his substrate mirror.350	/// If address is canonical then substrate mirror is zero and vice versa.351	/// @dev EVM selector for this function is: 0xdf727d3b,352	///  or in textual repr: collectionOwner()353	function collectionOwner() external view returns (CrossAddress memory);354355	// /// Changes collection owner to another account356	// ///357	// /// @dev Owner can be changed only by current owner358	// /// @param newOwner new owner account359	// /// @dev EVM selector for this function is: 0x4f53e226,360	// ///  or in textual repr: changeCollectionOwner(address)361	// function changeCollectionOwner(address newOwner) external;362363	/// Get collection administrators364	///365	/// @return Vector of tuples with admins address and his substrate mirror.366	/// If address is canonical then substrate mirror is zero and vice versa.367	/// @dev EVM selector for this function is: 0x5813216b,368	///  or in textual repr: collectionAdmins()369	function collectionAdmins() external view returns (CrossAddress[] memory);370371	/// Changes collection owner to another account372	///373	/// @dev Owner can be changed only by current owner374	/// @param newOwner new owner cross account375	/// @dev EVM selector for this function is: 0x6496c497,376	///  or in textual repr: changeCollectionOwnerCross((address,uint256))377	function changeCollectionOwnerCross(CrossAddress memory newOwner) external;378}379380/// Cross account struct381struct CrossAddress {382	address eth;383	uint256 sub;384}385386/// Ethereum representation of `AccessMode` (see [`up_data_structs::AccessMode`]).387enum AccessMode {388	/// Access grant for owner and admins. Used as default.389	Normal,390	/// Like a [`Normal`](AccessMode::Normal) but also users in allow list.391	AllowList392}393394/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) field.395struct CollectionNestingPermission {396	CollectionPermissionField field;397	bool value;398}399400/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.401enum CollectionPermissionField {402	/// Owner of token can nest tokens under it.403	TokenOwner,404	/// Admin of token collection can nest tokens under token.405	CollectionAdmin406}407408/// Nested collections.409struct CollectionNesting {410	bool token_owner;411	uint256[] ids;412}413414/// [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.415struct CollectionLimit {416	CollectionLimitField field;417	OptionUint256 value;418}419420/// Optional value421struct OptionUint256 {422	/// Shows the status of accessibility of value423	bool status;424	/// Actual value if `status` is true425	uint256 value;426}427428/// [`CollectionLimits`](up_data_structs::CollectionLimits) fields representation for EVM.429enum CollectionLimitField {430	/// How many tokens can a user have on one account.431	AccountTokenOwnership,432	/// How many bytes of data are available for sponsorship.433	SponsoredDataSize,434	/// In any case, chain default: [`SponsoringRateLimit::SponsoringDisabled`]435	SponsoredDataRateLimit,436	/// How many tokens can be mined into this collection.437	TokenLimit,438	/// Timeouts for transfer sponsoring.439	SponsorTransferTimeout,440	/// Timeout for sponsoring an approval in passed blocks.441	SponsorApproveTimeout,442	/// Whether the collection owner of the collection can send tokens (which belong to other users).443	OwnerCanTransfer,444	/// Can the collection owner burn other people's tokens.445	OwnerCanDestroy,446	/// Is it possible to send tokens from this collection between users.447	TransferEnabled448}449450/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension451/// @dev See https://eips.ethereum.org/EIPS/eip-721452/// @dev the ERC-165 identifier for this interface is 0x5b5e139f453interface ERC721Metadata is Dummy, ERC165 {454	// /// @notice A descriptive name for a collection of NFTs in this contract455	// /// @dev real implementation of this function lies in `ERC721UniqueExtensions`456	// /// @dev EVM selector for this function is: 0x06fdde03,457	// ///  or in textual repr: name()458	// function name() external view returns (string memory);459460	// /// @notice An abbreviated name for NFTs in this contract461	// /// @dev real implementation of this function lies in `ERC721UniqueExtensions`462	// /// @dev EVM selector for this function is: 0x95d89b41,463	// ///  or in textual repr: symbol()464	// function symbol() external view returns (string memory);465466	/// @notice A distinct Uniform Resource Identifier (URI) for a given asset.467	///468	/// @dev If the token has a `url` property and it is not empty, it is returned.469	///  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`.470	///  If the collection property `baseURI` is empty or absent, return "" (empty string)471	///  otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix472	///  otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).473	///474	/// @return token's const_metadata475	/// @dev EVM selector for this function is: 0xc87b56dd,476	///  or in textual repr: tokenURI(uint256)477	function tokenURI(uint256 tokenId) external view returns (string memory);478}479480/// @title ERC721 Token that can be irreversibly burned (destroyed).481/// @dev the ERC-165 identifier for this interface is 0x42966c68482interface ERC721Burnable is Dummy, ERC165 {483	/// @notice Burns a specific ERC721 token.484	/// @dev Throws unless `msg.sender` is the current RFT owner, or an authorized485	///  operator of the current owner.486	/// @param tokenId The RFT to approve487	/// @dev EVM selector for this function is: 0x42966c68,488	///  or in textual repr: burn(uint256)489	function burn(uint256 tokenId) external;490}491492/// @title ERC721 minting logic.493/// @dev the ERC-165 identifier for this interface is 0x3fd94ea6494interface ERC721UniqueMintable is Dummy, ERC165 {495	/// @notice Function to mint a token.496	/// @param to The new owner497	/// @return uint256 The id of the newly minted token498	/// @dev EVM selector for this function is: 0x6a627842,499	///  or in textual repr: mint(address)500	function mint(address to) external returns (uint256);501502	// /// @notice Function to mint a token.503	// /// @dev `tokenId` should be obtained with `nextTokenId` method,504	// ///  unlike standard, you can't specify it manually505	// /// @param to The new owner506	// /// @param tokenId ID of the minted RFT507	// /// @dev EVM selector for this function is: 0x40c10f19,508	// ///  or in textual repr: mint(address,uint256)509	// function mint(address to, uint256 tokenId) external returns (bool);510511	/// @notice Function to mint token with the given tokenUri.512	/// @param to The new owner513	/// @param tokenUri Token URI that would be stored in the NFT properties514	/// @return uint256 The id of the newly minted token515	/// @dev EVM selector for this function is: 0x45c17782,516	///  or in textual repr: mintWithTokenURI(address,string)517	function mintWithTokenURI(address to, string memory tokenUri) external returns (uint256);518	// /// @notice Function to mint token with the given tokenUri.519	// /// @dev `tokenId` should be obtained with `nextTokenId` method,520	// ///  unlike standard, you can't specify it manually521	// /// @param to The new owner522	// /// @param tokenId ID of the minted RFT523	// /// @param tokenUri Token URI that would be stored in the RFT properties524	// /// @dev EVM selector for this function is: 0x50bb4e7f,525	// ///  or in textual repr: mintWithTokenURI(address,uint256,string)526	// function mintWithTokenURI(address to, uint256 tokenId, string memory tokenUri) external returns (bool);527528}529530/// @title Unique extensions for ERC721.531/// @dev the ERC-165 identifier for this interface is 0xb365c124532interface ERC721UniqueExtensions is Dummy, ERC165 {533	/// @notice A descriptive name for a collection of NFTs in this contract534	/// @dev EVM selector for this function is: 0x06fdde03,535	///  or in textual repr: name()536	function name() external view returns (string memory);537538	/// @notice An abbreviated name for NFTs in this contract539	/// @dev EVM selector for this function is: 0x95d89b41,540	///  or in textual repr: symbol()541	function symbol() external view returns (string memory);542543	/// @notice A description for the collection.544	/// @dev EVM selector for this function is: 0x7284e416,545	///  or in textual repr: description()546	function description() external view returns (string memory);547548	/// Returns the owner (in cross format) of the token.549	///550	/// @param tokenId Id for the token.551	/// @dev EVM selector for this function is: 0x2b29dace,552	///  or in textual repr: crossOwnerOf(uint256)553	function crossOwnerOf(uint256 tokenId) external view returns (CrossAddress memory);554555	/// Returns the token properties.556	///557	/// @param tokenId Id for the token.558	/// @param keys Properties keys. Empty keys for all propertyes.559	/// @return Vector of properties key/value pairs.560	/// @dev EVM selector for this function is: 0xe07ede7e,561	///  or in textual repr: properties(uint256,string[])562	function properties(uint256 tokenId, string[] memory keys) external view returns (Property[] memory);563564	/// @notice Transfer ownership of an RFT565	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`566	///  is the zero address. Throws if `tokenId` is not a valid RFT.567	///  Throws if RFT pieces have multiple owners.568	/// @param to The new owner569	/// @param tokenId The RFT to transfer570	/// @dev EVM selector for this function is: 0xa9059cbb,571	///  or in textual repr: transfer(address,uint256)572	function transfer(address to, uint256 tokenId) external;573574	/// @notice Transfer ownership of an RFT575	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`576	///  is the zero address. Throws if `tokenId` is not a valid RFT.577	///  Throws if RFT pieces have multiple owners.578	/// @param to The new owner579	/// @param tokenId The RFT to transfer580	/// @dev EVM selector for this function is: 0x2ada85ff,581	///  or in textual repr: transferCross((address,uint256),uint256)582	function transferCross(CrossAddress memory to, uint256 tokenId) external;583584	/// @notice Transfer ownership of an RFT585	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`586	///  is the zero address. Throws if `tokenId` is not a valid RFT.587	///  Throws if RFT pieces have multiple owners.588	/// @param to The new owner589	/// @param tokenId The RFT to transfer590	/// @dev EVM selector for this function is: 0xd5cf430b,591	///  or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)592	function transferFromCross(593		CrossAddress memory from,594		CrossAddress memory to,595		uint256 tokenId596	) external;597598	// /// @notice Burns a specific ERC721 token.599	// /// @dev Throws unless `msg.sender` is the current owner or an authorized600	// ///  operator for this RFT. Throws if `from` is not the current owner. Throws601	// ///  if `to` is the zero address. Throws if `tokenId` is not a valid RFT.602	// ///  Throws if RFT pieces have multiple owners.603	// /// @param from The current owner of the RFT604	// /// @param tokenId The RFT to transfer605	// /// @dev EVM selector for this function is: 0x79cc6790,606	// ///  or in textual repr: burnFrom(address,uint256)607	// function burnFrom(address from, uint256 tokenId) external;608609	/// @notice Burns a specific ERC721 token.610	/// @dev Throws unless `msg.sender` is the current owner or an authorized611	///  operator for this RFT. Throws if `from` is not the current owner. Throws612	///  if `to` is the zero address. Throws if `tokenId` is not a valid RFT.613	///  Throws if RFT pieces have multiple owners.614	/// @param from The current owner of the RFT615	/// @param tokenId The RFT to transfer616	/// @dev EVM selector for this function is: 0xbb2f5a58,617	///  or in textual repr: burnFromCross((address,uint256),uint256)618	function burnFromCross(CrossAddress memory from, uint256 tokenId) external;619620	/// @notice Returns next free RFT ID.621	/// @dev EVM selector for this function is: 0x75794a3c,622	///  or in textual repr: nextTokenId()623	function nextTokenId() external view returns (uint256);624625	// /// @notice Function to mint multiple tokens.626	// /// @dev `tokenIds` should be an array of consecutive numbers and first number627	// ///  should be obtained with `nextTokenId` method628	// /// @param to The new owner629	// /// @param tokenIds IDs of the minted RFTs630	// /// @dev EVM selector for this function is: 0x44a9945e,631	// ///  or in textual repr: mintBulk(address,uint256[])632	// function mintBulk(address to, uint256[] memory tokenIds) external returns (bool);633634	// /// @notice Function to mint multiple tokens with the given tokenUris.635	// /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive636	// ///  numbers and first number should be obtained with `nextTokenId` method637	// /// @param to The new owner638	// /// @param tokens array of pairs of token ID and token URI for minted tokens639	// /// @dev EVM selector for this function is: 0x36543006,640	// ///  or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])641	// function mintBulkWithTokenURI(address to, TokenUri[] memory tokens) external returns (bool);642643	/// @notice Function to mint a token.644	/// @param to The new owner crossAccountId645	/// @param properties Properties of minted token646	/// @return uint256 The id of the newly minted token647	/// @dev EVM selector for this function is: 0xb904db03,648	///  or in textual repr: mintCross((address,uint256),(string,bytes)[])649	function mintCross(CrossAddress memory to, Property[] memory properties) external returns (uint256);650651	/// Returns EVM address for refungible token652	///653	/// @param token ID of the token654	/// @dev EVM selector for this function is: 0xab76fac6,655	///  or in textual repr: tokenContractAddress(uint256)656	function tokenContractAddress(uint256 token) external view returns (address);657658	/// @notice Returns collection helper contract address659	/// @dev EVM selector for this function is: 0x1896cce6,660	///  or in textual repr: collectionHelperAddress()661	function collectionHelperAddress() external view returns (address);662}663664/// Data for creation token with uri.665struct TokenUri {666	/// Id of new token.667	uint256 id;668	/// Uri of new token.669	string uri;670}671672/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension673/// @dev See https://eips.ethereum.org/EIPS/eip-721674/// @dev the ERC-165 identifier for this interface is 0x780e9d63675interface ERC721Enumerable is Dummy, ERC165 {676	/// @notice Enumerate valid RFTs677	/// @param index A counter less than `totalSupply()`678	/// @return The token identifier for the `index`th NFT,679	///  (sort order not specified)680	/// @dev EVM selector for this function is: 0x4f6ccce7,681	///  or in textual repr: tokenByIndex(uint256)682	function tokenByIndex(uint256 index) external view returns (uint256);683684	/// Not implemented685	/// @dev EVM selector for this function is: 0x2f745c59,686	///  or in textual repr: tokenOfOwnerByIndex(address,uint256)687	function tokenOfOwnerByIndex(address owner, uint256 index) external view returns (uint256);688689	/// @notice Count RFTs tracked by this contract690	/// @return A count of valid RFTs tracked by this contract, where each one of691	///  them has an assigned and queryable owner not equal to the zero address692	/// @dev EVM selector for this function is: 0x18160ddd,693	///  or in textual repr: totalSupply()694	function totalSupply() external view returns (uint256);695}696697/// @dev inlined interface698interface ERC721Events {699	event Transfer(address indexed from, address indexed to, uint256 indexed tokenId);700	event Approval(address indexed owner, address indexed approved, uint256 indexed tokenId);701	event ApprovalForAll(address indexed owner, address indexed operator, bool approved);702}703704/// @title ERC-721 Non-Fungible Token Standard705/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md706/// @dev the ERC-165 identifier for this interface is 0x80ac58cd707interface ERC721 is Dummy, ERC165, ERC721Events {708	/// @notice Count all RFTs assigned to an owner709	/// @dev RFTs assigned to the zero address are considered invalid, and this710	///  function throws for queries about the zero address.711	/// @param owner An address for whom to query the balance712	/// @return The number of RFTs owned by `owner`, possibly zero713	/// @dev EVM selector for this function is: 0x70a08231,714	///  or in textual repr: balanceOf(address)715	function balanceOf(address owner) external view returns (uint256);716717	/// @notice Find the owner of an RFT718	/// @dev RFTs assigned to zero address are considered invalid, and queries719	///  about them do throw.720	///  Returns special 0xffffffffffffffffffffffffffffffffffffffff address for721	///  the tokens that are partially owned.722	/// @param tokenId The identifier for an RFT723	/// @return The address of the owner of the RFT724	/// @dev EVM selector for this function is: 0x6352211e,725	///  or in textual repr: ownerOf(uint256)726	function ownerOf(uint256 tokenId) external view returns (address);727728	/// @dev Not implemented729	/// @dev EVM selector for this function is: 0xb88d4fde,730	///  or in textual repr: safeTransferFrom(address,address,uint256,bytes)731	function safeTransferFrom(732		address from,733		address to,734		uint256 tokenId,735		bytes memory data736	) external;737738	/// @dev Not implemented739	/// @dev EVM selector for this function is: 0x42842e0e,740	///  or in textual repr: safeTransferFrom(address,address,uint256)741	function safeTransferFrom(742		address from,743		address to,744		uint256 tokenId745	) external;746747	/// @notice Transfer ownership of an RFT -- THE CALLER IS RESPONSIBLE748	///  TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE749	///  THEY MAY BE PERMANENTLY LOST750	/// @dev Throws unless `msg.sender` is the current owner or an authorized751	///  operator for this RFT. Throws if `from` is not the current owner. Throws752	///  if `to` is the zero address. Throws if `tokenId` is not a valid RFT.753	///  Throws if RFT pieces have multiple owners.754	/// @param from The current owner of the NFT755	/// @param to The new owner756	/// @param tokenId The NFT to transfer757	/// @dev EVM selector for this function is: 0x23b872dd,758	///  or in textual repr: transferFrom(address,address,uint256)759	function transferFrom(760		address from,761		address to,762		uint256 tokenId763	) external;764765	/// @dev Not implemented766	/// @dev EVM selector for this function is: 0x095ea7b3,767	///  or in textual repr: approve(address,uint256)768	function approve(address approved, uint256 tokenId) external;769770	/// @notice Sets or unsets the approval of a given operator.771	///  The `operator` is allowed to transfer all token pieces of the `caller` on their behalf.772	/// @param operator Operator773	/// @param approved Should operator status be granted or revoked?774	/// @dev EVM selector for this function is: 0xa22cb465,775	///  or in textual repr: setApprovalForAll(address,bool)776	function setApprovalForAll(address operator, bool approved) external;777778	/// @dev Not implemented779	/// @dev EVM selector for this function is: 0x081812fc,780	///  or in textual repr: getApproved(uint256)781	function getApproved(uint256 tokenId) external view returns (address);782783	/// @notice Tells whether the given `owner` approves the `operator`.784	/// @dev EVM selector for this function is: 0xe985e9c5,785	///  or in textual repr: isApprovedForAll(address,address)786	function isApprovedForAll(address owner, address operator) external view returns (bool);787}788789interface UniqueRefungible is790	Dummy,791	ERC165,792	ERC721,793	ERC721Enumerable,794	ERC721UniqueExtensions,795	ERC721UniqueMintable,796	ERC721Burnable,797	ERC721Metadata,798	Collection,799	TokenProperties800{}
modifiedtests/src/eth/proxy/UniqueNFTProxy.soldiffbeforeafterboth
--- a/tests/src/eth/proxy/UniqueNFTProxy.sol
+++ b/tests/src/eth/proxy/UniqueNFTProxy.sol
@@ -168,7 +168,7 @@
         return proxied.mintBulk(to, tokenIds);
     }
 
-    function mintBulkWithTokenURI(address to, Tuple6[] memory tokens)
+    function mintBulkWithTokenURI(address to, TokenUri[] memory tokens)
         external
         override
         returns (bool)