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.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)
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.soldiffbeforeafterboth1// SPDX-License-Identifier: OTHER2// This code is automatically generated34pragma solidity >=0.8.0 <0.9.0;56<<<<<<< HEAD7/// @dev common stubs holder8=======9// Anonymous struct10struct Tuple0 {11 uint256 field_0;12 string field_1;13}1415// Anonymous struct16struct Tuple1 {17 address field_0;18 uint256 field_1;19}2021// Common stubs holder22>>>>>>> misk: Update stubs23interface Dummy {2425}2627interface ERC165 is Dummy {28 function supportsInterface(bytes4 interfaceID) external view returns (bool);29}3031/// @title A contract that allows to set and delete token properties and change token property permissions.32/// @dev the ERC-165 identifier for this interface is 0x4136937733interface TokenProperties is Dummy, ERC165 {34 /// @notice Set permissions for token property.35 /// @dev Throws error if `msg.sender` is not admin or owner of the collection.36 /// @param key Property key.37 /// @param isMutable Permission to mutate property.38 /// @param collectionAdmin Permission to mutate property by collection admin if property is mutable.39 /// @param tokenOwner Permission to mutate property by token owner if property is mutable.40 /// @dev EVM selector for this function is: 0x222d97fa,41 /// or in textual repr: setTokenPropertyPermission(string,bool,bool,bool)42 function setTokenPropertyPermission(43 string memory key,44 bool isMutable,45 bool collectionAdmin,46 bool tokenOwner47 ) external;4849 /// @notice Set token property value.50 /// @dev Throws error if `msg.sender` has no permission to edit the property.51 /// @param tokenId ID of the token.52 /// @param key Property key.53 /// @param value Property value.54 /// @dev EVM selector for this function is: 0x1752d67b,55 /// or in textual repr: setProperty(uint256,string,bytes)56 function setProperty(57 uint256 tokenId,58 string memory key,59 bytes memory value60 ) external;6162 /// @notice Delete token property value.63 /// @dev Throws error if `msg.sender` has no permission to edit the property.64 /// @param tokenId ID of the token.65 /// @param key Property key.66 /// @dev EVM selector for this function is: 0x066111d1,67 /// or in textual repr: deleteProperty(uint256,string)68 function deleteProperty(uint256 tokenId, string memory key) external;6970 /// @notice Get token property value.71 /// @dev Throws error if key not found72 /// @param tokenId ID of the token.73 /// @param key Property key.74 /// @return Property value bytes75 /// @dev EVM selector for this function is: 0x7228c327,76 /// or in textual repr: property(uint256,string)77 function property(uint256 tokenId, string memory key)78 external79 view80 returns (bytes memory);81}8283/// @title A contract that allows you to work with collections.84/// @dev the ERC-165 identifier for this interface is 0xffe4da2385interface Collection is Dummy, ERC165 {86 /// Set collection property.87 ///88 /// @param key Property key.89 /// @param value Propery value.90 /// @dev EVM selector for this function is: 0x2f073f66,91 /// or in textual repr: setCollectionProperty(string,bytes)92 function setCollectionProperty(string memory key, bytes memory value)93 external;9495 /// Delete collection property.96 ///97 /// @param key Property key.98 /// @dev EVM selector for this function is: 0x7b7debce,99 /// or in textual repr: deleteCollectionProperty(string)100 function deleteCollectionProperty(string memory key) external;101102 /// Get collection property.103 ///104 /// @dev Throws error if key not found.105 ///106 /// @param key Property key.107 /// @return bytes The property corresponding to the key.108 /// @dev EVM selector for this function is: 0xcf24fd6d,109 /// or in textual repr: collectionProperty(string)110 function collectionProperty(string memory key)111 external112 view113 returns (bytes memory);114115 /// Set the sponsor of the collection.116 ///117 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.118 ///119 /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.120 /// @dev EVM selector for this function is: 0x7623402e,121 /// or in textual repr: setCollectionSponsor(address)122 function setCollectionSponsor(address sponsor) external;123124 /// Collection sponsorship confirmation.125 ///126 /// @dev After setting the sponsor for the collection, it must be confirmed with this function.127 /// @dev EVM selector for this function is: 0x3c50e97a,128 /// or in textual repr: confirmCollectionSponsorship()129 function confirmCollectionSponsorship() external;130131 /// Set limits for the collection.132 /// @dev Throws error if limit not found.133 /// @param limit Name of the limit. Valid names:134 /// "accountTokenOwnershipLimit",135 /// "sponsoredDataSize",136 /// "sponsoredDataRateLimit",137 /// "tokenLimit",138 /// "sponsorTransferTimeout",139 /// "sponsorApproveTimeout"140 /// @param value Value of the limit.141 /// @dev EVM selector for this function is: 0x6a3841db,142 /// or in textual repr: setCollectionLimit(string,uint32)143 function setCollectionLimit(string memory limit, uint32 value) external;144145 /// Set limits for the collection.146 /// @dev Throws error if limit not found.147 /// @param limit Name of the limit. Valid names:148 /// "ownerCanTransfer",149 /// "ownerCanDestroy",150 /// "transfersEnabled"151 /// @param value Value of the limit.152 /// @dev EVM selector for this function is: 0x993b7fba,153 /// or in textual repr: setCollectionLimit(string,bool)154 function setCollectionLimit(string memory limit, bool value) external;155156 /// Get contract address.157 /// @dev EVM selector for this function is: 0xf6b4dfb4,158 /// or in textual repr: contractAddress()159 function contractAddress() external view returns (address);160161 /// Add collection admin by substrate address.162 /// @param newAdmin Substrate administrator address.163 /// @dev EVM selector for this function is: 0x5730062b,164 /// or in textual repr: addCollectionAdminSubstrate(uint256)165 function addCollectionAdminSubstrate(uint256 newAdmin) external;166167 /// Remove collection admin by substrate address.168 /// @param admin Substrate administrator address.169 /// @dev EVM selector for this function is: 0x4048fcf9,170 /// or in textual repr: removeCollectionAdminSubstrate(uint256)171 function removeCollectionAdminSubstrate(uint256 admin) external;172173 /// Add collection admin.174 /// @param newAdmin Address of the added administrator.175 /// @dev EVM selector for this function is: 0x92e462c7,176 /// or in textual repr: addCollectionAdmin(address)177 function addCollectionAdmin(address newAdmin) external;178179 /// Remove collection admin.180 ///181 /// @param admin Address of the removed administrator.182 /// @dev EVM selector for this function is: 0xfafd7b42,183 /// or in textual repr: removeCollectionAdmin(address)184 function removeCollectionAdmin(address admin) external;185186 /// Toggle accessibility of collection nesting.187 ///188 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'189 /// @dev EVM selector for this function is: 0x112d4586,190 /// or in textual repr: setCollectionNesting(bool)191 function setCollectionNesting(bool enable) external;192193 /// Toggle accessibility of collection nesting.194 ///195 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'196 /// @param collections Addresses of collections that will be available for nesting.197 /// @dev EVM selector for this function is: 0x64872396,198 /// or in textual repr: setCollectionNesting(bool,address[])199 function setCollectionNesting(bool enable, address[] memory collections)200 external;201202 /// Set the collection access method.203 /// @param mode Access mode204 /// 0 for Normal205 /// 1 for AllowList206 /// @dev EVM selector for this function is: 0x41835d4c,207 /// or in textual repr: setCollectionAccess(uint8)208 function setCollectionAccess(uint8 mode) external;209210 /// Add the user to the allowed list.211 ///212 /// @param user Address of a trusted user.213 /// @dev EVM selector for this function is: 0x67844fe6,214 /// or in textual repr: addToCollectionAllowList(address)215 function addToCollectionAllowList(address user) external;216217 /// Remove the user from the allowed list.218 ///219 /// @param user Address of a removed user.220 /// @dev EVM selector for this function is: 0x85c51acb,221 /// or in textual repr: removeFromCollectionAllowList(address)222 function removeFromCollectionAllowList(address user) external;223224 /// Switch permission for minting.225 ///226 /// @param mode Enable if "true".227 /// @dev EVM selector for this function is: 0x00018e84,228 /// or in textual repr: setCollectionMintMode(bool)229 function setCollectionMintMode(bool mode) external;230231 /// Check that account is the owner or admin of the collection232 ///233 /// @param user account to verify234 /// @return "true" if account is the owner or admin235 /// @dev EVM selector for this function is: 0x9811b0c7,236 /// or in textual repr: isOwnerOrAdmin(address)237 function isOwnerOrAdmin(address user) external view returns (bool);238239 /// Check that substrate account is the owner or admin of the collection240 ///241 /// @param user account to verify242 /// @return "true" if account is the owner or admin243 /// @dev EVM selector for this function is: 0x68910e00,244 /// or in textual repr: isOwnerOrAdminSubstrate(uint256)245 function isOwnerOrAdminSubstrate(uint256 user) external view returns (bool);246247 /// Returns collection type248 ///249 /// @return `Fungible` or `NFT` or `ReFungible`250 /// @dev EVM selector for this function is: 0xd34b55b8,251 /// or in textual repr: uniqueCollectionType()252 function uniqueCollectionType() external returns (string memory);253254 /// Changes collection owner to another account255 ///256 /// @dev Owner can be changed only by current owner257 /// @param newOwner new owner account258 /// @dev EVM selector for this function is: 0x13af4035,259 /// or in textual repr: setOwner(address)260 function setOwner(address newOwner) external;261262 /// Changes collection owner to another substrate account263 ///264 /// @dev Owner can be changed only by current owner265 /// @param newOwner new owner substrate account266 /// @dev EVM selector for this function is: 0xb212138f,267 /// or in textual repr: setOwnerSubstrate(uint256)268 function setOwnerSubstrate(uint256 newOwner) external;269}270271/// @title ERC721 Token that can be irreversibly burned (destroyed).272/// @dev the ERC-165 identifier for this interface is 0x42966c68273interface ERC721Burnable is Dummy, ERC165 {274 /// @notice Burns a specific ERC721 token.275 /// @dev Throws unless `msg.sender` is the current RFT owner, or an authorized276 /// operator of the current owner.277 /// @param tokenId The RFT to approve278 /// @dev EVM selector for this function is: 0x42966c68,279 /// or in textual repr: burn(uint256)280 function burn(uint256 tokenId) external;281}282283/// @dev inlined interface284interface ERC721MintableEvents {285 event MintingFinished();286}287288/// @title ERC721 minting logic.289/// @dev the ERC-165 identifier for this interface is 0x68ccfe89290interface ERC721Mintable is Dummy, ERC165, ERC721MintableEvents {291 /// @dev EVM selector for this function is: 0x05d2035b,292 /// or in textual repr: mintingFinished()293 function mintingFinished() external view returns (bool);294295 /// @notice Function to mint token.296 /// @dev `tokenId` should be obtained with `nextTokenId` method,297 /// unlike standard, you can't specify it manually298 /// @param to The new owner299 /// @param tokenId ID of the minted RFT300 /// @dev EVM selector for this function is: 0x40c10f19,301 /// or in textual repr: mint(address,uint256)302 function mint(address to, uint256 tokenId) external returns (bool);303304 /// @notice Function to mint token with the given tokenUri.305 /// @dev `tokenId` should be obtained with `nextTokenId` method,306 /// unlike standard, you can't specify it manually307 /// @param to The new owner308 /// @param tokenId ID of the minted RFT309 /// @param tokenUri Token URI that would be stored in the RFT properties310 /// @dev EVM selector for this function is: 0x50bb4e7f,311 /// or in textual repr: mintWithTokenURI(address,uint256,string)312 function mintWithTokenURI(313 address to,314 uint256 tokenId,315 string memory tokenUri316 ) external returns (bool);317318 /// @dev Not implemented319 /// @dev EVM selector for this function is: 0x7d64bcb4,320 /// or in textual repr: finishMinting()321 function finishMinting() external returns (bool);322}323324<<<<<<< HEAD325/// @title Unique extensions for ERC721.326/// @dev the ERC-165 identifier for this interface is 0x7c3bef89327=======328<<<<<<< HEAD329// Selector: 780e9d63330interface ERC721Enumerable is Dummy, ERC165 {331 // @notice Enumerate valid RFTs332 // @param index A counter less than `totalSupply()`333 // @return The token identifier for the `index`th NFT,334 // (sort order not specified)335 //336 // Selector: tokenByIndex(uint256) 4f6ccce7337 function tokenByIndex(uint256 index) external view returns (uint256);338339 // Not implemented340 //341 // Selector: tokenOfOwnerByIndex(address,uint256) 2f745c59342 function tokenOfOwnerByIndex(address owner, uint256 index)343 external344 view345 returns (uint256);346347 // @notice Count RFTs tracked by this contract348 // @return A count of valid RFTs tracked by this contract, where each one of349 // them has an assigned and queryable owner not equal to the zero address350 //351 // Selector: totalSupply() 18160ddd352 function totalSupply() external view returns (uint256);353}354355// Selector: 7c3bef89356>>>>>>> misk: Update stubs357interface ERC721UniqueExtensions is Dummy, ERC165 {358 /// @notice Transfer ownership of an RFT359 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`360 /// is the zero address. Throws if `tokenId` is not a valid RFT.361 /// Throws if RFT pieces have multiple owners.362 /// @param to The new owner363 /// @param tokenId The RFT to transfer364 /// @dev EVM selector for this function is: 0xa9059cbb,365 /// or in textual repr: transfer(address,uint256)366 function transfer(address to, uint256 tokenId) external;367368 /// @notice Burns a specific ERC721 token.369 /// @dev Throws unless `msg.sender` is the current owner or an authorized370 /// operator for this RFT. Throws if `from` is not the current owner. Throws371 /// if `to` is the zero address. Throws if `tokenId` is not a valid RFT.372 /// Throws if RFT pieces have multiple owners.373 /// @param from The current owner of the RFT374 /// @param tokenId The RFT to transfer375 /// @dev EVM selector for this function is: 0x79cc6790,376 /// or in textual repr: burnFrom(address,uint256)377 function burnFrom(address from, uint256 tokenId) external;378379 /// @notice Returns next free RFT ID.380 /// @dev EVM selector for this function is: 0x75794a3c,381 /// or in textual repr: nextTokenId()382 function nextTokenId() external view returns (uint256);383384 /// @notice Function to mint multiple tokens.385 /// @dev `tokenIds` should be an array of consecutive numbers and first number386 /// should be obtained with `nextTokenId` method387 /// @param to The new owner388 /// @param tokenIds IDs of the minted RFTs389 /// @dev EVM selector for this function is: 0x44a9945e,390 /// or in textual repr: mintBulk(address,uint256[])391 function mintBulk(address to, uint256[] memory tokenIds)392 external393 returns (bool);394395 /// @notice Function to mint multiple tokens with the given tokenUris.396 /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive397 /// numbers and first number should be obtained with `nextTokenId` method398 /// @param to The new owner399 /// @param tokens array of pairs of token ID and token URI for minted tokens400 /// @dev EVM selector for this function is: 0x36543006,401 /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])402 function mintBulkWithTokenURI(address to, Tuple8[] memory tokens)403 external404 returns (bool);405406 /// Returns EVM address for refungible token407 ///408 /// @param token ID of the token409 /// @dev EVM selector for this function is: 0xab76fac6,410 /// or in textual repr: tokenContractAddress(uint256)411 function tokenContractAddress(uint256 token)412 external413 view414 returns (address);415}416417<<<<<<< HEAD418/// @dev anonymous struct419struct Tuple8 {420 uint256 field_0;421 string field_1;422}423=======424// Selector: ffe4da23425=======426// Selector: 765e2fae427>>>>>>> misk: Update stubs428interface Collection is Dummy, ERC165 {429 // Set collection property.430 //431 // @param key Property key.432 // @param value Propery value.433 //434 // Selector: setCollectionProperty(string,bytes) 2f073f66435 function setCollectionProperty(string memory key, bytes memory value)436 external;437>>>>>>> misk: Update stubs438439/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension440/// @dev See https://eips.ethereum.org/EIPS/eip-721441/// @dev the ERC-165 identifier for this interface is 0x780e9d63442interface ERC721Enumerable is Dummy, ERC165 {443 /// @notice Enumerate valid RFTs444 /// @param index A counter less than `totalSupply()`445 /// @return The token identifier for the `index`th NFT,446 /// (sort order not specified)447 /// @dev EVM selector for this function is: 0x4f6ccce7,448 /// or in textual repr: tokenByIndex(uint256)449 function tokenByIndex(uint256 index) external view returns (uint256);450451 /// Not implemented452 /// @dev EVM selector for this function is: 0x2f745c59,453 /// or in textual repr: tokenOfOwnerByIndex(address,uint256)454 function tokenOfOwnerByIndex(address owner, uint256 index)455 external456 view457<<<<<<< HEAD458 returns (uint256);459=======460 returns (bytes memory);461462 // Set the sponsor of the collection.463 //464 // @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.465 //466 // @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.467 //468 // Selector: setCollectionSponsor(address) 7623402e469 function setCollectionSponsor(address sponsor) external;470471 // Set the substrate sponsor of the collection.472 //473 // @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.474 //475 // @param sponsor Substrate address of the sponsor from whose account funds will be debited for operations with the contract.476 //477 // Selector: setCollectionSponsorSubstrate(uint256) c74d6751478 function setCollectionSponsorSubstrate(uint256 sponsor) external;479480 // Selector: hasCollectionPendingSponsor() 058ac185481 function hasCollectionPendingSponsor() external view returns (bool);482483 // Collection sponsorship confirmation.484 //485 // @dev After setting the sponsor for the collection, it must be confirmed with this function.486 //487 // Selector: confirmCollectionSponsorship() 3c50e97a488 function confirmCollectionSponsorship() external;489490 // Remove collection sponsor.491 //492 // Selector: removeCollectionSponsor() 6e0326a3493 function removeCollectionSponsor() external;494495 // Get current sponsor.496 //497 // @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.498 //499 // Selector: getCollectionSponsor() b66bbc14500 function getCollectionSponsor() external view returns (Tuple1 memory);501502 // Set limits for the collection.503 // @dev Throws error if limit not found.504 // @param limit Name of the limit. Valid names:505 // "accountTokenOwnershipLimit",506 // "sponsoredDataSize",507 // "sponsoredDataRateLimit",508 // "tokenLimit",509 // "sponsorTransferTimeout",510 // "sponsorApproveTimeout"511 // @param value Value of the limit.512 //513 // Selector: setCollectionLimit(string,uint32) 6a3841db514 function setCollectionLimit(string memory limit, uint32 value) external;515516 // Set limits for the collection.517 // @dev Throws error if limit not found.518 // @param limit Name of the limit. Valid names:519 // "ownerCanTransfer",520 // "ownerCanDestroy",521 // "transfersEnabled"522 // @param value Value of the limit.523 //524 // Selector: setCollectionLimit(string,bool) 993b7fba525 function setCollectionLimit(string memory limit, bool value) external;526527 // Get contract address.528 //529 // Selector: contractAddress() f6b4dfb4530 function contractAddress() external view returns (address);531532 // Add collection admin by substrate address.533 // @param new_admin Substrate administrator address.534 //535 // Selector: addCollectionAdminSubstrate(uint256) 5730062b536 function addCollectionAdminSubstrate(uint256 newAdmin) external;537>>>>>>> misk: Update stubs538539 /// @notice Count RFTs tracked by this contract540 /// @return A count of valid RFTs tracked by this contract, where each one of541 /// them has an assigned and queryable owner not equal to the zero address542 /// @dev EVM selector for this function is: 0x18160ddd,543 /// or in textual repr: totalSupply()544 function totalSupply() external view returns (uint256);545}546547/// @dev the ERC-165 identifier for this interface is 0x5b5e139f548interface ERC721Metadata is Dummy, ERC165 {549 /// @notice A descriptive name for a collection of RFTs in this contract550 /// @dev EVM selector for this function is: 0x06fdde03,551 /// or in textual repr: name()552 function name() external view returns (string memory);553554 /// @notice An abbreviated name for RFTs in this contract555 /// @dev EVM selector for this function is: 0x95d89b41,556 /// or in textual repr: symbol()557 function symbol() external view returns (string memory);558559 /// @notice A distinct Uniform Resource Identifier (URI) for a given asset.560 ///561 /// @dev If the token has a `url` property and it is not empty, it is returned.562 /// Else If the collection does not have a property with key `schemaName` or its value is not equal to `ERC721Metadata`, it return an error `tokenURI not set`.563 /// If the collection property `baseURI` is empty or absent, return "" (empty string)564 /// otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix565 /// otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).566 ///567 /// @return token's const_metadata568 /// @dev EVM selector for this function is: 0xc87b56dd,569 /// or in textual repr: tokenURI(uint256)570 function tokenURI(uint256 tokenId) external view returns (string memory);571}572573/// @dev inlined interface574interface ERC721Events {575 event Transfer(576 address indexed from,577 address indexed to,578 uint256 indexed tokenId579 );580 event Approval(581 address indexed owner,582 address indexed approved,583 uint256 indexed tokenId584 );585 event ApprovalForAll(586 address indexed owner,587 address indexed operator,588 bool approved589 );590}591592/// @title ERC-721 Non-Fungible Token Standard593/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md594/// @dev the ERC-165 identifier for this interface is 0x58800161595interface ERC721 is Dummy, ERC165, ERC721Events {596 /// @notice Count all RFTs assigned to an owner597 /// @dev RFTs assigned to the zero address are considered invalid, and this598 /// function throws for queries about the zero address.599 /// @param owner An address for whom to query the balance600 /// @return The number of RFTs owned by `owner`, possibly zero601 /// @dev EVM selector for this function is: 0x70a08231,602 /// or in textual repr: balanceOf(address)603 function balanceOf(address owner) external view returns (uint256);604605 /// @notice Find the owner of an RFT606 /// @dev RFTs assigned to zero address are considered invalid, and queries607 /// about them do throw.608 /// Returns special 0xffffffffffffffffffffffffffffffffffffffff address for609 /// the tokens that are partially owned.610 /// @param tokenId The identifier for an RFT611 /// @return The address of the owner of the RFT612 /// @dev EVM selector for this function is: 0x6352211e,613 /// or in textual repr: ownerOf(uint256)614 function ownerOf(uint256 tokenId) external view returns (address);615616 /// @dev Not implemented617 /// @dev EVM selector for this function is: 0x60a11672,618 /// or in textual repr: safeTransferFromWithData(address,address,uint256,bytes)619 function safeTransferFromWithData(620 address from,621 address to,622 uint256 tokenId,623 bytes memory data624 ) external;625626 /// @dev Not implemented627 /// @dev EVM selector for this function is: 0x42842e0e,628 /// or in textual repr: safeTransferFrom(address,address,uint256)629 function safeTransferFrom(630 address from,631 address to,632 uint256 tokenId633 ) external;634635 /// @notice Transfer ownership of an RFT -- THE CALLER IS RESPONSIBLE636 /// TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE637 /// THEY MAY BE PERMANENTLY LOST638 /// @dev Throws unless `msg.sender` is the current owner or an authorized639 /// operator for this RFT. Throws if `from` is not the current owner. Throws640 /// if `to` is the zero address. Throws if `tokenId` is not a valid RFT.641 /// Throws if RFT pieces have multiple owners.642 /// @param from The current owner of the NFT643 /// @param to The new owner644 /// @param tokenId The NFT to transfer645 /// @dev EVM selector for this function is: 0x23b872dd,646 /// or in textual repr: transferFrom(address,address,uint256)647 function transferFrom(648 address from,649 address to,650 uint256 tokenId651 ) external;652653 /// @dev Not implemented654 /// @dev EVM selector for this function is: 0x095ea7b3,655 /// or in textual repr: approve(address,uint256)656 function approve(address approved, uint256 tokenId) external;657658 /// @dev Not implemented659 /// @dev EVM selector for this function is: 0xa22cb465,660 /// or in textual repr: setApprovalForAll(address,bool)661 function setApprovalForAll(address operator, bool approved) external;662663 /// @dev Not implemented664 /// @dev EVM selector for this function is: 0x081812fc,665 /// or in textual repr: getApproved(uint256)666 function getApproved(uint256 tokenId) external view returns (address);667668 /// @dev Not implemented669 /// @dev EVM selector for this function is: 0xe985e9c5,670 /// or in textual repr: isApprovedForAll(address,address)671 function isApprovedForAll(address owner, address operator)672 external673 view674 returns (address);675}676677interface UniqueRefungible is678 Dummy,679 ERC165,680 ERC721,681 ERC721Metadata,682 ERC721Enumerable,683 ERC721UniqueExtensions,684 ERC721Mintable,685 ERC721Burnable,686 Collection,687 TokenProperties688{}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" }
],