Add new deployments

ourzora · Oct 18, 2023 · 57c2543 · 57c2543
1 parent 99c7d71
commit 57c2543
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 31 deletions.
diff --git a/addresses/84531.json b/addresses/84531.json
@@ -1,16 +1,16 @@
 {
-  "Manager": "0xaa21afd73e6fd5f69c87a6839d0beedee075e9a3",
-  "ManagerImpl": "0xbf84fb51891656797df77a66857c63e80c1d6036",
-  "ProtocolRewards": "0xABdEdc8730410716DD0a5E54A89C85546A3458bA",
+  "Manager": "0x12dddc8a7a1947297732ebb841eae2f1f33b1d18",
+  "ManagerImpl": "0xb6d14a239fa04a206de7038e5bfd7fea8cf972c9",
+  "ProtocolRewards": "0x03ca9ba716b3768209470741c1ab53858e0dd02c",
   "WETH": "0x4200000000000000000000000000000000000006",
-  "Auction": "0x8c40618313de873978e1e8d403896f169aff3d9c",
-  "Token": "0x93f9d43a7bd751f8546a54785ae48d049ddd2697",
-  "MirrorToken": "0xebf351e71363c10913d513c68b1e8de34b7e585f",
-  "SequentialMetadataRenderer": "0x232e67c166c593cb15d7b4adc605b168b52d0939",
-  "MediaMetadataRenderer": "0x4dc60f832c1d19301e45a66ad1752c6f47ad4c68",
-  "Treasury": "0xdab522800bd789ddb61e01b52088b6a6d95b50eb",
-  "Governor": "0xaca9b2ddd5060ff81b1bf5ccaacd5b20429111cd",
+  "Auction": "0x7bc86f0a10fb91c2f8e00264e1f2dd591b1fd2c9",
+  "Token": "0xdb3a57106c852a726fdc0632107c7b4fa6b785c7",
+  "MirrorToken": "0x766230bf7ce7be2ed930e02ad167cb15f42f65e6",
+  "PropertyMetadataRenderer": "0xaf80f93d2c4fe567959cd9d0c923f1c114cdef36",
+  "MediaMetadataRenderer": "0xef36580d07a0649e616d8dff968762ec703e12bb",
+  "Treasury": "0x359c7bc065acd51eb2b053a7a09f7c5274734bae",
+  "Governor": "0x0b11e81948b528688d17b81e8f1e2c2b6c45f0e6",
   "BuilderDAO": "0x7498e6e471f31e869f038D8DBffbDFdf650c3F95",
-  "ERC721RedeemMinter": "0x82accbf10febc39f0d1ad3fed84137dde6542455",
-  "MerkleReserveMinter": "0x0300ba2fbc45c4191c475731b0876eeef3271b86"
+  "ERC721RedeemMinter": "0xef49483419bc5516ec4c6d601adfac4a359ef8a6",
+  "MerkleReserveMinter": "0xdd908dfaf5e13bac01abe96e4b6d992f92c1fca0"
 }
diff --git a/deploys/84531.version2_core.txt b/deploys/84531.version2_core.txt
@@ -1,7 +1,8 @@
-Manager: 0xaa21afd73e6fd5f69c87a6839d0beedee075e9a3
-Default Token implementation: 0x93f9d43a7bd751f8546a54785ae48d049ddd2697
-Metadata Renderer implementation: 0x232e67c166c593cb15d7b4adc605b168b52d0939
-Auction implementation: 0x8c40618313de873978e1e8d403896f169aff3d9c
-Treasury implementation: 0xdab522800bd789ddb61e01b52088b6a6d95b50eb
-Governor implementation: 0xaca9b2ddd5060ff81b1bf5ccaacd5b20429111cd
-Manager implementation: 0xbf84fb51891656797df77a66857c63e80c1d6036
+Manager: 0x12dddc8a7a1947297732ebb841eae2f1f33b1d18
+Default Token implementation: 0xdb3a57106c852a726fdc0632107c7b4fa6b785c7
+Protocol Rewards:0x03ca9ba716b3768209470741c1ab53858e0dd02c
+Metadata Renderer implementation: 0xaf80f93d2c4fe567959cd9d0c923f1c114cdef36
+Auction implementation: 0x7bc86f0a10fb91c2f8e00264e1f2dd591b1fd2c9
+Treasury implementation: 0x359c7bc065acd51eb2b053a7a09f7c5274734bae
+Governor implementation: 0x0b11e81948b528688d17b81e8f1e2c2b6c45f0e6
+Manager implementation: 0xb6d14a239fa04a206de7038e5bfd7fea8cf972c9
diff --git a/deploys/84531.version2_new.txt b/deploys/84531.version2_new.txt
@@ -1,4 +1,4 @@
-Mirror Token implementation: 0xebf351e71363c10913d513c68b1e8de34b7e585f
-ERC721 Redeem Minter: 0x82accbf10febc39f0d1ad3fed84137dde6542455
-Merkle Reserve Minter: 0x0300ba2fbc45c4191c475731b0876eeef3271b86
-Media Metadata Renderer: 0x4dc60f832c1d19301e45a66ad1752c6f47ad4c68
+Mirror Token implementation: 0x3e853337314269b0425e3b48f4c14180e19e4022
+ERC721 Redeem Minter: 0x4724f96e7b54ee2397d35bcb9a924f1c1bd321c5
+Merkle Reserve Minter: 0xb3258e9c38c85c939ce7e60acfbfc260eb754413
+Media Metadata Renderer: 0xd5cb21aaa7ddd05627260f78f8169f5b67c129b5
diff --git a/script/DeployNewDAO.s.sol b/script/DeployNewDAO.s.sol
@@ -5,11 +5,12 @@ import "forge-std/Script.sol";
 import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
 
 import { IManager } from "../src/manager/IManager.sol";
-import { IToken } from "../src/token/default/IToken.sol";
+import { IPartialMirrorToken } from "../src/token/partial-mirror/IPartialMirrorToken.sol";
 import { IPropertyMetadata } from "../src/metadata/property/interfaces/IPropertyMetadata.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;
@@ -38,16 +39,24 @@ contract SetupDaoScript is Script {
 
         IManager manager = IManager(_getKey("Manager"));
 
-        IToken.TokenParams memory tokenParams = IToken.TokenParams({
-            name: "Test",
+        MerkleReserveMinter.MerkleMinterSettings memory settings = MerkleReserveMinter.MerkleMinterSettings({
+            mintStart: 0,
+            mintEnd: 1,
+            pricePerToken: 0.01 ether,
+            merkleRoot: hex"00"
+        });
+
+        IPartialMirrorToken.TokenParams memory tokenParams = IPartialMirrorToken.TokenParams({
+            name: "Test Merkle Minter 2",
             symbol: "TST",
             reservedUntilTokenId: 10,
-            initialMinter: address(0),
-            initialMinterData: hex"00"
+            tokenToMirror: address(0xB0B),
+            initialMinter: _getKey("MerkleReserveMinter"),
+            initialMinterData: abi.encode(settings)
         });
 
         IPropertyMetadata.PropertyMetadataParams memory metadataParams = IPropertyMetadata.PropertyMetadataParams({
-            description: "This is a test DAO",
+            description: "This is a test Merkle minter DAO 2",
             contractImage: "https://test.com",
             projectURI: "https://test.com",
             rendererBase: "https://test.com"
@@ -74,8 +83,8 @@ contract SetupDaoScript is Script {
         founders[0] = IManager.FounderParams({ wallet: deployerAddress, ownershipPct: 10, vestExpiry: 30 days });
 
         address[] memory implementations = new address[](5);
-        implementations[0] = _getKey("Token");
-        implementations[1] = _getKey("MetadataRenderer");
+        implementations[0] = _getKey("MirrorToken");
+        implementations[1] = _getKey("PropertyMetadataRenderer");
         implementations[2] = _getKey("Auction");
         implementations[3] = _getKey("Treasury");
         implementations[4] = _getKey("Governor");