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
--- a/pallets/evm-contract-helpers/src/stubs/ContractHelpers.sol
+++ b/pallets/evm-contract-helpers/src/stubs/ContractHelpers.sol
@@ -22,6 +22,7 @@
 }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 /// @title Magic contract, which allows users to reconfigure other contracts
 /// @dev the ERC-165 identifier for this interface is 0xd77fab70
 =======
@@ -31,6 +32,9 @@
 // Selector: 06fc42e9
 >>>>>>> path: add stubs
 >>>>>>> path: add stubs
+=======
+// Selector: 6073d917
+>>>>>>> misc: update stubs
 contract ContractHelpers is Dummy, ERC165 {
 	/// Get user, which deployed specified contract
 	/// @dev May return zero address in case if contract is deployed
@@ -53,6 +57,7 @@
 	}
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 	/// Set sponsor.
 	/// @param contractAddress Contract for which a sponsor is being established.
 	/// @param sponsor User address who set as pending sponsor.
@@ -60,13 +65,13 @@
 	///  or in textual repr: setSponsor(address,address)
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> misc: update stubs
 	// Set sponsor.
 	//
 	// @param contract_address Contract for which a sponsor is being established.
 	// @param sponsor User address who set as pending sponsor.
 	//
-=======
->>>>>>> path: add stubs
 	// Selector: setSponsor(address,address) f01fba93
 >>>>>>> path: add stubs
 	function setSponsor(address contractAddress, address sponsor) public {
@@ -77,6 +82,7 @@
 	}
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 	/// Set contract as self sponsored.
 	///
 	/// @param contractAddress Contract for which a self sponsoring is being enabled.
@@ -84,6 +90,8 @@
 	///  or in textual repr: selfSponsoredEnable(address)
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> misc: update stubs
 	// Set contract as self sponsored.
 	//
 	// @param contract_address Contract for which a self sponsoring is being enabled.
@@ -91,16 +99,13 @@
 	// Selector: selfSponsoredEnable(address) 89f7d9ae
 >>>>>>> path: add stubs
 	function selfSponsoredEnable(address contractAddress) public {
-=======
-	// Selector: confirmSponsorship(address) abc00001
-	function confirmSponsorship(address contractAddress) public {
->>>>>>> path: add stubs
 		require(false, stub_error);
 		contractAddress;
 		dummy = 0;
 	}
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 	/// Remove sponsor.
 	///
 	/// @param contractAddress Contract for which a sponsorship is being removed.
@@ -108,6 +113,8 @@
 	///  or in textual repr: removeSponsor(address)
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> misc: update stubs
 	// Remove sponsor.
 	//
 	// @param contract_address Contract for which a sponsorship is being removed.
@@ -140,9 +147,6 @@
 	/// @dev EVM selector for this function is: 0x743fc745,
 	///  or in textual repr: getSponsor(address)
 	function getSponsor(address contractAddress)
-=======
-	// Selector: getSponsor(address) 743fc745
-	function getSponsor(address contractAddress)
 		public
 		view
 		returns (Tuple0 memory)
@@ -153,27 +157,6 @@
 		return Tuple0(0x0000000000000000000000000000000000000000, 0);
 	}
 
-	// Selector: hasSponsor(address) 97418603
-	function hasSponsor(address contractAddress) public view returns (bool) {
-		require(false, stub_error);
-		contractAddress;
-		dummy;
-		return false;
-	}
-
-	// Selector: hasPendingSponsor(address) 39b9b242
-	function hasPendingSponsor(address contractAddress)
->>>>>>> path: add stubs
-		public
-		view
-		returns (Tuple0 memory)
-	{
-		require(false, stub_error);
-		contractAddress;
-		dummy;
-		return Tuple0(0x0000000000000000000000000000000000000000, 0);
-	}
-
 	/// Check tat contract has confirmed sponsor.
 	///
 	/// @param contractAddress The contract for which the presence of a confirmed sponsor is checked.
@@ -188,6 +171,7 @@
 	}
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 	/// Check tat contract has pending sponsor.
 	///
 	/// @param contractAddress The contract for which the presence of a pending sponsor is checked.
@@ -196,6 +180,8 @@
 	///  or in textual repr: hasPendingSponsor(address)
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> misc: update stubs
 	// Check tat contract has pending sponsor.
 	//
 	// @param contract_address The contract for which the presence of a pending sponsor is checked.
@@ -204,10 +190,6 @@
 	// Selector: hasPendingSponsor(address) 39b9b242
 >>>>>>> path: add stubs
 	function hasPendingSponsor(address contractAddress)
-=======
-	// Selector: sponsoringEnabled(address) 6027dc61
-	function sponsoringEnabled(address contractAddress)
->>>>>>> path: add stubs
 		public
 		view
 		returns (bool)
@@ -216,7 +198,6 @@
 		contractAddress;
 		dummy;
 		return false;
-<<<<<<< HEAD
 	}
 
 	/// @dev EVM selector for this function is: 0x6027dc61,
@@ -230,8 +211,6 @@
 		contractAddress;
 		dummy;
 		return false;
-=======
->>>>>>> path: add stubs
 	}
 
 	/// @dev EVM selector for this function is: 0xfde8a560,
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<<<<<<< HEAD7/// @dev common stubs holder8=======9// Anonymous struct10struct Tuple0 {11	address field_0;12	uint256 field_1;13}1415// Common stubs holder16>>>>>>> misk: Update stubs17contract Dummy {18	uint8 dummy;19	string stub_error = "this contract is implemented in native";20}2122contract ERC165 is Dummy {23	function supportsInterface(bytes4 interfaceID)24		external25		view26		returns (bool)27	{28		require(false, stub_error);29		interfaceID;30		return true;31	}32}3334<<<<<<< HEAD35/// @title A contract that allows you to work with collections.36/// @dev the ERC-165 identifier for this interface is 0xffe4da2337=======38// Inline39contract ERC20Events {40	event Transfer(address indexed from, address indexed to, uint256 value);41	event Approval(42		address indexed owner,43		address indexed spender,44		uint256 value45	);46}4748<<<<<<< HEAD49// Selector: 79cc679050contract ERC20UniqueExtensions is Dummy, ERC165 {51	// Selector: burnFrom(address,uint256) 79cc679052	function burnFrom(address from, uint256 amount) public returns (bool) {53		require(false, stub_error);54		from;55		amount;56		dummy = 0;57		return false;58	}59}6061// Selector: 942e8b2262contract ERC20 is Dummy, ERC165, ERC20Events {63	// Selector: name() 06fdde0364	function name() public view returns (string memory) {65		require(false, stub_error);66		dummy;67		return "";68	}6970	// Selector: symbol() 95d89b4171	function symbol() public view returns (string memory) {72		require(false, stub_error);73		dummy;74		return "";75	}7677	// Selector: totalSupply() 18160ddd78	function totalSupply() public view returns (uint256) {79		require(false, stub_error);80		dummy;81		return 0;82	}8384	// Selector: decimals() 313ce56785	function decimals() public view returns (uint8) {86		require(false, stub_error);87		dummy;88		return 0;89	}9091	// Selector: balanceOf(address) 70a0823192	function balanceOf(address owner) public view returns (uint256) {93		require(false, stub_error);94		owner;95		dummy;96		return 0;97	}9899	// Selector: transfer(address,uint256) a9059cbb100	function transfer(address to, uint256 amount) public returns (bool) {101		require(false, stub_error);102		to;103		amount;104		dummy = 0;105		return false;106	}107108	// Selector: transferFrom(address,address,uint256) 23b872dd109	function transferFrom(110		address from,111		address to,112		uint256 amount113	) public returns (bool) {114		require(false, stub_error);115		from;116		to;117		amount;118		dummy = 0;119		return false;120	}121122	// Selector: approve(address,uint256) 095ea7b3123	function approve(address spender, uint256 amount) public returns (bool) {124		require(false, stub_error);125		spender;126		amount;127		dummy = 0;128		return false;129	}130131	// Selector: allowance(address,address) dd62ed3e132	function allowance(address owner, address spender)133		public134		view135		returns (uint256)136	{137		require(false, stub_error);138		owner;139		spender;140		dummy;141		return 0;142	}143}144145// Selector: ffe4da23146=======147// Selector: 765e2fae148>>>>>>> misk: Update stubs149>>>>>>> misk: Update stubs150contract Collection is Dummy, ERC165 {151	/// Set collection property.152	///153	/// @param key Property key.154	/// @param value Propery value.155	/// @dev EVM selector for this function is: 0x2f073f66,156	///  or in textual repr: setCollectionProperty(string,bytes)157	function setCollectionProperty(string memory key, bytes memory value)158		public159	{160		require(false, stub_error);161		key;162		value;163		dummy = 0;164	}165166	/// Delete collection property.167	///168	/// @param key Property key.169	/// @dev EVM selector for this function is: 0x7b7debce,170	///  or in textual repr: deleteCollectionProperty(string)171	function deleteCollectionProperty(string memory key) public {172		require(false, stub_error);173		key;174		dummy = 0;175	}176177	/// Get collection property.178	///179	/// @dev Throws error if key not found.180	///181	/// @param key Property key.182	/// @return bytes The property corresponding to the key.183	/// @dev EVM selector for this function is: 0xcf24fd6d,184	///  or in textual repr: collectionProperty(string)185	function collectionProperty(string memory key)186		public187		view188		returns (bytes memory)189	{190		require(false, stub_error);191		key;192		dummy;193		return hex"";194	}195196	/// Set the sponsor of the collection.197	///198	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.199	///200	/// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.201	/// @dev EVM selector for this function is: 0x7623402e,202	///  or in textual repr: setCollectionSponsor(address)203	function setCollectionSponsor(address sponsor) public {204		require(false, stub_error);205		sponsor;206		dummy = 0;207	}208209<<<<<<< HEAD210	/// Collection sponsorship confirmation.211	///212	/// @dev After setting the sponsor for the collection, it must be confirmed with this function.213	/// @dev EVM selector for this function is: 0x3c50e97a,214	///  or in textual repr: confirmCollectionSponsorship()215=======216	// Set the substrate sponsor of the collection.217	//218	// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.219	//220	// @param sponsor Substrate address of the sponsor from whose account funds will be debited for operations with the contract.221	//222	// Selector: setCollectionSponsorSubstrate(uint256) c74d6751223	function setCollectionSponsorSubstrate(uint256 sponsor) public {224		require(false, stub_error);225		sponsor;226		dummy = 0;227	}228229	// Selector: hasCollectionPendingSponsor() 058ac185230	function hasCollectionPendingSponsor() public view returns (bool) {231		require(false, stub_error);232		dummy;233		return false;234	}235236	// Collection sponsorship confirmation.237	//238	// @dev After setting the sponsor for the collection, it must be confirmed with this function.239	//240	// Selector: confirmCollectionSponsorship() 3c50e97a241>>>>>>> misk: Update stubs242	function confirmCollectionSponsorship() public {243		require(false, stub_error);244		dummy = 0;245	}246247<<<<<<< HEAD248	/// Set limits for the collection.249	/// @dev Throws error if limit not found.250	/// @param limit Name of the limit. Valid names:251	/// 	"accountTokenOwnershipLimit",252	/// 	"sponsoredDataSize",253	/// 	"sponsoredDataRateLimit",254	/// 	"tokenLimit",255	/// 	"sponsorTransferTimeout",256	/// 	"sponsorApproveTimeout"257	/// @param value Value of the limit.258	/// @dev EVM selector for this function is: 0x6a3841db,259	///  or in textual repr: setCollectionLimit(string,uint32)260=======261	// Remove collection sponsor.262	//263	// Selector: removeCollectionSponsor() 6e0326a3264	function removeCollectionSponsor() public {265		require(false, stub_error);266		dummy = 0;267	}268269	// Get current sponsor.270	//271	// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.272	//273	// Selector: getCollectionSponsor() b66bbc14274	function getCollectionSponsor() public view returns (Tuple0 memory) {275		require(false, stub_error);276		dummy;277		return Tuple0(0x0000000000000000000000000000000000000000, 0);278	}279280	// Set limits for the collection.281	// @dev Throws error if limit not found.282	// @param limit Name of the limit. Valid names:283	// 	"accountTokenOwnershipLimit",284	// 	"sponsoredDataSize",285	// 	"sponsoredDataRateLimit",286	// 	"tokenLimit",287	// 	"sponsorTransferTimeout",288	// 	"sponsorApproveTimeout"289	// @param value Value of the limit.290	//291	// Selector: setCollectionLimit(string,uint32) 6a3841db292>>>>>>> misk: Update stubs293	function setCollectionLimit(string memory limit, uint32 value) public {294		require(false, stub_error);295		limit;296		value;297		dummy = 0;298	}299300	/// Set limits for the collection.301	/// @dev Throws error if limit not found.302	/// @param limit Name of the limit. Valid names:303	/// 	"ownerCanTransfer",304	/// 	"ownerCanDestroy",305	/// 	"transfersEnabled"306	/// @param value Value of the limit.307	/// @dev EVM selector for this function is: 0x993b7fba,308	///  or in textual repr: setCollectionLimit(string,bool)309	function setCollectionLimit(string memory limit, bool value) public {310		require(false, stub_error);311		limit;312		value;313		dummy = 0;314	}315316	/// Get contract address.317	/// @dev EVM selector for this function is: 0xf6b4dfb4,318	///  or in textual repr: contractAddress()319	function contractAddress() public view returns (address) {320		require(false, stub_error);321		dummy;322		return 0x0000000000000000000000000000000000000000;323	}324325	/// Add collection admin by substrate address.326	/// @param newAdmin Substrate administrator address.327	/// @dev EVM selector for this function is: 0x5730062b,328	///  or in textual repr: addCollectionAdminSubstrate(uint256)329	function addCollectionAdminSubstrate(uint256 newAdmin) public {330		require(false, stub_error);331		newAdmin;332		dummy = 0;333	}334335	/// Remove collection admin by substrate address.336	/// @param admin Substrate administrator address.337	/// @dev EVM selector for this function is: 0x4048fcf9,338	///  or in textual repr: removeCollectionAdminSubstrate(uint256)339	function removeCollectionAdminSubstrate(uint256 admin) public {340		require(false, stub_error);341		admin;342		dummy = 0;343	}344345	/// Add collection admin.346	/// @param newAdmin Address of the added administrator.347	/// @dev EVM selector for this function is: 0x92e462c7,348	///  or in textual repr: addCollectionAdmin(address)349	function addCollectionAdmin(address newAdmin) public {350		require(false, stub_error);351		newAdmin;352		dummy = 0;353	}354355	/// Remove collection admin.356	///357	/// @param admin Address of the removed administrator.358	/// @dev EVM selector for this function is: 0xfafd7b42,359	///  or in textual repr: removeCollectionAdmin(address)360	function removeCollectionAdmin(address admin) public {361		require(false, stub_error);362		admin;363		dummy = 0;364	}365366	/// Toggle accessibility of collection nesting.367	///368	/// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'369	/// @dev EVM selector for this function is: 0x112d4586,370	///  or in textual repr: setCollectionNesting(bool)371	function setCollectionNesting(bool enable) public {372		require(false, stub_error);373		enable;374		dummy = 0;375	}376377	/// Toggle accessibility of collection nesting.378	///379	/// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'380	/// @param collections Addresses of collections that will be available for nesting.381	/// @dev EVM selector for this function is: 0x64872396,382	///  or in textual repr: setCollectionNesting(bool,address[])383	function setCollectionNesting(bool enable, address[] memory collections)384		public385	{386		require(false, stub_error);387		enable;388		collections;389		dummy = 0;390	}391392	/// Set the collection access method.393	/// @param mode Access mode394	/// 	0 for Normal395	/// 	1 for AllowList396	/// @dev EVM selector for this function is: 0x41835d4c,397	///  or in textual repr: setCollectionAccess(uint8)398	function setCollectionAccess(uint8 mode) public {399		require(false, stub_error);400		mode;401		dummy = 0;402	}403404	/// Add the user to the allowed list.405	///406	/// @param user Address of a trusted user.407	/// @dev EVM selector for this function is: 0x67844fe6,408	///  or in textual repr: addToCollectionAllowList(address)409	function addToCollectionAllowList(address user) public {410		require(false, stub_error);411		user;412		dummy = 0;413	}414415	/// Remove the user from the allowed list.416	///417	/// @param user Address of a removed user.418	/// @dev EVM selector for this function is: 0x85c51acb,419	///  or in textual repr: removeFromCollectionAllowList(address)420	function removeFromCollectionAllowList(address user) public {421		require(false, stub_error);422		user;423		dummy = 0;424	}425426	/// Switch permission for minting.427	///428	/// @param mode Enable if "true".429	/// @dev EVM selector for this function is: 0x00018e84,430	///  or in textual repr: setCollectionMintMode(bool)431	function setCollectionMintMode(bool mode) public {432		require(false, stub_error);433		mode;434		dummy = 0;435	}436437	/// Check that account is the owner or admin of the collection438	///439	/// @param user account to verify440	/// @return "true" if account is the owner or admin441	/// @dev EVM selector for this function is: 0x9811b0c7,442	///  or in textual repr: isOwnerOrAdmin(address)443	function isOwnerOrAdmin(address user) public view returns (bool) {444		require(false, stub_error);445		user;446		dummy;447		return false;448	}449450	/// Check that substrate account is the owner or admin of the collection451	///452	/// @param user account to verify453	/// @return "true" if account is the owner or admin454	/// @dev EVM selector for this function is: 0x68910e00,455	///  or in textual repr: isOwnerOrAdminSubstrate(uint256)456	function isOwnerOrAdminSubstrate(uint256 user) public view returns (bool) {457		require(false, stub_error);458		user;459		dummy;460		return false;461	}462463	/// Returns collection type464	///465	/// @return `Fungible` or `NFT` or `ReFungible`466	/// @dev EVM selector for this function is: 0xd34b55b8,467	///  or in textual repr: uniqueCollectionType()468	function uniqueCollectionType() public returns (string memory) {469		require(false, stub_error);470		dummy = 0;471		return "";472	}473474	/// Changes collection owner to another account475	///476	/// @dev Owner can be changed only by current owner477	/// @param newOwner new owner account478	/// @dev EVM selector for this function is: 0x13af4035,479	///  or in textual repr: setOwner(address)480	function setOwner(address newOwner) public {481		require(false, stub_error);482		newOwner;483		dummy = 0;484	}485486	/// Changes collection owner to another substrate account487	///488	/// @dev Owner can be changed only by current owner489	/// @param newOwner new owner substrate account490	/// @dev EVM selector for this function is: 0xb212138f,491	///  or in textual repr: setOwnerSubstrate(uint256)492	function setOwnerSubstrate(uint256 newOwner) public {493		require(false, stub_error);494		newOwner;495		dummy = 0;496	}497}498499/// @dev the ERC-165 identifier for this interface is 0x79cc6790500contract ERC20UniqueExtensions is Dummy, ERC165 {501	/// @dev EVM selector for this function is: 0x79cc6790,502	///  or in textual repr: burnFrom(address,uint256)503	function burnFrom(address from, uint256 amount) public returns (bool) {504		require(false, stub_error);505		from;506		amount;507		dummy = 0;508		return false;509	}510}511512/// @dev inlined interface513contract ERC20Events {514	event Transfer(address indexed from, address indexed to, uint256 value);515	event Approval(516		address indexed owner,517		address indexed spender,518		uint256 value519	);520}521522/// @dev the ERC-165 identifier for this interface is 0x942e8b22523contract ERC20 is Dummy, ERC165, ERC20Events {524	/// @dev EVM selector for this function is: 0x06fdde03,525	///  or in textual repr: name()526	function name() public view returns (string memory) {527		require(false, stub_error);528		dummy;529		return "";530	}531532	/// @dev EVM selector for this function is: 0x95d89b41,533	///  or in textual repr: symbol()534	function symbol() public view returns (string memory) {535		require(false, stub_error);536		dummy;537		return "";538	}539540	/// @dev EVM selector for this function is: 0x18160ddd,541	///  or in textual repr: totalSupply()542	function totalSupply() public view returns (uint256) {543		require(false, stub_error);544		dummy;545		return 0;546	}547548	/// @dev EVM selector for this function is: 0x313ce567,549	///  or in textual repr: decimals()550	function decimals() public view returns (uint8) {551		require(false, stub_error);552		dummy;553		return 0;554	}555556	/// @dev EVM selector for this function is: 0x70a08231,557	///  or in textual repr: balanceOf(address)558	function balanceOf(address owner) public view returns (uint256) {559		require(false, stub_error);560		owner;561		dummy;562		return 0;563	}564565	/// @dev EVM selector for this function is: 0xa9059cbb,566	///  or in textual repr: transfer(address,uint256)567	function transfer(address to, uint256 amount) public returns (bool) {568		require(false, stub_error);569		to;570		amount;571		dummy = 0;572		return false;573	}574575	/// @dev EVM selector for this function is: 0x23b872dd,576	///  or in textual repr: transferFrom(address,address,uint256)577	function transferFrom(578		address from,579		address to,580		uint256 amount581	) public returns (bool) {582		require(false, stub_error);583		from;584		to;585		amount;586		dummy = 0;587		return false;588	}589590	/// @dev EVM selector for this function is: 0x095ea7b3,591	///  or in textual repr: approve(address,uint256)592	function approve(address spender, uint256 amount) public returns (bool) {593		require(false, stub_error);594		spender;595		amount;596		dummy = 0;597		return false;598	}599600	/// @dev EVM selector for this function is: 0xdd62ed3e,601	///  or in textual repr: allowance(address,address)602	function allowance(address owner, address spender)603		public604		view605		returns (uint256)606	{607		require(false, stub_error);608		owner;609		spender;610		dummy;611		return 0;612	}613}614615contract UniqueFungible is616	Dummy,617	ERC165,618	ERC20,619	ERC20UniqueExtensions,620	Collection621{}
after · pallets/fungible/src/stubs/UniqueFungible.sol
1// SPDX-License-Identifier: OTHER2// This code is automatically generated34pragma solidity >=0.8.0 <0.9.0;56<<<<<<< HEAD7/// @dev common stubs holder8=======9// Anonymous struct10struct Tuple0 {11	address field_0;12	uint256 field_1;13}1415// Common stubs holder16>>>>>>> misk: Update stubs17contract Dummy {18	uint8 dummy;19	string stub_error = "this contract is implemented in native";20}2122contract ERC165 is Dummy {23	function supportsInterface(bytes4 interfaceID)24		external25		view26		returns (bool)27	{28		require(false, stub_error);29		interfaceID;30		return true;31	}32}3334<<<<<<< HEAD35/// @title A contract that allows you to work with collections.36/// @dev the ERC-165 identifier for this interface is 0xffe4da2337=======38// Inline39contract ERC20Events {40	event Transfer(address indexed from, address indexed to, uint256 value);41	event Approval(42		address indexed owner,43		address indexed spender,44		uint256 value45	);46}4748// Selector: 79cc679049contract ERC20UniqueExtensions is Dummy, ERC165 {50	// Selector: burnFrom(address,uint256) 79cc679051	function burnFrom(address from, uint256 amount) public returns (bool) {52		require(false, stub_error);53		from;54		amount;55		dummy = 0;56		return false;57	}58}5960// Selector: 942e8b2261contract ERC20 is Dummy, ERC165, ERC20Events {62	// Selector: name() 06fdde0363	function name() public view returns (string memory) {64		require(false, stub_error);65		dummy;66		return "";67	}6869	// Selector: symbol() 95d89b4170	function symbol() public view returns (string memory) {71		require(false, stub_error);72		dummy;73		return "";74	}7576	// Selector: totalSupply() 18160ddd77	function totalSupply() public view returns (uint256) {78		require(false, stub_error);79		dummy;80		return 0;81	}8283	// Selector: decimals() 313ce56784	function decimals() public view returns (uint8) {85		require(false, stub_error);86		dummy;87		return 0;88	}8990	// Selector: balanceOf(address) 70a0823191	function balanceOf(address owner) public view returns (uint256) {92		require(false, stub_error);93		owner;94		dummy;95		return 0;96	}9798	// Selector: transfer(address,uint256) a9059cbb99	function transfer(address to, uint256 amount) public returns (bool) {100		require(false, stub_error);101		to;102		amount;103		dummy = 0;104		return false;105	}106107	// Selector: transferFrom(address,address,uint256) 23b872dd108	function transferFrom(109		address from,110		address to,111		uint256 amount112	) public returns (bool) {113		require(false, stub_error);114		from;115		to;116		amount;117		dummy = 0;118		return false;119	}120121	// Selector: approve(address,uint256) 095ea7b3122	function approve(address spender, uint256 amount) public returns (bool) {123		require(false, stub_error);124		spender;125		amount;126		dummy = 0;127		return false;128	}129130	// Selector: allowance(address,address) dd62ed3e131	function allowance(address owner, address spender)132		public133		view134		returns (uint256)135	{136		require(false, stub_error);137		owner;138		spender;139		dummy;140		return 0;141	}142}143144<<<<<<< HEAD145// Selector: ffe4da23146=======147// Selector: 765e2fae148>>>>>>> misk: Update stubs149>>>>>>> misk: Update stubs150=======151// Selector: e54be640152>>>>>>> misc: update stubs153contract Collection is Dummy, ERC165 {154	/// Set collection property.155	///156	/// @param key Property key.157	/// @param value Propery value.158	/// @dev EVM selector for this function is: 0x2f073f66,159	///  or in textual repr: setCollectionProperty(string,bytes)160	function setCollectionProperty(string memory key, bytes memory value)161		public162	{163		require(false, stub_error);164		key;165		value;166		dummy = 0;167	}168169	/// Delete collection property.170	///171	/// @param key Property key.172	/// @dev EVM selector for this function is: 0x7b7debce,173	///  or in textual repr: deleteCollectionProperty(string)174	function deleteCollectionProperty(string memory key) public {175		require(false, stub_error);176		key;177		dummy = 0;178	}179180	/// Get collection property.181	///182	/// @dev Throws error if key not found.183	///184	/// @param key Property key.185	/// @return bytes The property corresponding to the key.186	/// @dev EVM selector for this function is: 0xcf24fd6d,187	///  or in textual repr: collectionProperty(string)188	function collectionProperty(string memory key)189		public190		view191		returns (bytes memory)192	{193		require(false, stub_error);194		key;195		dummy;196		return hex"";197	}198199	/// Set the sponsor of the collection.200	///201	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.202	///203	/// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.204	/// @dev EVM selector for this function is: 0x7623402e,205	///  or in textual repr: setCollectionSponsor(address)206	function setCollectionSponsor(address sponsor) public {207		require(false, stub_error);208		sponsor;209		dummy = 0;210	}211212<<<<<<< HEAD213	/// Collection sponsorship confirmation.214	///215	/// @dev After setting the sponsor for the collection, it must be confirmed with this function.216	/// @dev EVM selector for this function is: 0x3c50e97a,217	///  or in textual repr: confirmCollectionSponsorship()218=======219	// Set the substrate sponsor of the collection.220	//221	// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.222	//223	// @param sponsor Substrate address of the sponsor from whose account funds will be debited for operations with the contract.224	//225	// Selector: setCollectionSponsorSubstrate(uint256) c74d6751226	function setCollectionSponsorSubstrate(uint256 sponsor) public {227		require(false, stub_error);228		sponsor;229		dummy = 0;230	}231232	// Selector: hasCollectionPendingSponsor() 058ac185233	function hasCollectionPendingSponsor() public view returns (bool) {234		require(false, stub_error);235		dummy;236		return false;237	}238239	// Collection sponsorship confirmation.240	//241	// @dev After setting the sponsor for the collection, it must be confirmed with this function.242	//243	// Selector: confirmCollectionSponsorship() 3c50e97a244>>>>>>> misk: Update stubs245	function confirmCollectionSponsorship() public {246		require(false, stub_error);247		dummy = 0;248	}249250<<<<<<< HEAD251	/// Set limits for the collection.252	/// @dev Throws error if limit not found.253	/// @param limit Name of the limit. Valid names:254	/// 	"accountTokenOwnershipLimit",255	/// 	"sponsoredDataSize",256	/// 	"sponsoredDataRateLimit",257	/// 	"tokenLimit",258	/// 	"sponsorTransferTimeout",259	/// 	"sponsorApproveTimeout"260	/// @param value Value of the limit.261	/// @dev EVM selector for this function is: 0x6a3841db,262	///  or in textual repr: setCollectionLimit(string,uint32)263=======264	// Remove collection sponsor.265	//266	// Selector: removeCollectionSponsor() 6e0326a3267	function removeCollectionSponsor() public {268		require(false, stub_error);269		dummy = 0;270	}271272	// Get current sponsor.273	//274	// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.275	//276	// Selector: getCollectionSponsor() b66bbc14277	function getCollectionSponsor() public view returns (Tuple0 memory) {278		require(false, stub_error);279		dummy;280		return Tuple0(0x0000000000000000000000000000000000000000, 0);281	}282283	// Set limits for the collection.284	// @dev Throws error if limit not found.285	// @param limit Name of the limit. Valid names:286	// 	"accountTokenOwnershipLimit",287	// 	"sponsoredDataSize",288	// 	"sponsoredDataRateLimit",289	// 	"tokenLimit",290	// 	"sponsorTransferTimeout",291	// 	"sponsorApproveTimeout"292	// @param value Value of the limit.293	//294	// Selector: setCollectionLimit(string,uint32) 6a3841db295>>>>>>> misk: Update stubs296	function setCollectionLimit(string memory limit, uint32 value) public {297		require(false, stub_error);298		limit;299		value;300		dummy = 0;301	}302303	/// Set limits for the collection.304	/// @dev Throws error if limit not found.305	/// @param limit Name of the limit. Valid names:306	/// 	"ownerCanTransfer",307	/// 	"ownerCanDestroy",308	/// 	"transfersEnabled"309	/// @param value Value of the limit.310	/// @dev EVM selector for this function is: 0x993b7fba,311	///  or in textual repr: setCollectionLimit(string,bool)312	function setCollectionLimit(string memory limit, bool value) public {313		require(false, stub_error);314		limit;315		value;316		dummy = 0;317	}318319	/// Get contract address.320	/// @dev EVM selector for this function is: 0xf6b4dfb4,321	///  or in textual repr: contractAddress()322	function contractAddress() public view returns (address) {323		require(false, stub_error);324		dummy;325		return 0x0000000000000000000000000000000000000000;326	}327328	/// Add collection admin by substrate address.329	/// @param newAdmin Substrate administrator address.330	/// @dev EVM selector for this function is: 0x5730062b,331	///  or in textual repr: addCollectionAdminSubstrate(uint256)332	function addCollectionAdminSubstrate(uint256 newAdmin) public {333		require(false, stub_error);334		newAdmin;335		dummy = 0;336	}337338	/// Remove collection admin by substrate address.339	/// @param admin Substrate administrator address.340	/// @dev EVM selector for this function is: 0x4048fcf9,341	///  or in textual repr: removeCollectionAdminSubstrate(uint256)342	function removeCollectionAdminSubstrate(uint256 admin) public {343		require(false, stub_error);344		admin;345		dummy = 0;346	}347348	/// Add collection admin.349	/// @param newAdmin Address of the added administrator.350	/// @dev EVM selector for this function is: 0x92e462c7,351	///  or in textual repr: addCollectionAdmin(address)352	function addCollectionAdmin(address newAdmin) public {353		require(false, stub_error);354		newAdmin;355		dummy = 0;356	}357358	/// Remove collection admin.359	///360	/// @param admin Address of the removed administrator.361	/// @dev EVM selector for this function is: 0xfafd7b42,362	///  or in textual repr: removeCollectionAdmin(address)363	function removeCollectionAdmin(address admin) public {364		require(false, stub_error);365		admin;366		dummy = 0;367	}368369	/// Toggle accessibility of collection nesting.370	///371	/// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'372	/// @dev EVM selector for this function is: 0x112d4586,373	///  or in textual repr: setCollectionNesting(bool)374	function setCollectionNesting(bool enable) public {375		require(false, stub_error);376		enable;377		dummy = 0;378	}379380	/// Toggle accessibility of collection nesting.381	///382	/// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'383	/// @param collections Addresses of collections that will be available for nesting.384	/// @dev EVM selector for this function is: 0x64872396,385	///  or in textual repr: setCollectionNesting(bool,address[])386	function setCollectionNesting(bool enable, address[] memory collections)387		public388	{389		require(false, stub_error);390		enable;391		collections;392		dummy = 0;393	}394395	/// Set the collection access method.396	/// @param mode Access mode397	/// 	0 for Normal398	/// 	1 for AllowList399	/// @dev EVM selector for this function is: 0x41835d4c,400	///  or in textual repr: setCollectionAccess(uint8)401	function setCollectionAccess(uint8 mode) public {402		require(false, stub_error);403		mode;404		dummy = 0;405	}406407	/// Add the user to the allowed list.408	///409	/// @param user Address of a trusted user.410	/// @dev EVM selector for this function is: 0x67844fe6,411	///  or in textual repr: addToCollectionAllowList(address)412	function addToCollectionAllowList(address user) public {413		require(false, stub_error);414		user;415		dummy = 0;416	}417418	/// Remove the user from the allowed list.419	///420	/// @param user Address of a removed user.421	/// @dev EVM selector for this function is: 0x85c51acb,422	///  or in textual repr: removeFromCollectionAllowList(address)423	function removeFromCollectionAllowList(address user) public {424		require(false, stub_error);425		user;426		dummy = 0;427	}428429	/// Switch permission for minting.430	///431	/// @param mode Enable if "true".432	/// @dev EVM selector for this function is: 0x00018e84,433	///  or in textual repr: setCollectionMintMode(bool)434	function setCollectionMintMode(bool mode) public {435		require(false, stub_error);436		mode;437		dummy = 0;438	}439440	/// Check that account is the owner or admin of the collection441	///442	/// @param user account to verify443	/// @return "true" if account is the owner or admin444	/// @dev EVM selector for this function is: 0x9811b0c7,445	///  or in textual repr: isOwnerOrAdmin(address)446	function isOwnerOrAdmin(address user) public view returns (bool) {447		require(false, stub_error);448		user;449		dummy;450		return false;451	}452453	/// Check that substrate account is the owner or admin of the collection454	///455	/// @param user account to verify456	/// @return "true" if account is the owner or admin457	/// @dev EVM selector for this function is: 0x68910e00,458	///  or in textual repr: isOwnerOrAdminSubstrate(uint256)459	function isOwnerOrAdminSubstrate(uint256 user) public view returns (bool) {460		require(false, stub_error);461		user;462		dummy;463		return false;464	}465466	/// Returns collection type467	///468	/// @return `Fungible` or `NFT` or `ReFungible`469	/// @dev EVM selector for this function is: 0xd34b55b8,470	///  or in textual repr: uniqueCollectionType()471	function uniqueCollectionType() public returns (string memory) {472		require(false, stub_error);473		dummy = 0;474		return "";475	}476477	/// Changes collection owner to another account478	///479	/// @dev Owner can be changed only by current owner480	/// @param newOwner new owner account481	/// @dev EVM selector for this function is: 0x13af4035,482	///  or in textual repr: setOwner(address)483	function setOwner(address newOwner) public {484		require(false, stub_error);485		newOwner;486		dummy = 0;487	}488489	/// Changes collection owner to another substrate account490	///491	/// @dev Owner can be changed only by current owner492	/// @param newOwner new owner substrate account493	/// @dev EVM selector for this function is: 0xb212138f,494	///  or in textual repr: setOwnerSubstrate(uint256)495	function setOwnerSubstrate(uint256 newOwner) public {496		require(false, stub_error);497		newOwner;498		dummy = 0;499	}500}501502/// @dev the ERC-165 identifier for this interface is 0x79cc6790503contract ERC20UniqueExtensions is Dummy, ERC165 {504	/// @dev EVM selector for this function is: 0x79cc6790,505	///  or in textual repr: burnFrom(address,uint256)506	function burnFrom(address from, uint256 amount) public returns (bool) {507		require(false, stub_error);508		from;509		amount;510		dummy = 0;511		return false;512	}513}514515/// @dev inlined interface516contract ERC20Events {517	event Transfer(address indexed from, address indexed to, uint256 value);518	event Approval(519		address indexed owner,520		address indexed spender,521		uint256 value522	);523}524525/// @dev the ERC-165 identifier for this interface is 0x942e8b22526contract ERC20 is Dummy, ERC165, ERC20Events {527	/// @dev EVM selector for this function is: 0x06fdde03,528	///  or in textual repr: name()529	function name() public view returns (string memory) {530		require(false, stub_error);531		dummy;532		return "";533	}534535	/// @dev EVM selector for this function is: 0x95d89b41,536	///  or in textual repr: symbol()537	function symbol() public view returns (string memory) {538		require(false, stub_error);539		dummy;540		return "";541	}542543	/// @dev EVM selector for this function is: 0x18160ddd,544	///  or in textual repr: totalSupply()545	function totalSupply() public view returns (uint256) {546		require(false, stub_error);547		dummy;548		return 0;549	}550551	/// @dev EVM selector for this function is: 0x313ce567,552	///  or in textual repr: decimals()553	function decimals() public view returns (uint8) {554		require(false, stub_error);555		dummy;556		return 0;557	}558559	/// @dev EVM selector for this function is: 0x70a08231,560	///  or in textual repr: balanceOf(address)561	function balanceOf(address owner) public view returns (uint256) {562		require(false, stub_error);563		owner;564		dummy;565		return 0;566	}567568	/// @dev EVM selector for this function is: 0xa9059cbb,569	///  or in textual repr: transfer(address,uint256)570	function transfer(address to, uint256 amount) public returns (bool) {571		require(false, stub_error);572		to;573		amount;574		dummy = 0;575		return false;576	}577578	/// @dev EVM selector for this function is: 0x23b872dd,579	///  or in textual repr: transferFrom(address,address,uint256)580	function transferFrom(581		address from,582		address to,583		uint256 amount584	) public returns (bool) {585		require(false, stub_error);586		from;587		to;588		amount;589		dummy = 0;590		return false;591	}592593	/// @dev EVM selector for this function is: 0x095ea7b3,594	///  or in textual repr: approve(address,uint256)595	function approve(address spender, uint256 amount) public returns (bool) {596		require(false, stub_error);597		spender;598		amount;599		dummy = 0;600		return false;601	}602603	/// @dev EVM selector for this function is: 0xdd62ed3e,604	///  or in textual repr: allowance(address,address)605	function allowance(address owner, address spender)606		public607		view608		returns (uint256)609	{610		require(false, stub_error);611		owner;612		spender;613		dummy;614		return 0;615	}616}617618contract UniqueFungible is619	Dummy,620	ERC165,621	ERC20,622	ERC20UniqueExtensions,623	Collection624{}
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" }
     ],