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

difftreelog

fix after rebase

Trubnikov Sergey2023-02-13parent: #ab7466d.patch.diff
in: master

5 files changed

modifiedpallets/common/src/lib.rsdiffbeforeafterboth
--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -86,7 +86,6 @@
 use sp_core::H160;
 use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};
 
-use crate::erc::CollectionHelpersEvents;
 #[cfg(feature = "runtime-benchmarks")]
 pub mod benchmarking;
 pub mod dispatch;
modifiedpallets/fungible/src/stubs/UniqueFungible.soldiffbeforeafterboth
before · pallets/fungible/src/stubs/UniqueFungible.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 you to work with collections.21/// @dev the ERC-165 identifier for this interface is 0x2a14cfd122contract Collection is Dummy, ERC165 {23	// /// Set collection property.24	// ///25	// /// @param key Property key.26	// /// @param value Propery value.27	// /// @dev EVM selector for this function is: 0x2f073f66,28	// ///  or in textual repr: setCollectionProperty(string,bytes)29	// function setCollectionProperty(string memory key, bytes memory value) public {30	// 	require(false, stub_error);31	// 	key;32	// 	value;33	// 	dummy = 0;34	// }3536	/// Set collection properties.37	///38	/// @param properties Vector of properties key/value pair.39	/// @dev EVM selector for this function is: 0x50b26b2a,40	///  or in textual repr: setCollectionProperties((string,bytes)[])41	function setCollectionProperties(Property[] memory properties) public {42		require(false, stub_error);43		properties;44		dummy = 0;45	}4647	// /// Delete collection property.48	// ///49	// /// @param key Property key.50	// /// @dev EVM selector for this function is: 0x7b7debce,51	// ///  or in textual repr: deleteCollectionProperty(string)52	// function deleteCollectionProperty(string memory key) public {53	// 	require(false, stub_error);54	// 	key;55	// 	dummy = 0;56	// }5758	/// Delete collection properties.59	///60	/// @param keys Properties keys.61	/// @dev EVM selector for this function is: 0xee206ee3,62	///  or in textual repr: deleteCollectionProperties(string[])63	function deleteCollectionProperties(string[] memory keys) public {64		require(false, stub_error);65		keys;66		dummy = 0;67	}6869	/// Get collection property.70	///71	/// @dev Throws error if key not found.72	///73	/// @param key Property key.74	/// @return bytes The property corresponding to the key.75	/// @dev EVM selector for this function is: 0xcf24fd6d,76	///  or in textual repr: collectionProperty(string)77	function collectionProperty(string memory key) public view returns (bytes memory) {78		require(false, stub_error);79		key;80		dummy;81		return hex"";82	}8384	/// Get collection properties.85	///86	/// @param keys Properties keys. Empty keys for all propertyes.87	/// @return Vector of properties key/value pairs.88	/// @dev EVM selector for this function is: 0x285fb8e6,89	///  or in textual repr: collectionProperties(string[])90	function collectionProperties(string[] memory keys) public view returns (Property[] memory) {91		require(false, stub_error);92		keys;93		dummy;94		return new Property[](0);95	}9697	// /// Set the sponsor of the collection.98	// ///99	// /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.100	// ///101	// /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.102	// /// @dev EVM selector for this function is: 0x7623402e,103	// ///  or in textual repr: setCollectionSponsor(address)104	// function setCollectionSponsor(address sponsor) public {105	// 	require(false, stub_error);106	// 	sponsor;107	// 	dummy = 0;108	// }109110	/// Set the sponsor of the collection.111	///112	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.113	///114	/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.115	/// @dev EVM selector for this function is: 0x84a1d5a8,116	///  or in textual repr: setCollectionSponsorCross((address,uint256))117	function setCollectionSponsorCross(CrossAddress memory sponsor) public {118		require(false, stub_error);119		sponsor;120		dummy = 0;121	}122123	/// Whether there is a pending sponsor.124	/// @dev EVM selector for this function is: 0x058ac185,125	///  or in textual repr: hasCollectionPendingSponsor()126	function hasCollectionPendingSponsor() public view returns (bool) {127		require(false, stub_error);128		dummy;129		return false;130	}131132	/// Collection sponsorship confirmation.133	///134	/// @dev After setting the sponsor for the collection, it must be confirmed with this function.135	/// @dev EVM selector for this function is: 0x3c50e97a,136	///  or in textual repr: confirmCollectionSponsorship()137	function confirmCollectionSponsorship() public {138		require(false, stub_error);139		dummy = 0;140	}141142	/// Remove collection sponsor.143	/// @dev EVM selector for this function is: 0x6e0326a3,144	///  or in textual repr: removeCollectionSponsor()145	function removeCollectionSponsor() public {146		require(false, stub_error);147		dummy = 0;148	}149150	/// Get current sponsor.151	///152	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.153	/// @dev EVM selector for this function is: 0x6ec0a9f1,154	///  or in textual repr: collectionSponsor()155	function collectionSponsor() public view returns (CrossAddress memory) {156		require(false, stub_error);157		dummy;158		return CrossAddress(0x0000000000000000000000000000000000000000, 0);159	}160161	/// Get current collection limits.162	///163	/// @return Array of collection limits164	/// @dev EVM selector for this function is: 0xf63bc572,165	///  or in textual repr: collectionLimits()166	function collectionLimits() public view returns (CollectionLimit[] memory) {167		require(false, stub_error);168		dummy;169		return new CollectionLimit[](0);170	}171172	/// Set limits for the collection.173	/// @dev Throws error if limit not found.174	/// @param limit Some limit.175	/// @dev EVM selector for this function is: 0x2316ee74,176	///  or in textual repr: setCollectionLimit((uint8,(bool,uint256)))177	function setCollectionLimit(CollectionLimit memory limit) public {178		require(false, stub_error);179		limit;180		dummy = 0;181	}182183	/// Get contract address.184	/// @dev EVM selector for this function is: 0xf6b4dfb4,185	///  or in textual repr: contractAddress()186	function contractAddress() public view returns (address) {187		require(false, stub_error);188		dummy;189		return 0x0000000000000000000000000000000000000000;190	}191192	/// Add collection admin.193	/// @param newAdmin Cross account administrator address.194	/// @dev EVM selector for this function is: 0x859aa7d6,195	///  or in textual repr: addCollectionAdminCross((address,uint256))196	function addCollectionAdminCross(CrossAddress memory newAdmin) public {197		require(false, stub_error);198		newAdmin;199		dummy = 0;200	}201202	/// Remove collection admin.203	/// @param admin Cross account administrator address.204	/// @dev EVM selector for this function is: 0x6c0cd173,205	///  or in textual repr: removeCollectionAdminCross((address,uint256))206	function removeCollectionAdminCross(CrossAddress memory admin) public {207		require(false, stub_error);208		admin;209		dummy = 0;210	}211212	// /// Add collection admin.213	// /// @param newAdmin Address of the added administrator.214	// /// @dev EVM selector for this function is: 0x92e462c7,215	// ///  or in textual repr: addCollectionAdmin(address)216	// function addCollectionAdmin(address newAdmin) public {217	// 	require(false, stub_error);218	// 	newAdmin;219	// 	dummy = 0;220	// }221222	// /// Remove collection admin.223	// ///224	// /// @param admin Address of the removed administrator.225	// /// @dev EVM selector for this function is: 0xfafd7b42,226	// ///  or in textual repr: removeCollectionAdmin(address)227	// function removeCollectionAdmin(address admin) public {228	// 	require(false, stub_error);229	// 	admin;230	// 	dummy = 0;231	// }232233	/// Toggle accessibility of collection nesting.234	///235	/// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'236	/// @dev EVM selector for this function is: 0x112d4586,237	///  or in textual repr: setCollectionNesting(bool)238	function setCollectionNesting(bool enable) public {239		require(false, stub_error);240		enable;241		dummy = 0;242	}243244	/// Toggle accessibility of collection nesting.245	///246	/// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'247	/// @param collections Addresses of collections that will be available for nesting.248	/// @dev EVM selector for this function is: 0x64872396,249	///  or in textual repr: setCollectionNesting(bool,address[])250	function setCollectionNesting(bool enable, address[] memory collections) public {251		require(false, stub_error);252		enable;253		collections;254		dummy = 0;255	}256257	/// Returns nesting for a collection258	/// @dev EVM selector for this function is: 0x22d25bfe,259	///  or in textual repr: collectionNestingRestrictedCollectionIds()260	function collectionNestingRestrictedCollectionIds() public view returns (CollectionNesting memory) {261		require(false, stub_error);262		dummy;263		return CollectionNesting(false, new uint256[](0));264	}265266	/// Returns permissions for a collection267	/// @dev EVM selector for this function is: 0x5b2eaf4b,268	///  or in textual repr: collectionNestingPermissions()269	function collectionNestingPermissions() public view returns (CollectionNestingPermission[] memory) {270		require(false, stub_error);271		dummy;272		return new CollectionNestingPermission[](0);273	}274275	/// Set the collection access method.276	/// @param mode Access mode277	/// @dev EVM selector for this function is: 0x41835d4c,278	///  or in textual repr: setCollectionAccess(uint8)279	function setCollectionAccess(AccessMode mode) public {280		require(false, stub_error);281		mode;282		dummy = 0;283	}284285	/// Checks that user allowed to operate with collection.286	///287	/// @param user User address to check.288	/// @dev EVM selector for this function is: 0x91b6df49,289	///  or in textual repr: allowlistedCross((address,uint256))290	function allowlistedCross(CrossAddress memory user) public view returns (bool) {291		require(false, stub_error);292		user;293		dummy;294		return false;295	}296297	// /// Add the user to the allowed list.298	// ///299	// /// @param user Address of a trusted user.300	// /// @dev EVM selector for this function is: 0x67844fe6,301	// ///  or in textual repr: addToCollectionAllowList(address)302	// function addToCollectionAllowList(address user) public {303	// 	require(false, stub_error);304	// 	user;305	// 	dummy = 0;306	// }307308	/// Add user to allowed list.309	///310	/// @param user User cross account address.311	/// @dev EVM selector for this function is: 0xa0184a3a,312	///  or in textual repr: addToCollectionAllowListCross((address,uint256))313	function addToCollectionAllowListCross(CrossAddress memory user) public {314		require(false, stub_error);315		user;316		dummy = 0;317	}318319	// /// Remove the user from the allowed list.320	// ///321	// /// @param user Address of a removed user.322	// /// @dev EVM selector for this function is: 0x85c51acb,323	// ///  or in textual repr: removeFromCollectionAllowList(address)324	// function removeFromCollectionAllowList(address user) public {325	// 	require(false, stub_error);326	// 	user;327	// 	dummy = 0;328	// }329330	/// Remove user from allowed list.331	///332	/// @param user User cross account address.333	/// @dev EVM selector for this function is: 0x09ba452a,334	///  or in textual repr: removeFromCollectionAllowListCross((address,uint256))335	function removeFromCollectionAllowListCross(CrossAddress memory user) public {336		require(false, stub_error);337		user;338		dummy = 0;339	}340341	/// Switch permission for minting.342	///343	/// @param mode Enable if "true".344	/// @dev EVM selector for this function is: 0x00018e84,345	///  or in textual repr: setCollectionMintMode(bool)346	function setCollectionMintMode(bool mode) public {347		require(false, stub_error);348		mode;349		dummy = 0;350	}351352	// /// Check that account is the owner or admin of the collection353	// ///354	// /// @param user account to verify355	// /// @return "true" if account is the owner or admin356	// /// @dev EVM selector for this function is: 0x9811b0c7,357	// ///  or in textual repr: isOwnerOrAdmin(address)358	// function isOwnerOrAdmin(address user) public view returns (bool) {359	// 	require(false, stub_error);360	// 	user;361	// 	dummy;362	// 	return false;363	// }364365	/// Check that account is the owner or admin of the collection366	///367	/// @param user User cross account to verify368	/// @return "true" if account is the owner or admin369	/// @dev EVM selector for this function is: 0x3e75a905,370	///  or in textual repr: isOwnerOrAdminCross((address,uint256))371	function isOwnerOrAdminCross(CrossAddress memory user) public view returns (bool) {372		require(false, stub_error);373		user;374		dummy;375		return false;376	}377378	/// Returns collection type379	///380	/// @return `Fungible` or `NFT` or `ReFungible`381	/// @dev EVM selector for this function is: 0xd34b55b8,382	///  or in textual repr: uniqueCollectionType()383	function uniqueCollectionType() public view returns (string memory) {384		require(false, stub_error);385		dummy;386		return "";387	}388389	/// Get collection owner.390	///391	/// @return Tuble with sponsor address and his substrate mirror.392	/// If address is canonical then substrate mirror is zero and vice versa.393	/// @dev EVM selector for this function is: 0xdf727d3b,394	///  or in textual repr: collectionOwner()395	function collectionOwner() public view returns (CrossAddress memory) {396		require(false, stub_error);397		dummy;398		return CrossAddress(0x0000000000000000000000000000000000000000, 0);399	}400401	// /// Changes collection owner to another account402	// ///403	// /// @dev Owner can be changed only by current owner404	// /// @param newOwner new owner account405	// /// @dev EVM selector for this function is: 0x4f53e226,406	// ///  or in textual repr: changeCollectionOwner(address)407	// function changeCollectionOwner(address newOwner) public {408	// 	require(false, stub_error);409	// 	newOwner;410	// 	dummy = 0;411	// }412413	/// Get collection administrators414	///415	/// @return Vector of tuples with admins address and his substrate mirror.416	/// If address is canonical then substrate mirror is zero and vice versa.417	/// @dev EVM selector for this function is: 0x5813216b,418	///  or in textual repr: collectionAdmins()419	function collectionAdmins() public view returns (CrossAddress[] memory) {420		require(false, stub_error);421		dummy;422		return new CrossAddress[](0);423	}424425	/// Changes collection owner to another account426	///427	/// @dev Owner can be changed only by current owner428	/// @param newOwner new owner cross account429	/// @dev EVM selector for this function is: 0x6496c497,430	///  or in textual repr: changeCollectionOwnerCross((address,uint256))431	function changeCollectionOwnerCross(CrossAddress memory newOwner) public {432		require(false, stub_error);433		newOwner;434		dummy = 0;435	}436}437438/// Cross account struct439struct CrossAddress {440	address eth;441	uint256 sub;442}443444/// Ethereum representation of `AccessMode` (see [`up_data_structs::AccessMode`]).445enum AccessMode {446	/// Access grant for owner and admins. Used as default.447	Normal,448	/// Like a [`Normal`](AccessMode::Normal) but also users in allow list.449	AllowList450}451452/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) field.453struct CollectionNestingPermission {454	CollectionPermissionField field;455	bool value;456}457458/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.459enum CollectionPermissionField {460	/// Owner of token can nest tokens under it.461	TokenOwner,462	/// Admin of token collection can nest tokens under token.463	CollectionAdmin464}465466/// Nested collections.467struct CollectionNesting {468	bool token_owner;469	uint256[] ids;470}471472/// [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.473struct CollectionLimit {474	CollectionLimitField field;475	OptionUint256 value;476}477478/// Optional value479struct OptionUint256 {480	/// Shows the status of accessibility of value481	bool status;482	/// Actual value if `status` is true483	uint256 value;484}485486/// [`CollectionLimits`](up_data_structs::CollectionLimits) fields representation for EVM.487enum CollectionLimitField {488	/// How many tokens can a user have on one account.489	AccountTokenOwnership,490	/// How many bytes of data are available for sponsorship.491	SponsoredDataSize,492	/// In any case, chain default: [`SponsoringRateLimit::SponsoringDisabled`]493	SponsoredDataRateLimit,494	/// How many tokens can be mined into this collection.495	TokenLimit,496	/// Timeouts for transfer sponsoring.497	SponsorTransferTimeout,498	/// Timeout for sponsoring an approval in passed blocks.499	SponsorApproveTimeout,500	/// Whether the collection owner of the collection can send tokens (which belong to other users).501	OwnerCanTransfer,502	/// Can the collection owner burn other people's tokens.503	OwnerCanDestroy,504	/// Is it possible to send tokens from this collection between users.505	TransferEnabled506}507508/// Ethereum representation of collection [`PropertyKey`](up_data_structs::PropertyKey) and [`PropertyValue`](up_data_structs::PropertyValue).509struct Property {510	string key;511	bytes value;512}513514/// @dev the ERC-165 identifier for this interface is 0x85d7dea6515contract ERC20UniqueExtensions is Dummy, ERC165 {516	/// @dev Function to check the amount of tokens that an owner allowed to a spender.517	/// @param owner crossAddress The address which owns the funds.518	/// @param spender crossAddress The address which will spend the funds.519	/// @return A uint256 specifying the amount of tokens still available for the spender.520	/// @dev EVM selector for this function is: 0xe0af4bd7,521	///  or in textual repr: allowanceCross((address,uint256),(address,uint256))522	function allowanceCross(CrossAddress memory owner, CrossAddress memory spender) public view returns (uint256) {523		require(false, stub_error);524		owner;525		spender;526		dummy;527		return 0;528	}529530	/// @notice A description for the collection.531	/// @dev EVM selector for this function is: 0x7284e416,532	///  or in textual repr: description()533	function description() public view returns (string memory) {534		require(false, stub_error);535		dummy;536		return "";537	}538539	/// @dev EVM selector for this function is: 0x269e6158,540	///  or in textual repr: mintCross((address,uint256),uint256)541	function mintCross(CrossAddress memory to, uint256 amount) public returns (bool) {542		require(false, stub_error);543		to;544		amount;545		dummy = 0;546		return false;547	}548549	/// @dev EVM selector for this function is: 0x0ecd0ab0,550	///  or in textual repr: approveCross((address,uint256),uint256)551	function approveCross(CrossAddress memory spender, uint256 amount) public returns (bool) {552		require(false, stub_error);553		spender;554		amount;555		dummy = 0;556		return false;557	}558559	// /// Burn tokens from account560	// /// @dev Function that burns an `amount` of the tokens of a given account,561	// /// deducting from the sender's allowance for said account.562	// /// @param from The account whose tokens will be burnt.563	// /// @param amount The amount that will be burnt.564	// /// @dev EVM selector for this function is: 0x79cc6790,565	// ///  or in textual repr: burnFrom(address,uint256)566	// function burnFrom(address from, uint256 amount) public returns (bool) {567	// 	require(false, stub_error);568	// 	from;569	// 	amount;570	// 	dummy = 0;571	// 	return false;572	// }573574	/// Burn tokens from account575	/// @dev Function that burns an `amount` of the tokens of a given account,576	/// deducting from the sender's allowance for said account.577	/// @param from The account whose tokens will be burnt.578	/// @param amount The amount that will be burnt.579	/// @dev EVM selector for this function is: 0xbb2f5a58,580	///  or in textual repr: burnFromCross((address,uint256),uint256)581	function burnFromCross(CrossAddress memory from, uint256 amount) public returns (bool) {582		require(false, stub_error);583		from;584		amount;585		dummy = 0;586		return false;587	}588589	/// Mint tokens for multiple accounts.590	/// @param amounts array of pairs of account address and amount591	/// @dev EVM selector for this function is: 0x1acf2d55,592	///  or in textual repr: mintBulk((address,uint256)[])593	function mintBulk(AmountForAddress[] memory amounts) public returns (bool) {594		require(false, stub_error);595		amounts;596		dummy = 0;597		return false;598	}599600	/// @dev EVM selector for this function is: 0x2ada85ff,601	///  or in textual repr: transferCross((address,uint256),uint256)602	function transferCross(CrossAddress memory to, uint256 amount) public returns (bool) {603		require(false, stub_error);604		to;605		amount;606		dummy = 0;607		return false;608	}609610	/// @dev EVM selector for this function is: 0xd5cf430b,611	///  or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)612	function transferFromCross(613		CrossAddress memory from,614		CrossAddress memory to,615		uint256 amount616	) public returns (bool) {617		require(false, stub_error);618		from;619		to;620		amount;621		dummy = 0;622		return false;623	}624625	/// @notice Returns collection helper contract address626	/// @dev EVM selector for this function is: 0x1896cce6,627	///  or in textual repr: collectionHelperAddress()628	function collectionHelperAddress() public view returns (address) {629		require(false, stub_error);630		dummy;631		return 0x0000000000000000000000000000000000000000;632	}633}634635struct AmountForAddress {636	address to;637	uint256 amount;638}639640/// @dev the ERC-165 identifier for this interface is 0x40c10f19641contract ERC20Mintable is Dummy, ERC165 {642	/// Mint tokens for `to` account.643	/// @param to account that will receive minted tokens644	/// @param amount amount of tokens to mint645	/// @dev EVM selector for this function is: 0x40c10f19,646	///  or in textual repr: mint(address,uint256)647	function mint(address to, uint256 amount) public returns (bool) {648		require(false, stub_error);649		to;650		amount;651		dummy = 0;652		return false;653	}654}655656/// @dev inlined interface657contract ERC20Events {658	event Transfer(address indexed from, address indexed to, uint256 value);659	event Approval(address indexed owner, address indexed spender, uint256 value);660}661662/// @dev the ERC-165 identifier for this interface is 0x942e8b22663contract ERC20 is Dummy, ERC165, ERC20Events {664	/// @dev EVM selector for this function is: 0x06fdde03,665	///  or in textual repr: name()666	function name() public view returns (string memory) {667		require(false, stub_error);668		dummy;669		return "";670	}671672	/// @dev EVM selector for this function is: 0x95d89b41,673	///  or in textual repr: symbol()674	function symbol() public view returns (string memory) {675		require(false, stub_error);676		dummy;677		return "";678	}679680	/// @dev EVM selector for this function is: 0x18160ddd,681	///  or in textual repr: totalSupply()682	function totalSupply() public view returns (uint256) {683		require(false, stub_error);684		dummy;685		return 0;686	}687688	/// @dev EVM selector for this function is: 0x313ce567,689	///  or in textual repr: decimals()690	function decimals() public view returns (uint8) {691		require(false, stub_error);692		dummy;693		return 0;694	}695696	/// @dev EVM selector for this function is: 0x70a08231,697	///  or in textual repr: balanceOf(address)698	function balanceOf(address owner) public view returns (uint256) {699		require(false, stub_error);700		owner;701		dummy;702		return 0;703	}704705	/// @dev EVM selector for this function is: 0xa9059cbb,706	///  or in textual repr: transfer(address,uint256)707	function transfer(address to, uint256 amount) public returns (bool) {708		require(false, stub_error);709		to;710		amount;711		dummy = 0;712		return false;713	}714715	/// @dev EVM selector for this function is: 0x23b872dd,716	///  or in textual repr: transferFrom(address,address,uint256)717	function transferFrom(718		address from,719		address to,720		uint256 amount721	) public returns (bool) {722		require(false, stub_error);723		from;724		to;725		amount;726		dummy = 0;727		return false;728	}729730	/// @dev EVM selector for this function is: 0x095ea7b3,731	///  or in textual repr: approve(address,uint256)732	function approve(address spender, uint256 amount) public returns (bool) {733		require(false, stub_error);734		spender;735		amount;736		dummy = 0;737		return false;738	}739740	/// @dev EVM selector for this function is: 0xdd62ed3e,741	///  or in textual repr: allowance(address,address)742	function allowance(address owner, address spender) public view returns (uint256) {743		require(false, stub_error);744		owner;745		spender;746		dummy;747		return 0;748	}749}750751contract UniqueFungible is Dummy, ERC165, ERC20, ERC20Mintable, ERC20UniqueExtensions, Collection {}
modifiedpallets/nonfungible/src/lib.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -623,7 +623,6 @@
 			is_token_owner,
 			|properties| <TokenProperties<T>>::set((collection.id, token_id), properties),
 			erc::ERC721TokenEvent::TokenChanged {
-				collection_id: collection_id_to_address(collection.id),
 				token_id: token_id.into(),
 			}
 			.to_log(T::ContractAddress::get()),
modifiedpallets/refungible/src/lib.rsdiffbeforeafterboth
--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -572,7 +572,6 @@
 			is_token_owner,
 			|properties| <TokenProperties<T>>::set((collection.id, token_id), properties),
 			erc::ERC721TokenEvent::TokenChanged {
-				collection_id: collection_id_to_address(collection.id),
 				token_id: token_id.into(),
 			}
 			.to_log(T::ContractAddress::get()),
modifiedtests/src/eth/api/UniqueFungible.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueFungible.sol
+++ b/tests/src/eth/api/UniqueFungible.sol
@@ -1,485 +0,0 @@
-// SPDX-License-Identifier: OTHER
-// This code is automatically generated
-
-pragma solidity >=0.8.0 <0.9.0;
-
-/// @dev common stubs holder
-interface Dummy {
-
-}
-
-interface ERC165 is Dummy {
-	function supportsInterface(bytes4 interfaceID) external view returns (bool);
-}
-
-/// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0x2a14cfd1
-interface Collection is Dummy, ERC165 {
-	// /// Set collection property.
-	// ///
-	// /// @param key Property key.
-	// /// @param value Propery value.
-	// /// @dev EVM selector for this function is: 0x2f073f66,
-	// ///  or in textual repr: setCollectionProperty(string,bytes)
-	// function setCollectionProperty(string memory key, bytes memory value) external;
-
-	/// Set collection properties.
-	///
-	/// @param properties Vector of properties key/value pair.
-	/// @dev EVM selector for this function is: 0x50b26b2a,
-	///  or in textual repr: setCollectionProperties((string,bytes)[])
-	function setCollectionProperties(Property[] memory properties) external;
-
-	// /// Delete collection property.
-	// ///
-	// /// @param key Property key.
-	// /// @dev EVM selector for this function is: 0x7b7debce,
-	// ///  or in textual repr: deleteCollectionProperty(string)
-	// function deleteCollectionProperty(string memory key) external;
-
-	/// Delete collection properties.
-	///
-	/// @param keys Properties keys.
-	/// @dev EVM selector for this function is: 0xee206ee3,
-	///  or in textual repr: deleteCollectionProperties(string[])
-	function deleteCollectionProperties(string[] memory keys) external;
-
-	/// Get collection property.
-	///
-	/// @dev Throws error if key not found.
-	///
-	/// @param key Property key.
-	/// @return bytes The property corresponding to the key.
-	/// @dev EVM selector for this function is: 0xcf24fd6d,
-	///  or in textual repr: collectionProperty(string)
-	function collectionProperty(string memory key) external view returns (bytes memory);
-
-	/// Get collection properties.
-	///
-	/// @param keys Properties keys. Empty keys for all propertyes.
-	/// @return Vector of properties key/value pairs.
-	/// @dev EVM selector for this function is: 0x285fb8e6,
-	///  or in textual repr: collectionProperties(string[])
-	function collectionProperties(string[] memory keys) external view returns (Property[] memory);
-
-	// /// Set the sponsor of the collection.
-	// ///
-	// /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
-	// ///
-	// /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.
-	// /// @dev EVM selector for this function is: 0x7623402e,
-	// ///  or in textual repr: setCollectionSponsor(address)
-	// function setCollectionSponsor(address sponsor) external;
-
-	/// Set the sponsor of the collection.
-	///
-	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
-	///
-	/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.
-	/// @dev EVM selector for this function is: 0x84a1d5a8,
-	///  or in textual repr: setCollectionSponsorCross((address,uint256))
-	function setCollectionSponsorCross(CrossAddress memory sponsor) external;
-
-	/// Whether there is a pending sponsor.
-	/// @dev EVM selector for this function is: 0x058ac185,
-	///  or in textual repr: hasCollectionPendingSponsor()
-	function hasCollectionPendingSponsor() external view returns (bool);
-
-	/// Collection sponsorship confirmation.
-	///
-	/// @dev After setting the sponsor for the collection, it must be confirmed with this function.
-	/// @dev EVM selector for this function is: 0x3c50e97a,
-	///  or in textual repr: confirmCollectionSponsorship()
-	function confirmCollectionSponsorship() external;
-
-	/// Remove collection sponsor.
-	/// @dev EVM selector for this function is: 0x6e0326a3,
-	///  or in textual repr: removeCollectionSponsor()
-	function removeCollectionSponsor() external;
-
-	/// Get current sponsor.
-	///
-	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
-	/// @dev EVM selector for this function is: 0x6ec0a9f1,
-	///  or in textual repr: collectionSponsor()
-	function collectionSponsor() external view returns (CrossAddress memory);
-
-	/// Get current collection limits.
-	///
-	/// @return Array of collection limits
-	/// @dev EVM selector for this function is: 0xf63bc572,
-	///  or in textual repr: collectionLimits()
-	function collectionLimits() external view returns (CollectionLimit[] memory);
-
-	/// Set limits for the collection.
-	/// @dev Throws error if limit not found.
-	/// @param limit Some limit.
-	/// @dev EVM selector for this function is: 0x2316ee74,
-	///  or in textual repr: setCollectionLimit((uint8,(bool,uint256)))
-	function setCollectionLimit(CollectionLimit memory limit) external;
-
-	/// Get contract address.
-	/// @dev EVM selector for this function is: 0xf6b4dfb4,
-	///  or in textual repr: contractAddress()
-	function contractAddress() external view returns (address);
-
-	/// Add collection admin.
-	/// @param newAdmin Cross account administrator address.
-	/// @dev EVM selector for this function is: 0x859aa7d6,
-	///  or in textual repr: addCollectionAdminCross((address,uint256))
-	function addCollectionAdminCross(CrossAddress memory newAdmin) external;
-
-	/// Remove collection admin.
-	/// @param admin Cross account administrator address.
-	/// @dev EVM selector for this function is: 0x6c0cd173,
-	///  or in textual repr: removeCollectionAdminCross((address,uint256))
-	function removeCollectionAdminCross(CrossAddress memory admin) external;
-
-	// /// Add collection admin.
-	// /// @param newAdmin Address of the added administrator.
-	// /// @dev EVM selector for this function is: 0x92e462c7,
-	// ///  or in textual repr: addCollectionAdmin(address)
-	// function addCollectionAdmin(address newAdmin) external;
-
-	// /// Remove collection admin.
-	// ///
-	// /// @param admin Address of the removed administrator.
-	// /// @dev EVM selector for this function is: 0xfafd7b42,
-	// ///  or in textual repr: removeCollectionAdmin(address)
-	// function removeCollectionAdmin(address admin) external;
-
-	/// Toggle accessibility of collection nesting.
-	///
-	/// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'
-	/// @dev EVM selector for this function is: 0x112d4586,
-	///  or in textual repr: setCollectionNesting(bool)
-	function setCollectionNesting(bool enable) external;
-
-	/// Toggle accessibility of collection nesting.
-	///
-	/// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'
-	/// @param collections Addresses of collections that will be available for nesting.
-	/// @dev EVM selector for this function is: 0x64872396,
-	///  or in textual repr: setCollectionNesting(bool,address[])
-	function setCollectionNesting(bool enable, address[] memory collections) external;
-
-	/// Returns nesting for a collection
-	/// @dev EVM selector for this function is: 0x22d25bfe,
-	///  or in textual repr: collectionNestingRestrictedCollectionIds()
-	function collectionNestingRestrictedCollectionIds() external view returns (CollectionNesting memory);
-
-	/// Returns permissions for a collection
-	/// @dev EVM selector for this function is: 0x5b2eaf4b,
-	///  or in textual repr: collectionNestingPermissions()
-	function collectionNestingPermissions() external view returns (CollectionNestingPermission[] memory);
-
-	/// Set the collection access method.
-	/// @param mode Access mode
-	/// @dev EVM selector for this function is: 0x41835d4c,
-	///  or in textual repr: setCollectionAccess(uint8)
-	function setCollectionAccess(AccessMode mode) external;
-
-	/// Checks that user allowed to operate with collection.
-	///
-	/// @param user User address to check.
-	/// @dev EVM selector for this function is: 0x91b6df49,
-	///  or in textual repr: allowlistedCross((address,uint256))
-	function allowlistedCross(CrossAddress memory user) external view returns (bool);
-
-	// /// Add the user to the allowed list.
-	// ///
-	// /// @param user Address of a trusted user.
-	// /// @dev EVM selector for this function is: 0x67844fe6,
-	// ///  or in textual repr: addToCollectionAllowList(address)
-	// function addToCollectionAllowList(address user) external;
-
-	/// Add user to allowed list.
-	///
-	/// @param user User cross account address.
-	/// @dev EVM selector for this function is: 0xa0184a3a,
-	///  or in textual repr: addToCollectionAllowListCross((address,uint256))
-	function addToCollectionAllowListCross(CrossAddress memory user) external;
-
-	// /// Remove the user from the allowed list.
-	// ///
-	// /// @param user Address of a removed user.
-	// /// @dev EVM selector for this function is: 0x85c51acb,
-	// ///  or in textual repr: removeFromCollectionAllowList(address)
-	// function removeFromCollectionAllowList(address user) external;
-
-	/// Remove user from allowed list.
-	///
-	/// @param user User cross account address.
-	/// @dev EVM selector for this function is: 0x09ba452a,
-	///  or in textual repr: removeFromCollectionAllowListCross((address,uint256))
-	function removeFromCollectionAllowListCross(CrossAddress memory user) external;
-
-	/// Switch permission for minting.
-	///
-	/// @param mode Enable if "true".
-	/// @dev EVM selector for this function is: 0x00018e84,
-	///  or in textual repr: setCollectionMintMode(bool)
-	function setCollectionMintMode(bool mode) external;
-
-	// /// Check that account is the owner or admin of the collection
-	// ///
-	// /// @param user account to verify
-	// /// @return "true" if account is the owner or admin
-	// /// @dev EVM selector for this function is: 0x9811b0c7,
-	// ///  or in textual repr: isOwnerOrAdmin(address)
-	// function isOwnerOrAdmin(address user) external view returns (bool);
-
-	/// Check that account is the owner or admin of the collection
-	///
-	/// @param user User cross account to verify
-	/// @return "true" if account is the owner or admin
-	/// @dev EVM selector for this function is: 0x3e75a905,
-	///  or in textual repr: isOwnerOrAdminCross((address,uint256))
-	function isOwnerOrAdminCross(CrossAddress memory user) external view returns (bool);
-
-	/// Returns collection type
-	///
-	/// @return `Fungible` or `NFT` or `ReFungible`
-	/// @dev EVM selector for this function is: 0xd34b55b8,
-	///  or in textual repr: uniqueCollectionType()
-	function uniqueCollectionType() external view returns (string memory);
-
-	/// Get collection owner.
-	///
-	/// @return Tuble with sponsor address and his substrate mirror.
-	/// If address is canonical then substrate mirror is zero and vice versa.
-	/// @dev EVM selector for this function is: 0xdf727d3b,
-	///  or in textual repr: collectionOwner()
-	function collectionOwner() external view returns (CrossAddress memory);
-
-	// /// Changes collection owner to another account
-	// ///
-	// /// @dev Owner can be changed only by current owner
-	// /// @param newOwner new owner account
-	// /// @dev EVM selector for this function is: 0x4f53e226,
-	// ///  or in textual repr: changeCollectionOwner(address)
-	// function changeCollectionOwner(address newOwner) external;
-
-	/// Get collection administrators
-	///
-	/// @return Vector of tuples with admins address and his substrate mirror.
-	/// If address is canonical then substrate mirror is zero and vice versa.
-	/// @dev EVM selector for this function is: 0x5813216b,
-	///  or in textual repr: collectionAdmins()
-	function collectionAdmins() external view returns (CrossAddress[] memory);
-
-	/// Changes collection owner to another account
-	///
-	/// @dev Owner can be changed only by current owner
-	/// @param newOwner new owner cross account
-	/// @dev EVM selector for this function is: 0x6496c497,
-	///  or in textual repr: changeCollectionOwnerCross((address,uint256))
-	function changeCollectionOwnerCross(CrossAddress memory newOwner) external;
-}
-
-/// Cross account struct
-struct CrossAddress {
-	address eth;
-	uint256 sub;
-}
-
-/// Ethereum representation of `AccessMode` (see [`up_data_structs::AccessMode`]).
-enum AccessMode {
-	/// Access grant for owner and admins. Used as default.
-	Normal,
-	/// Like a [`Normal`](AccessMode::Normal) but also users in allow list.
-	AllowList
-}
-
-/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) field.
-struct CollectionNestingPermission {
-	CollectionPermissionField field;
-	bool value;
-}
-
-/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.
-enum CollectionPermissionField {
-	/// Owner of token can nest tokens under it.
-	TokenOwner,
-	/// Admin of token collection can nest tokens under token.
-	CollectionAdmin
-}
-
-/// Nested collections.
-struct CollectionNesting {
-	bool token_owner;
-	uint256[] ids;
-}
-
-/// [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
-struct CollectionLimit {
-	CollectionLimitField field;
-	OptionUint256 value;
-}
-
-/// Optional value
-struct OptionUint256 {
-	/// Shows the status of accessibility of value
-	bool status;
-	/// Actual value if `status` is true
-	uint256 value;
-}
-
-/// [`CollectionLimits`](up_data_structs::CollectionLimits) fields representation for EVM.
-enum CollectionLimitField {
-	/// How many tokens can a user have on one account.
-	AccountTokenOwnership,
-	/// How many bytes of data are available for sponsorship.
-	SponsoredDataSize,
-	/// In any case, chain default: [`SponsoringRateLimit::SponsoringDisabled`]
-	SponsoredDataRateLimit,
-	/// How many tokens can be mined into this collection.
-	TokenLimit,
-	/// Timeouts for transfer sponsoring.
-	SponsorTransferTimeout,
-	/// Timeout for sponsoring an approval in passed blocks.
-	SponsorApproveTimeout,
-	/// Whether the collection owner of the collection can send tokens (which belong to other users).
-	OwnerCanTransfer,
-	/// Can the collection owner burn other people's tokens.
-	OwnerCanDestroy,
-	/// Is it possible to send tokens from this collection between users.
-	TransferEnabled
-}
-
-/// Ethereum representation of collection [`PropertyKey`](up_data_structs::PropertyKey) and [`PropertyValue`](up_data_structs::PropertyValue).
-struct Property {
-	string key;
-	bytes value;
-}
-
-/// @dev the ERC-165 identifier for this interface is 0x85d7dea6
-interface ERC20UniqueExtensions is Dummy, ERC165 {
-	/// @dev Function to check the amount of tokens that an owner allowed to a spender.
-	/// @param owner crossAddress The address which owns the funds.
-	/// @param spender crossAddress The address which will spend the funds.
-	/// @return A uint256 specifying the amount of tokens still available for the spender.
-	/// @dev EVM selector for this function is: 0xe0af4bd7,
-	///  or in textual repr: allowanceCross((address,uint256),(address,uint256))
-	function allowanceCross(CrossAddress memory owner, CrossAddress memory spender) external view returns (uint256);
-
-	/// @notice A description for the collection.
-	/// @dev EVM selector for this function is: 0x7284e416,
-	///  or in textual repr: description()
-	function description() external view returns (string memory);
-
-	/// @dev EVM selector for this function is: 0x269e6158,
-	///  or in textual repr: mintCross((address,uint256),uint256)
-	function mintCross(CrossAddress memory to, uint256 amount) external returns (bool);
-
-	/// @dev EVM selector for this function is: 0x0ecd0ab0,
-	///  or in textual repr: approveCross((address,uint256),uint256)
-	function approveCross(CrossAddress memory spender, uint256 amount) external returns (bool);
-
-	// /// Burn tokens from account
-	// /// @dev Function that burns an `amount` of the tokens of a given account,
-	// /// deducting from the sender's allowance for said account.
-	// /// @param from The account whose tokens will be burnt.
-	// /// @param amount The amount that will be burnt.
-	// /// @dev EVM selector for this function is: 0x79cc6790,
-	// ///  or in textual repr: burnFrom(address,uint256)
-	// function burnFrom(address from, uint256 amount) external returns (bool);
-
-	/// Burn tokens from account
-	/// @dev Function that burns an `amount` of the tokens of a given account,
-	/// deducting from the sender's allowance for said account.
-	/// @param from The account whose tokens will be burnt.
-	/// @param amount The amount that will be burnt.
-	/// @dev EVM selector for this function is: 0xbb2f5a58,
-	///  or in textual repr: burnFromCross((address,uint256),uint256)
-	function burnFromCross(CrossAddress memory from, uint256 amount) external returns (bool);
-
-	/// Mint tokens for multiple accounts.
-	/// @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(AmountForAddress[] memory amounts) external returns (bool);
-
-	/// @dev EVM selector for this function is: 0x2ada85ff,
-	///  or in textual repr: transferCross((address,uint256),uint256)
-	function transferCross(CrossAddress memory to, uint256 amount) external returns (bool);
-
-	/// @dev EVM selector for this function is: 0xd5cf430b,
-	///  or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)
-	function transferFromCross(
-		CrossAddress memory from,
-		CrossAddress memory to,
-		uint256 amount
-	) external returns (bool);
-
-	/// @notice Returns collection helper contract address
-	/// @dev EVM selector for this function is: 0x1896cce6,
-	///  or in textual repr: collectionHelperAddress()
-	function collectionHelperAddress() external view returns (address);
-}
-
-struct AmountForAddress {
-	address to;
-	uint256 amount;
-}
-
-/// @dev the ERC-165 identifier for this interface is 0x40c10f19
-interface ERC20Mintable is Dummy, ERC165 {
-	/// Mint tokens for `to` account.
-	/// @param to account that will receive minted tokens
-	/// @param amount amount of tokens to mint
-	/// @dev EVM selector for this function is: 0x40c10f19,
-	///  or in textual repr: mint(address,uint256)
-	function mint(address to, uint256 amount) external returns (bool);
-}
-
-/// @dev inlined interface
-interface ERC20Events {
-	event Transfer(address indexed from, address indexed to, uint256 value);
-	event Approval(address indexed owner, address indexed spender, uint256 value);
-}
-
-/// @dev the ERC-165 identifier for this interface is 0x942e8b22
-interface ERC20 is Dummy, ERC165, ERC20Events {
-	/// @dev EVM selector for this function is: 0x06fdde03,
-	///  or in textual repr: name()
-	function name() external view returns (string memory);
-
-	/// @dev EVM selector for this function is: 0x95d89b41,
-	///  or in textual repr: symbol()
-	function symbol() external view returns (string memory);
-
-	/// @dev EVM selector for this function is: 0x18160ddd,
-	///  or in textual repr: totalSupply()
-	function totalSupply() external view returns (uint256);
-
-	/// @dev EVM selector for this function is: 0x313ce567,
-	///  or in textual repr: decimals()
-	function decimals() external view returns (uint8);
-
-	/// @dev EVM selector for this function is: 0x70a08231,
-	///  or in textual repr: balanceOf(address)
-	function balanceOf(address owner) external view returns (uint256);
-
-	/// @dev EVM selector for this function is: 0xa9059cbb,
-	///  or in textual repr: transfer(address,uint256)
-	function transfer(address to, uint256 amount) external returns (bool);
-
-	/// @dev EVM selector for this function is: 0x23b872dd,
-	///  or in textual repr: transferFrom(address,address,uint256)
-	function transferFrom(
-		address from,
-		address to,
-		uint256 amount
-	) external returns (bool);
-
-	/// @dev EVM selector for this function is: 0x095ea7b3,
-	///  or in textual repr: approve(address,uint256)
-	function approve(address spender, uint256 amount) external returns (bool);
-
-	/// @dev EVM selector for this function is: 0xdd62ed3e,
-	///  or in textual repr: allowance(address,address)
-	function allowance(address owner, address spender) external view returns (uint256);
-}
-
-interface UniqueFungible is Dummy, ERC165, ERC20, ERC20Mintable, ERC20UniqueExtensions, Collection {}