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
--- a/pallets/fungible/src/stubs/UniqueFungible.sol
+++ b/pallets/fungible/src/stubs/UniqueFungible.sol
@@ -45,7 +45,6 @@
 	);
 }
 
-<<<<<<< HEAD
 // Selector: 79cc6790
 contract ERC20UniqueExtensions is Dummy, ERC165 {
 	// Selector: burnFrom(address,uint256) 79cc6790
@@ -142,11 +141,15 @@
 	}
 }
 
+<<<<<<< HEAD
 // Selector: ffe4da23
 =======
 // Selector: 765e2fae
 >>>>>>> misk: Update stubs
 >>>>>>> misk: Update stubs
+=======
+// Selector: e54be640
+>>>>>>> misc: update stubs
 contract Collection is Dummy, ERC165 {
 	/// Set collection property.
 	///
modifiedpallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth
--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -482,10 +482,13 @@
 }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 /// @title Unique extensions for ERC721.
 /// @dev the ERC-165 identifier for this interface is 0xd74d154f
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> misc: update stubs
 // Selector: 780e9d63
 contract ERC721Enumerable is Dummy, ERC165 {
 	// @notice Enumerate valid NFTs
@@ -607,6 +610,7 @@
 }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 /// @dev anonymous struct
 struct Tuple8 {
 	uint256 field_0;
@@ -617,6 +621,9 @@
 =======
 // Selector: 765e2fae
 >>>>>>> misk: Update stubs
+=======
+// Selector: e54be640
+>>>>>>> misc: update stubs
 contract Collection is Dummy, ERC165 {
 	// Set collection property.
 	//
modifiedpallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth
--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -482,10 +482,13 @@
 }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 /// @title Unique extensions for ERC721.
 /// @dev the ERC-165 identifier for this interface is 0x7c3bef89
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> misc: update stubs
 // Selector: 780e9d63
 contract ERC721Enumerable is Dummy, ERC165 {
 	// @notice Enumerate valid RFTs
@@ -621,6 +624,7 @@
 }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 /// @dev anonymous struct
 struct Tuple8 {
 	uint256 field_0;
@@ -631,6 +635,9 @@
 =======
 // Selector: 765e2fae
 >>>>>>> misk: Update stubs
+=======
+// Selector: e54be640
+>>>>>>> misc: update stubs
 contract Collection is Dummy, ERC165 {
 	// Set collection property.
 	//
modifiedtests/src/eth/api/ContractHelpers.soldiffbeforeafterboth
--- a/tests/src/eth/api/ContractHelpers.sol
+++ b/tests/src/eth/api/ContractHelpers.sol
@@ -13,6 +13,7 @@
 }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 /// @title Magic contract, which allows users to reconfigure other contracts
 /// @dev the ERC-165 identifier for this interface is 0xd77fab70
 =======
@@ -22,6 +23,9 @@
 // Selector: 06fc42e9
 >>>>>>> path: add stubs
 >>>>>>> path: add stubs
+=======
+// Selector: 6073d917
+>>>>>>> misc: update stubs
 interface ContractHelpers is Dummy, ERC165 {
 	/// Get user, which deployed specified contract
 	/// @dev May return zero address in case if contract is deployed
@@ -38,6 +42,7 @@
 		returns (address);
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 	/// Set sponsor.
 	/// @param contractAddress Contract for which a sponsor is being established.
 	/// @param sponsor User address who set as pending sponsor.
@@ -45,6 +50,8 @@
 	///  or in textual repr: setSponsor(address,address)
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> misc: update stubs
 	// Set sponsor.
 	//
 	// @param contract_address Contract for which a sponsor is being established.
@@ -90,14 +97,6 @@
 	// @param contract_address The contract for which a sponsor is requested.
 	// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
 	//
-=======
-	// Selector: setSponsor(address,address) f01fba93
-	function setSponsor(address contractAddress, address sponsor) external;
-
-	// Selector: confirmSponsorship(address) abc00001
-	function confirmSponsorship(address contractAddress) external;
-
->>>>>>> path: add stubs
 	// Selector: getSponsor(address) 743fc745
 >>>>>>> path: add stubs
 	function getSponsor(address contractAddress)
@@ -106,6 +105,7 @@
 		returns (Tuple0 memory);
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 	/// Check tat contract has confirmed sponsor.
 	///
 	/// @param contractAddress The contract for which the presence of a confirmed sponsor is checked.
@@ -122,6 +122,8 @@
 	///  or in textual repr: hasPendingSponsor(address)
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> misc: update stubs
 	// Check tat contract has confirmed sponsor.
 	//
 	// @param contract_address The contract for which the presence of a confirmed sponsor is checked.
@@ -135,11 +137,6 @@
 	// @param contract_address The contract for which the presence of a pending sponsor is checked.
 	// @return **true** if contract has pending sponsor.
 	//
-=======
-	// Selector: hasSponsor(address) 97418603
-	function hasSponsor(address contractAddress) external view returns (bool);
-
->>>>>>> path: add stubs
 	// Selector: hasPendingSponsor(address) 39b9b242
 >>>>>>> path: add stubs
 	function hasPendingSponsor(address contractAddress)
modifiedtests/src/eth/api/UniqueFungible.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueFungible.sol
+++ b/tests/src/eth/api/UniqueFungible.sol
@@ -36,7 +36,6 @@
 	);
 }
 
-<<<<<<< HEAD
 // Selector: 79cc6790
 interface ERC20UniqueExtensions is Dummy, ERC165 {
 	// Selector: burnFrom(address,uint256) 79cc6790
@@ -80,11 +79,15 @@
 		returns (uint256);
 }
 
+<<<<<<< HEAD
 // Selector: ffe4da23
 =======
 // Selector: 765e2fae
 >>>>>>> misk: Update stubs
 >>>>>>> misk: Update stubs
+=======
+// Selector: e54be640
+>>>>>>> misc: update stubs
 interface Collection is Dummy, ERC165 {
 	/// Set collection property.
 	///
modifiedtests/src/eth/api/UniqueNFT.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -322,10 +322,13 @@
 }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 /// @title Unique extensions for ERC721.
 /// @dev the ERC-165 identifier for this interface is 0xd74d154f
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> misc: update stubs
 // Selector: 780e9d63
 interface ERC721Enumerable is Dummy, ERC165 {
 	// @notice Enumerate valid NFTs
@@ -403,6 +406,7 @@
 }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 /// @dev anonymous struct
 struct Tuple8 {
 	uint256 field_0;
@@ -413,6 +417,9 @@
 =======
 // Selector: 765e2fae
 >>>>>>> misk: Update stubs
+=======
+// Selector: e54be640
+>>>>>>> misc: update stubs
 interface Collection is Dummy, ERC165 {
 	// Set collection property.
 	//
modifiedtests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -322,10 +322,13 @@
 }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 /// @title Unique extensions for ERC721.
 /// @dev the ERC-165 identifier for this interface is 0x7c3bef89
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> misc: update stubs
 // Selector: 780e9d63
 interface ERC721Enumerable is Dummy, ERC165 {
 	// @notice Enumerate valid RFTs
@@ -415,6 +418,7 @@
 }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 /// @dev anonymous struct
 struct Tuple8 {
 	uint256 field_0;
@@ -425,6 +429,9 @@
 =======
 // Selector: 765e2fae
 >>>>>>> misk: Update stubs
+=======
+// Selector: e54be640
+>>>>>>> misc: update stubs
 interface Collection is Dummy, ERC165 {
 	// Set collection property.
 	//
modifiedtests/src/eth/fungibleAbi.jsondiffbeforeafterboth
--- a/tests/src/eth/fungibleAbi.json
+++ b/tests/src/eth/fungibleAbi.json
@@ -151,24 +151,6 @@
     "type": "function"
   },
   {
-    "inputs": [
-      { "internalType": "address", "name": "user", "type": "address" }
-    ],
-    "name": "isOwnerOrAdmin",
-    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      { "internalType": "uint256", "name": "user", "type": "uint256" }
-    ],
-    "name": "isOwnerOrAdminSubstrate",
-    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
     "inputs": [],
     "name": "getCollectionSponsor",
     "outputs": [
@@ -193,6 +175,24 @@
     "type": "function"
   },
   {
+    "inputs": [
+      { "internalType": "address", "name": "user", "type": "address" }
+    ],
+    "name": "isOwnerOrAdmin",
+    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "uint256", "name": "user", "type": "uint256" }
+    ],
+    "name": "isOwnerOrAdminSubstrate",
+    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
     "inputs": [],
     "name": "name",
     "outputs": [{ "internalType": "string", "name": "", "type": "string" }],
@@ -309,7 +309,15 @@
   },
   {
     "inputs": [
-<<<<<<< HEAD
+      { "internalType": "uint256", "name": "sponsor", "type": "uint256" }
+    ],
+    "name": "setCollectionSponsorSubstrate",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
       { "internalType": "address", "name": "newOwner", "type": "address" }
     ],
     "name": "setOwner",
@@ -322,11 +330,6 @@
       { "internalType": "uint256", "name": "newOwner", "type": "uint256" }
     ],
     "name": "setOwnerSubstrate",
-=======
-      { "internalType": "uint256", "name": "sponsor", "type": "uint256" }
-    ],
-    "name": "setCollectionSponsorSubstrate",
->>>>>>> misk: Update stubs
     "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"
modifiedtests/src/eth/nonFungibleAbi.jsondiffbeforeafterboth
before · tests/src/eth/nonFungibleAbi.json
1[2  {3    "anonymous": false,4    "inputs": [5      {6        "indexed": true,7        "internalType": "address",8        "name": "owner",9        "type": "address"10      },11      {12        "indexed": true,13        "internalType": "address",14        "name": "approved",15        "type": "address"16      },17      {18        "indexed": true,19        "internalType": "uint256",20        "name": "tokenId",21        "type": "uint256"22      }23    ],24    "name": "Approval",25    "type": "event"26  },27  {28    "anonymous": false,29    "inputs": [30      {31        "indexed": true,32        "internalType": "address",33        "name": "owner",34        "type": "address"35      },36      {37        "indexed": true,38        "internalType": "address",39        "name": "operator",40        "type": "address"41      },42      {43        "indexed": false,44        "internalType": "bool",45        "name": "approved",46        "type": "bool"47      }48    ],49    "name": "ApprovalForAll",50    "type": "event"51  },52  {53    "anonymous": false,54    "inputs": [],55    "name": "MintingFinished",56    "type": "event"57  },58  {59    "anonymous": false,60    "inputs": [61      {62        "indexed": true,63        "internalType": "address",64        "name": "from",65        "type": "address"66      },67      {68        "indexed": true,69        "internalType": "address",70        "name": "to",71        "type": "address"72      },73      {74        "indexed": true,75        "internalType": "uint256",76        "name": "tokenId",77        "type": "uint256"78      }79    ],80    "name": "Transfer",81    "type": "event"82  },83  {84    "inputs": [85      { "internalType": "address", "name": "newAdmin", "type": "address" }86    ],87    "name": "addCollectionAdmin",88    "outputs": [],89    "stateMutability": "nonpayable",90    "type": "function"91  },92  {93    "inputs": [94      { "internalType": "uint256", "name": "newAdmin", "type": "uint256" }95    ],96    "name": "addCollectionAdminSubstrate",97    "outputs": [],98    "stateMutability": "nonpayable",99    "type": "function"100  },101  {102    "inputs": [103      { "internalType": "address", "name": "user", "type": "address" }104    ],105    "name": "addToCollectionAllowList",106    "outputs": [],107    "stateMutability": "nonpayable",108    "type": "function"109  },110  {111    "inputs": [112      { "internalType": "address", "name": "approved", "type": "address" },113      { "internalType": "uint256", "name": "tokenId", "type": "uint256" }114    ],115    "name": "approve",116    "outputs": [],117    "stateMutability": "nonpayable",118    "type": "function"119  },120  {121    "inputs": [122      { "internalType": "address", "name": "owner", "type": "address" }123    ],124    "name": "balanceOf",125    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],126    "stateMutability": "view",127    "type": "function"128  },129  {130    "inputs": [131      { "internalType": "uint256", "name": "tokenId", "type": "uint256" }132    ],133    "name": "burn",134    "outputs": [],135    "stateMutability": "nonpayable",136    "type": "function"137  },138  {139    "inputs": [140      { "internalType": "address", "name": "from", "type": "address" },141      { "internalType": "uint256", "name": "tokenId", "type": "uint256" }142    ],143    "name": "burnFrom",144    "outputs": [],145    "stateMutability": "nonpayable",146    "type": "function"147  },148  {149    "inputs": [{ "internalType": "string", "name": "key", "type": "string" }],150    "name": "collectionProperty",151    "outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }],152    "stateMutability": "view",153    "type": "function"154  },155  {156    "inputs": [],157    "name": "confirmCollectionSponsorship",158    "outputs": [],159    "stateMutability": "nonpayable",160    "type": "function"161  },162  {163    "inputs": [],164    "name": "contractAddress",165    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],166    "stateMutability": "view",167    "type": "function"168  },169  {170    "inputs": [{ "internalType": "string", "name": "key", "type": "string" }],171    "name": "deleteCollectionProperty",172    "outputs": [],173    "stateMutability": "nonpayable",174    "type": "function"175  },176  {177    "inputs": [178      { "internalType": "uint256", "name": "tokenId", "type": "uint256" },179      { "internalType": "string", "name": "key", "type": "string" }180    ],181    "name": "deleteProperty",182    "outputs": [],183    "stateMutability": "nonpayable",184    "type": "function"185  },186  {187    "inputs": [],188    "name": "finishMinting",189    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],190    "stateMutability": "nonpayable",191    "type": "function"192  },193  {194    "inputs": [195      { "internalType": "uint256", "name": "tokenId", "type": "uint256" }196    ],197    "name": "getApproved",198    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],199    "stateMutability": "view",200    "type": "function"201  },202  {203    "inputs": [],204    "name": "getCollectionSponsor",205    "outputs": [206      {207        "components": [208          { "internalType": "address", "name": "field_0", "type": "address" },209          { "internalType": "uint256", "name": "field_1", "type": "uint256" }210        ],211        "internalType": "struct Tuple1",212        "name": "",213        "type": "tuple"214      }215    ],216    "stateMutability": "view",217    "type": "function"218  },219  {220    "inputs": [],221    "name": "hasCollectionPendingSponsor",222    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],223    "stateMutability": "view",224    "type": "function"225  },226  {227    "inputs": [228      { "internalType": "address", "name": "owner", "type": "address" },229      { "internalType": "address", "name": "operator", "type": "address" }230    ],231    "name": "isApprovedForAll",232    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],233    "stateMutability": "view",234    "type": "function"235  },236  {237    "inputs": [238      { "internalType": "address", "name": "user", "type": "address" }239    ],240    "name": "isOwnerOrAdmin",241    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],242    "stateMutability": "view",243    "type": "function"244  },245  {246    "inputs": [247      { "internalType": "uint256", "name": "user", "type": "uint256" }248    ],249    "name": "isOwnerOrAdminSubstrate",250    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],251    "stateMutability": "view",252    "type": "function"253  },254  {255    "inputs": [256      { "internalType": "address", "name": "to", "type": "address" },257      { "internalType": "uint256", "name": "tokenId", "type": "uint256" }258    ],259    "name": "mint",260    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],261    "stateMutability": "nonpayable",262    "type": "function"263  },264  {265    "inputs": [266      { "internalType": "address", "name": "to", "type": "address" },267      { "internalType": "uint256[]", "name": "tokenIds", "type": "uint256[]" }268    ],269    "name": "mintBulk",270    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],271    "stateMutability": "nonpayable",272    "type": "function"273  },274  {275    "inputs": [276      { "internalType": "address", "name": "to", "type": "address" },277      {278        "components": [279          { "internalType": "uint256", "name": "field_0", "type": "uint256" },280          { "internalType": "string", "name": "field_1", "type": "string" }281        ],282        "internalType": "struct Tuple8[]",283        "name": "tokens",284        "type": "tuple[]"285      }286    ],287    "name": "mintBulkWithTokenURI",288    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],289    "stateMutability": "nonpayable",290    "type": "function"291  },292  {293    "inputs": [294      { "internalType": "address", "name": "to", "type": "address" },295      { "internalType": "uint256", "name": "tokenId", "type": "uint256" },296      { "internalType": "string", "name": "tokenUri", "type": "string" }297    ],298    "name": "mintWithTokenURI",299    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],300    "stateMutability": "nonpayable",301    "type": "function"302  },303  {304    "inputs": [],305    "name": "mintingFinished",306    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],307    "stateMutability": "view",308    "type": "function"309  },310  {311    "inputs": [],312    "name": "name",313    "outputs": [{ "internalType": "string", "name": "", "type": "string" }],314    "stateMutability": "view",315    "type": "function"316  },317  {318    "inputs": [],319    "name": "nextTokenId",320    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],321    "stateMutability": "view",322    "type": "function"323  },324  {325    "inputs": [326      { "internalType": "uint256", "name": "tokenId", "type": "uint256" }327    ],328    "name": "ownerOf",329    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],330    "stateMutability": "view",331    "type": "function"332  },333  {334    "inputs": [335      { "internalType": "uint256", "name": "tokenId", "type": "uint256" },336      { "internalType": "string", "name": "key", "type": "string" }337    ],338    "name": "property",339    "outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }],340    "stateMutability": "view",341    "type": "function"342  },343  {344    "inputs": [345      { "internalType": "address", "name": "admin", "type": "address" }346    ],347    "name": "removeCollectionAdmin",348    "outputs": [],349    "stateMutability": "nonpayable",350    "type": "function"351  },352  {353    "inputs": [354      { "internalType": "uint256", "name": "admin", "type": "uint256" }355    ],356    "name": "removeCollectionAdminSubstrate",357    "outputs": [],358    "stateMutability": "nonpayable",359    "type": "function"360  },361  {362    "inputs": [],363    "name": "removeCollectionSponsor",364    "outputs": [],365    "stateMutability": "nonpayable",366    "type": "function"367  },368  {369    "inputs": [370      { "internalType": "address", "name": "user", "type": "address" }371    ],372    "name": "removeFromCollectionAllowList",373    "outputs": [],374    "stateMutability": "nonpayable",375    "type": "function"376  },377  {378    "inputs": [379      { "internalType": "address", "name": "from", "type": "address" },380      { "internalType": "address", "name": "to", "type": "address" },381      { "internalType": "uint256", "name": "tokenId", "type": "uint256" }382    ],383    "name": "safeTransferFrom",384    "outputs": [],385    "stateMutability": "nonpayable",386    "type": "function"387  },388  {389    "inputs": [390      { "internalType": "address", "name": "from", "type": "address" },391      { "internalType": "address", "name": "to", "type": "address" },392      { "internalType": "uint256", "name": "tokenId", "type": "uint256" },393      { "internalType": "bytes", "name": "data", "type": "bytes" }394    ],395    "name": "safeTransferFrom",396    "outputs": [],397    "stateMutability": "nonpayable",398    "type": "function"399  },400  {401    "inputs": [402      { "internalType": "address", "name": "operator", "type": "address" },403      { "internalType": "bool", "name": "approved", "type": "bool" }404    ],405    "name": "setApprovalForAll",406    "outputs": [],407    "stateMutability": "nonpayable",408    "type": "function"409  },410  {411    "inputs": [{ "internalType": "uint8", "name": "mode", "type": "uint8" }],412    "name": "setCollectionAccess",413    "outputs": [],414    "stateMutability": "nonpayable",415    "type": "function"416  },417  {418    "inputs": [419      { "internalType": "string", "name": "limit", "type": "string" },420      { "internalType": "uint32", "name": "value", "type": "uint32" }421    ],422    "name": "setCollectionLimit",423    "outputs": [],424    "stateMutability": "nonpayable",425    "type": "function"426  },427  {428    "inputs": [429      { "internalType": "string", "name": "limit", "type": "string" },430      { "internalType": "bool", "name": "value", "type": "bool" }431    ],432    "name": "setCollectionLimit",433    "outputs": [],434    "stateMutability": "nonpayable",435    "type": "function"436  },437  {438    "inputs": [{ "internalType": "bool", "name": "mode", "type": "bool" }],439    "name": "setCollectionMintMode",440    "outputs": [],441    "stateMutability": "nonpayable",442    "type": "function"443  },444  {445    "inputs": [{ "internalType": "bool", "name": "enable", "type": "bool" }],446    "name": "setCollectionNesting",447    "outputs": [],448    "stateMutability": "nonpayable",449    "type": "function"450  },451  {452    "inputs": [453      { "internalType": "bool", "name": "enable", "type": "bool" },454      {455        "internalType": "address[]",456        "name": "collections",457        "type": "address[]"458      }459    ],460    "name": "setCollectionNesting",461    "outputs": [],462    "stateMutability": "nonpayable",463    "type": "function"464  },465  {466    "inputs": [467      { "internalType": "string", "name": "key", "type": "string" },468      { "internalType": "bytes", "name": "value", "type": "bytes" }469    ],470    "name": "setCollectionProperty",471    "outputs": [],472    "stateMutability": "nonpayable",473    "type": "function"474  },475  {476    "inputs": [477      { "internalType": "address", "name": "sponsor", "type": "address" }478    ],479    "name": "setCollectionSponsor",480    "outputs": [],481    "stateMutability": "nonpayable",482    "type": "function"483  },484  {485    "inputs": [486<<<<<<< HEAD487      { "internalType": "address", "name": "newOwner", "type": "address" }488    ],489    "name": "setOwner",490    "outputs": [],491    "stateMutability": "nonpayable",492    "type": "function"493  },494  {495    "inputs": [496      { "internalType": "uint256", "name": "newOwner", "type": "uint256" }497    ],498    "name": "setOwnerSubstrate",499=======500      { "internalType": "uint256", "name": "sponsor", "type": "uint256" }501    ],502    "name": "setCollectionSponsorSubstrate",503>>>>>>> misk: Update stubs504    "outputs": [],505    "stateMutability": "nonpayable",506    "type": "function"507  },508  {509    "inputs": [510      { "internalType": "uint256", "name": "tokenId", "type": "uint256" },511      { "internalType": "string", "name": "key", "type": "string" },512      { "internalType": "bytes", "name": "value", "type": "bytes" }513    ],514    "name": "setProperty",515    "outputs": [],516    "stateMutability": "nonpayable",517    "type": "function"518  },519  {520    "inputs": [521      { "internalType": "string", "name": "key", "type": "string" },522      { "internalType": "bool", "name": "isMutable", "type": "bool" },523      { "internalType": "bool", "name": "collectionAdmin", "type": "bool" },524      { "internalType": "bool", "name": "tokenOwner", "type": "bool" }525    ],526    "name": "setTokenPropertyPermission",527    "outputs": [],528    "stateMutability": "nonpayable",529    "type": "function"530  },531  {532    "inputs": [533      { "internalType": "bytes4", "name": "interfaceID", "type": "bytes4" }534    ],535    "name": "supportsInterface",536    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],537    "stateMutability": "view",538    "type": "function"539  },540  {541    "inputs": [],542    "name": "symbol",543    "outputs": [{ "internalType": "string", "name": "", "type": "string" }],544    "stateMutability": "view",545    "type": "function"546  },547  {548    "inputs": [549      { "internalType": "uint256", "name": "index", "type": "uint256" }550    ],551    "name": "tokenByIndex",552    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],553    "stateMutability": "view",554    "type": "function"555  },556  {557    "inputs": [558      { "internalType": "address", "name": "owner", "type": "address" },559      { "internalType": "uint256", "name": "index", "type": "uint256" }560    ],561    "name": "tokenOfOwnerByIndex",562    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],563    "stateMutability": "view",564    "type": "function"565  },566  {567    "inputs": [568      { "internalType": "uint256", "name": "tokenId", "type": "uint256" }569    ],570    "name": "tokenURI",571    "outputs": [{ "internalType": "string", "name": "", "type": "string" }],572    "stateMutability": "view",573    "type": "function"574  },575  {576    "inputs": [],577    "name": "totalSupply",578    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],579    "stateMutability": "view",580    "type": "function"581  },582  {583    "inputs": [584      { "internalType": "address", "name": "to", "type": "address" },585      { "internalType": "uint256", "name": "tokenId", "type": "uint256" }586    ],587    "name": "transfer",588    "outputs": [],589    "stateMutability": "nonpayable",590    "type": "function"591  },592  {593    "inputs": [594      { "internalType": "address", "name": "from", "type": "address" },595      { "internalType": "address", "name": "to", "type": "address" },596      { "internalType": "uint256", "name": "tokenId", "type": "uint256" }597    ],598    "name": "transferFrom",599    "outputs": [],600    "stateMutability": "nonpayable",601    "type": "function"602  },603  {604    "inputs": [],605    "name": "uniqueCollectionType",606    "outputs": [{ "internalType": "string", "name": "", "type": "string" }],607    "stateMutability": "nonpayable",608    "type": "function"609  }610]
after · tests/src/eth/nonFungibleAbi.json
1[2  {3    "anonymous": false,4    "inputs": [5      {6        "indexed": true,7        "internalType": "address",8        "name": "owner",9        "type": "address"10      },11      {12        "indexed": true,13        "internalType": "address",14        "name": "approved",15        "type": "address"16      },17      {18        "indexed": true,19        "internalType": "uint256",20        "name": "tokenId",21        "type": "uint256"22      }23    ],24    "name": "Approval",25    "type": "event"26  },27  {28    "anonymous": false,29    "inputs": [30      {31        "indexed": true,32        "internalType": "address",33        "name": "owner",34        "type": "address"35      },36      {37        "indexed": true,38        "internalType": "address",39        "name": "operator",40        "type": "address"41      },42      {43        "indexed": false,44        "internalType": "bool",45        "name": "approved",46        "type": "bool"47      }48    ],49    "name": "ApprovalForAll",50    "type": "event"51  },52  {53    "anonymous": false,54    "inputs": [],55    "name": "MintingFinished",56    "type": "event"57  },58  {59    "anonymous": false,60    "inputs": [61      {62        "indexed": true,63        "internalType": "address",64        "name": "from",65        "type": "address"66      },67      {68        "indexed": true,69        "internalType": "address",70        "name": "to",71        "type": "address"72      },73      {74        "indexed": true,75        "internalType": "uint256",76        "name": "tokenId",77        "type": "uint256"78      }79    ],80    "name": "Transfer",81    "type": "event"82  },83  {84    "inputs": [85      { "internalType": "address", "name": "newAdmin", "type": "address" }86    ],87    "name": "addCollectionAdmin",88    "outputs": [],89    "stateMutability": "nonpayable",90    "type": "function"91  },92  {93    "inputs": [94      { "internalType": "uint256", "name": "newAdmin", "type": "uint256" }95    ],96    "name": "addCollectionAdminSubstrate",97    "outputs": [],98    "stateMutability": "nonpayable",99    "type": "function"100  },101  {102    "inputs": [103      { "internalType": "address", "name": "user", "type": "address" }104    ],105    "name": "addToCollectionAllowList",106    "outputs": [],107    "stateMutability": "nonpayable",108    "type": "function"109  },110  {111    "inputs": [112      { "internalType": "address", "name": "approved", "type": "address" },113      { "internalType": "uint256", "name": "tokenId", "type": "uint256" }114    ],115    "name": "approve",116    "outputs": [],117    "stateMutability": "nonpayable",118    "type": "function"119  },120  {121    "inputs": [122      { "internalType": "address", "name": "owner", "type": "address" }123    ],124    "name": "balanceOf",125    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],126    "stateMutability": "view",127    "type": "function"128  },129  {130    "inputs": [131      { "internalType": "uint256", "name": "tokenId", "type": "uint256" }132    ],133    "name": "burn",134    "outputs": [],135    "stateMutability": "nonpayable",136    "type": "function"137  },138  {139    "inputs": [140      { "internalType": "address", "name": "from", "type": "address" },141      { "internalType": "uint256", "name": "tokenId", "type": "uint256" }142    ],143    "name": "burnFrom",144    "outputs": [],145    "stateMutability": "nonpayable",146    "type": "function"147  },148  {149    "inputs": [{ "internalType": "string", "name": "key", "type": "string" }],150    "name": "collectionProperty",151    "outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }],152    "stateMutability": "view",153    "type": "function"154  },155  {156    "inputs": [],157    "name": "confirmCollectionSponsorship",158    "outputs": [],159    "stateMutability": "nonpayable",160    "type": "function"161  },162  {163    "inputs": [],164    "name": "contractAddress",165    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],166    "stateMutability": "view",167    "type": "function"168  },169  {170    "inputs": [{ "internalType": "string", "name": "key", "type": "string" }],171    "name": "deleteCollectionProperty",172    "outputs": [],173    "stateMutability": "nonpayable",174    "type": "function"175  },176  {177    "inputs": [178      { "internalType": "uint256", "name": "tokenId", "type": "uint256" },179      { "internalType": "string", "name": "key", "type": "string" }180    ],181    "name": "deleteProperty",182    "outputs": [],183    "stateMutability": "nonpayable",184    "type": "function"185  },186  {187    "inputs": [],188    "name": "finishMinting",189    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],190    "stateMutability": "nonpayable",191    "type": "function"192  },193  {194    "inputs": [195      { "internalType": "uint256", "name": "tokenId", "type": "uint256" }196    ],197    "name": "getApproved",198    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],199    "stateMutability": "view",200    "type": "function"201  },202  {203    "inputs": [],204    "name": "getCollectionSponsor",205    "outputs": [206      {207        "components": [208          { "internalType": "address", "name": "field_0", "type": "address" },209          { "internalType": "uint256", "name": "field_1", "type": "uint256" }210        ],211        "internalType": "struct Tuple1",212        "name": "",213        "type": "tuple"214      }215    ],216    "stateMutability": "view",217    "type": "function"218  },219  {220    "inputs": [],221    "name": "hasCollectionPendingSponsor",222    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],223    "stateMutability": "view",224    "type": "function"225  },226  {227    "inputs": [228      { "internalType": "address", "name": "owner", "type": "address" },229      { "internalType": "address", "name": "operator", "type": "address" }230    ],231    "name": "isApprovedForAll",232    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],233    "stateMutability": "view",234    "type": "function"235  },236  {237    "inputs": [238      { "internalType": "address", "name": "user", "type": "address" }239    ],240    "name": "isOwnerOrAdmin",241    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],242    "stateMutability": "view",243    "type": "function"244  },245  {246    "inputs": [247      { "internalType": "uint256", "name": "user", "type": "uint256" }248    ],249    "name": "isOwnerOrAdminSubstrate",250    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],251    "stateMutability": "view",252    "type": "function"253  },254  {255    "inputs": [256      { "internalType": "address", "name": "to", "type": "address" },257      { "internalType": "uint256", "name": "tokenId", "type": "uint256" }258    ],259    "name": "mint",260    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],261    "stateMutability": "nonpayable",262    "type": "function"263  },264  {265    "inputs": [266      { "internalType": "address", "name": "to", "type": "address" },267      { "internalType": "uint256[]", "name": "tokenIds", "type": "uint256[]" }268    ],269    "name": "mintBulk",270    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],271    "stateMutability": "nonpayable",272    "type": "function"273  },274  {275    "inputs": [276      { "internalType": "address", "name": "to", "type": "address" },277      {278        "components": [279          { "internalType": "uint256", "name": "field_0", "type": "uint256" },280          { "internalType": "string", "name": "field_1", "type": "string" }281        ],282        "internalType": "struct Tuple8[]",283        "name": "tokens",284        "type": "tuple[]"285      }286    ],287    "name": "mintBulkWithTokenURI",288    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],289    "stateMutability": "nonpayable",290    "type": "function"291  },292  {293    "inputs": [294      { "internalType": "address", "name": "to", "type": "address" },295      { "internalType": "uint256", "name": "tokenId", "type": "uint256" },296      { "internalType": "string", "name": "tokenUri", "type": "string" }297    ],298    "name": "mintWithTokenURI",299    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],300    "stateMutability": "nonpayable",301    "type": "function"302  },303  {304    "inputs": [],305    "name": "mintingFinished",306    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],307    "stateMutability": "view",308    "type": "function"309  },310  {311    "inputs": [],312    "name": "name",313    "outputs": [{ "internalType": "string", "name": "", "type": "string" }],314    "stateMutability": "view",315    "type": "function"316  },317  {318    "inputs": [],319    "name": "nextTokenId",320    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],321    "stateMutability": "view",322    "type": "function"323  },324  {325    "inputs": [326      { "internalType": "uint256", "name": "tokenId", "type": "uint256" }327    ],328    "name": "ownerOf",329    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],330    "stateMutability": "view",331    "type": "function"332  },333  {334    "inputs": [335      { "internalType": "uint256", "name": "tokenId", "type": "uint256" },336      { "internalType": "string", "name": "key", "type": "string" }337    ],338    "name": "property",339    "outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }],340    "stateMutability": "view",341    "type": "function"342  },343  {344    "inputs": [345      { "internalType": "address", "name": "admin", "type": "address" }346    ],347    "name": "removeCollectionAdmin",348    "outputs": [],349    "stateMutability": "nonpayable",350    "type": "function"351  },352  {353    "inputs": [354      { "internalType": "uint256", "name": "admin", "type": "uint256" }355    ],356    "name": "removeCollectionAdminSubstrate",357    "outputs": [],358    "stateMutability": "nonpayable",359    "type": "function"360  },361  {362    "inputs": [],363    "name": "removeCollectionSponsor",364    "outputs": [],365    "stateMutability": "nonpayable",366    "type": "function"367  },368  {369    "inputs": [370      { "internalType": "address", "name": "user", "type": "address" }371    ],372    "name": "removeFromCollectionAllowList",373    "outputs": [],374    "stateMutability": "nonpayable",375    "type": "function"376  },377  {378    "inputs": [379      { "internalType": "address", "name": "from", "type": "address" },380      { "internalType": "address", "name": "to", "type": "address" },381      { "internalType": "uint256", "name": "tokenId", "type": "uint256" }382    ],383    "name": "safeTransferFrom",384    "outputs": [],385    "stateMutability": "nonpayable",386    "type": "function"387  },388  {389    "inputs": [390      { "internalType": "address", "name": "from", "type": "address" },391      { "internalType": "address", "name": "to", "type": "address" },392      { "internalType": "uint256", "name": "tokenId", "type": "uint256" },393      { "internalType": "bytes", "name": "data", "type": "bytes" }394    ],395    "name": "safeTransferFrom",396    "outputs": [],397    "stateMutability": "nonpayable",398    "type": "function"399  },400  {401    "inputs": [402      { "internalType": "address", "name": "operator", "type": "address" },403      { "internalType": "bool", "name": "approved", "type": "bool" }404    ],405    "name": "setApprovalForAll",406    "outputs": [],407    "stateMutability": "nonpayable",408    "type": "function"409  },410  {411    "inputs": [{ "internalType": "uint8", "name": "mode", "type": "uint8" }],412    "name": "setCollectionAccess",413    "outputs": [],414    "stateMutability": "nonpayable",415    "type": "function"416  },417  {418    "inputs": [419      { "internalType": "string", "name": "limit", "type": "string" },420      { "internalType": "uint32", "name": "value", "type": "uint32" }421    ],422    "name": "setCollectionLimit",423    "outputs": [],424    "stateMutability": "nonpayable",425    "type": "function"426  },427  {428    "inputs": [429      { "internalType": "string", "name": "limit", "type": "string" },430      { "internalType": "bool", "name": "value", "type": "bool" }431    ],432    "name": "setCollectionLimit",433    "outputs": [],434    "stateMutability": "nonpayable",435    "type": "function"436  },437  {438    "inputs": [{ "internalType": "bool", "name": "mode", "type": "bool" }],439    "name": "setCollectionMintMode",440    "outputs": [],441    "stateMutability": "nonpayable",442    "type": "function"443  },444  {445    "inputs": [{ "internalType": "bool", "name": "enable", "type": "bool" }],446    "name": "setCollectionNesting",447    "outputs": [],448    "stateMutability": "nonpayable",449    "type": "function"450  },451  {452    "inputs": [453      { "internalType": "bool", "name": "enable", "type": "bool" },454      {455        "internalType": "address[]",456        "name": "collections",457        "type": "address[]"458      }459    ],460    "name": "setCollectionNesting",461    "outputs": [],462    "stateMutability": "nonpayable",463    "type": "function"464  },465  {466    "inputs": [467      { "internalType": "string", "name": "key", "type": "string" },468      { "internalType": "bytes", "name": "value", "type": "bytes" }469    ],470    "name": "setCollectionProperty",471    "outputs": [],472    "stateMutability": "nonpayable",473    "type": "function"474  },475  {476    "inputs": [477      { "internalType": "address", "name": "sponsor", "type": "address" }478    ],479    "name": "setCollectionSponsor",480    "outputs": [],481    "stateMutability": "nonpayable",482    "type": "function"483  },484  {485    "inputs": [486      { "internalType": "uint256", "name": "sponsor", "type": "uint256" }487    ],488    "name": "setCollectionSponsorSubstrate",489    "outputs": [],490    "stateMutability": "nonpayable",491    "type": "function"492  },493  {494    "inputs": [495      { "internalType": "address", "name": "newOwner", "type": "address" }496    ],497    "name": "setOwner",498    "outputs": [],499    "stateMutability": "nonpayable",500    "type": "function"501  },502  {503    "inputs": [504      { "internalType": "uint256", "name": "newOwner", "type": "uint256" }505    ],506    "name": "setOwnerSubstrate",507    "outputs": [],508    "stateMutability": "nonpayable",509    "type": "function"510  },511  {512    "inputs": [513      { "internalType": "uint256", "name": "tokenId", "type": "uint256" },514      { "internalType": "string", "name": "key", "type": "string" },515      { "internalType": "bytes", "name": "value", "type": "bytes" }516    ],517    "name": "setProperty",518    "outputs": [],519    "stateMutability": "nonpayable",520    "type": "function"521  },522  {523    "inputs": [524      { "internalType": "string", "name": "key", "type": "string" },525      { "internalType": "bool", "name": "isMutable", "type": "bool" },526      { "internalType": "bool", "name": "collectionAdmin", "type": "bool" },527      { "internalType": "bool", "name": "tokenOwner", "type": "bool" }528    ],529    "name": "setTokenPropertyPermission",530    "outputs": [],531    "stateMutability": "nonpayable",532    "type": "function"533  },534  {535    "inputs": [536      { "internalType": "bytes4", "name": "interfaceID", "type": "bytes4" }537    ],538    "name": "supportsInterface",539    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],540    "stateMutability": "view",541    "type": "function"542  },543  {544    "inputs": [],545    "name": "symbol",546    "outputs": [{ "internalType": "string", "name": "", "type": "string" }],547    "stateMutability": "view",548    "type": "function"549  },550  {551    "inputs": [552      { "internalType": "uint256", "name": "index", "type": "uint256" }553    ],554    "name": "tokenByIndex",555    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],556    "stateMutability": "view",557    "type": "function"558  },559  {560    "inputs": [561      { "internalType": "address", "name": "owner", "type": "address" },562      { "internalType": "uint256", "name": "index", "type": "uint256" }563    ],564    "name": "tokenOfOwnerByIndex",565    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],566    "stateMutability": "view",567    "type": "function"568  },569  {570    "inputs": [571      { "internalType": "uint256", "name": "tokenId", "type": "uint256" }572    ],573    "name": "tokenURI",574    "outputs": [{ "internalType": "string", "name": "", "type": "string" }],575    "stateMutability": "view",576    "type": "function"577  },578  {579    "inputs": [],580    "name": "totalSupply",581    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],582    "stateMutability": "view",583    "type": "function"584  },585  {586    "inputs": [587      { "internalType": "address", "name": "to", "type": "address" },588      { "internalType": "uint256", "name": "tokenId", "type": "uint256" }589    ],590    "name": "transfer",591    "outputs": [],592    "stateMutability": "nonpayable",593    "type": "function"594  },595  {596    "inputs": [597      { "internalType": "address", "name": "from", "type": "address" },598      { "internalType": "address", "name": "to", "type": "address" },599      { "internalType": "uint256", "name": "tokenId", "type": "uint256" }600    ],601    "name": "transferFrom",602    "outputs": [],603    "stateMutability": "nonpayable",604    "type": "function"605  },606  {607    "inputs": [],608    "name": "uniqueCollectionType",609    "outputs": [{ "internalType": "string", "name": "", "type": "string" }],610    "stateMutability": "nonpayable",611    "type": "function"612  }613]
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" }
     ],