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

difftreelog

add `collectionHelperAddress` method to `ERC721` & `ERC20` interfaces.

PraetorP2022-11-24parent: #5aafe0c.patch.diff
in: master

14 files changed

modifiedpallets/fungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/fungible/src/erc.rs
+++ b/pallets/fungible/src/erc.rs
@@ -30,6 +30,7 @@
 use pallet_evm_coder_substrate::{call, dispatch_to_evm};
 use pallet_structure::{SelfWeightOf as StructureWeight, weights::WeightInfo as _};
 use pallet_common::{CollectionHandle, erc::CollectionCall};
+use sp_core::Get;
 
 use crate::{
 	Allowance, Balance, Config, FungibleHandle, Pallet, SelfWeightOf, TotalSupply,
@@ -132,6 +133,11 @@
 
 		Ok(<Allowance<T>>::get((self.id, owner, spender)).into())
 	}
+
+	/// @notice Returns collection helper contract address
+	fn collection_helper_address(&self) -> Result<address> {
+		Ok(T::ContractAddress::get())
+	}
 }
 
 #[solidity_interface(name = ERC20Mintable)]
modifiedpallets/fungible/src/stubs/UniqueFungible.soldiffbeforeafterboth
--- a/pallets/fungible/src/stubs/UniqueFungible.sol
+++ b/pallets/fungible/src/stubs/UniqueFungible.sol
@@ -547,7 +547,7 @@
 	event Approval(address indexed owner, address indexed spender, uint256 value);
 }
 
-/// @dev the ERC-165 identifier for this interface is 0x942e8b22
+/// @dev the ERC-165 identifier for this interface is 0x8cb847c4
 contract ERC20 is Dummy, ERC165, ERC20Events {
 	/// @dev EVM selector for this function is: 0x06fdde03,
 	///  or in textual repr: name()
@@ -634,6 +634,15 @@
 		dummy;
 		return 0;
 	}
+
+	/// @notice Returns collection helper contract address
+	/// @dev EVM selector for this function is: 0x1896cce6,
+	///  or in textual repr: collectionHelperAddress()
+	function collectionHelperAddress() public view returns (address) {
+		require(false, stub_error);
+		dummy;
+		return 0x0000000000000000000000000000000000000000;
+	}
 }
 
 contract UniqueFungible is Dummy, ERC165, ERC20, ERC20Mintable, ERC20UniqueExtensions, Collection {}
modifiedpallets/nonfungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -42,6 +42,7 @@
 use pallet_evm::{account::CrossAccountId, PrecompileHandle};
 use pallet_evm_coder_substrate::call;
 use pallet_structure::{SelfWeightOf as StructureWeight, weights::WeightInfo as _};
+use sp_core::Get;
 
 use crate::{
 	AccountBalance, Config, CreateItemData, NonfungibleHandle, Pallet, TokenData, TokensMinted,
@@ -489,6 +490,11 @@
 		// TODO: Not implemetable
 		Err("not implemented".into())
 	}
+	
+	/// @notice Returns collection helper contract address 
+	fn collection_helper_address(&self) -> Result<address> {
+		Ok(T::ContractAddress::get())
+	}
 }
 
 /// @title ERC721 Token that can be irreversibly burned (destroyed).
modifiedpallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth
--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -920,7 +920,7 @@
 
 /// @title ERC-721 Non-Fungible Token Standard
 /// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md
-/// @dev the ERC-165 identifier for this interface is 0x80ac58cd
+/// @dev the ERC-165 identifier for this interface is 0x983a942b
 contract ERC721 is Dummy, ERC165, ERC721Events {
 	/// @notice Count all NFTs assigned to an owner
 	/// @dev NFTs assigned to the zero address are considered invalid, and this
@@ -1050,6 +1050,15 @@
 		dummy;
 		return 0x0000000000000000000000000000000000000000;
 	}
+
+	/// @notice Returns collection helper contract address
+	/// @dev EVM selector for this function is: 0x1896cce6,
+	///  or in textual repr: collectionHelperAddress()
+	function collectionHelperAddress() public view returns (address) {
+		require(false, stub_error);
+		dummy;
+		return 0x0000000000000000000000000000000000000000;
+	}
 }
 
 contract UniqueNFT is
modifiedpallets/refungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -38,7 +38,7 @@
 use pallet_evm::{account::CrossAccountId, PrecompileHandle};
 use pallet_evm_coder_substrate::{call, dispatch_to_evm};
 use pallet_structure::{SelfWeightOf as StructureWeight, weights::WeightInfo as _};
-use sp_core::H160;
+use sp_core::{H160, Get};
 use sp_std::{collections::btree_map::BTreeMap, vec::Vec, vec};
 use up_data_structs::{
 	CollectionId, CollectionPropertiesVec, mapping::TokenAddressMapping, Property, PropertyKey,
@@ -482,6 +482,11 @@
 		// TODO: Not implemetable
 		Err("not implemented".into())
 	}
+	
+	/// @notice Returns collection helper contract address
+	fn collection_helper_address(&self) -> Result<address> {
+		Ok(T::ContractAddress::get())
+	}
 }
 
 /// Returns amount of pieces of `token` that `owner` have
modifiedpallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth
--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -919,7 +919,7 @@
 
 /// @title ERC-721 Non-Fungible Token Standard
 /// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md
-/// @dev the ERC-165 identifier for this interface is 0x58800161
+/// @dev the ERC-165 identifier for this interface is 0x4016cd87
 contract ERC721 is Dummy, ERC165, ERC721Events {
 	/// @notice Count all RFTs assigned to an owner
 	/// @dev RFTs assigned to the zero address are considered invalid, and this
@@ -1047,6 +1047,15 @@
 		dummy;
 		return 0x0000000000000000000000000000000000000000;
 	}
+
+	/// @notice Returns collection helper contract address
+	/// @dev EVM selector for this function is: 0x1896cce6,
+	///  or in textual repr: collectionHelperAddress()
+	function collectionHelperAddress() public view returns (address) {
+		require(false, stub_error);
+		dummy;
+		return 0x0000000000000000000000000000000000000000;
+	}
 }
 
 contract UniqueRefungible is
modifiedtests/src/apiConsts.test.tsdiffbeforeafterboth
--- a/tests/src/apiConsts.test.ts
+++ b/tests/src/apiConsts.test.ts
@@ -117,4 +117,4 @@
 
 function checkConst<T>(constValue: any, expectedValue: T) {
   expect(constValue.toBigInt()).equal(expectedValue);
-}
+}
\ No newline at end of file
modifiedtests/src/eth/abi/fungible.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/fungible.json
+++ b/tests/src/eth/abi/fungible.json
@@ -201,6 +201,13 @@
   },
   {
     "inputs": [],
+    "name": "collectionHelperAddress",
+    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
     "name": "collectionOwner",
     "outputs": [
       {
modifiedtests/src/eth/abi/nonFungible.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/nonFungible.json
+++ b/tests/src/eth/abi/nonFungible.json
@@ -231,6 +231,13 @@
   },
   {
     "inputs": [],
+    "name": "collectionHelperAddress",
+    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
     "name": "collectionOwner",
     "outputs": [
       {
modifiedtests/src/eth/abi/reFungible.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/reFungible.json
+++ b/tests/src/eth/abi/reFungible.json
@@ -213,6 +213,13 @@
   },
   {
     "inputs": [],
+    "name": "collectionHelperAddress",
+    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
     "name": "collectionOwner",
     "outputs": [
       {
modifiedtests/src/eth/api/UniqueFungible.soldiffbeforeafterboth
before · tests/src/eth/api/UniqueFungible.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 you to work with collections.16/// @dev the ERC-165 identifier for this interface is 0xcc1d80ca17interface Collection is Dummy, ERC165 {18	// /// Set collection property.19	// ///20	// /// @param key Property key.21	// /// @param value Propery value.22	// /// @dev EVM selector for this function is: 0x2f073f66,23	// ///  or in textual repr: setCollectionProperty(string,bytes)24	// function setCollectionProperty(string memory key, bytes memory value) external;2526	/// Set collection properties.27	///28	/// @param properties Vector of properties key/value pair.29	/// @dev EVM selector for this function is: 0x50b26b2a,30	///  or in textual repr: setCollectionProperties((string,bytes)[])31	function setCollectionProperties(Property[] memory properties) external;3233	// /// Delete collection property.34	// ///35	// /// @param key Property key.36	// /// @dev EVM selector for this function is: 0x7b7debce,37	// ///  or in textual repr: deleteCollectionProperty(string)38	// function deleteCollectionProperty(string memory key) external;3940	/// Delete collection properties.41	///42	/// @param keys Properties keys.43	/// @dev EVM selector for this function is: 0xee206ee3,44	///  or in textual repr: deleteCollectionProperties(string[])45	function deleteCollectionProperties(string[] memory keys) external;4647	/// Get collection property.48	///49	/// @dev Throws error if key not found.50	///51	/// @param key Property key.52	/// @return bytes The property corresponding to the key.53	/// @dev EVM selector for this function is: 0xcf24fd6d,54	///  or in textual repr: collectionProperty(string)55	function collectionProperty(string memory key) external view returns (bytes memory);5657	/// Get collection properties.58	///59	/// @param keys Properties keys. Empty keys for all propertyes.60	/// @return Vector of properties key/value pairs.61	/// @dev EVM selector for this function is: 0x285fb8e6,62	///  or in textual repr: collectionProperties(string[])63	function collectionProperties(string[] memory keys) external view returns (Property[] memory);6465	// /// Set the sponsor of the collection.66	// ///67	// /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.68	// ///69	// /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.70	// /// @dev EVM selector for this function is: 0x7623402e,71	// ///  or in textual repr: setCollectionSponsor(address)72	// function setCollectionSponsor(address sponsor) external;7374	/// Set the sponsor of the collection.75	///76	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.77	///78	/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.79	/// @dev EVM selector for this function is: 0x84a1d5a8,80	///  or in textual repr: setCollectionSponsorCross((address,uint256))81	function setCollectionSponsorCross(EthCrossAccount memory sponsor) external;8283	/// Whether there is a pending sponsor.84	/// @dev EVM selector for this function is: 0x058ac185,85	///  or in textual repr: hasCollectionPendingSponsor()86	function hasCollectionPendingSponsor() external view returns (bool);8788	/// Collection sponsorship confirmation.89	///90	/// @dev After setting the sponsor for the collection, it must be confirmed with this function.91	/// @dev EVM selector for this function is: 0x3c50e97a,92	///  or in textual repr: confirmCollectionSponsorship()93	function confirmCollectionSponsorship() external;9495	/// Remove collection sponsor.96	/// @dev EVM selector for this function is: 0x6e0326a3,97	///  or in textual repr: removeCollectionSponsor()98	function removeCollectionSponsor() external;99100	/// Get current sponsor.101	///102	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.103	/// @dev EVM selector for this function is: 0x6ec0a9f1,104	///  or in textual repr: collectionSponsor()105	function collectionSponsor() external view returns (Tuple8 memory);106107	/// Set limits for the collection.108	/// @dev Throws error if limit not found.109	/// @param limit Name of the limit. Valid names:110	/// 	"accountTokenOwnershipLimit",111	/// 	"sponsoredDataSize",112	/// 	"sponsoredDataRateLimit",113	/// 	"tokenLimit",114	/// 	"sponsorTransferTimeout",115	/// 	"sponsorApproveTimeout"116	///  	"ownerCanTransfer",117	/// 	"ownerCanDestroy",118	/// 	"transfersEnabled"119	/// @param value Value of the limit.120	/// @dev EVM selector for this function is: 0x4ad890a8,121	///  or in textual repr: setCollectionLimit(string,uint256)122	function setCollectionLimit(string memory limit, uint256 value) external;123124	/// Get contract address.125	/// @dev EVM selector for this function is: 0xf6b4dfb4,126	///  or in textual repr: contractAddress()127	function contractAddress() external view returns (address);128129	/// Add collection admin.130	/// @param newAdmin Cross account administrator address.131	/// @dev EVM selector for this function is: 0x859aa7d6,132	///  or in textual repr: addCollectionAdminCross((address,uint256))133	function addCollectionAdminCross(EthCrossAccount memory newAdmin) external;134135	/// Remove collection admin.136	/// @param admin Cross account administrator address.137	/// @dev EVM selector for this function is: 0x6c0cd173,138	///  or in textual repr: removeCollectionAdminCross((address,uint256))139	function removeCollectionAdminCross(EthCrossAccount memory admin) external;140141	// /// Add collection admin.142	// /// @param newAdmin Address of the added administrator.143	// /// @dev EVM selector for this function is: 0x92e462c7,144	// ///  or in textual repr: addCollectionAdmin(address)145	// function addCollectionAdmin(address newAdmin) external;146147	// /// Remove collection admin.148	// ///149	// /// @param admin Address of the removed administrator.150	// /// @dev EVM selector for this function is: 0xfafd7b42,151	// ///  or in textual repr: removeCollectionAdmin(address)152	// function removeCollectionAdmin(address admin) external;153154	/// Toggle accessibility of collection nesting.155	///156	/// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'157	/// @dev EVM selector for this function is: 0x112d4586,158	///  or in textual repr: setCollectionNesting(bool)159	function setCollectionNesting(bool enable) external;160161	/// Toggle accessibility of collection nesting.162	///163	/// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'164	/// @param collections Addresses of collections that will be available for nesting.165	/// @dev EVM selector for this function is: 0x64872396,166	///  or in textual repr: setCollectionNesting(bool,address[])167	function setCollectionNesting(bool enable, address[] memory collections) external;168169	/// Set the collection access method.170	/// @param mode Access mode171	/// 	0 for Normal172	/// 	1 for AllowList173	/// @dev EVM selector for this function is: 0x41835d4c,174	///  or in textual repr: setCollectionAccess(uint8)175	function setCollectionAccess(uint8 mode) external;176177	/// Checks that user allowed to operate with collection.178	///179	/// @param user User address to check.180	/// @dev EVM selector for this function is: 0x91b6df49,181	///  or in textual repr: allowlistedCross((address,uint256))182	function allowlistedCross(EthCrossAccount memory user) external view returns (bool);183184	// /// Add the user to the allowed list.185	// ///186	// /// @param user Address of a trusted user.187	// /// @dev EVM selector for this function is: 0x67844fe6,188	// ///  or in textual repr: addToCollectionAllowList(address)189	// function addToCollectionAllowList(address user) external;190191	/// Add user to allowed list.192	///193	/// @param user User cross account address.194	/// @dev EVM selector for this function is: 0xa0184a3a,195	///  or in textual repr: addToCollectionAllowListCross((address,uint256))196	function addToCollectionAllowListCross(EthCrossAccount memory user) external;197198	// /// Remove the user from the allowed list.199	// ///200	// /// @param user Address of a removed user.201	// /// @dev EVM selector for this function is: 0x85c51acb,202	// ///  or in textual repr: removeFromCollectionAllowList(address)203	// function removeFromCollectionAllowList(address user) external;204205	/// Remove user from allowed list.206	///207	/// @param user User cross account address.208	/// @dev EVM selector for this function is: 0x09ba452a,209	///  or in textual repr: removeFromCollectionAllowListCross((address,uint256))210	function removeFromCollectionAllowListCross(EthCrossAccount memory user) external;211212	/// Switch permission for minting.213	///214	/// @param mode Enable if "true".215	/// @dev EVM selector for this function is: 0x00018e84,216	///  or in textual repr: setCollectionMintMode(bool)217	function setCollectionMintMode(bool mode) external;218219	// /// Check that account is the owner or admin of the collection220	// ///221	// /// @param user account to verify222	// /// @return "true" if account is the owner or admin223	// /// @dev EVM selector for this function is: 0x9811b0c7,224	// ///  or in textual repr: isOwnerOrAdmin(address)225	// function isOwnerOrAdmin(address user) external view returns (bool);226227	/// Check that account is the owner or admin of the collection228	///229	/// @param user User cross account to verify230	/// @return "true" if account is the owner or admin231	/// @dev EVM selector for this function is: 0x3e75a905,232	///  or in textual repr: isOwnerOrAdminCross((address,uint256))233	function isOwnerOrAdminCross(EthCrossAccount memory user) external view returns (bool);234235	/// Returns collection type236	///237	/// @return `Fungible` or `NFT` or `ReFungible`238	/// @dev EVM selector for this function is: 0xd34b55b8,239	///  or in textual repr: uniqueCollectionType()240	function uniqueCollectionType() external view returns (string memory);241242	/// Get collection owner.243	///244	/// @return Tuble with sponsor address and his substrate mirror.245	/// If address is canonical then substrate mirror is zero and vice versa.246	/// @dev EVM selector for this function is: 0xdf727d3b,247	///  or in textual repr: collectionOwner()248	function collectionOwner() external view returns (EthCrossAccount memory);249250	// /// Changes collection owner to another account251	// ///252	// /// @dev Owner can be changed only by current owner253	// /// @param newOwner new owner account254	// /// @dev EVM selector for this function is: 0x4f53e226,255	// ///  or in textual repr: changeCollectionOwner(address)256	// function changeCollectionOwner(address newOwner) external;257258	/// Get collection administrators259	///260	/// @return Vector of tuples with admins address and his substrate mirror.261	/// If address is canonical then substrate mirror is zero and vice versa.262	/// @dev EVM selector for this function is: 0x5813216b,263	///  or in textual repr: collectionAdmins()264	function collectionAdmins() external view returns (EthCrossAccount[] memory);265266	/// Changes collection owner to another account267	///268	/// @dev Owner can be changed only by current owner269	/// @param newOwner new owner cross account270	/// @dev EVM selector for this function is: 0x6496c497,271	///  or in textual repr: changeCollectionOwnerCross((address,uint256))272	function changeCollectionOwnerCross(EthCrossAccount memory newOwner) external;273}274275/// @dev Cross account struct276struct EthCrossAccount {277	address eth;278	uint256 sub;279}280281/// @dev Property struct282struct Property {283	string key;284	bytes value;285}286287/// @dev the ERC-165 identifier for this interface is 0x5b7038cf288interface ERC20UniqueExtensions is Dummy, ERC165 {289	/// @notice A description for the collection.290	/// @dev EVM selector for this function is: 0x7284e416,291	///  or in textual repr: description()292	function description() external view returns (string memory);293294	/// @dev EVM selector for this function is: 0x0ecd0ab0,295	///  or in textual repr: approveCross((address,uint256),uint256)296	function approveCross(EthCrossAccount memory spender, uint256 amount) external returns (bool);297298	// /// Burn tokens from account299	// /// @dev Function that burns an `amount` of the tokens of a given account,300	// /// deducting from the sender's allowance for said account.301	// /// @param from The account whose tokens will be burnt.302	// /// @param amount The amount that will be burnt.303	// /// @dev EVM selector for this function is: 0x79cc6790,304	// ///  or in textual repr: burnFrom(address,uint256)305	// function burnFrom(address from, uint256 amount) external returns (bool);306307	/// Burn tokens from account308	/// @dev Function that burns an `amount` of the tokens of a given account,309	/// deducting from the sender's allowance for said account.310	/// @param from The account whose tokens will be burnt.311	/// @param amount The amount that will be burnt.312	/// @dev EVM selector for this function is: 0xbb2f5a58,313	///  or in textual repr: burnFromCross((address,uint256),uint256)314	function burnFromCross(EthCrossAccount memory from, uint256 amount) external returns (bool);315316	/// Mint tokens for multiple accounts.317	/// @param amounts array of pairs of account address and amount318	/// @dev EVM selector for this function is: 0x1acf2d55,319	///  or in textual repr: mintBulk((address,uint256)[])320	function mintBulk(Tuple8[] memory amounts) external returns (bool);321322	/// @dev EVM selector for this function is: 0x2ada85ff,323	///  or in textual repr: transferCross((address,uint256),uint256)324	function transferCross(EthCrossAccount memory to, uint256 amount) external returns (bool);325326	/// @dev EVM selector for this function is: 0xd5cf430b,327	///  or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)328	function transferFromCross(329		EthCrossAccount memory from,330		EthCrossAccount memory to,331		uint256 amount332	) external returns (bool);333}334335/// @dev anonymous struct336struct Tuple8 {337	address field_0;338	uint256 field_1;339}340341/// @dev the ERC-165 identifier for this interface is 0x40c10f19342interface ERC20Mintable is Dummy, ERC165 {343	/// Mint tokens for `to` account.344	/// @param to account that will receive minted tokens345	/// @param amount amount of tokens to mint346	/// @dev EVM selector for this function is: 0x40c10f19,347	///  or in textual repr: mint(address,uint256)348	function mint(address to, uint256 amount) external returns (bool);349}350351/// @dev inlined interface352interface ERC20Events {353	event Transfer(address indexed from, address indexed to, uint256 value);354	event Approval(address indexed owner, address indexed spender, uint256 value);355}356357/// @dev the ERC-165 identifier for this interface is 0x942e8b22358interface ERC20 is Dummy, ERC165, ERC20Events {359	/// @dev EVM selector for this function is: 0x06fdde03,360	///  or in textual repr: name()361	function name() external view returns (string memory);362363	/// @dev EVM selector for this function is: 0x95d89b41,364	///  or in textual repr: symbol()365	function symbol() external view returns (string memory);366367	/// @dev EVM selector for this function is: 0x18160ddd,368	///  or in textual repr: totalSupply()369	function totalSupply() external view returns (uint256);370371	/// @dev EVM selector for this function is: 0x313ce567,372	///  or in textual repr: decimals()373	function decimals() external view returns (uint8);374375	/// @dev EVM selector for this function is: 0x70a08231,376	///  or in textual repr: balanceOf(address)377	function balanceOf(address owner) external view returns (uint256);378379	/// @dev EVM selector for this function is: 0xa9059cbb,380	///  or in textual repr: transfer(address,uint256)381	function transfer(address to, uint256 amount) external returns (bool);382383	/// @dev EVM selector for this function is: 0x23b872dd,384	///  or in textual repr: transferFrom(address,address,uint256)385	function transferFrom(386		address from,387		address to,388		uint256 amount389	) external returns (bool);390391	/// @dev EVM selector for this function is: 0x095ea7b3,392	///  or in textual repr: approve(address,uint256)393	function approve(address spender, uint256 amount) external returns (bool);394395	/// @dev EVM selector for this function is: 0xdd62ed3e,396	///  or in textual repr: allowance(address,address)397	function allowance(address owner, address spender) external view returns (uint256);398}399400interface UniqueFungible is Dummy, ERC165, ERC20, ERC20Mintable, ERC20UniqueExtensions, Collection {}
after · tests/src/eth/api/UniqueFungible.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 you to work with collections.16/// @dev the ERC-165 identifier for this interface is 0xcc1d80ca17interface Collection is Dummy, ERC165 {18	// /// Set collection property.19	// ///20	// /// @param key Property key.21	// /// @param value Propery value.22	// /// @dev EVM selector for this function is: 0x2f073f66,23	// ///  or in textual repr: setCollectionProperty(string,bytes)24	// function setCollectionProperty(string memory key, bytes memory value) external;2526	/// Set collection properties.27	///28	/// @param properties Vector of properties key/value pair.29	/// @dev EVM selector for this function is: 0x50b26b2a,30	///  or in textual repr: setCollectionProperties((string,bytes)[])31	function setCollectionProperties(Property[] memory properties) external;3233	// /// Delete collection property.34	// ///35	// /// @param key Property key.36	// /// @dev EVM selector for this function is: 0x7b7debce,37	// ///  or in textual repr: deleteCollectionProperty(string)38	// function deleteCollectionProperty(string memory key) external;3940	/// Delete collection properties.41	///42	/// @param keys Properties keys.43	/// @dev EVM selector for this function is: 0xee206ee3,44	///  or in textual repr: deleteCollectionProperties(string[])45	function deleteCollectionProperties(string[] memory keys) external;4647	/// Get collection property.48	///49	/// @dev Throws error if key not found.50	///51	/// @param key Property key.52	/// @return bytes The property corresponding to the key.53	/// @dev EVM selector for this function is: 0xcf24fd6d,54	///  or in textual repr: collectionProperty(string)55	function collectionProperty(string memory key) external view returns (bytes memory);5657	/// Get collection properties.58	///59	/// @param keys Properties keys. Empty keys for all propertyes.60	/// @return Vector of properties key/value pairs.61	/// @dev EVM selector for this function is: 0x285fb8e6,62	///  or in textual repr: collectionProperties(string[])63	function collectionProperties(string[] memory keys) external view returns (Property[] memory);6465	// /// Set the sponsor of the collection.66	// ///67	// /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.68	// ///69	// /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.70	// /// @dev EVM selector for this function is: 0x7623402e,71	// ///  or in textual repr: setCollectionSponsor(address)72	// function setCollectionSponsor(address sponsor) external;7374	/// Set the sponsor of the collection.75	///76	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.77	///78	/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.79	/// @dev EVM selector for this function is: 0x84a1d5a8,80	///  or in textual repr: setCollectionSponsorCross((address,uint256))81	function setCollectionSponsorCross(EthCrossAccount memory sponsor) external;8283	/// Whether there is a pending sponsor.84	/// @dev EVM selector for this function is: 0x058ac185,85	///  or in textual repr: hasCollectionPendingSponsor()86	function hasCollectionPendingSponsor() external view returns (bool);8788	/// Collection sponsorship confirmation.89	///90	/// @dev After setting the sponsor for the collection, it must be confirmed with this function.91	/// @dev EVM selector for this function is: 0x3c50e97a,92	///  or in textual repr: confirmCollectionSponsorship()93	function confirmCollectionSponsorship() external;9495	/// Remove collection sponsor.96	/// @dev EVM selector for this function is: 0x6e0326a3,97	///  or in textual repr: removeCollectionSponsor()98	function removeCollectionSponsor() external;99100	/// Get current sponsor.101	///102	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.103	/// @dev EVM selector for this function is: 0x6ec0a9f1,104	///  or in textual repr: collectionSponsor()105	function collectionSponsor() external view returns (Tuple8 memory);106107	/// Set limits for the collection.108	/// @dev Throws error if limit not found.109	/// @param limit Name of the limit. Valid names:110	/// 	"accountTokenOwnershipLimit",111	/// 	"sponsoredDataSize",112	/// 	"sponsoredDataRateLimit",113	/// 	"tokenLimit",114	/// 	"sponsorTransferTimeout",115	/// 	"sponsorApproveTimeout"116	///  	"ownerCanTransfer",117	/// 	"ownerCanDestroy",118	/// 	"transfersEnabled"119	/// @param value Value of the limit.120	/// @dev EVM selector for this function is: 0x4ad890a8,121	///  or in textual repr: setCollectionLimit(string,uint256)122	function setCollectionLimit(string memory limit, uint256 value) external;123124	/// Get contract address.125	/// @dev EVM selector for this function is: 0xf6b4dfb4,126	///  or in textual repr: contractAddress()127	function contractAddress() external view returns (address);128129	/// Add collection admin.130	/// @param newAdmin Cross account administrator address.131	/// @dev EVM selector for this function is: 0x859aa7d6,132	///  or in textual repr: addCollectionAdminCross((address,uint256))133	function addCollectionAdminCross(EthCrossAccount memory newAdmin) external;134135	/// Remove collection admin.136	/// @param admin Cross account administrator address.137	/// @dev EVM selector for this function is: 0x6c0cd173,138	///  or in textual repr: removeCollectionAdminCross((address,uint256))139	function removeCollectionAdminCross(EthCrossAccount memory admin) external;140141	// /// Add collection admin.142	// /// @param newAdmin Address of the added administrator.143	// /// @dev EVM selector for this function is: 0x92e462c7,144	// ///  or in textual repr: addCollectionAdmin(address)145	// function addCollectionAdmin(address newAdmin) external;146147	// /// Remove collection admin.148	// ///149	// /// @param admin Address of the removed administrator.150	// /// @dev EVM selector for this function is: 0xfafd7b42,151	// ///  or in textual repr: removeCollectionAdmin(address)152	// function removeCollectionAdmin(address admin) external;153154	/// Toggle accessibility of collection nesting.155	///156	/// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'157	/// @dev EVM selector for this function is: 0x112d4586,158	///  or in textual repr: setCollectionNesting(bool)159	function setCollectionNesting(bool enable) external;160161	/// Toggle accessibility of collection nesting.162	///163	/// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'164	/// @param collections Addresses of collections that will be available for nesting.165	/// @dev EVM selector for this function is: 0x64872396,166	///  or in textual repr: setCollectionNesting(bool,address[])167	function setCollectionNesting(bool enable, address[] memory collections) external;168169	/// Set the collection access method.170	/// @param mode Access mode171	/// 	0 for Normal172	/// 	1 for AllowList173	/// @dev EVM selector for this function is: 0x41835d4c,174	///  or in textual repr: setCollectionAccess(uint8)175	function setCollectionAccess(uint8 mode) external;176177	/// Checks that user allowed to operate with collection.178	///179	/// @param user User address to check.180	/// @dev EVM selector for this function is: 0x91b6df49,181	///  or in textual repr: allowlistedCross((address,uint256))182	function allowlistedCross(EthCrossAccount memory user) external view returns (bool);183184	// /// Add the user to the allowed list.185	// ///186	// /// @param user Address of a trusted user.187	// /// @dev EVM selector for this function is: 0x67844fe6,188	// ///  or in textual repr: addToCollectionAllowList(address)189	// function addToCollectionAllowList(address user) external;190191	/// Add user to allowed list.192	///193	/// @param user User cross account address.194	/// @dev EVM selector for this function is: 0xa0184a3a,195	///  or in textual repr: addToCollectionAllowListCross((address,uint256))196	function addToCollectionAllowListCross(EthCrossAccount memory user) external;197198	// /// Remove the user from the allowed list.199	// ///200	// /// @param user Address of a removed user.201	// /// @dev EVM selector for this function is: 0x85c51acb,202	// ///  or in textual repr: removeFromCollectionAllowList(address)203	// function removeFromCollectionAllowList(address user) external;204205	/// Remove user from allowed list.206	///207	/// @param user User cross account address.208	/// @dev EVM selector for this function is: 0x09ba452a,209	///  or in textual repr: removeFromCollectionAllowListCross((address,uint256))210	function removeFromCollectionAllowListCross(EthCrossAccount memory user) external;211212	/// Switch permission for minting.213	///214	/// @param mode Enable if "true".215	/// @dev EVM selector for this function is: 0x00018e84,216	///  or in textual repr: setCollectionMintMode(bool)217	function setCollectionMintMode(bool mode) external;218219	// /// Check that account is the owner or admin of the collection220	// ///221	// /// @param user account to verify222	// /// @return "true" if account is the owner or admin223	// /// @dev EVM selector for this function is: 0x9811b0c7,224	// ///  or in textual repr: isOwnerOrAdmin(address)225	// function isOwnerOrAdmin(address user) external view returns (bool);226227	/// Check that account is the owner or admin of the collection228	///229	/// @param user User cross account to verify230	/// @return "true" if account is the owner or admin231	/// @dev EVM selector for this function is: 0x3e75a905,232	///  or in textual repr: isOwnerOrAdminCross((address,uint256))233	function isOwnerOrAdminCross(EthCrossAccount memory user) external view returns (bool);234235	/// Returns collection type236	///237	/// @return `Fungible` or `NFT` or `ReFungible`238	/// @dev EVM selector for this function is: 0xd34b55b8,239	///  or in textual repr: uniqueCollectionType()240	function uniqueCollectionType() external view returns (string memory);241242	/// Get collection owner.243	///244	/// @return Tuble with sponsor address and his substrate mirror.245	/// If address is canonical then substrate mirror is zero and vice versa.246	/// @dev EVM selector for this function is: 0xdf727d3b,247	///  or in textual repr: collectionOwner()248	function collectionOwner() external view returns (EthCrossAccount memory);249250	// /// Changes collection owner to another account251	// ///252	// /// @dev Owner can be changed only by current owner253	// /// @param newOwner new owner account254	// /// @dev EVM selector for this function is: 0x4f53e226,255	// ///  or in textual repr: changeCollectionOwner(address)256	// function changeCollectionOwner(address newOwner) external;257258	/// Get collection administrators259	///260	/// @return Vector of tuples with admins address and his substrate mirror.261	/// If address is canonical then substrate mirror is zero and vice versa.262	/// @dev EVM selector for this function is: 0x5813216b,263	///  or in textual repr: collectionAdmins()264	function collectionAdmins() external view returns (EthCrossAccount[] memory);265266	/// Changes collection owner to another account267	///268	/// @dev Owner can be changed only by current owner269	/// @param newOwner new owner cross account270	/// @dev EVM selector for this function is: 0x6496c497,271	///  or in textual repr: changeCollectionOwnerCross((address,uint256))272	function changeCollectionOwnerCross(EthCrossAccount memory newOwner) external;273}274275/// @dev Cross account struct276struct EthCrossAccount {277	address eth;278	uint256 sub;279}280281/// @dev Property struct282struct Property {283	string key;284	bytes value;285}286287/// @dev the ERC-165 identifier for this interface is 0x5b7038cf288interface ERC20UniqueExtensions is Dummy, ERC165 {289	/// @notice A description for the collection.290	/// @dev EVM selector for this function is: 0x7284e416,291	///  or in textual repr: description()292	function description() external view returns (string memory);293294	/// @dev EVM selector for this function is: 0x0ecd0ab0,295	///  or in textual repr: approveCross((address,uint256),uint256)296	function approveCross(EthCrossAccount memory spender, uint256 amount) external returns (bool);297298	// /// Burn tokens from account299	// /// @dev Function that burns an `amount` of the tokens of a given account,300	// /// deducting from the sender's allowance for said account.301	// /// @param from The account whose tokens will be burnt.302	// /// @param amount The amount that will be burnt.303	// /// @dev EVM selector for this function is: 0x79cc6790,304	// ///  or in textual repr: burnFrom(address,uint256)305	// function burnFrom(address from, uint256 amount) external returns (bool);306307	/// Burn tokens from account308	/// @dev Function that burns an `amount` of the tokens of a given account,309	/// deducting from the sender's allowance for said account.310	/// @param from The account whose tokens will be burnt.311	/// @param amount The amount that will be burnt.312	/// @dev EVM selector for this function is: 0xbb2f5a58,313	///  or in textual repr: burnFromCross((address,uint256),uint256)314	function burnFromCross(EthCrossAccount memory from, uint256 amount) external returns (bool);315316	/// Mint tokens for multiple accounts.317	/// @param amounts array of pairs of account address and amount318	/// @dev EVM selector for this function is: 0x1acf2d55,319	///  or in textual repr: mintBulk((address,uint256)[])320	function mintBulk(Tuple8[] memory amounts) external returns (bool);321322	/// @dev EVM selector for this function is: 0x2ada85ff,323	///  or in textual repr: transferCross((address,uint256),uint256)324	function transferCross(EthCrossAccount memory to, uint256 amount) external returns (bool);325326	/// @dev EVM selector for this function is: 0xd5cf430b,327	///  or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)328	function transferFromCross(329		EthCrossAccount memory from,330		EthCrossAccount memory to,331		uint256 amount332	) external returns (bool);333}334335/// @dev anonymous struct336struct Tuple8 {337	address field_0;338	uint256 field_1;339}340341/// @dev the ERC-165 identifier for this interface is 0x40c10f19342interface ERC20Mintable is Dummy, ERC165 {343	/// Mint tokens for `to` account.344	/// @param to account that will receive minted tokens345	/// @param amount amount of tokens to mint346	/// @dev EVM selector for this function is: 0x40c10f19,347	///  or in textual repr: mint(address,uint256)348	function mint(address to, uint256 amount) external returns (bool);349}350351/// @dev inlined interface352interface ERC20Events {353	event Transfer(address indexed from, address indexed to, uint256 value);354	event Approval(address indexed owner, address indexed spender, uint256 value);355}356357/// @dev the ERC-165 identifier for this interface is 0x8cb847c4358interface ERC20 is Dummy, ERC165, ERC20Events {359	/// @dev EVM selector for this function is: 0x06fdde03,360	///  or in textual repr: name()361	function name() external view returns (string memory);362363	/// @dev EVM selector for this function is: 0x95d89b41,364	///  or in textual repr: symbol()365	function symbol() external view returns (string memory);366367	/// @dev EVM selector for this function is: 0x18160ddd,368	///  or in textual repr: totalSupply()369	function totalSupply() external view returns (uint256);370371	/// @dev EVM selector for this function is: 0x313ce567,372	///  or in textual repr: decimals()373	function decimals() external view returns (uint8);374375	/// @dev EVM selector for this function is: 0x70a08231,376	///  or in textual repr: balanceOf(address)377	function balanceOf(address owner) external view returns (uint256);378379	/// @dev EVM selector for this function is: 0xa9059cbb,380	///  or in textual repr: transfer(address,uint256)381	function transfer(address to, uint256 amount) external returns (bool);382383	/// @dev EVM selector for this function is: 0x23b872dd,384	///  or in textual repr: transferFrom(address,address,uint256)385	function transferFrom(386		address from,387		address to,388		uint256 amount389	) external returns (bool);390391	/// @dev EVM selector for this function is: 0x095ea7b3,392	///  or in textual repr: approve(address,uint256)393	function approve(address spender, uint256 amount) external returns (bool);394395	/// @dev EVM selector for this function is: 0xdd62ed3e,396	///  or in textual repr: allowance(address,address)397	function allowance(address owner, address spender) external view returns (uint256);398399	/// @notice Returns collection helper contract address400	/// @dev EVM selector for this function is: 0x1896cce6,401	///  or in textual repr: collectionHelperAddress()402	function collectionHelperAddress() external view returns (address);403}404405interface UniqueFungible is Dummy, ERC165, ERC20, ERC20Mintable, ERC20UniqueExtensions, Collection {}
modifiedtests/src/eth/api/UniqueNFT.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -605,7 +605,7 @@
 
 /// @title ERC-721 Non-Fungible Token Standard
 /// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md
-/// @dev the ERC-165 identifier for this interface is 0x80ac58cd
+/// @dev the ERC-165 identifier for this interface is 0x983a942b
 interface ERC721 is Dummy, ERC165, ERC721Events {
 	/// @notice Count all NFTs assigned to an owner
 	/// @dev NFTs assigned to the zero address are considered invalid, and this
@@ -685,6 +685,11 @@
 	/// @dev EVM selector for this function is: 0xe985e9c5,
 	///  or in textual repr: isApprovedForAll(address,address)
 	function isApprovedForAll(address owner, address operator) external view returns (address);
+
+	/// @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);
 }
 
 interface UniqueNFT is
modifiedtests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -604,7 +604,7 @@
 
 /// @title ERC-721 Non-Fungible Token Standard
 /// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md
-/// @dev the ERC-165 identifier for this interface is 0x58800161
+/// @dev the ERC-165 identifier for this interface is 0x4016cd87
 interface ERC721 is Dummy, ERC165, ERC721Events {
 	/// @notice Count all RFTs assigned to an owner
 	/// @dev RFTs assigned to the zero address are considered invalid, and this
@@ -682,6 +682,11 @@
 	/// @dev EVM selector for this function is: 0xe985e9c5,
 	///  or in textual repr: isApprovedForAll(address,address)
 	function isApprovedForAll(address owner, address operator) external view returns (address);
+
+	/// @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);
 }
 
 interface UniqueRefungible is
addedtests/src/eth/collectionHelperAddress.test.tsdiffbeforeafterboth
--- /dev/null
+++ b/tests/src/eth/collectionHelperAddress.test.ts
@@ -0,0 +1,57 @@
+// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
+// This file is part of Unique Network.
+
+// Unique Network is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// 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,
+// 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.
+
+// You should have received a copy of the GNU General Public License
+// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
+
+import {itEth, usingEthPlaygrounds, expect} from './util';
+import {IKeyringPair} from '@polkadot/types/types';
+
+const EVM_COLLECTION_HELPERS_ADDRESS = '0x6c4e9fe1ae37a41e93cee429e8e1881abdcbb54f';
+
+describe('[eth]CollectionHelerpAddress test: ERC721 ', () => {
+  let donor: IKeyringPair;
+
+  before(async function() {
+    await usingEthPlaygrounds(async (helper, privateKey) => {
+      donor = await privateKey({filename: __filename});
+    });
+  });
+
+  itEth('NFT\\RFT', async ({helper}) => {
+    const owner =  await helper.eth.createAccountWithBalance(donor);
+    
+    const {collectionAddress: nftCollectionAddress} = await helper.eth.createNFTCollection(owner, 'Sponsor', 'absolutely anything', 'ROC');
+    const nftCollection = helper.ethNativeContract.collection(nftCollectionAddress, 'nft', owner);
+    
+    const {collectionAddress: rftCollectionAddress} = await helper.eth.createRFTCollection(owner, 'Sponsor', 'absolutely anything', 'ROC');
+    const rftCollection = helper.ethNativeContract.collection(rftCollectionAddress, 'rft', owner);
+    
+    expect((await nftCollection.methods.collectionHelperAddress().call())
+      .toString().toLowerCase()).to.be.equal(EVM_COLLECTION_HELPERS_ADDRESS);
+    
+    expect((await rftCollection.methods.collectionHelperAddress().call())
+      .toString().toLowerCase()).to.be.equal(EVM_COLLECTION_HELPERS_ADDRESS);
+  });
+  
+  itEth('FT', async ({helper}) => {
+    const owner = await helper.eth.createAccountWithBalance(donor);
+
+    const {collectionAddress} = await helper.eth.createFungibleCollection(owner, 'Sponsor', 18, 'absolutely anything', 'ROC');
+    const collection = helper.ethNativeContract.collection(collectionAddress, 'ft', owner);
+    
+    expect((await collection.methods.collectionHelperAddress().call())
+      .toString().toLowerCase()).to.be.equal(EVM_COLLECTION_HELPERS_ADDRESS);
+  });
+ 
+});