--- a/pallets/fungible/src/erc.rs +++ b/pallets/fungible/src/erc.rs @@ -135,11 +135,6 @@ Ok(>::get((self.id, owner, spender)).into()) } - - /// @notice Returns collection helper contract address - fn collection_helper_address(&self) -> Result
{ - Ok(T::ContractAddress::get()) - } } #[solidity_interface(name = ERC20Mintable)] @@ -312,6 +307,11 @@ .map_err(dispatch_to_evm::)?; Ok(true) } + + /// @notice Returns collection helper contract address + fn collection_helper_address(&self) -> Result
{ + Ok(T::ContractAddress::get()) + } } #[solidity_interface( --- a/pallets/fungible/src/stubs/UniqueFungible.sol +++ b/pallets/fungible/src/stubs/UniqueFungible.sol @@ -511,7 +511,7 @@ bytes value; } -/// @dev the ERC-165 identifier for this interface is 0x7dee5997 +/// @dev the ERC-165 identifier for this interface is 0x65789571 contract ERC20UniqueExtensions is Dummy, ERC165 { /// @notice A description for the collection. /// @dev EVM selector for this function is: 0x7284e416, @@ -607,6 +607,15 @@ dummy = 0; return false; } + + /// @notice Returns collection helper contract address + /// @dev EVM selector for this function is: 0x1896cce6, + /// or in textual repr: collectionHelperAddress() + function collectionHelperAddress() public view returns (address) { + require(false, stub_error); + dummy; + return 0x0000000000000000000000000000000000000000; + } } /// @dev anonymous struct @@ -637,7 +646,7 @@ event Approval(address indexed owner, address indexed spender, uint256 value); } -/// @dev the ERC-165 identifier for this interface is 0x8cb847c4 +/// @dev the ERC-165 identifier for this interface is 0x942e8b22 contract ERC20 is Dummy, ERC165, ERC20Events { /// @dev EVM selector for this function is: 0x06fdde03, /// or in textual repr: name() @@ -723,15 +732,6 @@ spender; dummy; return 0; - } - - /// @notice Returns collection helper contract address - /// @dev EVM selector for this function is: 0x1896cce6, - /// or in textual repr: collectionHelperAddress() - function collectionHelperAddress() public view returns (address) { - require(false, stub_error); - dummy; - return 0x0000000000000000000000000000000000000000; } } --- a/tests/src/eth/api/UniqueFungible.sol +++ b/tests/src/eth/api/UniqueFungible.sol @@ -353,7 +353,7 @@ bytes value; } -/// @dev the ERC-165 identifier for this interface is 0x7dee5997 +/// @dev the ERC-165 identifier for this interface is 0x65789571 interface ERC20UniqueExtensions is Dummy, ERC165 { /// @notice A description for the collection. /// @dev EVM selector for this function is: 0x7284e416, @@ -403,6 +403,11 @@ CrossAddress memory to, uint256 amount ) external returns (bool); + + /// @notice Returns collection helper contract address + /// @dev EVM selector for this function is: 0x1896cce6, + /// or in textual repr: collectionHelperAddress() + function collectionHelperAddress() external view returns (address); } /// @dev anonymous struct @@ -427,7 +432,7 @@ event Approval(address indexed owner, address indexed spender, uint256 value); } -/// @dev the ERC-165 identifier for this interface is 0x8cb847c4 +/// @dev the ERC-165 identifier for this interface is 0x942e8b22 interface ERC20 is Dummy, ERC165, ERC20Events { /// @dev EVM selector for this function is: 0x06fdde03, /// or in textual repr: name() @@ -468,11 +473,6 @@ /// @dev EVM selector for this function is: 0xdd62ed3e, /// or in textual repr: allowance(address,address) function allowance(address owner, address spender) external view returns (uint256); - - /// @notice Returns collection helper contract address - /// @dev EVM selector for this function is: 0x1896cce6, - /// or in textual repr: collectionHelperAddress() - function collectionHelperAddress() external view returns (address); } interface UniqueFungible is Dummy, ERC165, ERC20, ERC20Mintable, ERC20UniqueExtensions, Collection {}