updated deployment for optimism

HausDAO · Aug 25, 2023 · c0fb129 · c0fb129
1 parent ed48dc3
commit c0fb129
Show file tree

Hide file tree

Showing 9 changed files with 698 additions and 157 deletions.
diff --git a/deploy/005_deploy_bt_factory.ts b/deploy/005_deploy_bt_factory.ts
@@ -20,7 +20,7 @@ const deployFn: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
 		return;
 	}
 
-    console.log('\n\nDeploying BaalAdvTokenSummoner factory on network:', network.name);
+    console.log('\n\nDeploying BaalAdvTokenSummoner(UUPS) factory on network:', network.name);
 	console.log('Deployer address:', `${chainId}:${deployer}`);
 	console.log(
 		'Deployer balance:',
@@ -42,7 +42,7 @@ const deployFn: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
 		from: deployer,
 		args: [],
         proxy: {
-            proxyContract: 'OpenZeppelinTransparentProxy',
+            proxyContract: 'UUPS',
             methodName: 'initialize',
         },
 		log: true,

diff --git a/deployments/optimisticEthereum/BaalAdvTokenSummoner.json b/deployments/optimisticEthereum/BaalAdvTokenSummoner.json
diff --git a/deployments/optimisticEthereum/BaalAdvTokenSummoner_Implementation.json b/deployments/optimisticEthereum/BaalAdvTokenSummoner_Implementation.json
diff --git a/deployments/optimisticEthereum/BaalAdvTokenSummoner_Proxy.json b/deployments/optimisticEthereum/BaalAdvTokenSummoner_Proxy.json
diff --git a/deployments/optimisticEthereum/solcInputs/0e89febeebc7444140de8e67c9067d2c.json b/deployments/optimisticEthereum/solcInputs/0e89febeebc7444140de8e67c9067d2c.json
diff --git a/deployments/optimisticEthereum/solcInputs/e59d9182173b42b6940606b788cb65c6.json b/deployments/optimisticEthereum/solcInputs/e59d9182173b42b6940606b788cb65c6.json
diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -222,6 +222,19 @@ const config: HardhatUserConfig = {
             // },
           },
         },
+      },
+      {
+        version: "0.8.10",
+        settings: {
+          optimizer: {
+            enabled: true,
+            runs: 200,
+            // coverage only
+            // details: {
+            //   yul: true
+            // },
+          },
+        },
       }
     ],
   },

diff --git a/src/addresses/deployed.ts b/src/addresses/deployed.ts
@@ -10,6 +10,7 @@ export const deployments = [
           vaultFactory: "0x594E630efbe8dbd810c168e3878817a4094bB312",
           advTokenFactory: "0x8a4A9E36106Ee290811B89e06e2faFE913507965",
           tributeMinion: "0x5c17BFBaB751C5ddF1Ff267acF8fF919537F39Cf",
+          DAO:"0x4A9a27d614a74Ee5524909cA27bdBcBB7eD3b315",
         },
       },
       goerli: {
@@ -21,6 +22,7 @@ export const deployments = [
           vaultFactory: "0x594E630efbe8dbd810c168e3878817a4094bB312",
           advTokenFactory: "0x0858CB45cE9300133FEbf2Ee2179441c6BadFcdD",
           tributeMinion: "0x5c17BFBaB751C5ddF1Ff267acF8fF919537F39Cf",
+          DAO:"0x4A9a27d614a74Ee5524909cA27bdBcBB7eD3b315",
         },
       },
       gnosis: {
@@ -32,6 +34,7 @@ export const deployments = [
           vaultFactory: "0x594E630efbe8dbd810c168e3878817a4094bB312",
           advTokenFactory: "0x8a4A9E36106Ee290811B89e06e2faFE913507965",
           tributeMinion: "0x5c17BFBaB751C5ddF1Ff267acF8fF919537F39Cf",
+          DAO:"0x4A9a27d614a74Ee5524909cA27bdBcBB7eD3b315",
         },
       },
       polygon: {
@@ -43,6 +46,7 @@ export const deployments = [
           vaultFactory: "0x594E630efbe8dbd810c168e3878817a4094bB312",
           advTokenFactory: "0x8a4A9E36106Ee290811B89e06e2faFE913507965",
           tributeMinion: "0x51498dDdd2A8cdeC82932E08A37eBaF346C38EFd",
+          DAO:"0x4A9a27d614a74Ee5524909cA27bdBcBB7eD3b315",
         },
       },
       polygonMumbai: {
@@ -54,6 +58,7 @@ export const deployments = [
           vaultFactory: "0xbB907b1a769bD338c9d09Fb20C2997ECE5E715a3",
           advTokenFactory: "0x8a4A9E36106Ee290811B89e06e2faFE913507965",
           tributeMinion: "0x898fc00771c148257a7edbdAD33c1469F4420740",
+          DAO:"0x4A9a27d614a74Ee5524909cA27bdBcBB7eD3b315",
         },
       },
       arbitrumOne: {
@@ -65,6 +70,7 @@ export const deployments = [
           vaultFactory: "0xC39E8D4DE75c6aC025a0C07dCd8Aeb0728C5DBF1",
           advTokenFactory: "0x8a4A9E36106Ee290811B89e06e2faFE913507965",
           tributeMinion: "0x7707964B4C24A6b8b7B747F7507F56818857A7C2",
+          DAO:"0x4A9a27d614a74Ee5524909cA27bdBcBB7eD3b315",
         },
       },
       optimisticEthereum: {
@@ -74,8 +80,9 @@ export const deployments = [
           baalSingleton: "0x17234C0Ae25AF09fAf57B9D5ea2B93C1f220E800",
           factory: "0x3E0eAdE343Ddc556a6Cf0f858e4f685ba303ce71",
           vaultFactory: "0xb04111e7b4576164145EF97EB81fd43DA0F2D675",
-          advTokenFactory: "0x8a4A9E36106Ee290811B89e06e2faFE913507965",
+          advTokenFactory: "0x84561C97156a128662B62952890469214FDC87bf",
           tributeMinion: "0x7707964B4C24A6b8b7B747F7507F56818857A7C2",
+          DAO:"0x1aCFF11474B9C6D15966Da7A08eD23438CDE23D4",
         },
       },
     },

diff --git a/src/addresses/setup.ts b/src/addresses/setup.ts
@@ -61,6 +61,6 @@ export const getSetupAddresses = async (
         poster: "0x000000000000cd17345801aa8147b8D3950260FF",
         gnosisSafeProxyFactory: "0xC22834581EbC8527d974F8a1c97E1bEA4EF910BC",
         moduleProxyFactory: "0x00000000000DC7F163742Eb4aBEf650037b1f588",
-        DAO: "0x1aCFF11474B9C6D15966Da7A08eD23438CDE23D4" // Change to Daohaus protocol zodiac baal avatar
+        DAO: "0xCED608Aa29bB92185D9b6340Adcbfa263DAe075b" // Change to Daohaus protocol zodiac baal avatar
     };
 };