Merge pull request #27 from SetProtocol/pranav/update-ethereum-optimism-dependency-issuance-extension

Author: pblivin0x

ethereum/deploy/002_delegated_manager_system.ts

@@ -25,7 +25,7 @@ const {
   MULTI_SIG_OWNER,
   CONTROLLER,
   SET_TOKEN_CREATOR,
-  ISSUANCE_MODULE,
+  DEBT_ISSUANCE_MODULE_V2,
   STREAMING_FEE_MODULE,
   TRADE_MODULE,
 } = DEPENDENCY;
@@ -54,7 +54,7 @@ const func: DeployFunction = trackFinishedStage(CURRENT_STAGE, async function (b
   await deployDelegatedManagerFactory();
   const delegatedManagerFactoryAddress = await getContractAddress(CONTRACT_NAMES.DELEGATED_MANAGER_FACTORY);
 
-  const issuanceModuleAddress = await findDependency(ISSUANCE_MODULE);
+  const issuanceModuleAddress = await findDependency(DEBT_ISSUANCE_MODULE_V2);
   await deployIssuanceExtension();
   const issuanceExtensionAddress = await getContractAddress(CONTRACT_NAMES.ISSUANCE_EXTENSION);
 

ethereum/deployments/utils/dependencies.ts

@@ -425,6 +425,13 @@ export default {
     },
     42: "0xf216FBFE81432d338e332Cace59c7AB5EDC0Ab6D",
   },
+  DEBT_ISSUANCE_MODULE_V2: {
+    1: {
+      staging: "0x3C0CC7624B1c408cF2cF11b3961301949f2F7820",
+      production: "0x69a592D2129415a4A1d1b1E309C17051B7F28d57"
+    },
+    42: "0x9EaEbA95ec20a7B493551693057bA3dd57f0CCe9",
+  },
   STREAMING_FEE_MODULE: {
     1: {
       staging: "0x3D8d14b7eFb8e342189ee14c3d40dCe005EB901B",
@@ -549,6 +556,7 @@ export const DEPENDENCY = {
   CONTROLLER: "CONTROLLER",
   SET_TOKEN_CREATOR: "SET_TOKEN_CREATOR",
   ISSUANCE_MODULE: "ISSUANCE_MODULE",
+  DEBT_ISSUANCE_MODULE_V2:"DEBT_ISSUANCE_MODULE_V2",
   STREAMING_FEE_MODULE: "STREAMING_FEE_MODULE",
   TRADE_MODULE: "TRADE_MODULE",
 

ethereum/test/deploys/002_delegated_manager_system.spec.ts

@@ -29,7 +29,7 @@ import { CONTRACT_NAMES } from "../../deployments/constants/002_delegated_manage
 const {
   CONTROLLER,
   SET_TOKEN_CREATOR,
-  ISSUANCE_MODULE,
+  DEBT_ISSUANCE_MODULE_V2,
   STREAMING_FEE_MODULE,
   TRADE_MODULE,
 } = DEPENDENCY;
@@ -135,7 +135,7 @@ describe("Delegated Manager System", () => {
 
     it("should have the correct IssuanceModule address", async () => {
       const issuanceModule = await issuanceExtensionInstance.issuanceModule();
-      expect(issuanceModule).to.eq(await findDependency(ISSUANCE_MODULE));
+      expect(issuanceModule).to.eq(await findDependency(DEBT_ISSUANCE_MODULE_V2));
     });
   });
 

optimism/deploy/003_delegated_manager_system.ts

@@ -25,7 +25,7 @@ const {
   MULTI_SIG_OWNER,
   CONTROLLER,
   SET_TOKEN_CREATOR,
-  ISSUANCE_MODULE,
+  DEBT_ISSUANCE_MODULE_V2,
   STREAMING_FEE_MODULE,
   TRADE_MODULE,
 } = DEPENDENCY;
@@ -54,7 +54,7 @@ const func: DeployFunction = trackFinishedStage(CURRENT_STAGE, async function (b
   await deployDelegatedManagerFactory();
   const delegatedManagerFactoryAddress = await getContractAddress(CONTRACT_NAMES.DELEGATED_MANAGER_FACTORY);
 
-  const issuanceModuleAddress = await findDependency(ISSUANCE_MODULE);
+  const issuanceModuleAddress = await findDependency(DEBT_ISSUANCE_MODULE_V2);
   await deployIssuanceExtension();
   const issuanceExtensionAddress = await getContractAddress(CONTRACT_NAMES.ISSUANCE_EXTENSION);
 

optimism/deployments/utils/dependencies.ts

@@ -178,6 +178,13 @@ export default {
     },
     69: "0x7853dD7De469638CA26bC9b6f343820be97E5faE",
   },
+  DEBT_ISSUANCE_MODULE_V2: {
+    10: {
+      staging: "0x8ebe03a1963901F6E1680A6234643Cc80dE2222F",
+      production: "0xda6D2Da01b7141Ba3232025DC45F192eAE5569DA"
+    },
+    69: "0x9e3604A29bED5C7F2fF5715390F77EC41d5EeA28",
+  },
   TRADE_MODULE: {
     10: {
       staging: "0x4F70287526ea9Ba7e799D616ea86635CdAf0de4F",
@@ -288,6 +295,7 @@ export const DEPENDENCY = {
   STREAMING_FEE_MODULE: "STREAMING_FEE_MODULE",
   SET_TOKEN_CREATOR: "SET_TOKEN_CREATOR",
   ISSUANCE_MODULE: "ISSUANCE_MODULE",
+  DEBT_ISSUANCE_MODULE_V2:"DEBT_ISSUANCE_MODULE_V2",
   TRADE_MODULE: "TRADE_MODULE",
   INTEGRATION_REGISTRY: "INTEGRATION_REGISTRY",
   SLIPPAGE_ISSUANCE_MODULE: "SLIPPAGE_ISSUANCE_MODULE",

optimism/test/deploys/003_delegated_manager_system.spec.ts

@@ -29,7 +29,7 @@ import { CONTRACT_NAMES } from "../../deployments/constants/003_delegated_manage
 const {
   CONTROLLER,
   SET_TOKEN_CREATOR,
-  ISSUANCE_MODULE,
+  DEBT_ISSUANCE_MODULE_V2,
   STREAMING_FEE_MODULE,
   TRADE_MODULE,
 } = DEPENDENCY;
@@ -135,7 +135,7 @@ describe("Delegated Manager System", () => {
 
     it("should have the correct IssuanceModule address", async () => {
       const issuanceModule = await issuanceExtensionInstance.issuanceModule();
-      expect(issuanceModule).to.eq(await findDependency(ISSUANCE_MODULE));
+      expect(issuanceModule).to.eq(await findDependency(DEBT_ISSUANCE_MODULE_V2));
     });
   });