From 0c6ccb546a80f784bac6ae5fd23d4cbd14102157 Mon Sep 17 00:00:00 2001
From: katzman <84420280+stevieraykatz@users.noreply.github.com>
Date: Fri, 15 Sep 2023 05:11:19 -0700
Subject: [PATCH] Deployed new side chain contracts, upgraded AccountsStrategy,
 fixed a couple tasks (#381)

---
 contract-address.json                         | 26 +++++++++-------
 .../integrations/strategy-addresses.json      |  2 +-
 tasks/deploy/deploySideChain.ts               | 10 +++++++
 tasks/manage/registrar/setStratParams.ts      | 30 +++++++++++++------
 4 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/contract-address.json b/contract-address.json
index 0b9a1928c..7e1734732 100644
--- a/contract-address.json
+++ b/contract-address.json
@@ -6,6 +6,7 @@
         "accountsDepositWithdrawEndowments": "",
         "accountsAllowance": "",
         "accountsCreateEndowment": "",
+        "accountsGasManager": "",
         "accountsQueryEndowments": "",
         "accountsStrategy": "",
         "accountsSwapRouter": "",
@@ -96,8 +97,8 @@
         "proxy": ""
       },
       "apTeam": {
-        "implementation": "0x39e698a2e9Dc5D65C42f9C0cd50904F9b46b42A3",
-        "proxy": "0x68E73152a3B6Fa0652d5EA5D977adEe4e168b145"
+        "implementation": "0xacE2a31e8B8d66C24DAea008d1eDaf571369A728",
+        "proxy": "0x33F76554d1474061482Bfa858f35AFD9BAb4D1C5"
       },
       "endowment": {
         "emitter": {
@@ -106,15 +107,16 @@
         },
         "factory": "",
         "implementation": ""
-      }
+      },
+      "proxyAdmin": "0xb463AFC0b3A499a2D826155fc6E6E73061BEF826"
     },
     "registrar": {
-      "implementation": "0x45CCb6251F3500c7EE3219eE47C213fB239346cB",
-      "proxy": "0xD3d0B4fFF90c36e1a31d478e35d699f432428Ae5"
+      "implementation": "0x053d1190081dC68ED544D5A2788878E823F64a69",
+      "proxy": "0xA8b73E610095A61de646eD06334c61b94318df52"
     },
     "router": {
-      "implementation": "0x8747cF2bd9BB0F46ced4adA1b472E995d1A3174A",
-      "proxy": "0xbc37e909abCB8cb443Cf30957154D37364b633B6"
+      "implementation": "0xB1A33A8f6cD8572976004C3653AbCEb3E697b9ad",
+      "proxy": "0x74C615649f260850c0702ca2aDAEDC0eb3F312a6"
     },
     "tokens": {
       "dai": "",
@@ -127,6 +129,10 @@
     "uniswap": {
       "factory": "",
       "swapRouter": ""
+    },
+    "vaultEmitter": {
+      "implementation": "0xbc6Fe0a018266F9F02C0E21cb21388cf1D09a560",
+      "proxy": "0xB4B13f54690D297b73291456e027b33aA303f744"
     }
   },
   "137": {
@@ -397,8 +403,8 @@
       "swapRouter": "0x40B5D836dBeAf26c652210D8f07169B99E77C994"
     },
     "vaultEmitter": {
-      "implementation": "0x402e14f3f9118A3745d8554EC4106450fB91aE23",
-      "proxy": "0x7Eb691CaD47e698642Ac507aC0383d8Ef1A20C7D"
+      "implementation": "0x1BE9451496bfB6aDcFfbc308b673018a8972AFFE",
+      "proxy": "0x2e3c2536E1349e0E18d057f61499Ef64BB4B23E8"
     }
   },
   "80001": {
@@ -410,7 +416,7 @@
         "accountsCreateEndowment": "0xb9B2b1a49020216fC5715AE05132dda968A06023",
         "accountsGasManager": "0xe224BcDd0aa37C262C7D9865d6fC9F8974996Ca4",
         "accountsQueryEndowments": "0xD1159b23003Db899801022c06dC09C00528fe20A",
-        "accountsStrategy": "0x51B51fA42802129a1e215300C8bfEE54879e5A31",
+        "accountsStrategy": "0x499272b4A1Cb3f6Ba622b34b666E40623b373817",
         "accountsSwapRouter": "0x23013c2a8E03Af04e23788789676E240654cc60d",
         "accountsUpdate": "0x4ba1Dff21DD94b1c87a4f2866eAEe90D7FfeFF57",
         "accountsUpdateEndowments": "0xC1d957Ee8EA1B44734b4Db056f96B37580Bd258E",
diff --git a/contracts/integrations/strategy-addresses.json b/contracts/integrations/strategy-addresses.json
index 1b9e90ba8..c5ce2884c 100644
--- a/contracts/integrations/strategy-addresses.json
+++ b/contracts/integrations/strategy-addresses.json
@@ -1 +1 @@
-{"dummy":{"strategy":"0x42f293b5D45C0a949639EE229E4c9acD51DF904D","locked":"0xf7C497157c4879A4C6ca9B66CF3911BD2b71E2da","liquid":"0x730EEB14F27B5D6132b9BF7D62eF877D89600F55"}}
\ No newline at end of file
+{"dummy":{"strategy":"0xBe3865948ba88f479Ca05265E9B59869d99552de","locked":"0x3ab0ADa0d1De810cc6845B7433134554D98Ff39f","liquid":"0x9ed0fC3ba80c2c3B443b3dc51597245F840d9D5C"}}
\ No newline at end of file
diff --git a/tasks/deploy/deploySideChain.ts b/tasks/deploy/deploySideChain.ts
index 3fc2d4c0b..7d33ab9f7 100644
--- a/tasks/deploy/deploySideChain.ts
+++ b/tasks/deploy/deploySideChain.ts
@@ -65,6 +65,16 @@ task("deploy:SideChain", "Will deploy complete side-chain infrastructure")
         yes: true,
       });
 
+      await hre.run("deploy:VaultEmitter", {
+        apTeamSignerPkey: taskArgs.apTeamSignerPkey,
+        skipVerify: taskArgs.skipVerify,
+        yes: true,
+      });
+
+      await hre.run("manage:registrar:setAllFeeSettings", {
+        apTeamSignerPkey: taskArgs.apTeamSignerPkey,
+      });
+
       if (!isLocalNetwork(hre) && !taskArgs.skipVerify) {
         const deployments: Array<Deployment<ContractFactory>> = [
           proxyAdminMultisig,
diff --git a/tasks/manage/registrar/setStratParams.ts b/tasks/manage/registrar/setStratParams.ts
index 6c743f4a2..5da359d32 100644
--- a/tasks/manage/registrar/setStratParams.ts
+++ b/tasks/manage/registrar/setStratParams.ts
@@ -4,7 +4,7 @@ import {submitMultiSigTx} from "tasks/helpers";
 import {cliTypes} from "tasks/types";
 import {Registrar__factory} from "typechain-types";
 import {ChainID} from "types";
-import {StratConfig, getAPTeamOwner, getAddressesByNetworkId, logger} from "utils";
+import {StratConfig, getAPTeamOwner, getAddressesByNetworkId, isProdNetwork, logger} from "utils";
 
 type TaskArgs = {
   name: string;
@@ -28,14 +28,26 @@ task("manage:registrar:setStratParams")
   )
   .setAction(async function (taskArguments: TaskArgs, hre) {
     const config: StratConfig = allStrategyConfigs[taskArguments.name];
-    await hre.run("manage:registrar:setStratParams:on-network", {
-      ...taskArguments,
-      chainId: ChainID.polygon,
-    });
-    await hre.run("manage:registrar:setStratParams:on-network", {
-      ...taskArguments,
-      chainId: config.chainId,
-    });
+    if(await isProdNetwork(hre)) {
+      await hre.run("manage:registrar:setStratParams:on-network", {
+        ...taskArguments,
+        chainId: ChainID.polygon,
+      });
+      await hre.run("manage:registrar:setStratParams:on-network", {
+        ...taskArguments,
+        chainId: config.chainId,
+      });
+    }
+    else {
+      await hre.run("manage:registrar:setStratParams:on-network", {
+        ...taskArguments,
+        chainId: ChainID.mumbai,
+      });
+      await hre.run("manage:registrar:setStratParams:on-network", {
+        ...taskArguments,
+        chainId: config.chainId,
+      });
+    }
   });
 
 subtask(