refactor to keep manager types and reduce diff

ourzora · Oct 18, 2023 · 8f46256 · 8f46256
1 parent 57c2543
commit 8f46256
Show file tree

Hide file tree

Showing 53 changed files with 664 additions and 1,861 deletions.
diff --git a/script/DeployMetadataUpgrade.s.sol b/script/DeployMetadataUpgrade.s.sol
diff --git a/script/DeployNewDAO.s.sol b/script/DeployNewDAO.s.sol
@@ -6,13 +6,14 @@ import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
 
 import { IManager } from "../src/manager/IManager.sol";
 import { IPartialMirrorToken } from "../src/token/partial-mirror/IPartialMirrorToken.sol";
-import { IPropertyMetadata } from "../src/metadata/property/interfaces/IPropertyMetadata.sol";
+import { IBaseMetadata } from "../src/token/metadata/interfaces/IBaseMetadata.sol";
 import { IAuction } from "../src/auction/IAuction.sol";
 import { IGovernor } from "../src/governance/governor/IGovernor.sol";
 import { ITreasury } from "../src/governance/treasury/ITreasury.sol";
 import { MerkleReserveMinter } from "../src/minters/MerkleReserveMinter.sol";
 
 contract SetupDaoScript is Script {
+    /*
     using Strings for uint256;
 
     string configFile;
@@ -102,4 +103,5 @@ contract SetupDaoScript is Script {
 
         vm.stopBroadcast();
     }
+    */
 }
diff --git a/script/DeployTokenUpgrade.s.sol b/script/DeployTokenUpgrade.s.sol
diff --git a/script/DeployV2Core.s.sol b/script/DeployV2Core.s.sol
@@ -6,11 +6,12 @@ import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
 
 import { IManager, Manager } from "../src/manager/Manager.sol";
 import { IToken, Token } from "../src/token/default/Token.sol";
+import { PartialMirrorToken } from "../src/token/partial-mirror/PartialMirrorToken.sol";
 import { IAuction, Auction } from "../src/auction/Auction.sol";
 import { IGovernor, Governor } from "../src/governance/governor/Governor.sol";
 import { ITreasury, Treasury } from "../src/governance/treasury/Treasury.sol";
-import { PropertyMetadata } from "../src/metadata/property/PropertyMetadata.sol";
-import { PropertyMetadataTypesV1 } from "../src/metadata/property/types/PropertyMetadataTypesV1.sol";
+import { MetadataRenderer } from "../src/token/metadata/MetadataRenderer.sol";
+import { MetadataRendererTypesV1 } from "../src/token/metadata/types/MetadataRendererTypesV1.sol";
 import { ERC1967Proxy } from "../src/lib/proxy/ERC1967Proxy.sol";
 import { ProtocolRewards } from "../src/rewards/ProtocolRewards.sol";
 
@@ -41,7 +42,7 @@ contract DeployContracts is Script {
         vm.startBroadcast(deployerAddress);
 
         // Deploy root manager implementation + proxy
-        address managerImpl0 = address(new Manager());
+        address managerImpl0 = address(new Manager(address(0), address(0), address(0), address(0), address(0), address(0)));
 
         Manager manager = Manager(address(new ERC1967Proxy(managerImpl0, abi.encodeWithSignature("initialize(address)", deployerAddress))));
 
@@ -50,8 +51,10 @@ contract DeployContracts is Script {
         // Deploy standard token implementation
         address tokenImpl = address(new Token(address(manager)));
 
+        address mirrorTokenImpl = address(new PartialMirrorToken(address(manager)));
+
         // Deploy metadata renderer implementation
-        address metadataRendererImpl = address(new PropertyMetadata(address(manager)));
+        address metadataRendererImpl = address(new MetadataRenderer(address(manager)));
 
         // Deploy auction house implementation
         address auctionImpl = address(new Auction(address(manager), address(rewards), weth));
@@ -62,21 +65,10 @@ contract DeployContracts is Script {
         // Deploy governor implementation
         address governorImpl = address(new Governor(address(manager)));
 
-        address managerImpl = address(new Manager());
+        address managerImpl = address(new Manager(tokenImpl, mirrorTokenImpl, metadataRendererImpl, auctionImpl, treasuryImpl, governorImpl));
 
         manager.upgradeTo(managerImpl);
 
-        // Register implementations
-        manager.registerImplementation(manager.IMPLEMENTATION_TYPE_TOKEN(), tokenImpl);
-
-        manager.registerImplementation(manager.IMPLEMENTATION_TYPE_METADATA(), metadataRendererImpl);
-
-        manager.registerImplementation(manager.IMPLEMENTATION_TYPE_AUCTION(), auctionImpl);
-
-        manager.registerImplementation(manager.IMPLEMENTATION_TYPE_GOVERNOR(), governorImpl);
-
-        manager.registerImplementation(manager.IMPLEMENTATION_TYPE_TREASURY(), treasuryImpl);
-
         vm.stopBroadcast();
 
         string memory filePath = string(abi.encodePacked("deploys/", chainID.toString(), ".version2_core.txt"));

diff --git a/script/DeployV2New.s.sol b/script/DeployV2New.s.sol
@@ -9,7 +9,6 @@ import { PartialMirrorToken } from "../src/token/partial-mirror/PartialMirrorTok
 import { ERC1967Proxy } from "../src/lib/proxy/ERC1967Proxy.sol";
 import { ERC721RedeemMinter } from "../src/minters/ERC721RedeemMinter.sol";
 import { MerkleReserveMinter } from "../src/minters/MerkleReserveMinter.sol";
-import { MediaMetadata } from "../src/metadata/media/MediaMetadata.sol";
 
 contract DeployContracts is Script {
     using Strings for uint256;
@@ -49,11 +48,6 @@ contract DeployContracts is Script {
 
         address merkleMinter = address(new MerkleReserveMinter(manager));
 
-        address mediaMetadata = address(new MediaMetadata(address(manager)));
-
-        // Register implementations
-        manager.registerImplementation(manager.IMPLEMENTATION_TYPE_TOKEN(), mirrorTokenImpl);
-
         vm.stopBroadcast();
 
         string memory filePath = string(abi.encodePacked("deploys/", chainID.toString(), ".version2_new.txt"));
@@ -62,7 +56,6 @@ contract DeployContracts is Script {
         vm.writeLine(filePath, string(abi.encodePacked("Mirror Token implementation: ", addressToString(mirrorTokenImpl))));
         vm.writeLine(filePath, string(abi.encodePacked("ERC721 Redeem Minter: ", addressToString(erc721Minter))));
         vm.writeLine(filePath, string(abi.encodePacked("Merkle Reserve Minter: ", addressToString(merkleMinter))));
-        vm.writeLine(filePath, string(abi.encodePacked("Media Metadata Renderer: ", addressToString(mediaMetadata))));
 
         console2.log("~~~~~~~~~~ MIRROR TOKEN IMPL ~~~~~~~~~~~");
         console2.logAddress(mirrorTokenImpl);
@@ -72,9 +65,6 @@ contract DeployContracts is Script {
 
         console2.log("~~~~~~~~~~ MERKLE RESERVE MINTER ~~~~~~~~~~~");
         console2.logAddress(merkleMinter);
-
-        console2.log("~~~~~~~~~~ MEDIA METADATA RENDERER ~~~~~~~~~~~");
-        console2.logAddress(mediaMetadata);
     }
 
     function addressToString(address _addr) private pure returns (string memory) {