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

difftreelog

misk: Update stubs

Trubnikov Sergey2022-08-24parent: #83de2b0.patch.diff
in: master

9 files changed

modifiedpallets/fungible/src/stubs/UniqueFungible.soldiffbeforeafterboth
--- a/pallets/fungible/src/stubs/UniqueFungible.sol
+++ b/pallets/fungible/src/stubs/UniqueFungible.sol
@@ -3,7 +3,17 @@
 
 pragma solidity >=0.8.0 <0.9.0;
 
+<<<<<<< HEAD
 /// @dev common stubs holder
+=======
+// Anonymous struct
+struct Tuple0 {
+	address field_0;
+	uint256 field_1;
+}
+
+// Common stubs holder
+>>>>>>> misk: Update stubs
 contract Dummy {
 	uint8 dummy;
 	string stub_error = "this contract is implemented in native";
@@ -21,8 +31,122 @@
 	}
 }
 
+<<<<<<< HEAD
 /// @title A contract that allows you to work with collections.
 /// @dev the ERC-165 identifier for this interface is 0xffe4da23
+=======
+// Inline
+contract ERC20Events {
+	event Transfer(address indexed from, address indexed to, uint256 value);
+	event Approval(
+		address indexed owner,
+		address indexed spender,
+		uint256 value
+	);
+}
+
+<<<<<<< HEAD
+// Selector: 79cc6790
+contract ERC20UniqueExtensions is Dummy, ERC165 {
+	// Selector: burnFrom(address,uint256) 79cc6790
+	function burnFrom(address from, uint256 amount) public returns (bool) {
+		require(false, stub_error);
+		from;
+		amount;
+		dummy = 0;
+		return false;
+	}
+}
+
+// Selector: 942e8b22
+contract ERC20 is Dummy, ERC165, ERC20Events {
+	// Selector: name() 06fdde03
+	function name() public view returns (string memory) {
+		require(false, stub_error);
+		dummy;
+		return "";
+	}
+
+	// Selector: symbol() 95d89b41
+	function symbol() public view returns (string memory) {
+		require(false, stub_error);
+		dummy;
+		return "";
+	}
+
+	// Selector: totalSupply() 18160ddd
+	function totalSupply() public view returns (uint256) {
+		require(false, stub_error);
+		dummy;
+		return 0;
+	}
+
+	// Selector: decimals() 313ce567
+	function decimals() public view returns (uint8) {
+		require(false, stub_error);
+		dummy;
+		return 0;
+	}
+
+	// Selector: balanceOf(address) 70a08231
+	function balanceOf(address owner) public view returns (uint256) {
+		require(false, stub_error);
+		owner;
+		dummy;
+		return 0;
+	}
+
+	// Selector: transfer(address,uint256) a9059cbb
+	function transfer(address to, uint256 amount) public returns (bool) {
+		require(false, stub_error);
+		to;
+		amount;
+		dummy = 0;
+		return false;
+	}
+
+	// Selector: transferFrom(address,address,uint256) 23b872dd
+	function transferFrom(
+		address from,
+		address to,
+		uint256 amount
+	) public returns (bool) {
+		require(false, stub_error);
+		from;
+		to;
+		amount;
+		dummy = 0;
+		return false;
+	}
+
+	// Selector: approve(address,uint256) 095ea7b3
+	function approve(address spender, uint256 amount) public returns (bool) {
+		require(false, stub_error);
+		spender;
+		amount;
+		dummy = 0;
+		return false;
+	}
+
+	// Selector: allowance(address,address) dd62ed3e
+	function allowance(address owner, address spender)
+		public
+		view
+		returns (uint256)
+	{
+		require(false, stub_error);
+		owner;
+		spender;
+		dummy;
+		return 0;
+	}
+}
+
+// Selector: ffe4da23
+=======
+// Selector: 765e2fae
+>>>>>>> misk: Update stubs
+>>>>>>> misk: Update stubs
 contract Collection is Dummy, ERC165 {
 	/// Set collection property.
 	///
@@ -82,16 +206,45 @@
 		dummy = 0;
 	}
 
+<<<<<<< HEAD
 	/// Collection sponsorship confirmation.
 	///
 	/// @dev After setting the sponsor for the collection, it must be confirmed with this function.
 	/// @dev EVM selector for this function is: 0x3c50e97a,
 	///  or in textual repr: confirmCollectionSponsorship()
+=======
+	// Set the substrate sponsor of the collection.
+	//
+	// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
+	//
+	// @param sponsor Substrate address of the sponsor from whose account funds will be debited for operations with the contract.
+	//
+	// Selector: setCollectionSponsorSubstrate(uint256) c74d6751
+	function setCollectionSponsorSubstrate(uint256 sponsor) public {
+		require(false, stub_error);
+		sponsor;
+		dummy = 0;
+	}
+
+	// Selector: hasCollectionPendingSponsor() 058ac185
+	function hasCollectionPendingSponsor() public view returns (bool) {
+		require(false, stub_error);
+		dummy;
+		return false;
+	}
+
+	// Collection sponsorship confirmation.
+	//
+	// @dev After setting the sponsor for the collection, it must be confirmed with this function.
+	//
+	// Selector: confirmCollectionSponsorship() 3c50e97a
+>>>>>>> misk: Update stubs
 	function confirmCollectionSponsorship() public {
 		require(false, stub_error);
 		dummy = 0;
 	}
 
+<<<<<<< HEAD
 	/// Set limits for the collection.
 	/// @dev Throws error if limit not found.
 	/// @param limit Name of the limit. Valid names:
@@ -104,6 +257,39 @@
 	/// @param value Value of the limit.
 	/// @dev EVM selector for this function is: 0x6a3841db,
 	///  or in textual repr: setCollectionLimit(string,uint32)
+=======
+	// Remove collection sponsor.
+	//
+	// Selector: removeCollectionSponsor() 6e0326a3
+	function removeCollectionSponsor() public {
+		require(false, stub_error);
+		dummy = 0;
+	}
+
+	// Get current sponsor.
+	//
+	// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
+	//
+	// Selector: getCollectionSponsor() b66bbc14
+	function getCollectionSponsor() public view returns (Tuple0 memory) {
+		require(false, stub_error);
+		dummy;
+		return Tuple0(0x0000000000000000000000000000000000000000, 0);
+	}
+
+	// Set limits for the collection.
+	// @dev Throws error if limit not found.
+	// @param limit Name of the limit. Valid names:
+	// 	"accountTokenOwnershipLimit",
+	// 	"sponsoredDataSize",
+	// 	"sponsoredDataRateLimit",
+	// 	"tokenLimit",
+	// 	"sponsorTransferTimeout",
+	// 	"sponsorApproveTimeout"
+	// @param value Value of the limit.
+	//
+	// Selector: setCollectionLimit(string,uint32) 6a3841db
+>>>>>>> misk: Update stubs
 	function setCollectionLimit(string memory limit, uint32 value) public {
 		require(false, stub_error);
 		limit;
modifiedpallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth
--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -3,7 +3,23 @@
 
 pragma solidity >=0.8.0 <0.9.0;
 
+<<<<<<< HEAD
 /// @dev common stubs holder
+=======
+// Anonymous struct
+struct Tuple0 {
+	uint256 field_0;
+	string field_1;
+}
+
+// Anonymous struct
+struct Tuple1 {
+	address field_0;
+	uint256 field_1;
+}
+
+// Common stubs holder
+>>>>>>> misk: Update stubs
 contract Dummy {
 	uint8 dummy;
 	string stub_error = "this contract is implemented in native";
@@ -465,8 +481,55 @@
 	}
 }
 
+<<<<<<< HEAD
 /// @title Unique extensions for ERC721.
 /// @dev the ERC-165 identifier for this interface is 0xd74d154f
+=======
+<<<<<<< HEAD
+// Selector: 780e9d63
+contract ERC721Enumerable is Dummy, ERC165 {
+	// @notice Enumerate valid NFTs
+	// @param index A counter less than `totalSupply()`
+	// @return The token identifier for the `index`th NFT,
+	//  (sort order not specified)
+	//
+	// Selector: tokenByIndex(uint256) 4f6ccce7
+	function tokenByIndex(uint256 index) public view returns (uint256) {
+		require(false, stub_error);
+		index;
+		dummy;
+		return 0;
+	}
+
+	// @dev Not implemented
+	//
+	// Selector: tokenOfOwnerByIndex(address,uint256) 2f745c59
+	function tokenOfOwnerByIndex(address owner, uint256 index)
+		public
+		view
+		returns (uint256)
+	{
+		require(false, stub_error);
+		owner;
+		index;
+		dummy;
+		return 0;
+	}
+
+	// @notice Count NFTs tracked by this contract
+	// @return A count of valid NFTs tracked by this contract, where each one of
+	//  them has an assigned and queryable owner not equal to the zero address
+	//
+	// Selector: totalSupply() 18160ddd
+	function totalSupply() public view returns (uint256) {
+		require(false, stub_error);
+		dummy;
+		return 0;
+	}
+}
+
+// Selector: d74d154f
+>>>>>>> misk: Update stubs
 contract ERC721UniqueExtensions is Dummy, ERC165 {
 	/// @notice Transfer ownership of an NFT
 	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`
@@ -543,11 +606,33 @@
 	}
 }
 
+<<<<<<< HEAD
 /// @dev anonymous struct
 struct Tuple8 {
 	uint256 field_0;
 	string field_1;
 }
+=======
+// Selector: ffe4da23
+=======
+// Selector: 765e2fae
+>>>>>>> misk: Update stubs
+contract Collection is Dummy, ERC165 {
+	// Set collection property.
+	//
+	// @param key Property key.
+	// @param value Propery value.
+	//
+	// Selector: setCollectionProperty(string,bytes) 2f073f66
+	function setCollectionProperty(string memory key, bytes memory value)
+		public
+	{
+		require(false, stub_error);
+		key;
+		value;
+		dummy = 0;
+	}
+>>>>>>> misk: Update stubs
 
 /// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension
 /// @dev See https://eips.ethereum.org/EIPS/eip-721
@@ -578,7 +663,92 @@
 		owner;
 		index;
 		dummy;
+<<<<<<< HEAD
 		return 0;
+=======
+		return hex"";
+	}
+
+	// Set the sponsor of the collection.
+	//
+	// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
+	//
+	// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.
+	//
+	// Selector: setCollectionSponsor(address) 7623402e
+	function setCollectionSponsor(address sponsor) public {
+		require(false, stub_error);
+		sponsor;
+		dummy = 0;
+	}
+
+	// Set the substrate sponsor of the collection.
+	//
+	// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
+	//
+	// @param sponsor Substrate address of the sponsor from whose account funds will be debited for operations with the contract.
+	//
+	// Selector: setCollectionSponsorSubstrate(uint256) c74d6751
+	function setCollectionSponsorSubstrate(uint256 sponsor) public {
+		require(false, stub_error);
+		sponsor;
+		dummy = 0;
+	}
+
+	// Selector: hasCollectionPendingSponsor() 058ac185
+	function hasCollectionPendingSponsor() public view returns (bool) {
+		require(false, stub_error);
+		dummy;
+		return false;
+	}
+
+	// Collection sponsorship confirmation.
+	//
+	// @dev After setting the sponsor for the collection, it must be confirmed with this function.
+	//
+	// Selector: confirmCollectionSponsorship() 3c50e97a
+	function confirmCollectionSponsorship() public {
+		require(false, stub_error);
+		dummy = 0;
+	}
+
+	// Remove collection sponsor.
+	//
+	// Selector: removeCollectionSponsor() 6e0326a3
+	function removeCollectionSponsor() public {
+		require(false, stub_error);
+		dummy = 0;
+	}
+
+	// Get current sponsor.
+	//
+	// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
+	//
+	// Selector: getCollectionSponsor() b66bbc14
+	function getCollectionSponsor() public view returns (Tuple1 memory) {
+		require(false, stub_error);
+		dummy;
+		return Tuple1(0x0000000000000000000000000000000000000000, 0);
+	}
+
+	// Set limits for the collection.
+	// @dev Throws error if limit not found.
+	// @param limit Name of the limit. Valid names:
+	// 	"accountTokenOwnershipLimit",
+	// 	"sponsoredDataSize",
+	// 	"sponsoredDataRateLimit",
+	// 	"tokenLimit",
+	// 	"sponsorTransferTimeout",
+	// 	"sponsorApproveTimeout"
+	// @param value Value of the limit.
+	//
+	// Selector: setCollectionLimit(string,uint32) 6a3841db
+	function setCollectionLimit(string memory limit, uint32 value) public {
+		require(false, stub_error);
+		limit;
+		value;
+		dummy = 0;
+>>>>>>> misk: Update stubs
 	}
 
 	/// @notice Count NFTs tracked by this contract
modifiedpallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth
before · pallets/refungible/src/stubs/UniqueRefungible.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/// @title A contract that allows to set and delete token properties and change token property permissions.25/// @dev the ERC-165 identifier for this interface is 0x4136937726contract TokenProperties is Dummy, ERC165 {27	/// @notice Set permissions for token property.28	/// @dev Throws error if `msg.sender` is not admin or owner of the collection.29	/// @param key Property key.30	/// @param isMutable Permission to mutate property.31	/// @param collectionAdmin Permission to mutate property by collection admin if property is mutable.32	/// @param tokenOwner Permission to mutate property by token owner if property is mutable.33	/// @dev EVM selector for this function is: 0x222d97fa,34	///  or in textual repr: setTokenPropertyPermission(string,bool,bool,bool)35	function setTokenPropertyPermission(36		string memory key,37		bool isMutable,38		bool collectionAdmin,39		bool tokenOwner40	) public {41		require(false, stub_error);42		key;43		isMutable;44		collectionAdmin;45		tokenOwner;46		dummy = 0;47	}4849	/// @notice Set token property value.50	/// @dev Throws error if `msg.sender` has no permission to edit the property.51	/// @param tokenId ID of the token.52	/// @param key Property key.53	/// @param value Property value.54	/// @dev EVM selector for this function is: 0x1752d67b,55	///  or in textual repr: setProperty(uint256,string,bytes)56	function setProperty(57		uint256 tokenId,58		string memory key,59		bytes memory value60	) public {61		require(false, stub_error);62		tokenId;63		key;64		value;65		dummy = 0;66	}6768	/// @notice Delete token property value.69	/// @dev Throws error if `msg.sender` has no permission to edit the property.70	/// @param tokenId ID of the token.71	/// @param key Property key.72	/// @dev EVM selector for this function is: 0x066111d1,73	///  or in textual repr: deleteProperty(uint256,string)74	function deleteProperty(uint256 tokenId, string memory key) public {75		require(false, stub_error);76		tokenId;77		key;78		dummy = 0;79	}8081	/// @notice Get token property value.82	/// @dev Throws error if key not found83	/// @param tokenId ID of the token.84	/// @param key Property key.85	/// @return Property value bytes86	/// @dev EVM selector for this function is: 0x7228c327,87	///  or in textual repr: property(uint256,string)88	function property(uint256 tokenId, string memory key)89		public90		view91		returns (bytes memory)92	{93		require(false, stub_error);94		tokenId;95		key;96		dummy;97		return hex"";98	}99}100101/// @title A contract that allows you to work with collections.102/// @dev the ERC-165 identifier for this interface is 0xffe4da23103contract Collection is Dummy, ERC165 {104	/// Set collection property.105	///106	/// @param key Property key.107	/// @param value Propery value.108	/// @dev EVM selector for this function is: 0x2f073f66,109	///  or in textual repr: setCollectionProperty(string,bytes)110	function setCollectionProperty(string memory key, bytes memory value)111		public112	{113		require(false, stub_error);114		key;115		value;116		dummy = 0;117	}118119	/// Delete collection property.120	///121	/// @param key Property key.122	/// @dev EVM selector for this function is: 0x7b7debce,123	///  or in textual repr: deleteCollectionProperty(string)124	function deleteCollectionProperty(string memory key) public {125		require(false, stub_error);126		key;127		dummy = 0;128	}129130	/// Get collection property.131	///132	/// @dev Throws error if key not found.133	///134	/// @param key Property key.135	/// @return bytes The property corresponding to the key.136	/// @dev EVM selector for this function is: 0xcf24fd6d,137	///  or in textual repr: collectionProperty(string)138	function collectionProperty(string memory key)139		public140		view141		returns (bytes memory)142	{143		require(false, stub_error);144		key;145		dummy;146		return hex"";147	}148149	/// Set the sponsor of the collection.150	///151	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.152	///153	/// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.154	/// @dev EVM selector for this function is: 0x7623402e,155	///  or in textual repr: setCollectionSponsor(address)156	function setCollectionSponsor(address sponsor) public {157		require(false, stub_error);158		sponsor;159		dummy = 0;160	}161162	/// Collection sponsorship confirmation.163	///164	/// @dev After setting the sponsor for the collection, it must be confirmed with this function.165	/// @dev EVM selector for this function is: 0x3c50e97a,166	///  or in textual repr: confirmCollectionSponsorship()167	function confirmCollectionSponsorship() public {168		require(false, stub_error);169		dummy = 0;170	}171172	/// Set limits for the collection.173	/// @dev Throws error if limit not found.174	/// @param limit Name of the limit. Valid names:175	/// 	"accountTokenOwnershipLimit",176	/// 	"sponsoredDataSize",177	/// 	"sponsoredDataRateLimit",178	/// 	"tokenLimit",179	/// 	"sponsorTransferTimeout",180	/// 	"sponsorApproveTimeout"181	/// @param value Value of the limit.182	/// @dev EVM selector for this function is: 0x6a3841db,183	///  or in textual repr: setCollectionLimit(string,uint32)184	function setCollectionLimit(string memory limit, uint32 value) public {185		require(false, stub_error);186		limit;187		value;188		dummy = 0;189	}190191	/// Set limits for the collection.192	/// @dev Throws error if limit not found.193	/// @param limit Name of the limit. Valid names:194	/// 	"ownerCanTransfer",195	/// 	"ownerCanDestroy",196	/// 	"transfersEnabled"197	/// @param value Value of the limit.198	/// @dev EVM selector for this function is: 0x993b7fba,199	///  or in textual repr: setCollectionLimit(string,bool)200	function setCollectionLimit(string memory limit, bool value) public {201		require(false, stub_error);202		limit;203		value;204		dummy = 0;205	}206207	/// Get contract address.208	/// @dev EVM selector for this function is: 0xf6b4dfb4,209	///  or in textual repr: contractAddress()210	function contractAddress() public view returns (address) {211		require(false, stub_error);212		dummy;213		return 0x0000000000000000000000000000000000000000;214	}215216	/// Add collection admin by substrate address.217	/// @param newAdmin Substrate administrator address.218	/// @dev EVM selector for this function is: 0x5730062b,219	///  or in textual repr: addCollectionAdminSubstrate(uint256)220	function addCollectionAdminSubstrate(uint256 newAdmin) public {221		require(false, stub_error);222		newAdmin;223		dummy = 0;224	}225226	/// Remove collection admin by substrate address.227	/// @param admin Substrate administrator address.228	/// @dev EVM selector for this function is: 0x4048fcf9,229	///  or in textual repr: removeCollectionAdminSubstrate(uint256)230	function removeCollectionAdminSubstrate(uint256 admin) public {231		require(false, stub_error);232		admin;233		dummy = 0;234	}235236	/// Add collection admin.237	/// @param newAdmin Address of the added administrator.238	/// @dev EVM selector for this function is: 0x92e462c7,239	///  or in textual repr: addCollectionAdmin(address)240	function addCollectionAdmin(address newAdmin) public {241		require(false, stub_error);242		newAdmin;243		dummy = 0;244	}245246	/// Remove collection admin.247	///248	/// @param admin Address of the removed administrator.249	/// @dev EVM selector for this function is: 0xfafd7b42,250	///  or in textual repr: removeCollectionAdmin(address)251	function removeCollectionAdmin(address admin) public {252		require(false, stub_error);253		admin;254		dummy = 0;255	}256257	/// Toggle accessibility of collection nesting.258	///259	/// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'260	/// @dev EVM selector for this function is: 0x112d4586,261	///  or in textual repr: setCollectionNesting(bool)262	function setCollectionNesting(bool enable) public {263		require(false, stub_error);264		enable;265		dummy = 0;266	}267268	/// Toggle accessibility of collection nesting.269	///270	/// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'271	/// @param collections Addresses of collections that will be available for nesting.272	/// @dev EVM selector for this function is: 0x64872396,273	///  or in textual repr: setCollectionNesting(bool,address[])274	function setCollectionNesting(bool enable, address[] memory collections)275		public276	{277		require(false, stub_error);278		enable;279		collections;280		dummy = 0;281	}282283	/// Set the collection access method.284	/// @param mode Access mode285	/// 	0 for Normal286	/// 	1 for AllowList287	/// @dev EVM selector for this function is: 0x41835d4c,288	///  or in textual repr: setCollectionAccess(uint8)289	function setCollectionAccess(uint8 mode) public {290		require(false, stub_error);291		mode;292		dummy = 0;293	}294295	/// Add the user to the allowed list.296	///297	/// @param user Address of a trusted user.298	/// @dev EVM selector for this function is: 0x67844fe6,299	///  or in textual repr: addToCollectionAllowList(address)300	function addToCollectionAllowList(address user) public {301		require(false, stub_error);302		user;303		dummy = 0;304	}305306	/// Remove the user from the allowed list.307	///308	/// @param user Address of a removed user.309	/// @dev EVM selector for this function is: 0x85c51acb,310	///  or in textual repr: removeFromCollectionAllowList(address)311	function removeFromCollectionAllowList(address user) public {312		require(false, stub_error);313		user;314		dummy = 0;315	}316317	/// Switch permission for minting.318	///319	/// @param mode Enable if "true".320	/// @dev EVM selector for this function is: 0x00018e84,321	///  or in textual repr: setCollectionMintMode(bool)322	function setCollectionMintMode(bool mode) public {323		require(false, stub_error);324		mode;325		dummy = 0;326	}327328	/// Check that account is the owner or admin of the collection329	///330	/// @param user account to verify331	/// @return "true" if account is the owner or admin332	/// @dev EVM selector for this function is: 0x9811b0c7,333	///  or in textual repr: isOwnerOrAdmin(address)334	function isOwnerOrAdmin(address user) public view returns (bool) {335		require(false, stub_error);336		user;337		dummy;338		return false;339	}340341	/// Check that substrate account is the owner or admin of the collection342	///343	/// @param user account to verify344	/// @return "true" if account is the owner or admin345	/// @dev EVM selector for this function is: 0x68910e00,346	///  or in textual repr: isOwnerOrAdminSubstrate(uint256)347	function isOwnerOrAdminSubstrate(uint256 user) public view returns (bool) {348		require(false, stub_error);349		user;350		dummy;351		return false;352	}353354	/// Returns collection type355	///356	/// @return `Fungible` or `NFT` or `ReFungible`357	/// @dev EVM selector for this function is: 0xd34b55b8,358	///  or in textual repr: uniqueCollectionType()359	function uniqueCollectionType() public returns (string memory) {360		require(false, stub_error);361		dummy = 0;362		return "";363	}364365	/// Changes collection owner to another account366	///367	/// @dev Owner can be changed only by current owner368	/// @param newOwner new owner account369	/// @dev EVM selector for this function is: 0x13af4035,370	///  or in textual repr: setOwner(address)371	function setOwner(address newOwner) public {372		require(false, stub_error);373		newOwner;374		dummy = 0;375	}376377	/// Changes collection owner to another substrate account378	///379	/// @dev Owner can be changed only by current owner380	/// @param newOwner new owner substrate account381	/// @dev EVM selector for this function is: 0xb212138f,382	///  or in textual repr: setOwnerSubstrate(uint256)383	function setOwnerSubstrate(uint256 newOwner) public {384		require(false, stub_error);385		newOwner;386		dummy = 0;387	}388}389390/// @title ERC721 Token that can be irreversibly burned (destroyed).391/// @dev the ERC-165 identifier for this interface is 0x42966c68392contract ERC721Burnable is Dummy, ERC165 {393	/// @notice Burns a specific ERC721 token.394	/// @dev Throws unless `msg.sender` is the current RFT owner, or an authorized395	///  operator of the current owner.396	/// @param tokenId The RFT to approve397	/// @dev EVM selector for this function is: 0x42966c68,398	///  or in textual repr: burn(uint256)399	function burn(uint256 tokenId) public {400		require(false, stub_error);401		tokenId;402		dummy = 0;403	}404}405406/// @dev inlined interface407contract ERC721MintableEvents {408	event MintingFinished();409}410411/// @title ERC721 minting logic.412/// @dev the ERC-165 identifier for this interface is 0x68ccfe89413contract ERC721Mintable is Dummy, ERC165, ERC721MintableEvents {414	/// @dev EVM selector for this function is: 0x05d2035b,415	///  or in textual repr: mintingFinished()416	function mintingFinished() public view returns (bool) {417		require(false, stub_error);418		dummy;419		return false;420	}421422	/// @notice Function to mint token.423	/// @dev `tokenId` should be obtained with `nextTokenId` method,424	///  unlike standard, you can't specify it manually425	/// @param to The new owner426	/// @param tokenId ID of the minted RFT427	/// @dev EVM selector for this function is: 0x40c10f19,428	///  or in textual repr: mint(address,uint256)429	function mint(address to, uint256 tokenId) public returns (bool) {430		require(false, stub_error);431		to;432		tokenId;433		dummy = 0;434		return false;435	}436437	/// @notice Function to mint token with the given tokenUri.438	/// @dev `tokenId` should be obtained with `nextTokenId` method,439	///  unlike standard, you can't specify it manually440	/// @param to The new owner441	/// @param tokenId ID of the minted RFT442	/// @param tokenUri Token URI that would be stored in the RFT properties443	/// @dev EVM selector for this function is: 0x50bb4e7f,444	///  or in textual repr: mintWithTokenURI(address,uint256,string)445	function mintWithTokenURI(446		address to,447		uint256 tokenId,448		string memory tokenUri449	) public returns (bool) {450		require(false, stub_error);451		to;452		tokenId;453		tokenUri;454		dummy = 0;455		return false;456	}457458	/// @dev Not implemented459	/// @dev EVM selector for this function is: 0x7d64bcb4,460	///  or in textual repr: finishMinting()461	function finishMinting() public returns (bool) {462		require(false, stub_error);463		dummy = 0;464		return false;465	}466}467468/// @title Unique extensions for ERC721.469/// @dev the ERC-165 identifier for this interface is 0x7c3bef89470contract ERC721UniqueExtensions is Dummy, ERC165 {471	/// @notice Transfer ownership of an RFT472	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`473	///  is the zero address. Throws if `tokenId` is not a valid RFT.474	///  Throws if RFT pieces have multiple owners.475	/// @param to The new owner476	/// @param tokenId The RFT to transfer477	/// @dev EVM selector for this function is: 0xa9059cbb,478	///  or in textual repr: transfer(address,uint256)479	function transfer(address to, uint256 tokenId) public {480		require(false, stub_error);481		to;482		tokenId;483		dummy = 0;484	}485486	/// @notice Burns a specific ERC721 token.487	/// @dev Throws unless `msg.sender` is the current owner or an authorized488	///  operator for this RFT. Throws if `from` is not the current owner. Throws489	///  if `to` is the zero address. Throws if `tokenId` is not a valid RFT.490	///  Throws if RFT pieces have multiple owners.491	/// @param from The current owner of the RFT492	/// @param tokenId The RFT to transfer493	/// @dev EVM selector for this function is: 0x79cc6790,494	///  or in textual repr: burnFrom(address,uint256)495	function burnFrom(address from, uint256 tokenId) public {496		require(false, stub_error);497		from;498		tokenId;499		dummy = 0;500	}501502	/// @notice Returns next free RFT ID.503	/// @dev EVM selector for this function is: 0x75794a3c,504	///  or in textual repr: nextTokenId()505	function nextTokenId() public view returns (uint256) {506		require(false, stub_error);507		dummy;508		return 0;509	}510511	/// @notice Function to mint multiple tokens.512	/// @dev `tokenIds` should be an array of consecutive numbers and first number513	///  should be obtained with `nextTokenId` method514	/// @param to The new owner515	/// @param tokenIds IDs of the minted RFTs516	/// @dev EVM selector for this function is: 0x44a9945e,517	///  or in textual repr: mintBulk(address,uint256[])518	function mintBulk(address to, uint256[] memory tokenIds)519		public520		returns (bool)521	{522		require(false, stub_error);523		to;524		tokenIds;525		dummy = 0;526		return false;527	}528529	/// @notice Function to mint multiple tokens with the given tokenUris.530	/// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive531	///  numbers and first number should be obtained with `nextTokenId` method532	/// @param to The new owner533	/// @param tokens array of pairs of token ID and token URI for minted tokens534	/// @dev EVM selector for this function is: 0x36543006,535	///  or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])536	function mintBulkWithTokenURI(address to, Tuple8[] memory tokens)537		public538		returns (bool)539	{540		require(false, stub_error);541		to;542		tokens;543		dummy = 0;544		return false;545	}546547	/// Returns EVM address for refungible token548	///549	/// @param token ID of the token550	/// @dev EVM selector for this function is: 0xab76fac6,551	///  or in textual repr: tokenContractAddress(uint256)552	function tokenContractAddress(uint256 token) public view returns (address) {553		require(false, stub_error);554		token;555		dummy;556		return 0x0000000000000000000000000000000000000000;557	}558}559560/// @dev anonymous struct561struct Tuple8 {562	uint256 field_0;563	string field_1;564}565566/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension567/// @dev See https://eips.ethereum.org/EIPS/eip-721568/// @dev the ERC-165 identifier for this interface is 0x780e9d63569contract ERC721Enumerable is Dummy, ERC165 {570	/// @notice Enumerate valid RFTs571	/// @param index A counter less than `totalSupply()`572	/// @return The token identifier for the `index`th NFT,573	///  (sort order not specified)574	/// @dev EVM selector for this function is: 0x4f6ccce7,575	///  or in textual repr: tokenByIndex(uint256)576	function tokenByIndex(uint256 index) public view returns (uint256) {577		require(false, stub_error);578		index;579		dummy;580		return 0;581	}582583	/// Not implemented584	/// @dev EVM selector for this function is: 0x2f745c59,585	///  or in textual repr: tokenOfOwnerByIndex(address,uint256)586	function tokenOfOwnerByIndex(address owner, uint256 index)587		public588		view589		returns (uint256)590	{591		require(false, stub_error);592		owner;593		index;594		dummy;595		return 0;596	}597598	/// @notice Count RFTs tracked by this contract599	/// @return A count of valid RFTs tracked by this contract, where each one of600	///  them has an assigned and queryable owner not equal to the zero address601	/// @dev EVM selector for this function is: 0x18160ddd,602	///  or in textual repr: totalSupply()603	function totalSupply() public view returns (uint256) {604		require(false, stub_error);605		dummy;606		return 0;607	}608}609610/// @dev the ERC-165 identifier for this interface is 0x5b5e139f611contract ERC721Metadata is Dummy, ERC165 {612	/// @notice A descriptive name for a collection of RFTs in this contract613	/// @dev EVM selector for this function is: 0x06fdde03,614	///  or in textual repr: name()615	function name() public view returns (string memory) {616		require(false, stub_error);617		dummy;618		return "";619	}620621	/// @notice An abbreviated name for RFTs in this contract622	/// @dev EVM selector for this function is: 0x95d89b41,623	///  or in textual repr: symbol()624	function symbol() public view returns (string memory) {625		require(false, stub_error);626		dummy;627		return "";628	}629630	/// @notice A distinct Uniform Resource Identifier (URI) for a given asset.631	///632	/// @dev If the token has a `url` property and it is not empty, it is returned.633	///  Else If the collection does not have a property with key `schemaName` or its value is not equal to `ERC721Metadata`, it return an error `tokenURI not set`.634	///  If the collection property `baseURI` is empty or absent, return "" (empty string)635	///  otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix636	///  otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).637	///638	/// @return token's const_metadata639	/// @dev EVM selector for this function is: 0xc87b56dd,640	///  or in textual repr: tokenURI(uint256)641	function tokenURI(uint256 tokenId) public view returns (string memory) {642		require(false, stub_error);643		tokenId;644		dummy;645		return "";646	}647}648649/// @dev inlined interface650contract ERC721Events {651	event Transfer(652		address indexed from,653		address indexed to,654		uint256 indexed tokenId655	);656	event Approval(657		address indexed owner,658		address indexed approved,659		uint256 indexed tokenId660	);661	event ApprovalForAll(662		address indexed owner,663		address indexed operator,664		bool approved665	);666}667668/// @title ERC-721 Non-Fungible Token Standard669/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md670/// @dev the ERC-165 identifier for this interface is 0x58800161671contract ERC721 is Dummy, ERC165, ERC721Events {672	/// @notice Count all RFTs assigned to an owner673	/// @dev RFTs assigned to the zero address are considered invalid, and this674	///  function throws for queries about the zero address.675	/// @param owner An address for whom to query the balance676	/// @return The number of RFTs owned by `owner`, possibly zero677	/// @dev EVM selector for this function is: 0x70a08231,678	///  or in textual repr: balanceOf(address)679	function balanceOf(address owner) public view returns (uint256) {680		require(false, stub_error);681		owner;682		dummy;683		return 0;684	}685686	/// @notice Find the owner of an RFT687	/// @dev RFTs assigned to zero address are considered invalid, and queries688	///  about them do throw.689	///  Returns special 0xffffffffffffffffffffffffffffffffffffffff address for690	///  the tokens that are partially owned.691	/// @param tokenId The identifier for an RFT692	/// @return The address of the owner of the RFT693	/// @dev EVM selector for this function is: 0x6352211e,694	///  or in textual repr: ownerOf(uint256)695	function ownerOf(uint256 tokenId) public view returns (address) {696		require(false, stub_error);697		tokenId;698		dummy;699		return 0x0000000000000000000000000000000000000000;700	}701702	/// @dev Not implemented703	/// @dev EVM selector for this function is: 0x60a11672,704	///  or in textual repr: safeTransferFromWithData(address,address,uint256,bytes)705	function safeTransferFromWithData(706		address from,707		address to,708		uint256 tokenId,709		bytes memory data710	) public {711		require(false, stub_error);712		from;713		to;714		tokenId;715		data;716		dummy = 0;717	}718719	/// @dev Not implemented720	/// @dev EVM selector for this function is: 0x42842e0e,721	///  or in textual repr: safeTransferFrom(address,address,uint256)722	function safeTransferFrom(723		address from,724		address to,725		uint256 tokenId726	) public {727		require(false, stub_error);728		from;729		to;730		tokenId;731		dummy = 0;732	}733734	/// @notice Transfer ownership of an RFT -- THE CALLER IS RESPONSIBLE735	///  TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE736	///  THEY MAY BE PERMANENTLY LOST737	/// @dev Throws unless `msg.sender` is the current owner or an authorized738	///  operator for this RFT. Throws if `from` is not the current owner. Throws739	///  if `to` is the zero address. Throws if `tokenId` is not a valid RFT.740	///  Throws if RFT pieces have multiple owners.741	/// @param from The current owner of the NFT742	/// @param to The new owner743	/// @param tokenId The NFT to transfer744	/// @dev EVM selector for this function is: 0x23b872dd,745	///  or in textual repr: transferFrom(address,address,uint256)746	function transferFrom(747		address from,748		address to,749		uint256 tokenId750	) public {751		require(false, stub_error);752		from;753		to;754		tokenId;755		dummy = 0;756	}757758	/// @dev Not implemented759	/// @dev EVM selector for this function is: 0x095ea7b3,760	///  or in textual repr: approve(address,uint256)761	function approve(address approved, uint256 tokenId) public {762		require(false, stub_error);763		approved;764		tokenId;765		dummy = 0;766	}767768	/// @dev Not implemented769	/// @dev EVM selector for this function is: 0xa22cb465,770	///  or in textual repr: setApprovalForAll(address,bool)771	function setApprovalForAll(address operator, bool approved) public {772		require(false, stub_error);773		operator;774		approved;775		dummy = 0;776	}777778	/// @dev Not implemented779	/// @dev EVM selector for this function is: 0x081812fc,780	///  or in textual repr: getApproved(uint256)781	function getApproved(uint256 tokenId) public view returns (address) {782		require(false, stub_error);783		tokenId;784		dummy;785		return 0x0000000000000000000000000000000000000000;786	}787788	/// @dev Not implemented789	/// @dev EVM selector for this function is: 0xe985e9c5,790	///  or in textual repr: isApprovedForAll(address,address)791	function isApprovedForAll(address owner, address operator)792		public793		view794		returns (address)795	{796		require(false, stub_error);797		owner;798		operator;799		dummy;800		return 0x0000000000000000000000000000000000000000;801	}802}803804contract UniqueRefungible is805	Dummy,806	ERC165,807	ERC721,808	ERC721Metadata,809	ERC721Enumerable,810	ERC721UniqueExtensions,811	ERC721Mintable,812	ERC721Burnable,813	Collection,814	TokenProperties815{}
modifiedtests/src/eth/api/UniqueFungible.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueFungible.sol
+++ b/tests/src/eth/api/UniqueFungible.sol
@@ -3,7 +3,17 @@
 
 pragma solidity >=0.8.0 <0.9.0;
 
+<<<<<<< HEAD
 /// @dev common stubs holder
+=======
+// Anonymous struct
+struct Tuple0 {
+	address field_0;
+	uint256 field_1;
+}
+
+// Common stubs holder
+>>>>>>> misk: Update stubs
 interface Dummy {
 
 }
@@ -12,8 +22,69 @@
 	function supportsInterface(bytes4 interfaceID) external view returns (bool);
 }
 
+<<<<<<< HEAD
 /// @title A contract that allows you to work with collections.
 /// @dev the ERC-165 identifier for this interface is 0xffe4da23
+=======
+// Inline
+interface ERC20Events {
+	event Transfer(address indexed from, address indexed to, uint256 value);
+	event Approval(
+		address indexed owner,
+		address indexed spender,
+		uint256 value
+	);
+}
+
+<<<<<<< HEAD
+// Selector: 79cc6790
+interface ERC20UniqueExtensions is Dummy, ERC165 {
+	// Selector: burnFrom(address,uint256) 79cc6790
+	function burnFrom(address from, uint256 amount) external returns (bool);
+}
+
+// Selector: 942e8b22
+interface ERC20 is Dummy, ERC165, ERC20Events {
+	// Selector: name() 06fdde03
+	function name() external view returns (string memory);
+
+	// Selector: symbol() 95d89b41
+	function symbol() external view returns (string memory);
+
+	// Selector: totalSupply() 18160ddd
+	function totalSupply() external view returns (uint256);
+
+	// Selector: decimals() 313ce567
+	function decimals() external view returns (uint8);
+
+	// Selector: balanceOf(address) 70a08231
+	function balanceOf(address owner) external view returns (uint256);
+
+	// Selector: transfer(address,uint256) a9059cbb
+	function transfer(address to, uint256 amount) external returns (bool);
+
+	// Selector: transferFrom(address,address,uint256) 23b872dd
+	function transferFrom(
+		address from,
+		address to,
+		uint256 amount
+	) external returns (bool);
+
+	// Selector: approve(address,uint256) 095ea7b3
+	function approve(address spender, uint256 amount) external returns (bool);
+
+	// Selector: allowance(address,address) dd62ed3e
+	function allowance(address owner, address spender)
+		external
+		view
+		returns (uint256);
+}
+
+// Selector: ffe4da23
+=======
+// Selector: 765e2fae
+>>>>>>> misk: Update stubs
+>>>>>>> misk: Update stubs
 interface Collection is Dummy, ERC165 {
 	/// Set collection property.
 	///
@@ -53,6 +124,7 @@
 	///  or in textual repr: setCollectionSponsor(address)
 	function setCollectionSponsor(address sponsor) external;
 
+<<<<<<< HEAD
 	/// Collection sponsorship confirmation.
 	///
 	/// @dev After setting the sponsor for the collection, it must be confirmed with this function.
@@ -72,6 +144,51 @@
 	/// @param value Value of the limit.
 	/// @dev EVM selector for this function is: 0x6a3841db,
 	///  or in textual repr: setCollectionLimit(string,uint32)
+=======
+	// Set the substrate sponsor of the collection.
+	//
+	// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
+	//
+	// @param sponsor Substrate address of the sponsor from whose account funds will be debited for operations with the contract.
+	//
+	// Selector: setCollectionSponsorSubstrate(uint256) c74d6751
+	function setCollectionSponsorSubstrate(uint256 sponsor) external;
+
+	// Selector: hasCollectionPendingSponsor() 058ac185
+	function hasCollectionPendingSponsor() external view returns (bool);
+
+	// Collection sponsorship confirmation.
+	//
+	// @dev After setting the sponsor for the collection, it must be confirmed with this function.
+	//
+	// Selector: confirmCollectionSponsorship() 3c50e97a
+	function confirmCollectionSponsorship() external;
+
+	// Remove collection sponsor.
+	//
+	// Selector: removeCollectionSponsor() 6e0326a3
+	function removeCollectionSponsor() external;
+
+	// Get current sponsor.
+	//
+	// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
+	//
+	// Selector: getCollectionSponsor() b66bbc14
+	function getCollectionSponsor() external view returns (Tuple0 memory);
+
+	// Set limits for the collection.
+	// @dev Throws error if limit not found.
+	// @param limit Name of the limit. Valid names:
+	// 	"accountTokenOwnershipLimit",
+	// 	"sponsoredDataSize",
+	// 	"sponsoredDataRateLimit",
+	// 	"tokenLimit",
+	// 	"sponsorTransferTimeout",
+	// 	"sponsorApproveTimeout"
+	// @param value Value of the limit.
+	//
+	// Selector: setCollectionLimit(string,uint32) 6a3841db
+>>>>>>> misk: Update stubs
 	function setCollectionLimit(string memory limit, uint32 value) external;
 
 	/// Set limits for the collection.
modifiedtests/src/eth/api/UniqueNFT.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -3,7 +3,23 @@
 
 pragma solidity >=0.8.0 <0.9.0;
 
+<<<<<<< HEAD
 /// @dev common stubs holder
+=======
+// Anonymous struct
+struct Tuple0 {
+	uint256 field_0;
+	string field_1;
+}
+
+// Anonymous struct
+struct Tuple1 {
+	address field_0;
+	uint256 field_1;
+}
+
+// Common stubs holder
+>>>>>>> misk: Update stubs
 interface Dummy {
 
 }
@@ -305,8 +321,39 @@
 	function finishMinting() external returns (bool);
 }
 
+<<<<<<< HEAD
 /// @title Unique extensions for ERC721.
 /// @dev the ERC-165 identifier for this interface is 0xd74d154f
+=======
+<<<<<<< HEAD
+// Selector: 780e9d63
+interface ERC721Enumerable is Dummy, ERC165 {
+	// @notice Enumerate valid NFTs
+	// @param index A counter less than `totalSupply()`
+	// @return The token identifier for the `index`th NFT,
+	//  (sort order not specified)
+	//
+	// Selector: tokenByIndex(uint256) 4f6ccce7
+	function tokenByIndex(uint256 index) external view returns (uint256);
+
+	// @dev Not implemented
+	//
+	// Selector: tokenOfOwnerByIndex(address,uint256) 2f745c59
+	function tokenOfOwnerByIndex(address owner, uint256 index)
+		external
+		view
+		returns (uint256);
+
+	// @notice Count NFTs tracked by this contract
+	// @return A count of valid NFTs tracked by this contract, where each one of
+	//  them has an assigned and queryable owner not equal to the zero address
+	//
+	// Selector: totalSupply() 18160ddd
+	function totalSupply() external view returns (uint256);
+}
+
+// Selector: d74d154f
+>>>>>>> misk: Update stubs
 interface ERC721UniqueExtensions is Dummy, ERC165 {
 	/// @notice Transfer ownership of an NFT
 	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`
@@ -355,11 +402,27 @@
 		returns (bool);
 }
 
+<<<<<<< HEAD
 /// @dev anonymous struct
 struct Tuple8 {
 	uint256 field_0;
 	string field_1;
 }
+=======
+// Selector: ffe4da23
+=======
+// Selector: 765e2fae
+>>>>>>> misk: Update stubs
+interface Collection is Dummy, ERC165 {
+	// Set collection property.
+	//
+	// @param key Property key.
+	// @param value Propery value.
+	//
+	// Selector: setCollectionProperty(string,bytes) 2f073f66
+	function setCollectionProperty(string memory key, bytes memory value)
+		external;
+>>>>>>> misk: Update stubs
 
 /// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension
 /// @dev See https://eips.ethereum.org/EIPS/eip-721
@@ -379,7 +442,87 @@
 	function tokenOfOwnerByIndex(address owner, uint256 index)
 		external
 		view
+<<<<<<< HEAD
 		returns (uint256);
+=======
+		returns (bytes memory);
+
+	// Set the sponsor of the collection.
+	//
+	// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
+	//
+	// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.
+	//
+	// Selector: setCollectionSponsor(address) 7623402e
+	function setCollectionSponsor(address sponsor) external;
+
+	// Set the substrate sponsor of the collection.
+	//
+	// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
+	//
+	// @param sponsor Substrate address of the sponsor from whose account funds will be debited for operations with the contract.
+	//
+	// Selector: setCollectionSponsorSubstrate(uint256) c74d6751
+	function setCollectionSponsorSubstrate(uint256 sponsor) external;
+
+	// Selector: hasCollectionPendingSponsor() 058ac185
+	function hasCollectionPendingSponsor() external view returns (bool);
+
+	// Collection sponsorship confirmation.
+	//
+	// @dev After setting the sponsor for the collection, it must be confirmed with this function.
+	//
+	// Selector: confirmCollectionSponsorship() 3c50e97a
+	function confirmCollectionSponsorship() external;
+
+	// Remove collection sponsor.
+	//
+	// Selector: removeCollectionSponsor() 6e0326a3
+	function removeCollectionSponsor() external;
+
+	// Get current sponsor.
+	//
+	// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
+	//
+	// Selector: getCollectionSponsor() b66bbc14
+	function getCollectionSponsor() external view returns (Tuple1 memory);
+
+	// Set limits for the collection.
+	// @dev Throws error if limit not found.
+	// @param limit Name of the limit. Valid names:
+	// 	"accountTokenOwnershipLimit",
+	// 	"sponsoredDataSize",
+	// 	"sponsoredDataRateLimit",
+	// 	"tokenLimit",
+	// 	"sponsorTransferTimeout",
+	// 	"sponsorApproveTimeout"
+	// @param value Value of the limit.
+	//
+	// Selector: setCollectionLimit(string,uint32) 6a3841db
+	function setCollectionLimit(string memory limit, uint32 value) external;
+
+	// Set limits for the collection.
+	// @dev Throws error if limit not found.
+	// @param limit Name of the limit. Valid names:
+	// 	"ownerCanTransfer",
+	// 	"ownerCanDestroy",
+	// 	"transfersEnabled"
+	// @param value Value of the limit.
+	//
+	// Selector: setCollectionLimit(string,bool) 993b7fba
+	function setCollectionLimit(string memory limit, bool value) external;
+
+	// Get contract address.
+	//
+	// Selector: contractAddress() f6b4dfb4
+	function contractAddress() external view returns (address);
+
+	// Add collection admin by substrate address.
+	// @param new_admin Substrate administrator address.
+	//
+	// Selector: addCollectionAdminSubstrate(uint256) 5730062b
+	function addCollectionAdminSubstrate(uint256 newAdmin) external;
+>>>>>>> misk: Update stubs
 
 	/// @notice Count NFTs tracked by this contract
 	/// @return A count of valid NFTs tracked by this contract, where each one of
modifiedtests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -3,7 +3,23 @@
 
 pragma solidity >=0.8.0 <0.9.0;
 
+<<<<<<< HEAD
 /// @dev common stubs holder
+=======
+// Anonymous struct
+struct Tuple0 {
+	uint256 field_0;
+	string field_1;
+}
+
+// Anonymous struct
+struct Tuple1 {
+	address field_0;
+	uint256 field_1;
+}
+
+// Common stubs holder
+>>>>>>> misk: Update stubs
 interface Dummy {
 
 }
@@ -305,8 +321,39 @@
 	function finishMinting() external returns (bool);
 }
 
+<<<<<<< HEAD
 /// @title Unique extensions for ERC721.
 /// @dev the ERC-165 identifier for this interface is 0x7c3bef89
+=======
+<<<<<<< HEAD
+// Selector: 780e9d63
+interface ERC721Enumerable is Dummy, ERC165 {
+	// @notice Enumerate valid RFTs
+	// @param index A counter less than `totalSupply()`
+	// @return The token identifier for the `index`th NFT,
+	//  (sort order not specified)
+	//
+	// Selector: tokenByIndex(uint256) 4f6ccce7
+	function tokenByIndex(uint256 index) external view returns (uint256);
+
+	// Not implemented
+	//
+	// Selector: tokenOfOwnerByIndex(address,uint256) 2f745c59
+	function tokenOfOwnerByIndex(address owner, uint256 index)
+		external
+		view
+		returns (uint256);
+
+	// @notice Count RFTs tracked by this contract
+	// @return A count of valid RFTs tracked by this contract, where each one of
+	//  them has an assigned and queryable owner not equal to the zero address
+	//
+	// Selector: totalSupply() 18160ddd
+	function totalSupply() external view returns (uint256);
+}
+
+// Selector: 7c3bef89
+>>>>>>> misk: Update stubs
 interface ERC721UniqueExtensions is Dummy, ERC165 {
 	/// @notice Transfer ownership of an RFT
 	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`
@@ -367,11 +414,27 @@
 		returns (address);
 }
 
+<<<<<<< HEAD
 /// @dev anonymous struct
 struct Tuple8 {
 	uint256 field_0;
 	string field_1;
 }
+=======
+// Selector: ffe4da23
+=======
+// Selector: 765e2fae
+>>>>>>> misk: Update stubs
+interface Collection is Dummy, ERC165 {
+	// Set collection property.
+	//
+	// @param key Property key.
+	// @param value Propery value.
+	//
+	// Selector: setCollectionProperty(string,bytes) 2f073f66
+	function setCollectionProperty(string memory key, bytes memory value)
+		external;
+>>>>>>> misk: Update stubs
 
 /// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension
 /// @dev See https://eips.ethereum.org/EIPS/eip-721
@@ -391,7 +454,87 @@
 	function tokenOfOwnerByIndex(address owner, uint256 index)
 		external
 		view
+<<<<<<< HEAD
 		returns (uint256);
+=======
+		returns (bytes memory);
+
+	// Set the sponsor of the collection.
+	//
+	// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
+	//
+	// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.
+	//
+	// Selector: setCollectionSponsor(address) 7623402e
+	function setCollectionSponsor(address sponsor) external;
+
+	// Set the substrate sponsor of the collection.
+	//
+	// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
+	//
+	// @param sponsor Substrate address of the sponsor from whose account funds will be debited for operations with the contract.
+	//
+	// Selector: setCollectionSponsorSubstrate(uint256) c74d6751
+	function setCollectionSponsorSubstrate(uint256 sponsor) external;
+
+	// Selector: hasCollectionPendingSponsor() 058ac185
+	function hasCollectionPendingSponsor() external view returns (bool);
+
+	// Collection sponsorship confirmation.
+	//
+	// @dev After setting the sponsor for the collection, it must be confirmed with this function.
+	//
+	// Selector: confirmCollectionSponsorship() 3c50e97a
+	function confirmCollectionSponsorship() external;
+
+	// Remove collection sponsor.
+	//
+	// Selector: removeCollectionSponsor() 6e0326a3
+	function removeCollectionSponsor() external;
+
+	// Get current sponsor.
+	//
+	// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
+	//
+	// Selector: getCollectionSponsor() b66bbc14
+	function getCollectionSponsor() external view returns (Tuple1 memory);
+
+	// Set limits for the collection.
+	// @dev Throws error if limit not found.
+	// @param limit Name of the limit. Valid names:
+	// 	"accountTokenOwnershipLimit",
+	// 	"sponsoredDataSize",
+	// 	"sponsoredDataRateLimit",
+	// 	"tokenLimit",
+	// 	"sponsorTransferTimeout",
+	// 	"sponsorApproveTimeout"
+	// @param value Value of the limit.
+	//
+	// Selector: setCollectionLimit(string,uint32) 6a3841db
+	function setCollectionLimit(string memory limit, uint32 value) external;
+
+	// Set limits for the collection.
+	// @dev Throws error if limit not found.
+	// @param limit Name of the limit. Valid names:
+	// 	"ownerCanTransfer",
+	// 	"ownerCanDestroy",
+	// 	"transfersEnabled"
+	// @param value Value of the limit.
+	//
+	// Selector: setCollectionLimit(string,bool) 993b7fba
+	function setCollectionLimit(string memory limit, bool value) external;
+
+	// Get contract address.
+	//
+	// Selector: contractAddress() f6b4dfb4
+	function contractAddress() external view returns (address);
+
+	// Add collection admin by substrate address.
+	// @param new_admin Substrate administrator address.
+	//
+	// Selector: addCollectionAdminSubstrate(uint256) 5730062b
+	function addCollectionAdminSubstrate(uint256 newAdmin) external;
+>>>>>>> misk: Update stubs
 
 	/// @notice Count RFTs tracked by this contract
 	/// @return A count of valid RFTs tracked by this contract, where each one of
modifiedtests/src/eth/fungibleAbi.jsondiffbeforeafterboth
--- a/tests/src/eth/fungibleAbi.json
+++ b/tests/src/eth/fungibleAbi.json
@@ -170,6 +170,30 @@
   },
   {
     "inputs": [],
+    "name": "getCollectionSponsor",
+    "outputs": [
+      {
+        "components": [
+          { "internalType": "address", "name": "field_0", "type": "address" },
+          { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+        ],
+        "internalType": "struct Tuple0",
+        "name": "",
+        "type": "tuple"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "hasCollectionPendingSponsor",
+    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
     "name": "name",
     "outputs": [{ "internalType": "string", "name": "", "type": "string" }],
     "stateMutability": "view",
@@ -194,6 +218,13 @@
     "type": "function"
   },
   {
+    "inputs": [],
+    "name": "removeCollectionSponsor",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
     "inputs": [
       { "internalType": "address", "name": "user", "type": "address" }
     ],
@@ -278,6 +309,7 @@
   },
   {
     "inputs": [
+<<<<<<< HEAD
       { "internalType": "address", "name": "newOwner", "type": "address" }
     ],
     "name": "setOwner",
@@ -290,6 +322,11 @@
       { "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
@@ -200,6 +200,30 @@
     "type": "function"
   },
   {
+    "inputs": [],
+    "name": "getCollectionSponsor",
+    "outputs": [
+      {
+        "components": [
+          { "internalType": "address", "name": "field_0", "type": "address" },
+          { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+        ],
+        "internalType": "struct Tuple1",
+        "name": "",
+        "type": "tuple"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "hasCollectionPendingSponsor",
+    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
     "inputs": [
       { "internalType": "address", "name": "owner", "type": "address" },
       { "internalType": "address", "name": "operator", "type": "address" }
@@ -335,6 +359,13 @@
     "type": "function"
   },
   {
+    "inputs": [],
+    "name": "removeCollectionSponsor",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
     "inputs": [
       { "internalType": "address", "name": "user", "type": "address" }
     ],
@@ -452,6 +483,7 @@
   },
   {
     "inputs": [
+<<<<<<< HEAD
       { "internalType": "address", "name": "newOwner", "type": "address" }
     ],
     "name": "setOwner",
@@ -464,6 +496,11 @@
       { "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
@@ -200,6 +200,30 @@
     "type": "function"
   },
   {
+    "inputs": [],
+    "name": "getCollectionSponsor",
+    "outputs": [
+      {
+        "components": [
+          { "internalType": "address", "name": "field_0", "type": "address" },
+          { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+        ],
+        "internalType": "struct Tuple1",
+        "name": "",
+        "type": "tuple"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "hasCollectionPendingSponsor",
+    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
     "inputs": [
       { "internalType": "address", "name": "owner", "type": "address" },
       { "internalType": "address", "name": "operator", "type": "address" }
@@ -335,6 +359,13 @@
     "type": "function"
   },
   {
+    "inputs": [],
+    "name": "removeCollectionSponsor",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
     "inputs": [
       { "internalType": "address", "name": "user", "type": "address" }
     ],
@@ -452,6 +483,7 @@
   },
   {
     "inputs": [
+<<<<<<< HEAD
       { "internalType": "address", "name": "newOwner", "type": "address" }
     ],
     "name": "setOwner",
@@ -464,6 +496,11 @@
       { "internalType": "uint256", "name": "newOwner", "type": "uint256" }
     ],
     "name": "setOwnerSubstrate",
+=======
+      { "internalType": "uint256", "name": "sponsor", "type": "uint256" }
+    ],
+    "name": "setCollectionSponsorSubstrate",
+>>>>>>> misk: Update stubs
     "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"