-
Notifications
You must be signed in to change notification settings - Fork 496
Delegatable resolver #288
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.
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
makoto
wants to merge
21
commits into
staging
Choose a base branch
from
delegatable-resolver-wo-factory
base: staging
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Delegatable resolver #288
Changes from 16 commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
bdb5bde
Add DelegatableResolver.sol
makoto 440e77b
Merge branch 'staging' into delegatable-resolver
makoto 701bf66
WIP
makoto bbd083a
Add tests for DelegatableResolver
makoto 16d5a79
Add encodedname into the event
makoto 2aee50b
Add comment
makoto 429fa38
Add custom error
makoto afae77e
Add IDelegatableResolver
makoto 5eb3d37
Remove script/deploy.ts
makoto 6cc269f
Remove empty file
makoto 59b0cc7
Remove Ownable
makoto 0abb7cd
Revert indentation
makoto 2fadc67
Fix test
makoto 42acb3f
Remove test
makoto 7ecbe22
Revert to use OZ Ownable
makoto ed57aa8
Add a test to check the owner
makoto 093fbd2
Add comments and more test
makoto d07e6d9
Rename getAuthorizedNode to getAuthorisedNode
makoto 9ae2281
Delegatable resolver with factory (#289)
makoto e97d21f
Use addressOfClone2 instead of predictAddress
Chomtana 52ef40c
Merge pull request #344 from Opti-domains/delegatable-resolver-wo-fac…
Arachnid File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| pragma solidity >=0.8.4; | ||
| import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol"; | ||
| import "./profiles/ABIResolver.sol"; | ||
| import "./profiles/AddrResolver.sol"; | ||
| import "./profiles/ContentHashResolver.sol"; | ||
| import "./profiles/DNSResolver.sol"; | ||
| import "./profiles/InterfaceResolver.sol"; | ||
| import "./profiles/NameResolver.sol"; | ||
| import "./profiles/PubkeyResolver.sol"; | ||
| import "./profiles/TextResolver.sol"; | ||
| import "./profiles/ExtendedResolver.sol"; | ||
| import "./Multicallable.sol"; | ||
| import "./IDelegatableResolver.sol"; | ||
|
|
||
| /** | ||
| * A delegated resolver that allows the resolver owner to add an operator to update records of a node on behalf of the owner. | ||
| * address. | ||
| */ | ||
| contract DelegatableResolver is | ||
| Ownable, | ||
| Multicallable, | ||
| ABIResolver, | ||
| AddrResolver, | ||
| ContentHashResolver, | ||
| DNSResolver, | ||
| InterfaceResolver, | ||
| NameResolver, | ||
| PubkeyResolver, | ||
| TextResolver, | ||
| ExtendedResolver | ||
| { | ||
| using BytesUtils for bytes; | ||
|
|
||
| // Logged when an operator is added or removed. | ||
| event Approval( | ||
| bytes32 indexed node, | ||
| address indexed operator, | ||
| bytes name, | ||
| bool approved | ||
| ); | ||
|
|
||
| error NotAuthorized(bytes32 node); | ||
|
|
||
| constructor(address owner) { | ||
| operators[bytes32(0)][owner] = true; | ||
| transferOwnership(owner); | ||
| } | ||
|
|
||
| //node => (delegate => isAuthorised) | ||
| mapping(bytes32 => mapping(address => bool)) operators; | ||
|
|
||
| /** | ||
| * @dev Check to see if the operator has been approved by the owner for the node. | ||
makoto marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| */ | ||
| function getAuthorizedNode( | ||
makoto marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| bytes memory name, | ||
| uint256 offset, | ||
| address operator | ||
| ) public view returns (bytes32 node, bool authorized) { | ||
| uint256 len = name.readUint8(offset); | ||
| node = bytes32(0); | ||
| if (len > 0) { | ||
makoto marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| bytes32 label = name.keccak(offset + 1, len); | ||
| (node, authorized) = getAuthorizedNode( | ||
| name, | ||
| offset + len + 1, | ||
| operator | ||
| ); | ||
| node = keccak256(abi.encodePacked(node, label)); | ||
| } | ||
| return (node, authorized || operators[node][operator]); | ||
| } | ||
|
|
||
| /** | ||
| * @dev Approve an operator to be able to updated records on a node. | ||
| */ | ||
| function approve( | ||
| bytes memory name, | ||
| address operator, | ||
| bool approved | ||
| ) external { | ||
| (bytes32 node, bool authorized) = getAuthorizedNode( | ||
| name, | ||
| 0, | ||
| msg.sender | ||
| ); | ||
| if (!authorized) { | ||
| revert NotAuthorized(node); | ||
| } | ||
| operators[node][operator] = approved; | ||
| emit Approval(node, operator, name, approved); | ||
| } | ||
|
|
||
| function isAuthorised(bytes32 node) internal view override returns (bool) { | ||
| return msg.sender == owner() || operators[node][msg.sender]; | ||
| } | ||
|
|
||
| function supportsInterface( | ||
| bytes4 interfaceID | ||
| ) | ||
| public | ||
| view | ||
| virtual | ||
| override( | ||
| Multicallable, | ||
| ABIResolver, | ||
| AddrResolver, | ||
| ContentHashResolver, | ||
| DNSResolver, | ||
| InterfaceResolver, | ||
| NameResolver, | ||
| PubkeyResolver, | ||
| TextResolver | ||
| ) | ||
| returns (bool) | ||
| { | ||
| return | ||
| interfaceID == type(IDelegatableResolver).interfaceId || | ||
| super.supportsInterface(interfaceID); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| // SPDX-License-Identifier: MIT | ||
| pragma solidity >=0.8.4; | ||
|
|
||
| interface IDelegatableResolver { | ||
| function approve( | ||
| bytes memory name, | ||
| address operator, | ||
| bool approved | ||
| ) external; | ||
|
|
||
| function getAuthorizedNode( | ||
| bytes memory name, | ||
| uint256 offset, | ||
| address operator | ||
| ) external returns (bytes32 node, bool authorized); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,136 @@ | ||
| const DelegatableResolver = artifacts.require('DelegatableResolver.sol') | ||
| const { encodeName, namehash } = require('../test-utils/ens') | ||
| const { exceptions } = require('../test-utils') | ||
| const { expect } = require('chai') | ||
|
|
||
| contract('DelegatableResolver', function (accounts) { | ||
| let node | ||
| let encodedname | ||
| let resolver | ||
| let signers | ||
| let deployer | ||
| let owner | ||
| let operator | ||
| let operator2 | ||
|
|
||
| beforeEach(async () => { | ||
| signers = await ethers.getSigners() | ||
| deployer = await signers[0].getAddress() | ||
| owner = await signers[1].getAddress() | ||
| operator = await signers[2].getAddress() | ||
| operator2 = await signers[3].getAddress() | ||
| node = namehash('eth') | ||
| encodedname = encodeName('eth') | ||
| resolver = await DelegatableResolver.new(owner) | ||
| }) | ||
|
|
||
| describe('supportsInterface function', async () => { | ||
| it('supports known interfaces', async () => { | ||
| assert.equal(await resolver.supportsInterface('0x3b3b57de'), true) // IAddrResolver | ||
| assert.equal(await resolver.supportsInterface('0xf1cb7e06'), true) // IAddressResolver | ||
| assert.equal(await resolver.supportsInterface('0x691f3431'), true) // INameResolver | ||
| assert.equal(await resolver.supportsInterface('0x2203ab56'), true) // IABIResolver | ||
| assert.equal(await resolver.supportsInterface('0xc8690233'), true) // IPubkeyResolver | ||
| assert.equal(await resolver.supportsInterface('0x59d1d43c'), true) // ITextResolver | ||
| assert.equal(await resolver.supportsInterface('0xbc1c58d1'), true) // IContentHashResolver | ||
| assert.equal(await resolver.supportsInterface('0xa8fa5682'), true) // IDNSRecordResolver | ||
| assert.equal(await resolver.supportsInterface('0x5c98042b'), true) // IDNSZoneResolver | ||
| assert.equal(await resolver.supportsInterface('0x01ffc9a7'), true) // IInterfaceResolver | ||
| assert.equal(await resolver.supportsInterface('0x4fbf0433'), true) // IMulticallable | ||
| assert.equal(await resolver.supportsInterface('0xdd48591c'), true) // IDelegatable | ||
| }) | ||
|
|
||
| it('does not support a random interface', async () => { | ||
| assert.equal(await resolver.supportsInterface('0x3b3b57df'), false) | ||
| }) | ||
| }) | ||
|
|
||
| describe('addr', async () => { | ||
| it('permits setting address by owner', async () => { | ||
| await resolver.methods['setAddr(bytes32,address)'](node, operator, { | ||
| from: owner, | ||
| }) | ||
| assert.equal(await resolver.methods['addr(bytes32)'](node), operator) | ||
| }) | ||
|
|
||
| it('forbids setting new address by non-owners', async () => { | ||
| await exceptions.expectFailure( | ||
| resolver.methods['setAddr(bytes32,address)'](node, operator, { | ||
| from: operator, | ||
| }), | ||
| ) | ||
| }) | ||
| }) | ||
|
|
||
| describe('authorisations', async () => { | ||
makoto marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| it('owner is the owner', async () => { | ||
| assert.equal(await resolver.owner(), owner) | ||
| }) | ||
|
|
||
| it('approves multiple users', async () => { | ||
| await resolver.approve(encodedname, operator, true, { from: owner }) | ||
| await resolver.approve(encodedname, operator2, true, { from: owner }) | ||
| const result = await resolver.getAuthorizedNode(encodedname, 0, operator) | ||
| assert.equal(result.node, node) | ||
| assert.equal(result.authorized, true) | ||
| assert.equal( | ||
| (await resolver.getAuthorizedNode(encodedname, 0, operator2)) | ||
| .authorized, | ||
| true, | ||
| ) | ||
| }) | ||
|
|
||
| it('approves subnames', async () => { | ||
| const subname = 'a.b.c.eth' | ||
| await resolver.approve(encodeName(subname), operator, true, { | ||
| from: owner, | ||
| }) | ||
| await resolver.methods['setAddr(bytes32,address)']( | ||
| namehash(subname), | ||
| operator, | ||
| { | ||
| from: operator, | ||
| }, | ||
| ) | ||
| }) | ||
|
|
||
| it('approves users to make changes', async () => { | ||
| await resolver.approve(encodedname, operator, true, { from: owner }) | ||
| await resolver.methods['setAddr(bytes32,address)'](node, operator, { | ||
| from: operator, | ||
| }) | ||
| assert.equal(await resolver.addr(node), operator) | ||
| }) | ||
|
|
||
| it('approves to be revoked', async () => { | ||
| await resolver.approve(encodedname, operator, true, { from: owner }) | ||
| resolver.methods['setAddr(bytes32,address)'](node, operator2, { | ||
| from: operator, | ||
| }), | ||
| await resolver.approve(encodedname, operator, false, { from: owner }) | ||
| await exceptions.expectFailure( | ||
| resolver.methods['setAddr(bytes32,address)'](node, operator2, { | ||
| from: operator, | ||
| }), | ||
| ) | ||
| }) | ||
|
|
||
| it('does not allow non owner to approve', async () => { | ||
| await expect( | ||
| resolver.approve(encodedname, operator, true, { from: operator }), | ||
| ).to.be.revertedWith('NotAuthorized') | ||
| }) | ||
|
|
||
| it('emits an Approval log', async () => { | ||
| var tx = await resolver.approve(encodedname, operator, true, { | ||
| from: owner, | ||
| }) | ||
| assert.equal(tx.logs.length, 1) | ||
| assert.equal(tx.logs[0].event, 'Approval') | ||
| assert.equal(tx.logs[0].args.node, node) | ||
| assert.equal(tx.logs[0].args.operator, operator) | ||
| assert.equal(tx.logs[0].args.name, encodedname) | ||
| assert.equal(tx.logs[0].args.approved, true) | ||
| }) | ||
| }) | ||
| }) | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.