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

Add overloaded external overrideAllowed method #46

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add overloaded external overrideAllowed method #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ff0f4c
add second override-allowed
jameswenzel May 26, 2023
25fe7f3
add test
jameswenzel May 26, 2023
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
7 changes: 7 additions & 0 deletions contracts/IRoyaltyRegistry.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,11 @@ interface IRoyaltyRegistry is IERC165 {
* @param tokenAddress - The token address you are looking up the royalty for
*/
function overrideAllowed(address tokenAddress) external view returns (bool);

/**
* Whether or not an arbitrary caller can override the royalty address for the given token address
*
* @param tokenAddress - The token address you are looking up the royalty for
*/
function overrideAllowed(address tokenAddress, address caller) external view returns (bool);
}
38 changes: 24 additions & 14 deletions contracts/RoyaltyRegistry.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pragma solidity ^0.8.0;

/// @author: manifold.xyz

import "@openzeppelin/contracts/utils/introspection/ERC165.sol";
import "@openzeppelin/contracts/utils/introspection/ERC165.sol";
import "@openzeppelin/contracts/utils/introspection/ERC165Checker.sol";
import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
import "@openzeppelin/contracts-upgradeable/access/IAccessControlUpgradeable.sol";
Expand Down Expand Up @@ -49,7 +49,7 @@ contract RoyaltyRegistry is ERC165, OwnableUpgradeable, IRoyaltyRegistry {
/**
* @dev See {IERC165-supportsInterface}.
*/
function supportsInterface(bytes4 interfaceId) public view virtual override (ERC165, IERC165) returns (bool) {
function supportsInterface(bytes4 interfaceId) public view virtual override(ERC165, IERC165) returns (bool) {
return interfaceId == type(IRoyaltyRegistry).interfaceId || super.supportsInterface(interfaceId);
}

Expand Down Expand Up @@ -77,8 +77,7 @@ contract RoyaltyRegistry is ERC165, OwnableUpgradeable, IRoyaltyRegistry {
"Invalid input"
);
require(overrideAllowed(tokenAddress), "Permission denied");
// look up existing override, if any
address existingOverride = _overrides[tokenAddress];

// set new override and reverse-lookup
_overrides[tokenAddress] = royaltyLookupAddress;

Expand All @@ -90,32 +89,43 @@ contract RoyaltyRegistry is ERC165, OwnableUpgradeable, IRoyaltyRegistry {
* @dev See {IRegistry-overrideAllowed}.
*/
function overrideAllowed(address tokenAddress) public view override returns (bool) {
if (owner() == _msgSender()) return true;
return _overrideAllowed(tokenAddress, _msgSender());
}

/**
* @dev See {IRegistry-overrideAllowed}.
*/
function overrideAllowed(address tokenAddress, address caller) external view override returns (bool) {
return _overrideAllowed(tokenAddress, caller);
}

function _overrideAllowed(address tokenAddress, address caller) internal view returns (bool) {
if (owner() == caller) return true;

if (
ERC165Checker.supportsInterface(tokenAddress, type(IAdminControl).interfaceId)
&& IAdminControl(tokenAddress).isAdmin(_msgSender())
&& IAdminControl(tokenAddress).isAdmin(caller)
) {
return true;
}

try OwnableUpgradeable(tokenAddress).owner() returns (address owner) {
if (owner == _msgSender()) return true;
if (owner == caller) return true;

if (owner.isContract()) {
try OwnableUpgradeable(owner).owner() returns (address passThroughOwner) {
if (passThroughOwner == _msgSender()) return true;
if (passThroughOwner == caller) return true;
} catch { }
}
} catch { }

try IAccessControlUpgradeable(tokenAddress).hasRole(0x00, _msgSender()) returns (bool hasRole) {
try IAccessControlUpgradeable(tokenAddress).hasRole(0x00, caller) returns (bool hasRole) {
if (hasRole) return true;
} catch { }

// Nifty Gateway overrides
try INiftyBuilderInstance(tokenAddress).niftyRegistryContract() returns (address niftyRegistry) {
try INiftyRegistry(niftyRegistry).isValidNiftySender(_msgSender()) returns (bool valid) {
try INiftyRegistry(niftyRegistry).isValidNiftySender(caller) returns (bool valid) {
return valid;
} catch { }
} catch { }
Expand All @@ -125,21 +135,21 @@ contract RoyaltyRegistry is ERC165, OwnableUpgradeable, IRoyaltyRegistry {

// Foundation overrides
try IFoundationTreasuryNode(tokenAddress).getFoundationTreasury() returns (address payable foundationTreasury) {
try IFoundationTreasury(foundationTreasury).isAdmin(_msgSender()) returns (bool isAdmin) {
try IFoundationTreasury(foundationTreasury).isAdmin(caller) returns (bool isAdmin) {
return isAdmin;
} catch { }
} catch { }

// DIGITALAX overrides
try IDigitalax(tokenAddress).accessControls() returns (address externalAccessControls) {
try IDigitalaxAccessControls(externalAccessControls).hasAdminRole(_msgSender()) returns (bool hasRole) {
try IDigitalaxAccessControls(externalAccessControls).hasAdminRole(caller) returns (bool hasRole) {
if (hasRole) return true;
} catch { }
} catch { }

// Art Blocks overrides
try IArtBlocks(tokenAddress).admin() returns (address admin) {
if (admin == _msgSender()) return true;
if (admin == caller) return true;
} catch { }

// Superrare overrides
Expand All @@ -151,7 +161,7 @@ contract RoyaltyRegistry is ERC165, OwnableUpgradeable, IRoyaltyRegistry {
return false;
}

function _msgSender() internal view virtual override (ContextUpgradeable) returns (address) {
function _msgSender() internal view virtual override(ContextUpgradeable) returns (address) {
if (msg.sender == OVERRIDE_FACTORY) {
address relayedSender;
///@solidity memory-safe-assembly
Expand Down
9 changes: 9 additions & 0 deletions test/Registry.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,15 @@ contract RegistryTest is BaseOverrideTest {
_testOverrideAllowed(makeAddr("owner"), tokenAddress);
}

function testOverrideAllowed_Overloaded() public {
address tokenAddress = address(ownable);
ownable.transferOwnership(makeAddr("owner"));
vm.prank(registry.owner());
assertTrue(registry.overrideAllowed(tokenAddress, registry.owner()));
assertTrue(registry.overrideAllowed(tokenAddress, makeAddr("owner")));
assertFalse(registry.overrideAllowed(tokenAddress, makeAddr("not authed")));
}

function _testOverrideAllowed(address authedCaller, address tokenAddress) internal {
vm.prank(registry.owner());
assertTrue(registry.overrideAllowed(tokenAddress));
Expand Down