Skip to content
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

FuseController #318

Open
wants to merge 15 commits into
base: l2-registry
Choose a base branch
from
Open

FuseController #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1f29495
add token approvals and add ROOT_NODE
nxt3d Jan 20, 2024
f1a6742
add Record struct with "name" value
nxt3d Jan 25, 2024
5b55181
add metadata service and make ownable
nxt3d Jan 25, 2024
1a76c96
add ownerOf function, add expiry, fuses, renewalController, upgrade f…
nxt3d Jan 28, 2024
90ba244
change SimpleController to FuseController
nxt3d Jan 28, 2024
570323c
Add upgrade test
nxt3d Jan 28, 2024
e139421
add safe transfer acceptance checking
nxt3d Jan 29, 2024
83d43da
change fuses from uint96 to uint64
nxt3d Feb 14, 2024
650072a
make sure node is not expired
nxt3d Feb 14, 2024
30b473b
add expiration checks
nxt3d Feb 15, 2024
245d731
add fuse checks
nxt3d Feb 21, 2024
eaa6a02
add burn functions
nxt3d Feb 21, 2024
aa23c1f
allow for renewal controllers to renew a name
nxt3d Feb 23, 2024
cdef50e
make renewal controllers override owners
nxt3d Feb 23, 2024
b27533e
add PARENT_CANNOT_SET_EXPIRY fuse
nxt3d Feb 23, 2024
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
684 changes: 684 additions & 0 deletions contracts/l2/FuseController.sol
View file
Open in desktop

Large diffs are not rendered by default.

18 changes: 16 additions & 2 deletions contracts/l2/IController.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
pragma solidity ^0.8.17;

interface IController {
function ownerOf(bytes calldata tokenData) external view returns (address);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the purpose of this change? Requiring controllers to implement both methods complicates them, and many will have to implement ownerOf simply by calling the registry back to fetch their data from it anywy.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It saves an external call.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In what circumstances?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

function ownerOf(bytes32 node) external view returns (address) {
        //get the tokenData
        bytes memory tokenData = registry.getData(uint256(node));
        (address owner, , , , ) = _unpack(tokenData);
        return owner;
    }

function ownerOfWithData(
bytes calldata tokenData
) external view returns (address);

function ownerOf(bytes32 node) external view returns (address);

function safeTransferFrom(
bytes calldata tokenData,
Expand All @@ -13,9 +17,19 @@ interface IController {
uint256 id,
uint256 value,
bytes calldata data,
bool operatorApproved
bool isApproved
) external returns (bytes memory);

function burn(
bytes calldata tokenData,
address operator,
address from,
uint256 id,
uint256 value,
bytes calldata data,
bool operatorApproved
) external view returns (bytes memory);

function balanceOf(
bytes calldata tokenData,
address owner,
Expand Down
9 changes: 9 additions & 0 deletions contracts/l2/IControllerUpgradeTarget.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// SPDX-License-Identifier: MIT

pragma solidity ^0.8.17;

import "./IController.sol";

interface IControllerUpgradeTarget is IController {
function upgradeFrom(bytes32 node, bytes calldata extraData) external;
}
29 changes: 29 additions & 0 deletions contracts/l2/IFuseController.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.17;

import "./IController.sol";
import "./IControllerUpgradeTarget.sol";

uint64 constant CAN_DO_EVERYTHING = 0;
uint64 constant CANNOT_BURN_NAME = 1;
uint64 constant CANNOT_BURN_FUSES = 2;
uint64 constant CANNOT_TRANSFER = 4;
uint64 constant CANNOT_SET_RESOLVER = 8;
uint64 constant CANNOT_CREATE_SUBDOMAIN = 16;
uint64 constant CANNOT_SET_RENEWAL_CONTROLLER = 32;
uint64 constant PARENT_CANNOT_SET_EXPIRY = 64;
uint64 constant PARENT_CANNOT_CONTROL = 128;

interface IFuseController is IController {
function expiryOf(bytes32 node) external view returns (uint64);

function fusesOf(bytes32 node) external view returns (uint64);

function renewalControllerOf(bytes32 node) external view returns (address);

function upgrade(bytes32 node, bytes calldata extraData) external;

function setUpgradeController(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't this an upgrade target, rather than any kind of controller?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

setUpgradeControllerTarget? It's a controller to upgrade to.

IControllerUpgradeTarget _upgradeController
) external;
}
Loading
Loading