Skip to content

Add IERC7996 support to AbstractReverseResolver #508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
adraffy wants to merge 1 commit into
base: staging
Choose a base branch
from
Open

Add IERC7996 support to AbstractReverseResolver #508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions contracts/reverseResolver/AbstractReverseResolver.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,27 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.17;

import {ERC165} from "@openzeppelin/contracts-v5/utils/introspection/ERC165.sol";
import {
ERC165
} from "@openzeppelin/contracts-v5/utils/introspection/ERC165.sol";
import {IExtendedResolver} from "../resolvers/profiles/IExtendedResolver.sol";
import {IAddressResolver} from "../resolvers/profiles/IAddressResolver.sol";
import {IAddrResolver} from "../resolvers/profiles/IAddrResolver.sol";
import {INameResolver} from "../resolvers/profiles/INameResolver.sol";
import {INameReverser} from "./INameReverser.sol";
import {IERC7996} from "../utils/IERC7996.sol";
import {ENSIP19, COIN_TYPE_DEFAULT, COIN_TYPE_ETH} from "../utils/ENSIP19.sol";

abstract contract AbstractReverseResolver is
IExtendedResolver,
INameReverser,
IERC7996,
ERC165
{
/// @inheritdoc INameReverser
uint256 public immutable coinType;

/// @inheritdoc INameReverser
/// @inheritdoc INameReverser
address public immutable chainRegistrar;

/// @notice `resolve()` was called with a profile other than `name()` or `addr(*)`.
Expand All @@ -40,9 +44,15 @@ abstract contract AbstractReverseResolver is
return
interfaceId == type(IExtendedResolver).interfaceId ||
interfaceId == type(INameReverser).interfaceId ||
interfaceId == type(IERC7996).interfaceId ||
super.supportsInterface(interfaceId);
}

/// @inheritdoc IERC7996
function supportsFeature(bytes4) external pure returns (bool) {
return false;
}

/// @inheritdoc INameReverser
function chainId() external view returns (uint32) {
return ENSIP19.chainFromCoinType(coinType);
Expand Down Expand Up @@ -86,14 +96,18 @@ abstract contract AbstractReverseResolver is
(bool valid, ) = ENSIP19.parseNamespace(name, 0);
if (!valid) revert UnreachableName(name);
return
abi.encode(coinType == COIN_TYPE_ETH ? chainRegistrar : address(0));
abi.encode(
coinType == COIN_TYPE_ETH ? chainRegistrar : address(0)
);
} else if (selector == IAddressResolver.addr.selector) {
(bool valid, ) = ENSIP19.parseNamespace(name, 0);
if (!valid) revert UnreachableName(name);
(, uint256 ct) = abi.decode(data[4:], (bytes32, uint256));
return
abi.encode(
coinType == ct ? abi.encodePacked(chainRegistrar) : new bytes(0)
coinType == ct
? abi.encodePacked(chainRegistrar)
: new bytes(0)
);
} else {
revert UnsupportedResolverProfile(selector);
Expand Down
1 change: 1 addition & 0 deletions test/reverseResolver/TestChainReverseResolver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ describe('ChainReverseResolver', () => {
'IERC165',
'IExtendedResolver',
'INameReverser',
'IERC7996',
'IVerifiableResolver',
],
})
Expand Down
2 changes: 1 addition & 1 deletion test/reverseResolver/TestDefaultReverseResolver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ async function fixture() {
describe('DefaultReverseResolver', () => {
shouldSupportInterfaces({
contract: () => loadFixture().then((F) => F.defaultReverseResolver),
interfaces: ['IERC165', 'IExtendedResolver', 'INameReverser'],
interfaces: ['IERC165', 'IExtendedResolver', 'INameReverser', 'IERC7996'],
})

it('coinType()', async () => {
Expand Down
2 changes: 1 addition & 1 deletion test/reverseResolver/TestETHReverseResolver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ Object.entries(sources).forEach(([source, setters], i) => {
describe('ETHReverseResolver', () => {
shouldSupportInterfaces({
contract: () => loadFixture().then((F) => F.reverseResolver),
interfaces: ['IERC165', 'IExtendedResolver', 'INameReverser'],
interfaces: ['IERC165', 'IExtendedResolver', 'INameReverser', 'IERC7996'],
})

it('coinType()', async () => {
Expand Down