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
22}22}
2323
24<<<<<<< HEAD24<<<<<<< HEAD
25<<<<<<< HEAD
25/// @title Magic contract, which allows users to reconfigure other contracts26/// @title Magic contract, which allows users to reconfigure other contracts
26/// @dev the ERC-165 identifier for this interface is 0xd77fab7027/// @dev the ERC-165 identifier for this interface is 0xd77fab70
27=======28=======
31// Selector: 06fc42e932// Selector: 06fc42e9
32>>>>>>> path: add stubs33>>>>>>> path: add stubs
33>>>>>>> path: add stubs34>>>>>>> path: add stubs
35=======
36// Selector: 6073d917
37>>>>>>> misc: update stubs
34contract ContractHelpers is Dummy, ERC165 {38contract ContractHelpers is Dummy, ERC165 {
35	/// Get user, which deployed specified contract39	/// Get user, which deployed specified contract
36	/// @dev May return zero address in case if contract is deployed40	/// @dev May return zero address in case if contract is deployed
53	}57	}
5458
55<<<<<<< HEAD59<<<<<<< HEAD
60<<<<<<< HEAD
56	/// Set sponsor.61	/// Set sponsor.
57	/// @param contractAddress Contract for which a sponsor is being established.62	/// @param contractAddress Contract for which a sponsor is being established.
58	/// @param sponsor User address who set as pending sponsor.63	/// @param sponsor User address who set as pending sponsor.
59	/// @dev EVM selector for this function is: 0xf01fba93,64	/// @dev EVM selector for this function is: 0xf01fba93,
60	///  or in textual repr: setSponsor(address,address)65	///  or in textual repr: setSponsor(address,address)
61=======66=======
62<<<<<<< HEAD67<<<<<<< HEAD
68=======
69>>>>>>> misc: update stubs
63	// Set sponsor.70	// Set sponsor.
64	//71	//
65	// @param contract_address Contract for which a sponsor is being established.72	// @param contract_address Contract for which a sponsor is being established.
66	// @param sponsor User address who set as pending sponsor.73	// @param sponsor User address who set as pending sponsor.
67	//74	//
68=======
69>>>>>>> path: add stubs
70	// Selector: setSponsor(address,address) f01fba9375	// Selector: setSponsor(address,address) f01fba93
71>>>>>>> path: add stubs76>>>>>>> path: add stubs
72	function setSponsor(address contractAddress, address sponsor) public {77	function setSponsor(address contractAddress, address sponsor) public {
77	}82	}
7883
79<<<<<<< HEAD84<<<<<<< HEAD
85<<<<<<< HEAD
80	/// Set contract as self sponsored.86	/// Set contract as self sponsored.
81	///87	///
82	/// @param contractAddress Contract for which a self sponsoring is being enabled.88	/// @param contractAddress Contract for which a self sponsoring is being enabled.
83	/// @dev EVM selector for this function is: 0x89f7d9ae,89	/// @dev EVM selector for this function is: 0x89f7d9ae,
84	///  or in textual repr: selfSponsoredEnable(address)90	///  or in textual repr: selfSponsoredEnable(address)
85=======91=======
86<<<<<<< HEAD92<<<<<<< HEAD
93=======
94>>>>>>> misc: update stubs
87	// Set contract as self sponsored.95	// Set contract as self sponsored.
88	//96	//
89	// @param contract_address Contract for which a self sponsoring is being enabled.97	// @param contract_address Contract for which a self sponsoring is being enabled.
90	//98	//
91	// Selector: selfSponsoredEnable(address) 89f7d9ae99	// Selector: selfSponsoredEnable(address) 89f7d9ae
92>>>>>>> path: add stubs100>>>>>>> path: add stubs
93	function selfSponsoredEnable(address contractAddress) public {101	function selfSponsoredEnable(address contractAddress) public {
94=======
95	// Selector: confirmSponsorship(address) abc00001
96	function confirmSponsorship(address contractAddress) public {
97>>>>>>> path: add stubs
98		require(false, stub_error);102		require(false, stub_error);
99		contractAddress;103		contractAddress;
100		dummy = 0;104		dummy = 0;
101	}105	}
102106
103<<<<<<< HEAD107<<<<<<< HEAD
108<<<<<<< HEAD
104	/// Remove sponsor.109	/// Remove sponsor.
105	///110	///
106	/// @param contractAddress Contract for which a sponsorship is being removed.111	/// @param contractAddress Contract for which a sponsorship is being removed.
107	/// @dev EVM selector for this function is: 0xef784250,112	/// @dev EVM selector for this function is: 0xef784250,
108	///  or in textual repr: removeSponsor(address)113	///  or in textual repr: removeSponsor(address)
109=======114=======
110<<<<<<< HEAD115<<<<<<< HEAD
116=======
117>>>>>>> misc: update stubs
111	// Remove sponsor.118	// Remove sponsor.
112	//119	//
113	// @param contract_address Contract for which a sponsorship is being removed.120	// @param contract_address Contract for which a sponsorship is being removed.
140	/// @dev EVM selector for this function is: 0x743fc745,147	/// @dev EVM selector for this function is: 0x743fc745,
141	///  or in textual repr: getSponsor(address)148	///  or in textual repr: getSponsor(address)
142	function getSponsor(address contractAddress)149	function getSponsor(address contractAddress)
143=======
144	// Selector: getSponsor(address) 743fc745
145	function getSponsor(address contractAddress)
146		public150		public
147		view151		view
148		returns (Tuple0 memory)152		returns (Tuple0 memory)
153		return Tuple0(0x0000000000000000000000000000000000000000, 0);157		return Tuple0(0x0000000000000000000000000000000000000000, 0);
154	}158	}
155159
156	// Selector: hasSponsor(address) 97418603
157	function hasSponsor(address contractAddress) public view returns (bool) {
158		require(false, stub_error);
159		contractAddress;
160		dummy;
161		return false;
162	}
163
164	// Selector: hasPendingSponsor(address) 39b9b242
165	function hasPendingSponsor(address contractAddress)
166>>>>>>> path: add stubs
167		public
168		view
169		returns (Tuple0 memory)
170	{
171		require(false, stub_error);
172		contractAddress;
173		dummy;
174		return Tuple0(0x0000000000000000000000000000000000000000, 0);
175	}
176
177	/// Check tat contract has confirmed sponsor.160	/// Check tat contract has confirmed sponsor.
178	///161	///
179	/// @param contractAddress The contract for which the presence of a confirmed sponsor is checked.162	/// @param contractAddress The contract for which the presence of a confirmed sponsor is checked.
188	}171	}
189172
190<<<<<<< HEAD173<<<<<<< HEAD
174<<<<<<< HEAD
191	/// Check tat contract has pending sponsor.175	/// Check tat contract has pending sponsor.
192	///176	///
193	/// @param contractAddress The contract for which the presence of a pending sponsor is checked.177	/// @param contractAddress The contract for which the presence of a pending sponsor is checked.
196	///  or in textual repr: hasPendingSponsor(address)180	///  or in textual repr: hasPendingSponsor(address)
197=======181=======
198<<<<<<< HEAD182<<<<<<< HEAD
183=======
184>>>>>>> misc: update stubs
199	// Check tat contract has pending sponsor.185	// Check tat contract has pending sponsor.
200	//186	//
201	// @param contract_address The contract for which the presence of a pending sponsor is checked.187	// @param contract_address The contract for which the presence of a pending sponsor is checked.
204	// Selector: hasPendingSponsor(address) 39b9b242190	// Selector: hasPendingSponsor(address) 39b9b242
205>>>>>>> path: add stubs191>>>>>>> path: add stubs
206	function hasPendingSponsor(address contractAddress)192	function hasPendingSponsor(address contractAddress)
207=======
208	// Selector: sponsoringEnabled(address) 6027dc61
209	function sponsoringEnabled(address contractAddress)
210>>>>>>> path: add stubs
211		public193		public
212		view194		view
213		returns (bool)195		returns (bool)
216		contractAddress;198		contractAddress;
217		dummy;199		dummy;
218		return false;200		return false;
219<<<<<<< HEAD
220	}201	}
221202
222	/// @dev EVM selector for this function is: 0x6027dc61,203	/// @dev EVM selector for this function is: 0x6027dc61,
230		contractAddress;211		contractAddress;
231		dummy;212		dummy;
232		return false;213		return false;
233=======
234>>>>>>> path: add stubs
235	}214	}
236215
237	/// @dev EVM selector for this function is: 0xfde8a560,216	/// @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
--- a/tests/src/eth/nonFungibleAbi.json
+++ b/tests/src/eth/nonFungibleAbi.json
@@ -483,7 +483,15 @@
   },
   {
     "inputs": [
-<<<<<<< HEAD
+      { "internalType": "uint256", "name": "sponsor", "type": "uint256" }
+    ],
+    "name": "setCollectionSponsorSubstrate",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
       { "internalType": "address", "name": "newOwner", "type": "address" }
     ],
     "name": "setOwner",
@@ -496,11 +504,6 @@
       { "internalType": "uint256", "name": "newOwner", "type": "uint256" }
     ],
     "name": "setOwnerSubstrate",
-=======
-      { "internalType": "uint256", "name": "sponsor", "type": "uint256" }
-    ],
-    "name": "setCollectionSponsorSubstrate",
->>>>>>> misk: Update stubs
     "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"
modifiedtests/src/eth/reFungibleAbi.jsondiffbeforeafterboth
--- a/tests/src/eth/reFungibleAbi.json
+++ b/tests/src/eth/reFungibleAbi.json
@@ -483,7 +483,15 @@
   },
   {
     "inputs": [
-<<<<<<< HEAD
+      { "internalType": "uint256", "name": "sponsor", "type": "uint256" }
+    ],
+    "name": "setCollectionSponsorSubstrate",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
       { "internalType": "address", "name": "newOwner", "type": "address" }
     ],
     "name": "setOwner",
@@ -496,11 +504,6 @@
       { "internalType": "uint256", "name": "newOwner", "type": "uint256" }
     ],
     "name": "setOwnerSubstrate",
-=======
-      { "internalType": "uint256", "name": "sponsor", "type": "uint256" }
-    ],
-    "name": "setCollectionSponsorSubstrate",
->>>>>>> misk: Update stubs
     "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"
modifiedtests/src/eth/util/contractHelpersAbi.jsondiffbeforeafterboth
--- a/tests/src/eth/util/contractHelpersAbi.json
+++ b/tests/src/eth/util/contractHelpersAbi.json
@@ -120,7 +120,6 @@
         "internalType": "address",
         "name": "contractAddress",
         "type": "address"
-<<<<<<< HEAD
       }
     ],
     "name": "removeSponsor",
@@ -147,8 +146,6 @@
         "internalType": "address",
         "name": "contractAddress",
         "type": "address"
-=======
->>>>>>> path: add stubs
       },
       { "internalType": "address", "name": "sponsor", "type": "address" }
     ],