Expose configureRoyalties to proxies

0xGh · Dec 29, 2023 · eb97354 · eb97354
1 parent 32bf0e0
commit eb97354
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 6 deletions.
diff --git a/contracts/ERC721BaselineImplementation.sol b/contracts/ERC721BaselineImplementation.sol
@@ -271,12 +271,7 @@ contract ERC721BaselineImplementation is ERC721Upgradeable, IERC721Baseline {
     return (address(0), 0);
   }
 
-  /**
-   * @inheritdoc IERC721Baseline
-   */
-  function configureRoyalties(address payable receiver, uint16 bps) external {
-    this.requireAdmin(_msgSender());
-
+  function _configureRoyalties(address payable receiver, uint16 bps) internal {
     ERC721BaselineStorage storage $ = _getStorage();
 
     if (receiver != $._royaltiesReceiver) {
@@ -288,6 +283,21 @@ contract ERC721BaselineImplementation is ERC721Upgradeable, IERC721Baseline {
     }
   }
 
+  /**
+   * @inheritdoc IERC721Baseline
+   */
+  function configureRoyalties(address payable receiver, uint16 bps) external {
+    this.requireAdmin(_msgSender());
+    _configureRoyalties(receiver, bps);
+  }
+
+  /**
+   * @inheritdoc IERC721Baseline
+   */
+  function __configureRoyalties(address payable receiver, uint16 bps) external onlyProxy {
+    _configureRoyalties(receiver, bps);
+  }
+
   /************************************************
    * Internal ERC721 methods exposed to the proxy
    ************************************************/

diff --git a/contracts/IERC721Baseline.sol b/contracts/IERC721Baseline.sol
@@ -175,6 +175,16 @@ interface IERC721Baseline is IERC721, IERC2981 {
    */
   function configureRoyalties(address payable receiver, uint16 bps) external;
 
+  /**
+   * @notice Configures royalties receiver and bps for all the tokens.
+   * @dev Bps stants for basis points where 100 bps = 1%.
+   * This method is internal and only the proxy contract can call it.
+   *
+   * @param receiver address for the royalties receiver
+   * @param bps (basis points) royalties rate
+   */
+  function __configureRoyalties(address payable receiver, uint16 bps) external;
+
 
   /************************************************
    * Internal ERC721 methods exposed to the proxy

diff --git a/contracts/mocks/ERC721ProxyMock.sol b/contracts/mocks/ERC721ProxyMock.sol
@@ -35,6 +35,10 @@ contract ERC721ProxyMock is ERC721Baseline {
     baseline().__setBaseURI(baseURI);
   }
 
+  function onlyProxy_configureRoyalties(address payable receiver, uint16 bps) external {
+    baseline().__configureRoyalties(receiver, bps);
+  }
+
   function onlyProxy_mint(address to, uint256 tokenId) external returns (uint256 newBalance) {
     baseline().__mint(to, tokenId);
     return baseline().balanceOf(to);