Skip to content

Commit

Permalink
fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
@mejango
mejango committed Jun 6, 2024
1 parent e68db0a commit 909ea2e
Show file tree
Hide file tree
Showing 3 changed files with 84 additions and 184 deletions.
99 changes: 36 additions & 63 deletions src/JBProjectHandles.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ contract JBProjectHandles is IJBProjectHandles, ERC2771Context {

/// @notice The ENS registry contract address.
/// @dev Same on every network
ENS public constant ENS_REGISTRY =
ENS(0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e);
ENS public constant ENS_REGISTRY = ENS(0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e);

//*********************************************************************//
// --------------- public immutable stored properties ---------------- //
Expand All @@ -48,8 +47,8 @@ contract JBProjectHandles is IJBProjectHandles, ERC2771Context {
/// @custom:param chainId The chain ID of the network on which the project ID exists.
/// @custom:param projectId The ID of the project to get an ENS name for.
/// @custom:param projectOwner The address of the project's owner.
mapping(uint256 chainId => mapping(uint256 projectId => mapping(address projectOwner => string[] ensParts)))
private _ensNamePartsOf;
mapping(uint256 chainId => mapping(uint256 projectId => mapping(address projectOwner => string[] ensParts))) private
_ensNamePartsOf;

//*********************************************************************//
// ------------------------- external views -------------------------- //
Expand All @@ -66,11 +65,14 @@ contract JBProjectHandles is IJBProjectHandles, ERC2771Context {
uint256 chainId,
uint256 projectId,
address projectOwner
) external view override returns (string memory) {
)
external
view
override
returns (string memory)
{
// Get a reference to the project's ENS name parts.
string[] memory ensNameParts = _ensNamePartsOf[chainId][projectId][
projectOwner
];
string[] memory ensNameParts = _ensNamePartsOf[chainId][projectId][projectOwner];

// Return an empty string if not found.
if (ensNameParts.length == 0) return "";
Expand All @@ -85,25 +87,22 @@ contract JBProjectHandles is IJBProjectHandles, ERC2771Context {
if (textResolver == address(0)) return "";

// Find the projectId that the text record of the ENS name is mapped to.
string memory textRecord = ITextResolver(textResolver).text(
hashedName,
TEXT_KEY
);
string memory textRecord = ITextResolver(textResolver).text(hashedName, TEXT_KEY);

// Return empty string if text record from ENS name doesn't match projectId or chainId.
if (
keccak256(bytes(textRecord)) !=
keccak256(
bytes(
string.concat(
Strings.toString(chainId),
":",
Strings.toString(projectId),
":",
Strings.toHexString(uint256(uint160(projectOwner)))
keccak256(bytes(textRecord))
!= keccak256(
bytes(
string.concat(
Strings.toString(chainId),
":",
Strings.toString(projectId),
":",
Strings.toHexString(uint256(uint160(projectOwner)))
)
)
)
)
) return "";

// Format the handle from the name parts.
Expand All @@ -119,7 +118,12 @@ contract JBProjectHandles is IJBProjectHandles, ERC2771Context {
uint256 chainId,
uint256 projectId,
address projectOwner
) external view override returns (string[] memory) {
)
external
view
override
returns (string[] memory)
{
return _ensNamePartsOf[chainId][projectId][projectOwner];
}

Expand All @@ -129,10 +133,7 @@ contract JBProjectHandles is IJBProjectHandles, ERC2771Context {

/// @param projects A contract which mints ERC-721's that represent project ownership and transfers.
/// @param trustedForwarder The trusted forwarder for the ERC2771Context.
constructor(
IJBProjects projects,
address trustedForwarder
) ERC2771Context(trustedForwarder) {
constructor(IJBProjects projects, address trustedForwarder) ERC2771Context(trustedForwarder) {
PROJECTS = projects;
}

Expand All @@ -146,11 +147,7 @@ contract JBProjectHandles is IJBProjectHandles, ERC2771Context {
/// @param chainId The chain ID of the network on which the project ID exists.
/// @param projectId The ID of the project to set an ENS handle for.
/// @param parts The parts of the ENS domain to use as the project handle, excluding the trailing .eth.
function setEnsNamePartsFor(
uint256 chainId,
uint256 projectId,
string[] memory parts
) external override {
function setEnsNamePartsFor(uint256 chainId, uint256 projectId, string[] memory parts) external override {
// Get a reference to the number of parts are in the ENS name.
uint256 partsLength = parts.length;

Expand All @@ -165,12 +162,7 @@ contract JBProjectHandles is IJBProjectHandles, ERC2771Context {
// Store the parts.
_ensNamePartsOf[chainId][projectId][_msgSender()] = parts;

emit SetEnsNameParts(
projectId,
_formatHandle(parts),
parts,
_msgSender()
);
emit SetEnsNameParts(projectId, _formatHandle(parts), parts, _msgSender());
}

//*********************************************************************//
Expand All @@ -180,18 +172,14 @@ contract JBProjectHandles is IJBProjectHandles, ERC2771Context {
/// @notice Formats ENS name parts into a handle.
/// @param ensNameParts The ENS name parts to format into a handle.
/// @return handle The formatted ENS handle.
function _formatHandle(
string[] memory ensNameParts
) internal pure returns (string memory handle) {
function _formatHandle(string[] memory ensNameParts) internal pure returns (string memory handle) {
// Get a reference to the number of parts are in the ENS name.
uint256 partsLength = ensNameParts.length;

// Concatenate each name part.
for (uint256 i = 1; i <= partsLength; i++) {
// Compute the handle.
handle = string(
abi.encodePacked(handle, ensNameParts[partsLength - i])
);
handle = string(abi.encodePacked(handle, ensNameParts[partsLength - i]));

// Add a dot if this part isn't the last.
if (i < partsLength) handle = string(abi.encodePacked(handle, "."));
Expand All @@ -202,25 +190,16 @@ contract JBProjectHandles is IJBProjectHandles, ERC2771Context {
/// @dev See https://eips.ethereum.org/EIPS/eip-137.
/// @param ensNameParts The parts of an ENS name to hash.
/// @return namehash The namehash for an ENS name parts.
function _namehash(
string[] memory ensNameParts
) internal pure returns (bytes32 namehash) {
function _namehash(string[] memory ensNameParts) internal pure returns (bytes32 namehash) {
// Hash the trailing "eth" suffix.
namehash = keccak256(
abi.encodePacked(namehash, keccak256(abi.encodePacked("eth")))
);
namehash = keccak256(abi.encodePacked(namehash, keccak256(abi.encodePacked("eth"))));

// Get a reference to the number of parts are in the ENS name.
uint256 nameLength = ensNameParts.length;

// Hash each part.
for (uint256 i; i < nameLength; i++) {
namehash = keccak256(
abi.encodePacked(
namehash,
keccak256(abi.encodePacked(ensNameParts[i]))
)
);
namehash = keccak256(abi.encodePacked(namehash, keccak256(abi.encodePacked(ensNameParts[i]))));
}
}

Expand All @@ -237,13 +216,7 @@ contract JBProjectHandles is IJBProjectHandles, ERC2771Context {
}

/// @dev ERC-2771 specifies the context as being a single address (20 bytes).
function _contextSuffixLength()
internal
view
virtual
override
returns (uint256)
{
function _contextSuffixLength() internal view virtual override returns (uint256) {
return super._contextSuffixLength();
}
}
24 changes: 7 additions & 17 deletions src/interfaces/IJBProjectHandles.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,22 @@ import "@ensdomains/ens-contracts/contracts/resolvers/profiles/ITextResolver.sol
import "@bananapus/core/src/interfaces/IJBProjects.sol";

interface IJBProjectHandles {
event SetEnsNameParts(
uint256 indexed projectId,
string indexed handle,
string[] parts,
address caller
);
event SetEnsNameParts(uint256 indexed projectId, string indexed handle, string[] parts, address caller);

function setEnsNamePartsFor(
uint256 chainId,
uint256 projectId,
string[] memory parts
) external;
function setEnsNamePartsFor(uint256 chainId, uint256 projectId, string[] memory parts) external;

function ensNamePartsOf(
uint256 chainId,
uint256 projectId,
address projectOwner
) external view returns (string[] memory);
)
external
view
returns (string[] memory);

function TEXT_KEY() external view returns (string memory);

function PROJECTS() external view returns (IJBProjects);

function handleOf(
uint256 chainId,
uint256 projectId,
address projectOwner
) external view returns (string memory);
function handleOf(uint256 chainId, uint256 projectId, address projectOwner) external view returns (string memory);
}
Loading

0 comments on commit 909ea2e

Please sign in to comment.