difftreelog
misc: update stubs
in: master
12 files changed
pallets/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,
pallets/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.
///
pallets/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.
//
pallets/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.
//
tests/src/eth/api/ContractHelpers.soldiffbeforeafterboth1// SPDX-License-Identifier: OTHER2// This code is automatically generated34pragma solidity >=0.8.0 <0.9.0;56/// @dev common stubs holder7interface Dummy {89}1011interface ERC165 is Dummy {12 function supportsInterface(bytes4 interfaceID) external view returns (bool);13}1415<<<<<<< HEAD16/// @title Magic contract, which allows users to reconfigure other contracts17/// @dev the ERC-165 identifier for this interface is 0xd77fab7018=======19<<<<<<< HEAD20// Selector: 6073d91721=======22// Selector: 06fc42e923>>>>>>> path: add stubs24>>>>>>> path: add stubs25interface ContractHelpers is Dummy, ERC165 {26 /// Get user, which deployed specified contract27 /// @dev May return zero address in case if contract is deployed28 /// using uniquenetwork evm-migration pallet, or using other terms not29 /// intended by pallet-evm30 /// @dev Returns zero address if contract does not exists31 /// @param contractAddress Contract to get owner of32 /// @return address Owner of contract33 /// @dev EVM selector for this function is: 0x5152b14c,34 /// or in textual repr: contractOwner(address)35 function contractOwner(address contractAddress)36 external37 view38 returns (address);3940<<<<<<< HEAD41 /// Set sponsor.42 /// @param contractAddress Contract for which a sponsor is being established.43 /// @param sponsor User address who set as pending sponsor.44 /// @dev EVM selector for this function is: 0xf01fba93,45 /// or in textual repr: setSponsor(address,address)46=======47<<<<<<< HEAD48 // Set sponsor.49 //50 // @param contract_address Contract for which a sponsor is being established.51 // @param sponsor User address who set as pending sponsor.52 //53 // Selector: setSponsor(address,address) f01fba9354>>>>>>> path: add stubs55 function setSponsor(address contractAddress, address sponsor) external;5657 /// Set contract as self sponsored.58 ///59 /// @param contractAddress Contract for which a self sponsoring is being enabled.60 /// @dev EVM selector for this function is: 0x89f7d9ae,61 /// or in textual repr: selfSponsoredEnable(address)62 function selfSponsoredEnable(address contractAddress) external;6364 /// Remove sponsor.65 ///66 /// @param contractAddress Contract for which a sponsorship is being removed.67 /// @dev EVM selector for this function is: 0xef784250,68 /// or in textual repr: removeSponsor(address)69 function removeSponsor(address contractAddress) external;7071 /// Confirm sponsorship.72 ///73 /// @dev Caller must be same that set via [`setSponsor`].74 ///75 /// @param contractAddress Сontract for which need to confirm sponsorship.76 /// @dev EVM selector for this function is: 0xabc00001,77 /// or in textual repr: confirmSponsorship(address)78 function confirmSponsorship(address contractAddress) external;7980<<<<<<< HEAD81 /// Get current sponsor.82 ///83 /// @param contractAddress The contract for which a sponsor is requested.84 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.85 /// @dev EVM selector for this function is: 0x743fc745,86 /// or in textual repr: getSponsor(address)87=======88 // Get current sponsor.89 //90 // @param contract_address The contract for which a sponsor is requested.91 // @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.92 //93=======94 // Selector: setSponsor(address,address) f01fba9395 function setSponsor(address contractAddress, address sponsor) external;9697 // Selector: confirmSponsorship(address) abc0000198 function confirmSponsorship(address contractAddress) external;99100>>>>>>> path: add stubs101 // Selector: getSponsor(address) 743fc745102>>>>>>> path: add stubs103 function getSponsor(address contractAddress)104 external105 view106 returns (Tuple0 memory);107108<<<<<<< HEAD109 /// Check tat contract has confirmed sponsor.110 ///111 /// @param contractAddress The contract for which the presence of a confirmed sponsor is checked.112 /// @return **true** if contract has confirmed sponsor.113 /// @dev EVM selector for this function is: 0x97418603,114 /// or in textual repr: hasSponsor(address)115 function hasSponsor(address contractAddress) external view returns (bool);116117 /// Check tat contract has pending sponsor.118 ///119 /// @param contractAddress The contract for which the presence of a pending sponsor is checked.120 /// @return **true** if contract has pending sponsor.121 /// @dev EVM selector for this function is: 0x39b9b242,122 /// or in textual repr: hasPendingSponsor(address)123=======124<<<<<<< HEAD125 // Check tat contract has confirmed sponsor.126 //127 // @param contract_address The contract for which the presence of a confirmed sponsor is checked.128 // @return **true** if contract has confirmed sponsor.129 //130 // Selector: hasSponsor(address) 97418603131 function hasSponsor(address contractAddress) external view returns (bool);132133 // Check tat contract has pending sponsor.134 //135 // @param contract_address The contract for which the presence of a pending sponsor is checked.136 // @return **true** if contract has pending sponsor.137 //138=======139 // Selector: hasSponsor(address) 97418603140 function hasSponsor(address contractAddress) external view returns (bool);141142>>>>>>> path: add stubs143 // Selector: hasPendingSponsor(address) 39b9b242144>>>>>>> path: add stubs145 function hasPendingSponsor(address contractAddress)146 external147 view148 returns (bool);149150 /// @dev EVM selector for this function is: 0x6027dc61,151 /// or in textual repr: sponsoringEnabled(address)152 function sponsoringEnabled(address contractAddress)153 external154 view155 returns (bool);156157 /// @dev EVM selector for this function is: 0xfde8a560,158 /// or in textual repr: setSponsoringMode(address,uint8)159 function setSponsoringMode(address contractAddress, uint8 mode) external;160161 /// Get current contract sponsoring rate limit162 /// @param contractAddress Contract to get sponsoring mode of163 /// @return uint32 Amount of blocks between two sponsored transactions164 /// @dev EVM selector for this function is: 0x610cfabd,165 /// or in textual repr: getSponsoringRateLimit(address)166 function getSponsoringRateLimit(address contractAddress)167 external168 view169 returns (uint32);170171 /// Set contract sponsoring rate limit172 /// @dev Sponsoring rate limit - is a minimum amount of blocks that should173 /// pass between two sponsored transactions174 /// @param contractAddress Contract to change sponsoring rate limit of175 /// @param rateLimit Target rate limit176 /// @dev Only contract owner can change this setting177 /// @dev EVM selector for this function is: 0x77b6c908,178 /// or in textual repr: setSponsoringRateLimit(address,uint32)179 function setSponsoringRateLimit(address contractAddress, uint32 rateLimit)180 external;181182 /// Is specified user present in contract allow list183 /// @dev Contract owner always implicitly included184 /// @param contractAddress Contract to check allowlist of185 /// @param user User to check186 /// @return bool Is specified users exists in contract allowlist187 /// @dev EVM selector for this function is: 0x5c658165,188 /// or in textual repr: allowed(address,address)189 function allowed(address contractAddress, address user)190 external191 view192 returns (bool);193194 /// Toggle user presence in contract allowlist195 /// @param contractAddress Contract to change allowlist of196 /// @param user Which user presence should be toggled197 /// @param isAllowed `true` if user should be allowed to be sponsored198 /// or call this contract, `false` otherwise199 /// @dev Only contract owner can change this setting200 /// @dev EVM selector for this function is: 0x4706cc1c,201 /// or in textual repr: toggleAllowed(address,address,bool)202 function toggleAllowed(203 address contractAddress,204 address user,205 bool isAllowed206 ) external;207208 /// Is this contract has allowlist access enabled209 /// @dev Allowlist always can have users, and it is used for two purposes:210 /// in case of allowlist sponsoring mode, users will be sponsored if they exist in allowlist211 /// in case of allowlist access enabled, only users from allowlist may call this contract212 /// @param contractAddress Contract to get allowlist access of213 /// @return bool Is specified contract has allowlist access enabled214 /// @dev EVM selector for this function is: 0xc772ef6c,215 /// or in textual repr: allowlistEnabled(address)216 function allowlistEnabled(address contractAddress)217 external218 view219 returns (bool);220221 /// Toggle contract allowlist access222 /// @param contractAddress Contract to change allowlist access of223 /// @param enabled Should allowlist access to be enabled?224 /// @dev EVM selector for this function is: 0x36de20f5,225 /// or in textual repr: toggleAllowlist(address,bool)226 function toggleAllowlist(address contractAddress, bool enabled) external;227}228229/// @dev anonymous struct230struct Tuple0 {231 address field_0;232 uint256 field_1;233}1// SPDX-License-Identifier: OTHER2// This code is automatically generated34pragma solidity >=0.8.0 <0.9.0;56/// @dev common stubs holder7interface Dummy {89}1011interface ERC165 is Dummy {12 function supportsInterface(bytes4 interfaceID) external view returns (bool);13}1415<<<<<<< HEAD16<<<<<<< HEAD17/// @title Magic contract, which allows users to reconfigure other contracts18/// @dev the ERC-165 identifier for this interface is 0xd77fab7019=======20<<<<<<< HEAD21// Selector: 6073d91722=======23// Selector: 06fc42e924>>>>>>> path: add stubs25>>>>>>> path: add stubs26=======27// Selector: 6073d91728>>>>>>> misc: update stubs29interface ContractHelpers is Dummy, ERC165 {30 /// Get user, which deployed specified contract31 /// @dev May return zero address in case if contract is deployed32 /// using uniquenetwork evm-migration pallet, or using other terms not33 /// intended by pallet-evm34 /// @dev Returns zero address if contract does not exists35 /// @param contractAddress Contract to get owner of36 /// @return address Owner of contract37 /// @dev EVM selector for this function is: 0x5152b14c,38 /// or in textual repr: contractOwner(address)39 function contractOwner(address contractAddress)40 external41 view42 returns (address);4344<<<<<<< HEAD45<<<<<<< HEAD46 /// Set sponsor.47 /// @param contractAddress Contract for which a sponsor is being established.48 /// @param sponsor User address who set as pending sponsor.49 /// @dev EVM selector for this function is: 0xf01fba93,50 /// or in textual repr: setSponsor(address,address)51=======52<<<<<<< HEAD53=======54>>>>>>> misc: update stubs55 // Set sponsor.56 //57 // @param contract_address Contract for which a sponsor is being established.58 // @param sponsor User address who set as pending sponsor.59 //60 // Selector: setSponsor(address,address) f01fba9361>>>>>>> path: add stubs62 function setSponsor(address contractAddress, address sponsor) external;6364 /// Set contract as self sponsored.65 ///66 /// @param contractAddress Contract for which a self sponsoring is being enabled.67 /// @dev EVM selector for this function is: 0x89f7d9ae,68 /// or in textual repr: selfSponsoredEnable(address)69 function selfSponsoredEnable(address contractAddress) external;7071 /// Remove sponsor.72 ///73 /// @param contractAddress Contract for which a sponsorship is being removed.74 /// @dev EVM selector for this function is: 0xef784250,75 /// or in textual repr: removeSponsor(address)76 function removeSponsor(address contractAddress) external;7778 /// Confirm sponsorship.79 ///80 /// @dev Caller must be same that set via [`setSponsor`].81 ///82 /// @param contractAddress Сontract for which need to confirm sponsorship.83 /// @dev EVM selector for this function is: 0xabc00001,84 /// or in textual repr: confirmSponsorship(address)85 function confirmSponsorship(address contractAddress) external;8687<<<<<<< HEAD88 /// Get current sponsor.89 ///90 /// @param contractAddress The contract for which a sponsor is requested.91 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.92 /// @dev EVM selector for this function is: 0x743fc745,93 /// or in textual repr: getSponsor(address)94=======95 // Get current sponsor.96 //97 // @param contract_address The contract for which a sponsor is requested.98 // @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.99 //100 // Selector: getSponsor(address) 743fc745101>>>>>>> path: add stubs102 function getSponsor(address contractAddress)103 external104 view105 returns (Tuple0 memory);106107<<<<<<< HEAD108<<<<<<< HEAD109 /// Check tat contract has confirmed sponsor.110 ///111 /// @param contractAddress The contract for which the presence of a confirmed sponsor is checked.112 /// @return **true** if contract has confirmed sponsor.113 /// @dev EVM selector for this function is: 0x97418603,114 /// or in textual repr: hasSponsor(address)115 function hasSponsor(address contractAddress) external view returns (bool);116117 /// Check tat contract has pending sponsor.118 ///119 /// @param contractAddress The contract for which the presence of a pending sponsor is checked.120 /// @return **true** if contract has pending sponsor.121 /// @dev EVM selector for this function is: 0x39b9b242,122 /// or in textual repr: hasPendingSponsor(address)123=======124<<<<<<< HEAD125=======126>>>>>>> misc: update stubs127 // Check tat contract has confirmed sponsor.128 //129 // @param contract_address The contract for which the presence of a confirmed sponsor is checked.130 // @return **true** if contract has confirmed sponsor.131 //132 // Selector: hasSponsor(address) 97418603133 function hasSponsor(address contractAddress) external view returns (bool);134135 // Check tat contract has pending sponsor.136 //137 // @param contract_address The contract for which the presence of a pending sponsor is checked.138 // @return **true** if contract has pending sponsor.139 //140 // Selector: hasPendingSponsor(address) 39b9b242141>>>>>>> path: add stubs142 function hasPendingSponsor(address contractAddress)143 external144 view145 returns (bool);146147 /// @dev EVM selector for this function is: 0x6027dc61,148 /// or in textual repr: sponsoringEnabled(address)149 function sponsoringEnabled(address contractAddress)150 external151 view152 returns (bool);153154 /// @dev EVM selector for this function is: 0xfde8a560,155 /// or in textual repr: setSponsoringMode(address,uint8)156 function setSponsoringMode(address contractAddress, uint8 mode) external;157158 /// Get current contract sponsoring rate limit159 /// @param contractAddress Contract to get sponsoring mode of160 /// @return uint32 Amount of blocks between two sponsored transactions161 /// @dev EVM selector for this function is: 0x610cfabd,162 /// or in textual repr: getSponsoringRateLimit(address)163 function getSponsoringRateLimit(address contractAddress)164 external165 view166 returns (uint32);167168 /// Set contract sponsoring rate limit169 /// @dev Sponsoring rate limit - is a minimum amount of blocks that should170 /// pass between two sponsored transactions171 /// @param contractAddress Contract to change sponsoring rate limit of172 /// @param rateLimit Target rate limit173 /// @dev Only contract owner can change this setting174 /// @dev EVM selector for this function is: 0x77b6c908,175 /// or in textual repr: setSponsoringRateLimit(address,uint32)176 function setSponsoringRateLimit(address contractAddress, uint32 rateLimit)177 external;178179 /// Is specified user present in contract allow list180 /// @dev Contract owner always implicitly included181 /// @param contractAddress Contract to check allowlist of182 /// @param user User to check183 /// @return bool Is specified users exists in contract allowlist184 /// @dev EVM selector for this function is: 0x5c658165,185 /// or in textual repr: allowed(address,address)186 function allowed(address contractAddress, address user)187 external188 view189 returns (bool);190191 /// Toggle user presence in contract allowlist192 /// @param contractAddress Contract to change allowlist of193 /// @param user Which user presence should be toggled194 /// @param isAllowed `true` if user should be allowed to be sponsored195 /// or call this contract, `false` otherwise196 /// @dev Only contract owner can change this setting197 /// @dev EVM selector for this function is: 0x4706cc1c,198 /// or in textual repr: toggleAllowed(address,address,bool)199 function toggleAllowed(200 address contractAddress,201 address user,202 bool isAllowed203 ) external;204205 /// Is this contract has allowlist access enabled206 /// @dev Allowlist always can have users, and it is used for two purposes:207 /// in case of allowlist sponsoring mode, users will be sponsored if they exist in allowlist208 /// in case of allowlist access enabled, only users from allowlist may call this contract209 /// @param contractAddress Contract to get allowlist access of210 /// @return bool Is specified contract has allowlist access enabled211 /// @dev EVM selector for this function is: 0xc772ef6c,212 /// or in textual repr: allowlistEnabled(address)213 function allowlistEnabled(address contractAddress)214 external215 view216 returns (bool);217218 /// Toggle contract allowlist access219 /// @param contractAddress Contract to change allowlist access of220 /// @param enabled Should allowlist access to be enabled?221 /// @dev EVM selector for this function is: 0x36de20f5,222 /// or in textual repr: toggleAllowlist(address,bool)223 function toggleAllowlist(address contractAddress, bool enabled) external;224}225226/// @dev anonymous struct227struct Tuple0 {228 address field_0;229 uint256 field_1;230}tests/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.
///
tests/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.
//
tests/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.
//
tests/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"
tests/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"
tests/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"
tests/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" }
],