git.delta.rocks / unique-network / refs/commits / 2ba119d71c40

difftreelog

misc: update stubs

Trubnikov Sergey2022-08-25parent: #41b5a1d.patch.diff
in: master

12 files changed

modifiedpallets/evm-contract-helpers/src/stubs/ContractHelpers.soldiffbeforeafterboth
before · pallets/evm-contract-helpers/src/stubs/ContractHelpers.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)14		external15		view16		returns (bool)17	{18		require(false, stub_error);19		interfaceID;20		return true;21	}22}2324<<<<<<< HEAD25/// @title Magic contract, which allows users to reconfigure other contracts26/// @dev the ERC-165 identifier for this interface is 0xd77fab7027=======28<<<<<<< HEAD29// Selector: 6073d91730=======31// Selector: 06fc42e932>>>>>>> path: add stubs33>>>>>>> path: add stubs34contract ContractHelpers is Dummy, ERC165 {35	/// Get user, which deployed specified contract36	/// @dev May return zero address in case if contract is deployed37	///  using uniquenetwork evm-migration pallet, or using other terms not38	///  intended by pallet-evm39	/// @dev Returns zero address if contract does not exists40	/// @param contractAddress Contract to get owner of41	/// @return address Owner of contract42	/// @dev EVM selector for this function is: 0x5152b14c,43	///  or in textual repr: contractOwner(address)44	function contractOwner(address contractAddress)45		public46		view47		returns (address)48	{49		require(false, stub_error);50		contractAddress;51		dummy;52		return 0x0000000000000000000000000000000000000000;53	}5455<<<<<<< HEAD56	/// Set sponsor.57	/// @param contractAddress Contract for which a sponsor is being established.58	/// @param sponsor User address who set as pending sponsor.59	/// @dev EVM selector for this function is: 0xf01fba93,60	///  or in textual repr: setSponsor(address,address)61=======62<<<<<<< HEAD63	// Set sponsor.64	//65	// @param contract_address Contract for which a sponsor is being established.66	// @param sponsor User address who set as pending sponsor.67	//68=======69>>>>>>> path: add stubs70	// Selector: setSponsor(address,address) f01fba9371>>>>>>> path: add stubs72	function setSponsor(address contractAddress, address sponsor) public {73		require(false, stub_error);74		contractAddress;75		sponsor;76		dummy = 0;77	}7879<<<<<<< HEAD80	/// Set contract as self sponsored.81	///82	/// @param contractAddress Contract for which a self sponsoring is being enabled.83	/// @dev EVM selector for this function is: 0x89f7d9ae,84	///  or in textual repr: selfSponsoredEnable(address)85=======86<<<<<<< HEAD87	// Set contract as self sponsored.88	//89	// @param contract_address Contract for which a self sponsoring is being enabled.90	//91	// Selector: selfSponsoredEnable(address) 89f7d9ae92>>>>>>> path: add stubs93	function selfSponsoredEnable(address contractAddress) public {94=======95	// Selector: confirmSponsorship(address) abc0000196	function confirmSponsorship(address contractAddress) public {97>>>>>>> path: add stubs98		require(false, stub_error);99		contractAddress;100		dummy = 0;101	}102103<<<<<<< HEAD104	/// Remove sponsor.105	///106	/// @param contractAddress Contract for which a sponsorship is being removed.107	/// @dev EVM selector for this function is: 0xef784250,108	///  or in textual repr: removeSponsor(address)109=======110<<<<<<< HEAD111	// Remove sponsor.112	//113	// @param contract_address Contract for which a sponsorship is being removed.114	//115	// Selector: removeSponsor(address) ef784250116>>>>>>> path: add stubs117	function removeSponsor(address contractAddress) public {118		require(false, stub_error);119		contractAddress;120		dummy = 0;121	}122123	/// Confirm sponsorship.124	///125	/// @dev Caller must be same that set via [`setSponsor`].126	///127	/// @param contractAddress Сontract for which need to confirm sponsorship.128	/// @dev EVM selector for this function is: 0xabc00001,129	///  or in textual repr: confirmSponsorship(address)130	function confirmSponsorship(address contractAddress) public {131		require(false, stub_error);132		contractAddress;133		dummy = 0;134	}135136	/// Get current sponsor.137	///138	/// @param contractAddress The contract for which a sponsor is requested.139	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.140	/// @dev EVM selector for this function is: 0x743fc745,141	///  or in textual repr: getSponsor(address)142	function getSponsor(address contractAddress)143=======144	// Selector: getSponsor(address) 743fc745145	function getSponsor(address contractAddress)146		public147		view148		returns (Tuple0 memory)149	{150		require(false, stub_error);151		contractAddress;152		dummy;153		return Tuple0(0x0000000000000000000000000000000000000000, 0);154	}155156	// Selector: hasSponsor(address) 97418603157	function hasSponsor(address contractAddress) public view returns (bool) {158		require(false, stub_error);159		contractAddress;160		dummy;161		return false;162	}163164	// Selector: hasPendingSponsor(address) 39b9b242165	function hasPendingSponsor(address contractAddress)166>>>>>>> path: add stubs167		public168		view169		returns (Tuple0 memory)170	{171		require(false, stub_error);172		contractAddress;173		dummy;174		return Tuple0(0x0000000000000000000000000000000000000000, 0);175	}176177	/// Check tat contract has confirmed sponsor.178	///179	/// @param contractAddress The contract for which the presence of a confirmed sponsor is checked.180	/// @return **true** if contract has confirmed sponsor.181	/// @dev EVM selector for this function is: 0x97418603,182	///  or in textual repr: hasSponsor(address)183	function hasSponsor(address contractAddress) public view returns (bool) {184		require(false, stub_error);185		contractAddress;186		dummy;187		return false;188	}189190<<<<<<< HEAD191	/// Check tat contract has pending sponsor.192	///193	/// @param contractAddress The contract for which the presence of a pending sponsor is checked.194	/// @return **true** if contract has pending sponsor.195	/// @dev EVM selector for this function is: 0x39b9b242,196	///  or in textual repr: hasPendingSponsor(address)197=======198<<<<<<< HEAD199	// Check tat contract has pending sponsor.200	//201	// @param contract_address The contract for which the presence of a pending sponsor is checked.202	// @return **true** if contract has pending sponsor.203	//204	// Selector: hasPendingSponsor(address) 39b9b242205>>>>>>> path: add stubs206	function hasPendingSponsor(address contractAddress)207=======208	// Selector: sponsoringEnabled(address) 6027dc61209	function sponsoringEnabled(address contractAddress)210>>>>>>> path: add stubs211		public212		view213		returns (bool)214	{215		require(false, stub_error);216		contractAddress;217		dummy;218		return false;219<<<<<<< HEAD220	}221222	/// @dev EVM selector for this function is: 0x6027dc61,223	///  or in textual repr: sponsoringEnabled(address)224	function sponsoringEnabled(address contractAddress)225		public226		view227		returns (bool)228	{229		require(false, stub_error);230		contractAddress;231		dummy;232		return false;233=======234>>>>>>> path: add stubs235	}236237	/// @dev EVM selector for this function is: 0xfde8a560,238	///  or in textual repr: setSponsoringMode(address,uint8)239	function setSponsoringMode(address contractAddress, uint8 mode) public {240		require(false, stub_error);241		contractAddress;242		mode;243		dummy = 0;244	}245246	/// Get current contract sponsoring rate limit247	/// @param contractAddress Contract to get sponsoring mode of248	/// @return uint32 Amount of blocks between two sponsored transactions249	/// @dev EVM selector for this function is: 0x610cfabd,250	///  or in textual repr: getSponsoringRateLimit(address)251	function getSponsoringRateLimit(address contractAddress)252		public253		view254		returns (uint32)255	{256		require(false, stub_error);257		contractAddress;258		dummy;259		return 0;260	}261262	/// Set contract sponsoring rate limit263	/// @dev Sponsoring rate limit - is a minimum amount of blocks that should264	///  pass between two sponsored transactions265	/// @param contractAddress Contract to change sponsoring rate limit of266	/// @param rateLimit Target rate limit267	/// @dev Only contract owner can change this setting268	/// @dev EVM selector for this function is: 0x77b6c908,269	///  or in textual repr: setSponsoringRateLimit(address,uint32)270	function setSponsoringRateLimit(address contractAddress, uint32 rateLimit)271		public272	{273		require(false, stub_error);274		contractAddress;275		rateLimit;276		dummy = 0;277	}278279	/// Is specified user present in contract allow list280	/// @dev Contract owner always implicitly included281	/// @param contractAddress Contract to check allowlist of282	/// @param user User to check283	/// @return bool Is specified users exists in contract allowlist284	/// @dev EVM selector for this function is: 0x5c658165,285	///  or in textual repr: allowed(address,address)286	function allowed(address contractAddress, address user)287		public288		view289		returns (bool)290	{291		require(false, stub_error);292		contractAddress;293		user;294		dummy;295		return false;296	}297298	/// Toggle user presence in contract allowlist299	/// @param contractAddress Contract to change allowlist of300	/// @param user Which user presence should be toggled301	/// @param isAllowed `true` if user should be allowed to be sponsored302	///  or call this contract, `false` otherwise303	/// @dev Only contract owner can change this setting304	/// @dev EVM selector for this function is: 0x4706cc1c,305	///  or in textual repr: toggleAllowed(address,address,bool)306	function toggleAllowed(307		address contractAddress,308		address user,309		bool isAllowed310	) public {311		require(false, stub_error);312		contractAddress;313		user;314		isAllowed;315		dummy = 0;316	}317318	/// Is this contract has allowlist access enabled319	/// @dev Allowlist always can have users, and it is used for two purposes:320	///  in case of allowlist sponsoring mode, users will be sponsored if they exist in allowlist321	///  in case of allowlist access enabled, only users from allowlist may call this contract322	/// @param contractAddress Contract to get allowlist access of323	/// @return bool Is specified contract has allowlist access enabled324	/// @dev EVM selector for this function is: 0xc772ef6c,325	///  or in textual repr: allowlistEnabled(address)326	function allowlistEnabled(address contractAddress)327		public328		view329		returns (bool)330	{331		require(false, stub_error);332		contractAddress;333		dummy;334		return false;335	}336337	/// Toggle contract allowlist access338	/// @param contractAddress Contract to change allowlist access of339	/// @param enabled Should allowlist access to be enabled?340	/// @dev EVM selector for this function is: 0x36de20f5,341	///  or in textual repr: toggleAllowlist(address,bool)342	function toggleAllowlist(address contractAddress, bool enabled) public {343		require(false, stub_error);344		contractAddress;345		enabled;346		dummy = 0;347	}348}349350/// @dev anonymous struct351struct Tuple0 {352	address field_0;353	uint256 field_1;354}
after · pallets/evm-contract-helpers/src/stubs/ContractHelpers.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)14		external15		view16		returns (bool)17	{18		require(false, stub_error);19		interfaceID;20		return true;21	}22}2324<<<<<<< HEAD25<<<<<<< HEAD26/// @title Magic contract, which allows users to reconfigure other contracts27/// @dev the ERC-165 identifier for this interface is 0xd77fab7028=======29<<<<<<< HEAD30// Selector: 6073d91731=======32// Selector: 06fc42e933>>>>>>> path: add stubs34>>>>>>> path: add stubs35=======36// Selector: 6073d91737>>>>>>> misc: update stubs38contract ContractHelpers is Dummy, ERC165 {39	/// Get user, which deployed specified contract40	/// @dev May return zero address in case if contract is deployed41	///  using uniquenetwork evm-migration pallet, or using other terms not42	///  intended by pallet-evm43	/// @dev Returns zero address if contract does not exists44	/// @param contractAddress Contract to get owner of45	/// @return address Owner of contract46	/// @dev EVM selector for this function is: 0x5152b14c,47	///  or in textual repr: contractOwner(address)48	function contractOwner(address contractAddress)49		public50		view51		returns (address)52	{53		require(false, stub_error);54		contractAddress;55		dummy;56		return 0x0000000000000000000000000000000000000000;57	}5859<<<<<<< HEAD60<<<<<<< HEAD61	/// Set sponsor.62	/// @param contractAddress Contract for which a sponsor is being established.63	/// @param sponsor User address who set as pending sponsor.64	/// @dev EVM selector for this function is: 0xf01fba93,65	///  or in textual repr: setSponsor(address,address)66=======67<<<<<<< HEAD68=======69>>>>>>> misc: update stubs70	// Set sponsor.71	//72	// @param contract_address Contract for which a sponsor is being established.73	// @param sponsor User address who set as pending sponsor.74	//75	// Selector: setSponsor(address,address) f01fba9376>>>>>>> path: add stubs77	function setSponsor(address contractAddress, address sponsor) public {78		require(false, stub_error);79		contractAddress;80		sponsor;81		dummy = 0;82	}8384<<<<<<< HEAD85<<<<<<< HEAD86	/// Set contract as self sponsored.87	///88	/// @param contractAddress Contract for which a self sponsoring is being enabled.89	/// @dev EVM selector for this function is: 0x89f7d9ae,90	///  or in textual repr: selfSponsoredEnable(address)91=======92<<<<<<< HEAD93=======94>>>>>>> misc: update stubs95	// Set contract as self sponsored.96	//97	// @param contract_address Contract for which a self sponsoring is being enabled.98	//99	// Selector: selfSponsoredEnable(address) 89f7d9ae100>>>>>>> path: add stubs101	function selfSponsoredEnable(address contractAddress) public {102		require(false, stub_error);103		contractAddress;104		dummy = 0;105	}106107<<<<<<< HEAD108<<<<<<< HEAD109	/// Remove sponsor.110	///111	/// @param contractAddress Contract for which a sponsorship is being removed.112	/// @dev EVM selector for this function is: 0xef784250,113	///  or in textual repr: removeSponsor(address)114=======115<<<<<<< HEAD116=======117>>>>>>> misc: update stubs118	// Remove sponsor.119	//120	// @param contract_address Contract for which a sponsorship is being removed.121	//122	// Selector: removeSponsor(address) ef784250123>>>>>>> path: add stubs124	function removeSponsor(address contractAddress) public {125		require(false, stub_error);126		contractAddress;127		dummy = 0;128	}129130	/// Confirm sponsorship.131	///132	/// @dev Caller must be same that set via [`setSponsor`].133	///134	/// @param contractAddress Сontract for which need to confirm sponsorship.135	/// @dev EVM selector for this function is: 0xabc00001,136	///  or in textual repr: confirmSponsorship(address)137	function confirmSponsorship(address contractAddress) public {138		require(false, stub_error);139		contractAddress;140		dummy = 0;141	}142143	/// Get current sponsor.144	///145	/// @param contractAddress The contract for which a sponsor is requested.146	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.147	/// @dev EVM selector for this function is: 0x743fc745,148	///  or in textual repr: getSponsor(address)149	function getSponsor(address contractAddress)150		public151		view152		returns (Tuple0 memory)153	{154		require(false, stub_error);155		contractAddress;156		dummy;157		return Tuple0(0x0000000000000000000000000000000000000000, 0);158	}159160	/// Check tat contract has confirmed sponsor.161	///162	/// @param contractAddress The contract for which the presence of a confirmed sponsor is checked.163	/// @return **true** if contract has confirmed sponsor.164	/// @dev EVM selector for this function is: 0x97418603,165	///  or in textual repr: hasSponsor(address)166	function hasSponsor(address contractAddress) public view returns (bool) {167		require(false, stub_error);168		contractAddress;169		dummy;170		return false;171	}172173<<<<<<< HEAD174<<<<<<< HEAD175	/// Check tat contract has pending sponsor.176	///177	/// @param contractAddress The contract for which the presence of a pending sponsor is checked.178	/// @return **true** if contract has pending sponsor.179	/// @dev EVM selector for this function is: 0x39b9b242,180	///  or in textual repr: hasPendingSponsor(address)181=======182<<<<<<< HEAD183=======184>>>>>>> misc: update stubs185	// Check tat contract has pending sponsor.186	//187	// @param contract_address The contract for which the presence of a pending sponsor is checked.188	// @return **true** if contract has pending sponsor.189	//190	// Selector: hasPendingSponsor(address) 39b9b242191>>>>>>> path: add stubs192	function hasPendingSponsor(address contractAddress)193		public194		view195		returns (bool)196	{197		require(false, stub_error);198		contractAddress;199		dummy;200		return false;201	}202203	/// @dev EVM selector for this function is: 0x6027dc61,204	///  or in textual repr: sponsoringEnabled(address)205	function sponsoringEnabled(address contractAddress)206		public207		view208		returns (bool)209	{210		require(false, stub_error);211		contractAddress;212		dummy;213		return false;214	}215216	/// @dev EVM selector for this function is: 0xfde8a560,217	///  or in textual repr: setSponsoringMode(address,uint8)218	function setSponsoringMode(address contractAddress, uint8 mode) public {219		require(false, stub_error);220		contractAddress;221		mode;222		dummy = 0;223	}224225	/// Get current contract sponsoring rate limit226	/// @param contractAddress Contract to get sponsoring mode of227	/// @return uint32 Amount of blocks between two sponsored transactions228	/// @dev EVM selector for this function is: 0x610cfabd,229	///  or in textual repr: getSponsoringRateLimit(address)230	function getSponsoringRateLimit(address contractAddress)231		public232		view233		returns (uint32)234	{235		require(false, stub_error);236		contractAddress;237		dummy;238		return 0;239	}240241	/// Set contract sponsoring rate limit242	/// @dev Sponsoring rate limit - is a minimum amount of blocks that should243	///  pass between two sponsored transactions244	/// @param contractAddress Contract to change sponsoring rate limit of245	/// @param rateLimit Target rate limit246	/// @dev Only contract owner can change this setting247	/// @dev EVM selector for this function is: 0x77b6c908,248	///  or in textual repr: setSponsoringRateLimit(address,uint32)249	function setSponsoringRateLimit(address contractAddress, uint32 rateLimit)250		public251	{252		require(false, stub_error);253		contractAddress;254		rateLimit;255		dummy = 0;256	}257258	/// Is specified user present in contract allow list259	/// @dev Contract owner always implicitly included260	/// @param contractAddress Contract to check allowlist of261	/// @param user User to check262	/// @return bool Is specified users exists in contract allowlist263	/// @dev EVM selector for this function is: 0x5c658165,264	///  or in textual repr: allowed(address,address)265	function allowed(address contractAddress, address user)266		public267		view268		returns (bool)269	{270		require(false, stub_error);271		contractAddress;272		user;273		dummy;274		return false;275	}276277	/// Toggle user presence in contract allowlist278	/// @param contractAddress Contract to change allowlist of279	/// @param user Which user presence should be toggled280	/// @param isAllowed `true` if user should be allowed to be sponsored281	///  or call this contract, `false` otherwise282	/// @dev Only contract owner can change this setting283	/// @dev EVM selector for this function is: 0x4706cc1c,284	///  or in textual repr: toggleAllowed(address,address,bool)285	function toggleAllowed(286		address contractAddress,287		address user,288		bool isAllowed289	) public {290		require(false, stub_error);291		contractAddress;292		user;293		isAllowed;294		dummy = 0;295	}296297	/// Is this contract has allowlist access enabled298	/// @dev Allowlist always can have users, and it is used for two purposes:299	///  in case of allowlist sponsoring mode, users will be sponsored if they exist in allowlist300	///  in case of allowlist access enabled, only users from allowlist may call this contract301	/// @param contractAddress Contract to get allowlist access of302	/// @return bool Is specified contract has allowlist access enabled303	/// @dev EVM selector for this function is: 0xc772ef6c,304	///  or in textual repr: allowlistEnabled(address)305	function allowlistEnabled(address contractAddress)306		public307		view308		returns (bool)309	{310		require(false, stub_error);311		contractAddress;312		dummy;313		return false;314	}315316	/// Toggle contract allowlist access317	/// @param contractAddress Contract to change allowlist access of318	/// @param enabled Should allowlist access to be enabled?319	/// @dev EVM selector for this function is: 0x36de20f5,320	///  or in textual repr: toggleAllowlist(address,bool)321	function toggleAllowlist(address contractAddress, bool enabled) public {322		require(false, stub_error);323		contractAddress;324		enabled;325		dummy = 0;326	}327}328329/// @dev anonymous struct330struct Tuple0 {331	address field_0;332	uint256 field_1;333}
modifiedpallets/fungible/src/stubs/UniqueFungible.soldiffbeforeafterboth
--- a/pallets/fungible/src/stubs/UniqueFungible.sol
+++ b/pallets/fungible/src/stubs/UniqueFungible.sol
@@ -45,7 +45,6 @@
 	);
 }
 
-<<<<<<< HEAD
 // Selector: 79cc6790
 contract ERC20UniqueExtensions is Dummy, ERC165 {
 	// Selector: burnFrom(address,uint256) 79cc6790
@@ -142,11 +141,15 @@
 	}
 }
 
+<<<<<<< HEAD
 // Selector: ffe4da23
 =======
 // Selector: 765e2fae
 >>>>>>> misk: Update stubs
 >>>>>>> misk: Update stubs
+=======
+// Selector: e54be640
+>>>>>>> misc: update stubs
 contract Collection is Dummy, ERC165 {
 	/// Set collection property.
 	///
modifiedpallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth
--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -482,10 +482,13 @@
 }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 /// @title Unique extensions for ERC721.
 /// @dev the ERC-165 identifier for this interface is 0xd74d154f
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> misc: update stubs
 // Selector: 780e9d63
 contract ERC721Enumerable is Dummy, ERC165 {
 	// @notice Enumerate valid NFTs
@@ -607,6 +610,7 @@
 }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 /// @dev anonymous struct
 struct Tuple8 {
 	uint256 field_0;
@@ -617,6 +621,9 @@
 =======
 // Selector: 765e2fae
 >>>>>>> misk: Update stubs
+=======
+// Selector: e54be640
+>>>>>>> misc: update stubs
 contract Collection is Dummy, ERC165 {
 	// Set collection property.
 	//
modifiedpallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth
--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -482,10 +482,13 @@
 }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 /// @title Unique extensions for ERC721.
 /// @dev the ERC-165 identifier for this interface is 0x7c3bef89
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> misc: update stubs
 // Selector: 780e9d63
 contract ERC721Enumerable is Dummy, ERC165 {
 	// @notice Enumerate valid RFTs
@@ -621,6 +624,7 @@
 }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 /// @dev anonymous struct
 struct Tuple8 {
 	uint256 field_0;
@@ -631,6 +635,9 @@
 =======
 // Selector: 765e2fae
 >>>>>>> misk: Update stubs
+=======
+// Selector: e54be640
+>>>>>>> misc: update stubs
 contract Collection is Dummy, ERC165 {
 	// Set collection property.
 	//
modifiedtests/src/eth/api/ContractHelpers.soldiffbeforeafterboth
--- a/tests/src/eth/api/ContractHelpers.sol
+++ b/tests/src/eth/api/ContractHelpers.sol
@@ -13,6 +13,7 @@
 }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 /// @title Magic contract, which allows users to reconfigure other contracts
 /// @dev the ERC-165 identifier for this interface is 0xd77fab70
 =======
@@ -22,6 +23,9 @@
 // Selector: 06fc42e9
 >>>>>>> path: add stubs
 >>>>>>> path: add stubs
+=======
+// Selector: 6073d917
+>>>>>>> misc: update stubs
 interface ContractHelpers is Dummy, ERC165 {
 	/// Get user, which deployed specified contract
 	/// @dev May return zero address in case if contract is deployed
@@ -38,6 +42,7 @@
 		returns (address);
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 	/// Set sponsor.
 	/// @param contractAddress Contract for which a sponsor is being established.
 	/// @param sponsor User address who set as pending sponsor.
@@ -45,6 +50,8 @@
 	///  or in textual repr: setSponsor(address,address)
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> misc: update stubs
 	// Set sponsor.
 	//
 	// @param contract_address Contract for which a sponsor is being established.
@@ -90,14 +97,6 @@
 	// @param contract_address The contract for which a sponsor is requested.
 	// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
 	//
-=======
-	// Selector: setSponsor(address,address) f01fba93
-	function setSponsor(address contractAddress, address sponsor) external;
-
-	// Selector: confirmSponsorship(address) abc00001
-	function confirmSponsorship(address contractAddress) external;
-
->>>>>>> path: add stubs
 	// Selector: getSponsor(address) 743fc745
 >>>>>>> path: add stubs
 	function getSponsor(address contractAddress)
@@ -106,6 +105,7 @@
 		returns (Tuple0 memory);
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 	/// Check tat contract has confirmed sponsor.
 	///
 	/// @param contractAddress The contract for which the presence of a confirmed sponsor is checked.
@@ -122,6 +122,8 @@
 	///  or in textual repr: hasPendingSponsor(address)
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> misc: update stubs
 	// Check tat contract has confirmed sponsor.
 	//
 	// @param contract_address The contract for which the presence of a confirmed sponsor is checked.
@@ -135,11 +137,6 @@
 	// @param contract_address The contract for which the presence of a pending sponsor is checked.
 	// @return **true** if contract has pending sponsor.
 	//
-=======
-	// Selector: hasSponsor(address) 97418603
-	function hasSponsor(address contractAddress) external view returns (bool);
-
->>>>>>> path: add stubs
 	// Selector: hasPendingSponsor(address) 39b9b242
 >>>>>>> path: add stubs
 	function hasPendingSponsor(address contractAddress)
modifiedtests/src/eth/api/UniqueFungible.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueFungible.sol
+++ b/tests/src/eth/api/UniqueFungible.sol
@@ -36,7 +36,6 @@
 	);
 }
 
-<<<<<<< HEAD
 // Selector: 79cc6790
 interface ERC20UniqueExtensions is Dummy, ERC165 {
 	// Selector: burnFrom(address,uint256) 79cc6790
@@ -80,11 +79,15 @@
 		returns (uint256);
 }
 
+<<<<<<< HEAD
 // Selector: ffe4da23
 =======
 // Selector: 765e2fae
 >>>>>>> misk: Update stubs
 >>>>>>> misk: Update stubs
+=======
+// Selector: e54be640
+>>>>>>> misc: update stubs
 interface Collection is Dummy, ERC165 {
 	/// Set collection property.
 	///
modifiedtests/src/eth/api/UniqueNFT.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -322,10 +322,13 @@
 }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 /// @title Unique extensions for ERC721.
 /// @dev the ERC-165 identifier for this interface is 0xd74d154f
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> misc: update stubs
 // Selector: 780e9d63
 interface ERC721Enumerable is Dummy, ERC165 {
 	// @notice Enumerate valid NFTs
@@ -403,6 +406,7 @@
 }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 /// @dev anonymous struct
 struct Tuple8 {
 	uint256 field_0;
@@ -413,6 +417,9 @@
 =======
 // Selector: 765e2fae
 >>>>>>> misk: Update stubs
+=======
+// Selector: e54be640
+>>>>>>> misc: update stubs
 interface Collection is Dummy, ERC165 {
 	// Set collection property.
 	//
modifiedtests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -322,10 +322,13 @@
 }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 /// @title Unique extensions for ERC721.
 /// @dev the ERC-165 identifier for this interface is 0x7c3bef89
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> misc: update stubs
 // Selector: 780e9d63
 interface ERC721Enumerable is Dummy, ERC165 {
 	// @notice Enumerate valid RFTs
@@ -415,6 +418,7 @@
 }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 /// @dev anonymous struct
 struct Tuple8 {
 	uint256 field_0;
@@ -425,6 +429,9 @@
 =======
 // Selector: 765e2fae
 >>>>>>> misk: Update stubs
+=======
+// Selector: e54be640
+>>>>>>> misc: update stubs
 interface Collection is Dummy, ERC165 {
 	// Set collection property.
 	//
modifiedtests/src/eth/fungibleAbi.jsondiffbeforeafterboth
--- a/tests/src/eth/fungibleAbi.json
+++ b/tests/src/eth/fungibleAbi.json
@@ -151,24 +151,6 @@
     "type": "function"
   },
   {
-    "inputs": [
-      { "internalType": "address", "name": "user", "type": "address" }
-    ],
-    "name": "isOwnerOrAdmin",
-    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      { "internalType": "uint256", "name": "user", "type": "uint256" }
-    ],
-    "name": "isOwnerOrAdminSubstrate",
-    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
     "inputs": [],
     "name": "getCollectionSponsor",
     "outputs": [
@@ -193,6 +175,24 @@
     "type": "function"
   },
   {
+    "inputs": [
+      { "internalType": "address", "name": "user", "type": "address" }
+    ],
+    "name": "isOwnerOrAdmin",
+    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "uint256", "name": "user", "type": "uint256" }
+    ],
+    "name": "isOwnerOrAdminSubstrate",
+    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
     "inputs": [],
     "name": "name",
     "outputs": [{ "internalType": "string", "name": "", "type": "string" }],
@@ -309,7 +309,15 @@
   },
   {
     "inputs": [
-<<<<<<< HEAD
+      { "internalType": "uint256", "name": "sponsor", "type": "uint256" }
+    ],
+    "name": "setCollectionSponsorSubstrate",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
       { "internalType": "address", "name": "newOwner", "type": "address" }
     ],
     "name": "setOwner",
@@ -322,11 +330,6 @@
       { "internalType": "uint256", "name": "newOwner", "type": "uint256" }
     ],
     "name": "setOwnerSubstrate",
-=======
-      { "internalType": "uint256", "name": "sponsor", "type": "uint256" }
-    ],
-    "name": "setCollectionSponsorSubstrate",
->>>>>>> misk: Update stubs
     "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"
modifiedtests/src/eth/nonFungibleAbi.jsondiffbeforeafterboth
--- a/tests/src/eth/nonFungibleAbi.json
+++ b/tests/src/eth/nonFungibleAbi.json
@@ -483,7 +483,15 @@
   },
   {
     "inputs": [
-<<<<<<< HEAD
+      { "internalType": "uint256", "name": "sponsor", "type": "uint256" }
+    ],
+    "name": "setCollectionSponsorSubstrate",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
       { "internalType": "address", "name": "newOwner", "type": "address" }
     ],
     "name": "setOwner",
@@ -496,11 +504,6 @@
       { "internalType": "uint256", "name": "newOwner", "type": "uint256" }
     ],
     "name": "setOwnerSubstrate",
-=======
-      { "internalType": "uint256", "name": "sponsor", "type": "uint256" }
-    ],
-    "name": "setCollectionSponsorSubstrate",
->>>>>>> misk: Update stubs
     "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"
modifiedtests/src/eth/reFungibleAbi.jsondiffbeforeafterboth
--- a/tests/src/eth/reFungibleAbi.json
+++ b/tests/src/eth/reFungibleAbi.json
@@ -483,7 +483,15 @@
   },
   {
     "inputs": [
-<<<<<<< HEAD
+      { "internalType": "uint256", "name": "sponsor", "type": "uint256" }
+    ],
+    "name": "setCollectionSponsorSubstrate",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
       { "internalType": "address", "name": "newOwner", "type": "address" }
     ],
     "name": "setOwner",
@@ -496,11 +504,6 @@
       { "internalType": "uint256", "name": "newOwner", "type": "uint256" }
     ],
     "name": "setOwnerSubstrate",
-=======
-      { "internalType": "uint256", "name": "sponsor", "type": "uint256" }
-    ],
-    "name": "setCollectionSponsorSubstrate",
->>>>>>> misk: Update stubs
     "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"
modifiedtests/src/eth/util/contractHelpersAbi.jsondiffbeforeafterboth
--- a/tests/src/eth/util/contractHelpersAbi.json
+++ b/tests/src/eth/util/contractHelpersAbi.json
@@ -120,7 +120,6 @@
         "internalType": "address",
         "name": "contractAddress",
         "type": "address"
-<<<<<<< HEAD
       }
     ],
     "name": "removeSponsor",
@@ -147,8 +146,6 @@
         "internalType": "address",
         "name": "contractAddress",
         "type": "address"
-=======
->>>>>>> path: add stubs
       },
       { "internalType": "address", "name": "sponsor", "type": "address" }
     ],