From 6b71957232bbf0f3f3472587e2fe1c09f172fee6 Mon Sep 17 00:00:00 2001 From: Trubnikov Sergey Date: Thu, 25 Aug 2022 14:21:27 +0000 Subject: [PATCH] misc: update stubs --- --- a/pallets/evm-contract-helpers/src/stubs/ContractHelpers.sol +++ b/pallets/evm-contract-helpers/src/stubs/ContractHelpers.sol @@ -21,20 +21,8 @@ } } -<<<<<<< HEAD -<<<<<<< HEAD /// @title Magic contract, which allows users to reconfigure other contracts /// @dev the ERC-165 identifier for this interface is 0xd77fab70 -======= -<<<<<<< HEAD -// Selector: 6073d917 -======= -// 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 @@ -56,24 +44,11 @@ return 0x0000000000000000000000000000000000000000; } -<<<<<<< HEAD -<<<<<<< HEAD /// Set sponsor. /// @param contractAddress Contract for which a sponsor is being established. /// @param sponsor User address who set as pending sponsor. /// @dev EVM selector for this function is: 0xf01fba93, /// 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. - // - // Selector: setSponsor(address,address) f01fba93 ->>>>>>> path: add stubs function setSponsor(address contractAddress, address sponsor) public { require(false, stub_error); contractAddress; @@ -81,46 +56,22 @@ dummy = 0; } -<<<<<<< HEAD -<<<<<<< HEAD /// Set contract as self sponsored. /// /// @param contractAddress Contract for which a self sponsoring is being enabled. /// @dev EVM selector for this function is: 0x89f7d9ae, /// 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. - // - // Selector: selfSponsoredEnable(address) 89f7d9ae ->>>>>>> path: add stubs function selfSponsoredEnable(address contractAddress) public { require(false, stub_error); contractAddress; dummy = 0; } -<<<<<<< HEAD -<<<<<<< HEAD /// Remove sponsor. /// /// @param contractAddress Contract for which a sponsorship is being removed. /// @dev EVM selector for this function is: 0xef784250, /// or in textual repr: removeSponsor(address) -======= -<<<<<<< HEAD -======= ->>>>>>> misc: update stubs - // Remove sponsor. - // - // @param contract_address Contract for which a sponsorship is being removed. - // - // Selector: removeSponsor(address) ef784250 ->>>>>>> path: add stubs function removeSponsor(address contractAddress) public { require(false, stub_error); contractAddress; @@ -170,25 +121,12 @@ return false; } -<<<<<<< HEAD -<<<<<<< HEAD /// Check tat contract has pending sponsor. /// /// @param contractAddress The contract for which the presence of a pending sponsor is checked. /// @return **true** if contract has pending sponsor. /// @dev EVM selector for this function is: 0x39b9b242, /// 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. - // @return **true** if contract has pending sponsor. - // - // Selector: hasPendingSponsor(address) 39b9b242 ->>>>>>> path: add stubs function hasPendingSponsor(address contractAddress) public view --- a/pallets/fungible/src/stubs/UniqueFungible.sol +++ b/pallets/fungible/src/stubs/UniqueFungible.sol @@ -3,17 +3,7 @@ pragma solidity >=0.8.0 <0.9.0; -<<<<<<< HEAD /// @dev common stubs holder -======= -// Anonymous struct -struct Tuple0 { - address field_0; - uint256 field_1; -} - -// Common stubs holder ->>>>>>> misk: Update stubs contract Dummy { uint8 dummy; string stub_error = "this contract is implemented in native"; @@ -31,125 +21,8 @@ } } -<<<<<<< HEAD /// @title A contract that allows you to work with collections. -/// @dev the ERC-165 identifier for this interface is 0xffe4da23 -======= -// Inline -contract ERC20Events { - event Transfer(address indexed from, address indexed to, uint256 value); - event Approval( - address indexed owner, - address indexed spender, - uint256 value - ); -} - -// Selector: 79cc6790 -contract ERC20UniqueExtensions is Dummy, ERC165 { - // Selector: burnFrom(address,uint256) 79cc6790 - function burnFrom(address from, uint256 amount) public returns (bool) { - require(false, stub_error); - from; - amount; - dummy = 0; - return false; - } -} - -// Selector: 942e8b22 -contract ERC20 is Dummy, ERC165, ERC20Events { - // Selector: name() 06fdde03 - function name() public view returns (string memory) { - require(false, stub_error); - dummy; - return ""; - } - - // Selector: symbol() 95d89b41 - function symbol() public view returns (string memory) { - require(false, stub_error); - dummy; - return ""; - } - - // Selector: totalSupply() 18160ddd - function totalSupply() public view returns (uint256) { - require(false, stub_error); - dummy; - return 0; - } - - // Selector: decimals() 313ce567 - function decimals() public view returns (uint8) { - require(false, stub_error); - dummy; - return 0; - } - - // Selector: balanceOf(address) 70a08231 - function balanceOf(address owner) public view returns (uint256) { - require(false, stub_error); - owner; - dummy; - return 0; - } - - // Selector: transfer(address,uint256) a9059cbb - function transfer(address to, uint256 amount) public returns (bool) { - require(false, stub_error); - to; - amount; - dummy = 0; - return false; - } - - // Selector: transferFrom(address,address,uint256) 23b872dd - function transferFrom( - address from, - address to, - uint256 amount - ) public returns (bool) { - require(false, stub_error); - from; - to; - amount; - dummy = 0; - return false; - } - - // Selector: approve(address,uint256) 095ea7b3 - function approve(address spender, uint256 amount) public returns (bool) { - require(false, stub_error); - spender; - amount; - dummy = 0; - return false; - } - - // Selector: allowance(address,address) dd62ed3e - function allowance(address owner, address spender) - public - view - returns (uint256) - { - require(false, stub_error); - owner; - spender; - dummy; - return 0; - } -} - -<<<<<<< HEAD -// Selector: ffe4da23 -======= -// Selector: 765e2fae ->>>>>>> misk: Update stubs ->>>>>>> misk: Update stubs -======= -// Selector: e54be640 ->>>>>>> misc: update stubs +/// @dev the ERC-165 identifier for this interface is 0xe54be640 contract Collection is Dummy, ERC165 { /// Set collection property. /// @@ -209,45 +82,56 @@ dummy = 0; } -<<<<<<< HEAD - /// Collection sponsorship confirmation. + /// Set the substrate sponsor of the collection. + /// + /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor. /// - /// @dev After setting the sponsor for the collection, it must be confirmed with this function. - /// @dev EVM selector for this function is: 0x3c50e97a, - /// or in textual repr: confirmCollectionSponsorship() -======= - // Set the substrate sponsor of the collection. - // - // @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor. - // - // @param sponsor Substrate address of the sponsor from whose account funds will be debited for operations with the contract. - // - // Selector: setCollectionSponsorSubstrate(uint256) c74d6751 + /// @param sponsor Substrate address of the sponsor from whose account funds will be debited for operations with the contract. + /// @dev EVM selector for this function is: 0xc74d6751, + /// or in textual repr: setCollectionSponsorSubstrate(uint256) function setCollectionSponsorSubstrate(uint256 sponsor) public { require(false, stub_error); sponsor; dummy = 0; } - // Selector: hasCollectionPendingSponsor() 058ac185 + /// @dev EVM selector for this function is: 0x058ac185, + /// or in textual repr: hasCollectionPendingSponsor() function hasCollectionPendingSponsor() public view returns (bool) { require(false, stub_error); dummy; return false; } - // Collection sponsorship confirmation. - // - // @dev After setting the sponsor for the collection, it must be confirmed with this function. - // - // Selector: confirmCollectionSponsorship() 3c50e97a ->>>>>>> misk: Update stubs + /// Collection sponsorship confirmation. + /// + /// @dev After setting the sponsor for the collection, it must be confirmed with this function. + /// @dev EVM selector for this function is: 0x3c50e97a, + /// or in textual repr: confirmCollectionSponsorship() function confirmCollectionSponsorship() public { require(false, stub_error); dummy = 0; } -<<<<<<< HEAD + /// Remove collection sponsor. + /// @dev EVM selector for this function is: 0x6e0326a3, + /// or in textual repr: removeCollectionSponsor() + function removeCollectionSponsor() public { + require(false, stub_error); + dummy = 0; + } + + /// Get current sponsor. + /// + /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw. + /// @dev EVM selector for this function is: 0xb66bbc14, + /// or in textual repr: getCollectionSponsor() + function getCollectionSponsor() public view returns (Tuple6 memory) { + require(false, stub_error); + dummy; + return Tuple6(0x0000000000000000000000000000000000000000, 0); + } + /// Set limits for the collection. /// @dev Throws error if limit not found. /// @param limit Name of the limit. Valid names: @@ -260,39 +144,6 @@ /// @param value Value of the limit. /// @dev EVM selector for this function is: 0x6a3841db, /// or in textual repr: setCollectionLimit(string,uint32) -======= - // Remove collection sponsor. - // - // Selector: removeCollectionSponsor() 6e0326a3 - function removeCollectionSponsor() public { - require(false, stub_error); - dummy = 0; - } - - // Get current sponsor. - // - // @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw. - // - // Selector: getCollectionSponsor() b66bbc14 - function getCollectionSponsor() public view returns (Tuple0 memory) { - require(false, stub_error); - dummy; - return Tuple0(0x0000000000000000000000000000000000000000, 0); - } - - // Set limits for the collection. - // @dev Throws error if limit not found. - // @param limit Name of the limit. Valid names: - // "accountTokenOwnershipLimit", - // "sponsoredDataSize", - // "sponsoredDataRateLimit", - // "tokenLimit", - // "sponsorTransferTimeout", - // "sponsorApproveTimeout" - // @param value Value of the limit. - // - // Selector: setCollectionLimit(string,uint32) 6a3841db ->>>>>>> misk: Update stubs function setCollectionLimit(string memory limit, uint32 value) public { require(false, stub_error); limit; @@ -499,6 +350,12 @@ } } +/// @dev anonymous struct +struct Tuple6 { + address field_0; + uint256 field_1; +} + /// @dev the ERC-165 identifier for this interface is 0x79cc6790 contract ERC20UniqueExtensions is Dummy, ERC165 { /// @dev EVM selector for this function is: 0x79cc6790, --- a/pallets/nonfungible/src/stubs/UniqueNFT.sol +++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol @@ -3,23 +3,7 @@ pragma solidity >=0.8.0 <0.9.0; -<<<<<<< HEAD /// @dev common stubs holder -======= -// Anonymous struct -struct Tuple0 { - uint256 field_0; - string field_1; -} - -// Anonymous struct -struct Tuple1 { - address field_0; - uint256 field_1; -} - -// Common stubs holder ->>>>>>> misk: Update stubs contract Dummy { uint8 dummy; string stub_error = "this contract is implemented in native"; @@ -115,7 +99,7 @@ } /// @title A contract that allows you to work with collections. -/// @dev the ERC-165 identifier for this interface is 0xffe4da23 +/// @dev the ERC-165 identifier for this interface is 0xe54be640 contract Collection is Dummy, ERC165 { /// Set collection property. /// @@ -175,6 +159,27 @@ dummy = 0; } + /// Set the substrate sponsor of the collection. + /// + /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor. + /// + /// @param sponsor Substrate address of the sponsor from whose account funds will be debited for operations with the contract. + /// @dev EVM selector for this function is: 0xc74d6751, + /// or in textual repr: setCollectionSponsorSubstrate(uint256) + function setCollectionSponsorSubstrate(uint256 sponsor) public { + require(false, stub_error); + sponsor; + dummy = 0; + } + + /// @dev EVM selector for this function is: 0x058ac185, + /// or in textual repr: hasCollectionPendingSponsor() + function hasCollectionPendingSponsor() public view returns (bool) { + require(false, stub_error); + dummy; + return false; + } + /// Collection sponsorship confirmation. /// /// @dev After setting the sponsor for the collection, it must be confirmed with this function. @@ -185,6 +190,25 @@ dummy = 0; } + /// Remove collection sponsor. + /// @dev EVM selector for this function is: 0x6e0326a3, + /// or in textual repr: removeCollectionSponsor() + function removeCollectionSponsor() public { + require(false, stub_error); + dummy = 0; + } + + /// Get current sponsor. + /// + /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw. + /// @dev EVM selector for this function is: 0xb66bbc14, + /// or in textual repr: getCollectionSponsor() + function getCollectionSponsor() public view returns (Tuple17 memory) { + require(false, stub_error); + dummy; + return Tuple17(0x0000000000000000000000000000000000000000, 0); + } + /// Set limits for the collection. /// @dev Throws error if limit not found. /// @param limit Name of the limit. Valid names: @@ -403,6 +427,12 @@ } } +/// @dev anonymous struct +struct Tuple17 { + address field_0; + uint256 field_1; +} + /// @title ERC721 Token that can be irreversibly burned (destroyed). /// @dev the ERC-165 identifier for this interface is 0x42966c68 contract ERC721Burnable is Dummy, ERC165 { @@ -481,58 +511,8 @@ } } -<<<<<<< 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 - // @param index A counter less than `totalSupply()` - // @return The token identifier for the `index`th NFT, - // (sort order not specified) - // - // Selector: tokenByIndex(uint256) 4f6ccce7 - function tokenByIndex(uint256 index) public view returns (uint256) { - require(false, stub_error); - index; - dummy; - return 0; - } - - // @dev Not implemented - // - // Selector: tokenOfOwnerByIndex(address,uint256) 2f745c59 - function tokenOfOwnerByIndex(address owner, uint256 index) - public - view - returns (uint256) - { - require(false, stub_error); - owner; - index; - dummy; - return 0; - } - - // @notice Count NFTs tracked by this contract - // @return A count of valid NFTs tracked by this contract, where each one of - // them has an assigned and queryable owner not equal to the zero address - // - // Selector: totalSupply() 18160ddd - function totalSupply() public view returns (uint256) { - require(false, stub_error); - dummy; - return 0; - } -} - -// Selector: d74d154f ->>>>>>> misk: Update stubs contract ERC721UniqueExtensions is Dummy, ERC165 { /// @notice Transfer ownership of an NFT /// @dev Throws unless `msg.sender` is the current owner. Throws if `to` @@ -609,37 +589,11 @@ } } -<<<<<<< HEAD -<<<<<<< HEAD /// @dev anonymous struct struct Tuple8 { uint256 field_0; string field_1; } -======= -// Selector: ffe4da23 -======= -// Selector: 765e2fae ->>>>>>> misk: Update stubs -======= -// Selector: e54be640 ->>>>>>> misc: update stubs -contract Collection is Dummy, ERC165 { - // Set collection property. - // - // @param key Property key. - // @param value Propery value. - // - // Selector: setCollectionProperty(string,bytes) 2f073f66 - function setCollectionProperty(string memory key, bytes memory value) - public - { - require(false, stub_error); - key; - value; - dummy = 0; - } ->>>>>>> misk: Update stubs /// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension /// @dev See https://eips.ethereum.org/EIPS/eip-721 @@ -670,92 +624,7 @@ owner; index; dummy; -<<<<<<< HEAD return 0; -======= - return hex""; - } - - // Set the sponsor of the collection. - // - // @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor. - // - // @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract. - // - // Selector: setCollectionSponsor(address) 7623402e - function setCollectionSponsor(address sponsor) public { - require(false, stub_error); - sponsor; - dummy = 0; - } - - // Set the substrate sponsor of the collection. - // - // @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor. - // - // @param sponsor Substrate address of the sponsor from whose account funds will be debited for operations with the contract. - // - // Selector: setCollectionSponsorSubstrate(uint256) c74d6751 - function setCollectionSponsorSubstrate(uint256 sponsor) public { - require(false, stub_error); - sponsor; - dummy = 0; - } - - // Selector: hasCollectionPendingSponsor() 058ac185 - function hasCollectionPendingSponsor() public view returns (bool) { - require(false, stub_error); - dummy; - return false; - } - - // Collection sponsorship confirmation. - // - // @dev After setting the sponsor for the collection, it must be confirmed with this function. - // - // Selector: confirmCollectionSponsorship() 3c50e97a - function confirmCollectionSponsorship() public { - require(false, stub_error); - dummy = 0; - } - - // Remove collection sponsor. - // - // Selector: removeCollectionSponsor() 6e0326a3 - function removeCollectionSponsor() public { - require(false, stub_error); - dummy = 0; - } - - // Get current sponsor. - // - // @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw. - // - // Selector: getCollectionSponsor() b66bbc14 - function getCollectionSponsor() public view returns (Tuple1 memory) { - require(false, stub_error); - dummy; - return Tuple1(0x0000000000000000000000000000000000000000, 0); - } - - // Set limits for the collection. - // @dev Throws error if limit not found. - // @param limit Name of the limit. Valid names: - // "accountTokenOwnershipLimit", - // "sponsoredDataSize", - // "sponsoredDataRateLimit", - // "tokenLimit", - // "sponsorTransferTimeout", - // "sponsorApproveTimeout" - // @param value Value of the limit. - // - // Selector: setCollectionLimit(string,uint32) 6a3841db - function setCollectionLimit(string memory limit, uint32 value) public { - require(false, stub_error); - limit; - value; - dummy = 0; ->>>>>>> misk: Update stubs } /// @notice Count NFTs tracked by this contract --- a/pallets/refungible/src/stubs/UniqueRefungible.sol +++ b/pallets/refungible/src/stubs/UniqueRefungible.sol @@ -3,23 +3,7 @@ pragma solidity >=0.8.0 <0.9.0; -<<<<<<< HEAD /// @dev common stubs holder -======= -// Anonymous struct -struct Tuple0 { - uint256 field_0; - string field_1; -} - -// Anonymous struct -struct Tuple1 { - address field_0; - uint256 field_1; -} - -// Common stubs holder ->>>>>>> misk: Update stubs contract Dummy { uint8 dummy; string stub_error = "this contract is implemented in native"; @@ -115,7 +99,7 @@ } /// @title A contract that allows you to work with collections. -/// @dev the ERC-165 identifier for this interface is 0xffe4da23 +/// @dev the ERC-165 identifier for this interface is 0xe54be640 contract Collection is Dummy, ERC165 { /// Set collection property. /// @@ -175,6 +159,27 @@ dummy = 0; } + /// Set the substrate sponsor of the collection. + /// + /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor. + /// + /// @param sponsor Substrate address of the sponsor from whose account funds will be debited for operations with the contract. + /// @dev EVM selector for this function is: 0xc74d6751, + /// or in textual repr: setCollectionSponsorSubstrate(uint256) + function setCollectionSponsorSubstrate(uint256 sponsor) public { + require(false, stub_error); + sponsor; + dummy = 0; + } + + /// @dev EVM selector for this function is: 0x058ac185, + /// or in textual repr: hasCollectionPendingSponsor() + function hasCollectionPendingSponsor() public view returns (bool) { + require(false, stub_error); + dummy; + return false; + } + /// Collection sponsorship confirmation. /// /// @dev After setting the sponsor for the collection, it must be confirmed with this function. @@ -185,6 +190,25 @@ dummy = 0; } + /// Remove collection sponsor. + /// @dev EVM selector for this function is: 0x6e0326a3, + /// or in textual repr: removeCollectionSponsor() + function removeCollectionSponsor() public { + require(false, stub_error); + dummy = 0; + } + + /// Get current sponsor. + /// + /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw. + /// @dev EVM selector for this function is: 0xb66bbc14, + /// or in textual repr: getCollectionSponsor() + function getCollectionSponsor() public view returns (Tuple17 memory) { + require(false, stub_error); + dummy; + return Tuple17(0x0000000000000000000000000000000000000000, 0); + } + /// Set limits for the collection. /// @dev Throws error if limit not found. /// @param limit Name of the limit. Valid names: @@ -403,6 +427,12 @@ } } +/// @dev anonymous struct +struct Tuple17 { + address field_0; + uint256 field_1; +} + /// @title ERC721 Token that can be irreversibly burned (destroyed). /// @dev the ERC-165 identifier for this interface is 0x42966c68 contract ERC721Burnable is Dummy, ERC165 { @@ -481,58 +511,8 @@ } } -<<<<<<< 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 - // @param index A counter less than `totalSupply()` - // @return The token identifier for the `index`th NFT, - // (sort order not specified) - // - // Selector: tokenByIndex(uint256) 4f6ccce7 - function tokenByIndex(uint256 index) public view returns (uint256) { - require(false, stub_error); - index; - dummy; - return 0; - } - - // Not implemented - // - // Selector: tokenOfOwnerByIndex(address,uint256) 2f745c59 - function tokenOfOwnerByIndex(address owner, uint256 index) - public - view - returns (uint256) - { - require(false, stub_error); - owner; - index; - dummy; - return 0; - } - - // @notice Count RFTs tracked by this contract - // @return A count of valid RFTs tracked by this contract, where each one of - // them has an assigned and queryable owner not equal to the zero address - // - // Selector: totalSupply() 18160ddd - function totalSupply() public view returns (uint256) { - require(false, stub_error); - dummy; - return 0; - } -} - -// Selector: 7c3bef89 ->>>>>>> misk: Update stubs contract ERC721UniqueExtensions is Dummy, ERC165 { /// @notice Transfer ownership of an RFT /// @dev Throws unless `msg.sender` is the current owner. Throws if `to` @@ -623,37 +603,11 @@ } } -<<<<<<< HEAD -<<<<<<< HEAD /// @dev anonymous struct struct Tuple8 { uint256 field_0; string field_1; } -======= -// Selector: ffe4da23 -======= -// Selector: 765e2fae ->>>>>>> misk: Update stubs -======= -// Selector: e54be640 ->>>>>>> misc: update stubs -contract Collection is Dummy, ERC165 { - // Set collection property. - // - // @param key Property key. - // @param value Propery value. - // - // Selector: setCollectionProperty(string,bytes) 2f073f66 - function setCollectionProperty(string memory key, bytes memory value) - public - { - require(false, stub_error); - key; - value; - dummy = 0; - } ->>>>>>> misk: Update stubs /// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension /// @dev See https://eips.ethereum.org/EIPS/eip-721 @@ -684,92 +638,7 @@ owner; index; dummy; -<<<<<<< HEAD return 0; -======= - return hex""; - } - - // Set the sponsor of the collection. - // - // @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor. - // - // @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract. - // - // Selector: setCollectionSponsor(address) 7623402e - function setCollectionSponsor(address sponsor) public { - require(false, stub_error); - sponsor; - dummy = 0; - } - - // Set the substrate sponsor of the collection. - // - // @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor. - // - // @param sponsor Substrate address of the sponsor from whose account funds will be debited for operations with the contract. - // - // Selector: setCollectionSponsorSubstrate(uint256) c74d6751 - function setCollectionSponsorSubstrate(uint256 sponsor) public { - require(false, stub_error); - sponsor; - dummy = 0; - } - - // Selector: hasCollectionPendingSponsor() 058ac185 - function hasCollectionPendingSponsor() public view returns (bool) { - require(false, stub_error); - dummy; - return false; - } - - // Collection sponsorship confirmation. - // - // @dev After setting the sponsor for the collection, it must be confirmed with this function. - // - // Selector: confirmCollectionSponsorship() 3c50e97a - function confirmCollectionSponsorship() public { - require(false, stub_error); - dummy = 0; - } - - // Remove collection sponsor. - // - // Selector: removeCollectionSponsor() 6e0326a3 - function removeCollectionSponsor() public { - require(false, stub_error); - dummy = 0; - } - - // Get current sponsor. - // - // @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw. - // - // Selector: getCollectionSponsor() b66bbc14 - function getCollectionSponsor() public view returns (Tuple1 memory) { - require(false, stub_error); - dummy; - return Tuple1(0x0000000000000000000000000000000000000000, 0); - } - - // Set limits for the collection. - // @dev Throws error if limit not found. - // @param limit Name of the limit. Valid names: - // "accountTokenOwnershipLimit", - // "sponsoredDataSize", - // "sponsoredDataRateLimit", - // "tokenLimit", - // "sponsorTransferTimeout", - // "sponsorApproveTimeout" - // @param value Value of the limit. - // - // Selector: setCollectionLimit(string,uint32) 6a3841db - function setCollectionLimit(string memory limit, uint32 value) public { - require(false, stub_error); - limit; - value; - dummy = 0; ->>>>>>> misk: Update stubs } /// @notice Count RFTs tracked by this contract --- a/tests/src/eth/api/ContractHelpers.sol +++ b/tests/src/eth/api/ContractHelpers.sol @@ -12,20 +12,8 @@ function supportsInterface(bytes4 interfaceID) external view returns (bool); } -<<<<<<< HEAD -<<<<<<< HEAD /// @title Magic contract, which allows users to reconfigure other contracts /// @dev the ERC-165 identifier for this interface is 0xd77fab70 -======= -<<<<<<< HEAD -// Selector: 6073d917 -======= -// 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 @@ -41,24 +29,11 @@ view 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. /// @dev EVM selector for this function is: 0xf01fba93, /// 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. - // - // Selector: setSponsor(address,address) f01fba93 ->>>>>>> path: add stubs function setSponsor(address contractAddress, address sponsor) external; /// Set contract as self sponsored. @@ -84,28 +59,17 @@ /// or in textual repr: confirmSponsorship(address) function confirmSponsorship(address contractAddress) external; -<<<<<<< HEAD /// Get current sponsor. /// /// @param contractAddress 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. /// @dev EVM selector for this function is: 0x743fc745, /// or in textual repr: getSponsor(address) -======= - // Get current sponsor. - // - // @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: getSponsor(address) 743fc745 ->>>>>>> path: add stubs function getSponsor(address contractAddress) external view 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. @@ -120,25 +84,6 @@ /// @return **true** if contract has pending sponsor. /// @dev EVM selector for this function is: 0x39b9b242, /// 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. - // @return **true** if contract has confirmed sponsor. - // - // Selector: hasSponsor(address) 97418603 - function hasSponsor(address contractAddress) external view returns (bool); - - // Check tat contract has pending sponsor. - // - // @param contract_address The contract for which the presence of a pending sponsor is checked. - // @return **true** if contract has pending sponsor. - // - // Selector: hasPendingSponsor(address) 39b9b242 ->>>>>>> path: add stubs function hasPendingSponsor(address contractAddress) external view --- a/tests/src/eth/api/UniqueFungible.sol +++ b/tests/src/eth/api/UniqueFungible.sol @@ -3,17 +3,7 @@ pragma solidity >=0.8.0 <0.9.0; -<<<<<<< HEAD /// @dev common stubs holder -======= -// Anonymous struct -struct Tuple0 { - address field_0; - uint256 field_1; -} - -// Common stubs holder ->>>>>>> misk: Update stubs interface Dummy { } @@ -22,72 +12,8 @@ function supportsInterface(bytes4 interfaceID) external view returns (bool); } -<<<<<<< HEAD /// @title A contract that allows you to work with collections. -/// @dev the ERC-165 identifier for this interface is 0xffe4da23 -======= -// Inline -interface ERC20Events { - event Transfer(address indexed from, address indexed to, uint256 value); - event Approval( - address indexed owner, - address indexed spender, - uint256 value - ); -} - -// Selector: 79cc6790 -interface ERC20UniqueExtensions is Dummy, ERC165 { - // Selector: burnFrom(address,uint256) 79cc6790 - function burnFrom(address from, uint256 amount) external returns (bool); -} - -// Selector: 942e8b22 -interface ERC20 is Dummy, ERC165, ERC20Events { - // Selector: name() 06fdde03 - function name() external view returns (string memory); - - // Selector: symbol() 95d89b41 - function symbol() external view returns (string memory); - - // Selector: totalSupply() 18160ddd - function totalSupply() external view returns (uint256); - - // Selector: decimals() 313ce567 - function decimals() external view returns (uint8); - - // Selector: balanceOf(address) 70a08231 - function balanceOf(address owner) external view returns (uint256); - - // Selector: transfer(address,uint256) a9059cbb - function transfer(address to, uint256 amount) external returns (bool); - - // Selector: transferFrom(address,address,uint256) 23b872dd - function transferFrom( - address from, - address to, - uint256 amount - ) external returns (bool); - - // Selector: approve(address,uint256) 095ea7b3 - function approve(address spender, uint256 amount) external returns (bool); - - // Selector: allowance(address,address) dd62ed3e - function allowance(address owner, address spender) - external - view - returns (uint256); -} - -<<<<<<< HEAD -// Selector: ffe4da23 -======= -// Selector: 765e2fae ->>>>>>> misk: Update stubs ->>>>>>> misk: Update stubs -======= -// Selector: e54be640 ->>>>>>> misc: update stubs +/// @dev the ERC-165 identifier for this interface is 0xe54be640 interface Collection is Dummy, ERC165 { /// Set collection property. /// @@ -127,7 +53,19 @@ /// or in textual repr: setCollectionSponsor(address) function setCollectionSponsor(address sponsor) external; -<<<<<<< HEAD + /// Set the substrate sponsor of the collection. + /// + /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor. + /// + /// @param sponsor Substrate address of the sponsor from whose account funds will be debited for operations with the contract. + /// @dev EVM selector for this function is: 0xc74d6751, + /// or in textual repr: setCollectionSponsorSubstrate(uint256) + function setCollectionSponsorSubstrate(uint256 sponsor) external; + + /// @dev EVM selector for this function is: 0x058ac185, + /// or in textual repr: hasCollectionPendingSponsor() + function hasCollectionPendingSponsor() external view returns (bool); + /// Collection sponsorship confirmation. /// /// @dev After setting the sponsor for the collection, it must be confirmed with this function. @@ -135,6 +73,18 @@ /// or in textual repr: confirmCollectionSponsorship() function confirmCollectionSponsorship() external; + /// Remove collection sponsor. + /// @dev EVM selector for this function is: 0x6e0326a3, + /// or in textual repr: removeCollectionSponsor() + function removeCollectionSponsor() external; + + /// Get current sponsor. + /// + /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw. + /// @dev EVM selector for this function is: 0xb66bbc14, + /// or in textual repr: getCollectionSponsor() + function getCollectionSponsor() external view returns (Tuple6 memory); + /// Set limits for the collection. /// @dev Throws error if limit not found. /// @param limit Name of the limit. Valid names: @@ -147,51 +97,6 @@ /// @param value Value of the limit. /// @dev EVM selector for this function is: 0x6a3841db, /// or in textual repr: setCollectionLimit(string,uint32) -======= - // Set the substrate sponsor of the collection. - // - // @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor. - // - // @param sponsor Substrate address of the sponsor from whose account funds will be debited for operations with the contract. - // - // Selector: setCollectionSponsorSubstrate(uint256) c74d6751 - function setCollectionSponsorSubstrate(uint256 sponsor) external; - - // Selector: hasCollectionPendingSponsor() 058ac185 - function hasCollectionPendingSponsor() external view returns (bool); - - // Collection sponsorship confirmation. - // - // @dev After setting the sponsor for the collection, it must be confirmed with this function. - // - // Selector: confirmCollectionSponsorship() 3c50e97a - function confirmCollectionSponsorship() external; - - // Remove collection sponsor. - // - // Selector: removeCollectionSponsor() 6e0326a3 - function removeCollectionSponsor() external; - - // Get current sponsor. - // - // @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw. - // - // Selector: getCollectionSponsor() b66bbc14 - function getCollectionSponsor() external view returns (Tuple0 memory); - - // Set limits for the collection. - // @dev Throws error if limit not found. - // @param limit Name of the limit. Valid names: - // "accountTokenOwnershipLimit", - // "sponsoredDataSize", - // "sponsoredDataRateLimit", - // "tokenLimit", - // "sponsorTransferTimeout", - // "sponsorApproveTimeout" - // @param value Value of the limit. - // - // Selector: setCollectionLimit(string,uint32) 6a3841db ->>>>>>> misk: Update stubs function setCollectionLimit(string memory limit, uint32 value) external; /// Set limits for the collection. @@ -320,6 +225,12 @@ function setOwnerSubstrate(uint256 newOwner) external; } +/// @dev anonymous struct +struct Tuple6 { + address field_0; + uint256 field_1; +} + /// @dev the ERC-165 identifier for this interface is 0x79cc6790 interface ERC20UniqueExtensions is Dummy, ERC165 { /// @dev EVM selector for this function is: 0x79cc6790, --- a/tests/src/eth/api/UniqueNFT.sol +++ b/tests/src/eth/api/UniqueNFT.sol @@ -3,23 +3,7 @@ pragma solidity >=0.8.0 <0.9.0; -<<<<<<< HEAD /// @dev common stubs holder -======= -// Anonymous struct -struct Tuple0 { - uint256 field_0; - string field_1; -} - -// Anonymous struct -struct Tuple1 { - address field_0; - uint256 field_1; -} - -// Common stubs holder ->>>>>>> misk: Update stubs interface Dummy { } @@ -81,7 +65,7 @@ } /// @title A contract that allows you to work with collections. -/// @dev the ERC-165 identifier for this interface is 0xffe4da23 +/// @dev the ERC-165 identifier for this interface is 0xe54be640 interface Collection is Dummy, ERC165 { /// Set collection property. /// @@ -121,6 +105,19 @@ /// or in textual repr: setCollectionSponsor(address) function setCollectionSponsor(address sponsor) external; + /// Set the substrate sponsor of the collection. + /// + /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor. + /// + /// @param sponsor Substrate address of the sponsor from whose account funds will be debited for operations with the contract. + /// @dev EVM selector for this function is: 0xc74d6751, + /// or in textual repr: setCollectionSponsorSubstrate(uint256) + function setCollectionSponsorSubstrate(uint256 sponsor) external; + + /// @dev EVM selector for this function is: 0x058ac185, + /// or in textual repr: hasCollectionPendingSponsor() + function hasCollectionPendingSponsor() external view returns (bool); + /// Collection sponsorship confirmation. /// /// @dev After setting the sponsor for the collection, it must be confirmed with this function. @@ -128,6 +125,18 @@ /// or in textual repr: confirmCollectionSponsorship() function confirmCollectionSponsorship() external; + /// Remove collection sponsor. + /// @dev EVM selector for this function is: 0x6e0326a3, + /// or in textual repr: removeCollectionSponsor() + function removeCollectionSponsor() external; + + /// Get current sponsor. + /// + /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw. + /// @dev EVM selector for this function is: 0xb66bbc14, + /// or in textual repr: getCollectionSponsor() + function getCollectionSponsor() external view returns (Tuple17 memory); + /// Set limits for the collection. /// @dev Throws error if limit not found. /// @param limit Name of the limit. Valid names: @@ -268,6 +277,12 @@ function setOwnerSubstrate(uint256 newOwner) external; } +/// @dev anonymous struct +struct Tuple17 { + address field_0; + uint256 field_1; +} + /// @title ERC721 Token that can be irreversibly burned (destroyed). /// @dev the ERC-165 identifier for this interface is 0x42966c68 interface ERC721Burnable is Dummy, ERC165 { @@ -321,42 +336,8 @@ function finishMinting() external returns (bool); } -<<<<<<< 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 - // @param index A counter less than `totalSupply()` - // @return The token identifier for the `index`th NFT, - // (sort order not specified) - // - // Selector: tokenByIndex(uint256) 4f6ccce7 - function tokenByIndex(uint256 index) external view returns (uint256); - - // @dev Not implemented - // - // Selector: tokenOfOwnerByIndex(address,uint256) 2f745c59 - function tokenOfOwnerByIndex(address owner, uint256 index) - external - view - returns (uint256); - - // @notice Count NFTs tracked by this contract - // @return A count of valid NFTs tracked by this contract, where each one of - // them has an assigned and queryable owner not equal to the zero address - // - // Selector: totalSupply() 18160ddd - function totalSupply() external view returns (uint256); -} - -// Selector: d74d154f ->>>>>>> misk: Update stubs interface ERC721UniqueExtensions is Dummy, ERC165 { /// @notice Transfer ownership of an NFT /// @dev Throws unless `msg.sender` is the current owner. Throws if `to` @@ -405,31 +386,11 @@ returns (bool); } -<<<<<<< HEAD -<<<<<<< HEAD /// @dev anonymous struct struct Tuple8 { uint256 field_0; string field_1; } -======= -// Selector: ffe4da23 -======= -// Selector: 765e2fae ->>>>>>> misk: Update stubs -======= -// Selector: e54be640 ->>>>>>> misc: update stubs -interface Collection is Dummy, ERC165 { - // Set collection property. - // - // @param key Property key. - // @param value Propery value. - // - // Selector: setCollectionProperty(string,bytes) 2f073f66 - function setCollectionProperty(string memory key, bytes memory value) - external; ->>>>>>> misk: Update stubs /// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension /// @dev See https://eips.ethereum.org/EIPS/eip-721 @@ -449,87 +410,7 @@ function tokenOfOwnerByIndex(address owner, uint256 index) external view -<<<<<<< HEAD returns (uint256); -======= - returns (bytes memory); - - // Set the sponsor of the collection. - // - // @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor. - // - // @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract. - // - // Selector: setCollectionSponsor(address) 7623402e - function setCollectionSponsor(address sponsor) external; - - // Set the substrate sponsor of the collection. - // - // @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor. - // - // @param sponsor Substrate address of the sponsor from whose account funds will be debited for operations with the contract. - // - // Selector: setCollectionSponsorSubstrate(uint256) c74d6751 - function setCollectionSponsorSubstrate(uint256 sponsor) external; - - // Selector: hasCollectionPendingSponsor() 058ac185 - function hasCollectionPendingSponsor() external view returns (bool); - - // Collection sponsorship confirmation. - // - // @dev After setting the sponsor for the collection, it must be confirmed with this function. - // - // Selector: confirmCollectionSponsorship() 3c50e97a - function confirmCollectionSponsorship() external; - - // Remove collection sponsor. - // - // Selector: removeCollectionSponsor() 6e0326a3 - function removeCollectionSponsor() external; - - // Get current sponsor. - // - // @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw. - // - // Selector: getCollectionSponsor() b66bbc14 - function getCollectionSponsor() external view returns (Tuple1 memory); - - // Set limits for the collection. - // @dev Throws error if limit not found. - // @param limit Name of the limit. Valid names: - // "accountTokenOwnershipLimit", - // "sponsoredDataSize", - // "sponsoredDataRateLimit", - // "tokenLimit", - // "sponsorTransferTimeout", - // "sponsorApproveTimeout" - // @param value Value of the limit. - // - // Selector: setCollectionLimit(string,uint32) 6a3841db - function setCollectionLimit(string memory limit, uint32 value) external; - - // Set limits for the collection. - // @dev Throws error if limit not found. - // @param limit Name of the limit. Valid names: - // "ownerCanTransfer", - // "ownerCanDestroy", - // "transfersEnabled" - // @param value Value of the limit. - // - // Selector: setCollectionLimit(string,bool) 993b7fba - function setCollectionLimit(string memory limit, bool value) external; - - // Get contract address. - // - // Selector: contractAddress() f6b4dfb4 - function contractAddress() external view returns (address); - - // Add collection admin by substrate address. - // @param new_admin Substrate administrator address. - // - // Selector: addCollectionAdminSubstrate(uint256) 5730062b - function addCollectionAdminSubstrate(uint256 newAdmin) external; ->>>>>>> misk: Update stubs /// @notice Count NFTs tracked by this contract /// @return A count of valid NFTs tracked by this contract, where each one of --- a/tests/src/eth/api/UniqueRefungible.sol +++ b/tests/src/eth/api/UniqueRefungible.sol @@ -3,23 +3,7 @@ pragma solidity >=0.8.0 <0.9.0; -<<<<<<< HEAD /// @dev common stubs holder -======= -// Anonymous struct -struct Tuple0 { - uint256 field_0; - string field_1; -} - -// Anonymous struct -struct Tuple1 { - address field_0; - uint256 field_1; -} - -// Common stubs holder ->>>>>>> misk: Update stubs interface Dummy { } @@ -81,7 +65,7 @@ } /// @title A contract that allows you to work with collections. -/// @dev the ERC-165 identifier for this interface is 0xffe4da23 +/// @dev the ERC-165 identifier for this interface is 0xe54be640 interface Collection is Dummy, ERC165 { /// Set collection property. /// @@ -121,6 +105,19 @@ /// or in textual repr: setCollectionSponsor(address) function setCollectionSponsor(address sponsor) external; + /// Set the substrate sponsor of the collection. + /// + /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor. + /// + /// @param sponsor Substrate address of the sponsor from whose account funds will be debited for operations with the contract. + /// @dev EVM selector for this function is: 0xc74d6751, + /// or in textual repr: setCollectionSponsorSubstrate(uint256) + function setCollectionSponsorSubstrate(uint256 sponsor) external; + + /// @dev EVM selector for this function is: 0x058ac185, + /// or in textual repr: hasCollectionPendingSponsor() + function hasCollectionPendingSponsor() external view returns (bool); + /// Collection sponsorship confirmation. /// /// @dev After setting the sponsor for the collection, it must be confirmed with this function. @@ -128,6 +125,18 @@ /// or in textual repr: confirmCollectionSponsorship() function confirmCollectionSponsorship() external; + /// Remove collection sponsor. + /// @dev EVM selector for this function is: 0x6e0326a3, + /// or in textual repr: removeCollectionSponsor() + function removeCollectionSponsor() external; + + /// Get current sponsor. + /// + /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw. + /// @dev EVM selector for this function is: 0xb66bbc14, + /// or in textual repr: getCollectionSponsor() + function getCollectionSponsor() external view returns (Tuple17 memory); + /// Set limits for the collection. /// @dev Throws error if limit not found. /// @param limit Name of the limit. Valid names: @@ -268,6 +277,12 @@ function setOwnerSubstrate(uint256 newOwner) external; } +/// @dev anonymous struct +struct Tuple17 { + address field_0; + uint256 field_1; +} + /// @title ERC721 Token that can be irreversibly burned (destroyed). /// @dev the ERC-165 identifier for this interface is 0x42966c68 interface ERC721Burnable is Dummy, ERC165 { @@ -321,42 +336,8 @@ function finishMinting() external returns (bool); } -<<<<<<< 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 - // @param index A counter less than `totalSupply()` - // @return The token identifier for the `index`th NFT, - // (sort order not specified) - // - // Selector: tokenByIndex(uint256) 4f6ccce7 - function tokenByIndex(uint256 index) external view returns (uint256); - - // Not implemented - // - // Selector: tokenOfOwnerByIndex(address,uint256) 2f745c59 - function tokenOfOwnerByIndex(address owner, uint256 index) - external - view - returns (uint256); - - // @notice Count RFTs tracked by this contract - // @return A count of valid RFTs tracked by this contract, where each one of - // them has an assigned and queryable owner not equal to the zero address - // - // Selector: totalSupply() 18160ddd - function totalSupply() external view returns (uint256); -} - -// Selector: 7c3bef89 ->>>>>>> misk: Update stubs interface ERC721UniqueExtensions is Dummy, ERC165 { /// @notice Transfer ownership of an RFT /// @dev Throws unless `msg.sender` is the current owner. Throws if `to` @@ -417,31 +398,11 @@ returns (address); } -<<<<<<< HEAD -<<<<<<< HEAD /// @dev anonymous struct struct Tuple8 { uint256 field_0; string field_1; } -======= -// Selector: ffe4da23 -======= -// Selector: 765e2fae ->>>>>>> misk: Update stubs -======= -// Selector: e54be640 ->>>>>>> misc: update stubs -interface Collection is Dummy, ERC165 { - // Set collection property. - // - // @param key Property key. - // @param value Propery value. - // - // Selector: setCollectionProperty(string,bytes) 2f073f66 - function setCollectionProperty(string memory key, bytes memory value) - external; ->>>>>>> misk: Update stubs /// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension /// @dev See https://eips.ethereum.org/EIPS/eip-721 @@ -461,87 +422,7 @@ function tokenOfOwnerByIndex(address owner, uint256 index) external view -<<<<<<< HEAD returns (uint256); -======= - returns (bytes memory); - - // Set the sponsor of the collection. - // - // @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor. - // - // @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract. - // - // Selector: setCollectionSponsor(address) 7623402e - function setCollectionSponsor(address sponsor) external; - - // Set the substrate sponsor of the collection. - // - // @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor. - // - // @param sponsor Substrate address of the sponsor from whose account funds will be debited for operations with the contract. - // - // Selector: setCollectionSponsorSubstrate(uint256) c74d6751 - function setCollectionSponsorSubstrate(uint256 sponsor) external; - - // Selector: hasCollectionPendingSponsor() 058ac185 - function hasCollectionPendingSponsor() external view returns (bool); - - // Collection sponsorship confirmation. - // - // @dev After setting the sponsor for the collection, it must be confirmed with this function. - // - // Selector: confirmCollectionSponsorship() 3c50e97a - function confirmCollectionSponsorship() external; - - // Remove collection sponsor. - // - // Selector: removeCollectionSponsor() 6e0326a3 - function removeCollectionSponsor() external; - - // Get current sponsor. - // - // @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw. - // - // Selector: getCollectionSponsor() b66bbc14 - function getCollectionSponsor() external view returns (Tuple1 memory); - - // Set limits for the collection. - // @dev Throws error if limit not found. - // @param limit Name of the limit. Valid names: - // "accountTokenOwnershipLimit", - // "sponsoredDataSize", - // "sponsoredDataRateLimit", - // "tokenLimit", - // "sponsorTransferTimeout", - // "sponsorApproveTimeout" - // @param value Value of the limit. - // - // Selector: setCollectionLimit(string,uint32) 6a3841db - function setCollectionLimit(string memory limit, uint32 value) external; - - // Set limits for the collection. - // @dev Throws error if limit not found. - // @param limit Name of the limit. Valid names: - // "ownerCanTransfer", - // "ownerCanDestroy", - // "transfersEnabled" - // @param value Value of the limit. - // - // Selector: setCollectionLimit(string,bool) 993b7fba - function setCollectionLimit(string memory limit, bool value) external; - - // Get contract address. - // - // Selector: contractAddress() f6b4dfb4 - function contractAddress() external view returns (address); - - // Add collection admin by substrate address. - // @param new_admin Substrate administrator address. - // - // Selector: addCollectionAdminSubstrate(uint256) 5730062b - function addCollectionAdminSubstrate(uint256 newAdmin) external; ->>>>>>> misk: Update stubs /// @notice Count RFTs tracked by this contract /// @return A count of valid RFTs tracked by this contract, where each one of --- a/tests/src/eth/fungibleAbi.json +++ b/tests/src/eth/fungibleAbi.json @@ -159,7 +159,7 @@ { "internalType": "address", "name": "field_0", "type": "address" }, { "internalType": "uint256", "name": "field_1", "type": "uint256" } ], - "internalType": "struct Tuple0", + "internalType": "struct Tuple6", "name": "", "type": "tuple" } --- a/tests/src/eth/nonFungibleAbi.json +++ b/tests/src/eth/nonFungibleAbi.json @@ -208,7 +208,7 @@ { "internalType": "address", "name": "field_0", "type": "address" }, { "internalType": "uint256", "name": "field_1", "type": "uint256" } ], - "internalType": "struct Tuple1", + "internalType": "struct Tuple17", "name": "", "type": "tuple" } --- a/tests/src/eth/reFungibleAbi.json +++ b/tests/src/eth/reFungibleAbi.json @@ -208,7 +208,7 @@ { "internalType": "address", "name": "field_0", "type": "address" }, { "internalType": "uint256", "name": "field_1", "type": "uint256" } ], - "internalType": "struct Tuple1", + "internalType": "struct Tuple17", "name": "", "type": "tuple" } -- gitstuff