Allow deployment with custom metadata renderer

ourzora · Oct 26, 2023 · 7bf36d5 · 7bf36d5
1 parent b0506e7
commit 7bf36d5
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 9 deletions.
diff --git a/script/DeployNewDAO.s.sol b/script/DeployNewDAO.s.sol
@@ -45,7 +45,11 @@ contract SetupDaoScript is Script {
             "https://renderer.com/render"
         );
 
-        IManager.TokenParams memory tokenParams = IManager.TokenParams({ initStrings: initStrings, reservedUntilTokenId: 10 });
+        IManager.TokenParams memory tokenParams = IManager.TokenParams({
+            initStrings: initStrings,
+            metadataRenderer: address(0),
+            reservedUntilTokenId: 10
+        });
 
         IManager.AuctionParams memory auctionParams = IManager.AuctionParams({
             duration: 24 hours,

diff --git a/script/DeployV2New.s.sol b/script/DeployV2New.s.sol
@@ -26,7 +26,6 @@ contract DeployContracts is Script {
 
         address deployerAddress = vm.addr(key);
         address managerAddress = _getKey("Manager");
-        address builderDAO = _getKey("BuilderDAO");
         address crossDomainMessenger = _getKey("CrossDomainMessenger");
 
         console2.log("~~~~~~~~~~ CHAIN ID ~~~~~~~~~~~");

diff --git a/src/manager/IManager.sol b/src/manager/IManager.sol
@@ -71,9 +71,11 @@ interface IManager is IUUPS, IOwnable {
 
     /// @notice The ERC-721 token parameters
     /// @param initStrings The encoded token name, symbol, collection description, collection image uri, renderer base uri
+    /// @param metadataRenderer The metadata renderer implementation to use
     /// @param reservedUntilTokenId The tokenId that a DAO's auctions will start at
     struct TokenParams {
         bytes initStrings;
+        address metadataRenderer;
         uint256 reservedUntilTokenId;
     }
 

diff --git a/src/manager/Manager.sol b/src/manager/Manager.sol
@@ -113,8 +113,11 @@ contract Manager is IManager, VersionedContract, UUPS, Ownable, ManagerStorageV1
             // Use the token address to precompute the DAO's remaining addresses
             bytes32 salt = bytes32(uint256(uint160(token)) << 96);
 
+            // Check if the deployer is using an alternate metadata renderer. If not default to the standard one
+            address metadataImplToUse = _tokenParams.metadataRenderer != address(0) ? _tokenParams.metadataRenderer : metadataImpl;
+
             // Deploy the remaining DAO contracts
-            metadata = address(new ERC1967Proxy{ salt: salt }(metadataImpl, ""));
+            metadata = address(new ERC1967Proxy{ salt: salt }(metadataImplToUse, ""));
             auction = address(new ERC1967Proxy{ salt: salt }(auctionImpl, ""));
             treasury = address(new ERC1967Proxy{ salt: salt }(treasuryImpl, ""));
             governor = address(new ERC1967Proxy{ salt: salt }(governorImpl, ""));

diff --git a/test/Manager.t.sol b/test/Manager.t.sol
@@ -6,20 +6,23 @@ import { NounsBuilderTest } from "./utils/NounsBuilderTest.sol";
 import { IManager, Manager } from "../src/manager/Manager.sol";
 
 import { MockImpl } from "./utils/mocks/MockImpl.sol";
+import { MetadataRenderer } from "../src/token/metadata/MetadataRenderer.sol";
 
 contract ManagerTest is NounsBuilderTest {
     MockImpl internal mockImpl;
+    address internal altMetadataImpl;
 
     function setUp() public virtual override {
         super.setUp();
 
         mockImpl = new MockImpl();
+        altMetadataImpl = address(new MetadataRenderer(address(manager)));
     }
 
     function setupAltMock() internal virtual {
         setMockFounderParams();
 
-        setMockTokenParams();
+        setMockTokenParamsWithRenderer(altMetadataImpl);
 
         setMockAuctionParams();
 
@@ -139,6 +142,13 @@ contract ManagerTest is NounsBuilderTest {
         manager.removeUpgrade(address(token), address(mockImpl));
     }
 
+    function test_DeployWithAltRenderer() public {
+        setupAltMock();
+        deploy(foundersArr, tokenParams, auctionParams, govParams);
+
+        assertEq(metadataRenderer.owner(), address(founder));
+    }
+
     function test_SetNewRenderer() public {
         deployMock();
 

diff --git a/test/utils/NounsBuilderTest.sol b/test/utils/NounsBuilderTest.sol
@@ -128,7 +128,8 @@ contract NounsBuilderTest is Test {
             "ipfs://Qmew7TdyGnj6YRUjQR68sUJN3239MYXRD8uxowxF6rGK8j",
             "https://nouns.build",
             "http://localhost:5000/render",
-            0
+            0,
+            address(0)
         );
     }
 
@@ -140,7 +141,21 @@ contract NounsBuilderTest is Test {
             "ipfs://Qmew7TdyGnj6YRUjQR68sUJN3239MYXRD8uxowxF6rGK8j",
             "https://nouns.build",
             "http://localhost:5000/render",
-            _reservedUntilTokenId
+            _reservedUntilTokenId,
+            address(0)
+        );
+    }
+
+    function setMockTokenParamsWithRenderer(address _metadataRenderer) internal virtual {
+        setTokenParams(
+            "Mock Token",
+            "MOCK",
+            "This is a mock token",
+            "ipfs://Qmew7TdyGnj6YRUjQR68sUJN3239MYXRD8uxowxF6rGK8j",
+            "https://nouns.build",
+            "http://localhost:5000/render",
+            0,
+            _metadataRenderer
         );
     }
 
@@ -151,11 +166,16 @@ contract NounsBuilderTest is Test {
         string memory _contractImage,
         string memory _contractURI,
         string memory _rendererBase,
-        uint256 _reservedUntilTokenId
+        uint256 _reservedUntilTokenId,
+        address _metadataRenderer
     ) internal virtual {
         bytes memory initStrings = abi.encode(_name, _symbol, _description, _contractImage, _contractURI, _rendererBase);
 
-        tokenParams = IManager.TokenParams({ initStrings: initStrings, reservedUntilTokenId: _reservedUntilTokenId });
+        tokenParams = IManager.TokenParams({
+            initStrings: initStrings,
+            metadataRenderer: _metadataRenderer,
+            reservedUntilTokenId: _reservedUntilTokenId
+        });
     }
 
     function setMockAuctionParams() internal virtual {
@@ -264,7 +284,7 @@ contract NounsBuilderTest is Test {
     ) internal {
         setMockFounderParams();
 
-        setTokenParams(_name, _symbol, _description, _contractImage, _projectURI, _rendererBase, 0);
+        setTokenParams(_name, _symbol, _description, _contractImage, _projectURI, _rendererBase, 0, address(0));
 
         setMockAuctionParams();