Merge pull request #21 from SetProtocol/pranav/polygon-delegated-manager-system-deploy-update

Update DelegatedManagerSystem polygon deploy script

Author: pblivin0x

package.json

@@ -91,7 +91,7 @@
     "@indexcoop/index-coop-smart-contracts": "^0.2.0",
     "@perp/curie-contract": "^0.14.0-staging",
     "@setprotocol/set-protocol-v2": "^0.1.14",
-    "@setprotocol/set-v2-strategies": "^0.0.6",
+    "@setprotocol/set-v2-strategies": "^0.0.7",
     "ethers": "5.5.2",
     "fs-extra": "^5.0.0",
     "module-alias": "^2.2.2",

polygon/deploy/002_delegated_manager_system.ts

@@ -10,45 +10,63 @@ import {
   getCurrentStage,
   saveContractDeployment,
   stageAlreadyFinished,
-  trackFinishedStage
+  trackFinishedStage,
+  saveDeferredTransactionData,
+  writeTransactionToOutputs,
+  getAccounts,
 } from "@utils/index";
 
-import { initializeManagerCore } from "@utils/deploys/deployUtils";
+import { Account } from "@utils/types";
+import { InstanceGetter } from "@utils/instanceGetter";
 
 import { DEPENDENCY } from "../deployments/utils/dependencies";
 import { CONTRACT_NAMES } from "../deployments/constants/002_delegated_manager_system";
 
 const {
+  CONTROLLER,
   SET_TOKEN_CREATOR,
   ISSUANCE_MODULE,
   STREAMING_FEE_MODULE,
   TRADE_MODULE,
 } = DEPENDENCY;
 
+let owner: Account;
+let instanceGetter: InstanceGetter;
+
 const CURRENT_STAGE = getCurrentStage(__filename);
 
 const func: DeployFunction = trackFinishedStage(CURRENT_STAGE, async function (bre: HRE) {
   const {
     deploy,
     deployer,
+    rawTx,
+    networkConstant
   } = await prepareDeployment(bre);
 
+  [owner] = await getAccounts();
+  instanceGetter = new InstanceGetter(owner.wallet);
+
   await deployManagerCore();
   const managerCoreAddress = await getContractAddress(CONTRACT_NAMES.MANAGER_CORE);
 
+  const controllerAddress = await findDependency(CONTROLLER);
   const setTokenCreatorAddress = await findDependency(SET_TOKEN_CREATOR);
   await deployDelegatedManagerFactory();
-
-  await initializeManagerCore(CONTRACT_NAMES.DELEGATED_MANAGER_FACTORY, bre);
+  const delegatedManagerFactoryAddress = await getContractAddress(CONTRACT_NAMES.DELEGATED_MANAGER_FACTORY);
 
   const issuanceModuleAddress = await findDependency(ISSUANCE_MODULE);
   await deployIssuanceExtension();
+  const issuanceExtensionAddress = await getContractAddress(CONTRACT_NAMES.ISSUANCE_EXTENSION);
 
   const streamingFeeModuleAddress = await findDependency(STREAMING_FEE_MODULE);
   await deployStreamingFeeSplitExtension();
+  const streamingFeeSplitExtensionAddress = await getContractAddress(CONTRACT_NAMES.STREAMING_FEE_SPLIT_EXTENSION);
 
   const tradeModuleAddress = await findDependency(TRADE_MODULE);
   await deployTradeExtension();
+  const tradeExtensionAddress = await getContractAddress(CONTRACT_NAMES.TRADE_EXTENSION);
+
+  await initializeManagerCore();
 
   //
   // Helper Functions
@@ -73,7 +91,7 @@ const func: DeployFunction = trackFinishedStage(CURRENT_STAGE, async function (b
   async function deployDelegatedManagerFactory(): Promise<void> {
     const checkDelegatedManagerFactoryAddress = await getContractAddress(CONTRACT_NAMES.DELEGATED_MANAGER_FACTORY);
     if (checkDelegatedManagerFactoryAddress === "") {
-      const constructorArgs = [managerCoreAddress, setTokenCreatorAddress];
+      const constructorArgs = [managerCoreAddress, controllerAddress, setTokenCreatorAddress];
       const delegatedManagerFactoryDeploy = await deploy(
         CONTRACT_NAMES.DELEGATED_MANAGER_FACTORY,
         { from: deployer, args: constructorArgs, log: true }
@@ -141,6 +159,33 @@ const func: DeployFunction = trackFinishedStage(CURRENT_STAGE, async function (b
       });
     }
   }
+
+  async function initializeManagerCore(): Promise<void> {
+    const managerCoreInstance = await instanceGetter.getManagerCore(managerCoreAddress);
+    if (!await managerCoreInstance.isInitialized()) {
+      const data = managerCoreInstance.interface.encodeFunctionData(
+        "initialize",
+        [[issuanceExtensionAddress, streamingFeeSplitExtensionAddress, tradeExtensionAddress], [delegatedManagerFactoryAddress]]
+      );
+      const description = "Initialized ManagerCore with DelegatedManagerFactory, IssuanceExtension, StreamingFeeSplitExtension, and TradeExtension";
+
+      if ((networkConstant === "production" || process.env.TESTING_PRODUCTION)) {
+        await saveDeferredTransactionData({
+          data,
+          description,
+          contractName: "ManagerCore",
+        });
+      } else {
+        const initializeTransaction: any = await rawTx({
+          from: deployer,
+          to: managerCoreAddress,
+          data,
+          log: true,
+        });
+        await writeTransactionToOutputs(initializeTransaction.transactionHash, description);
+      }
+    }
+  }
 });
 
 func.skip = stageAlreadyFinished(CURRENT_STAGE);

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

@@ -27,6 +27,7 @@ import { DEPENDENCY } from "../../deployments/utils/dependencies";
 import { CONTRACT_NAMES } from "../../deployments/constants/002_delegated_manager_system";
 
 const {
+  CONTROLLER,
   SET_TOKEN_CREATOR,
   ISSUANCE_MODULE,
   STREAMING_FEE_MODULE,
@@ -87,6 +88,26 @@ describe("Delegated Manager System", () => {
       const validFactory = await managerCoreInstance.isFactory(delegatedManagerFactoryInstance.address);
       expect(validFactory).to.eq(true);
     });
+
+    it("should have three enabled extensions", async () => {
+      const extensions = await managerCoreInstance.getExtensions();
+      expect(extensions.length).to.eq(3);
+    });
+
+    it("should have IssuanceExtension as valid extension", async () => {
+      const validIssuanceExtension = await managerCoreInstance.isExtension(issuanceExtensionInstance.address);
+      expect(validIssuanceExtension).to.eq(true);
+    });
+
+    it("should have StreamingFeeSplitExtension as valid extension", async () => {
+      const validStreamingFeeSplitExtension = await managerCoreInstance.isExtension(streamingFeeSplitExtensionInstance.address);
+      expect(validStreamingFeeSplitExtension).to.eq(true);
+    });
+
+    it("should have TradeExtension as valid extension", async () => {
+      const validTradeExtension = await managerCoreInstance.isExtension(tradeExtensionInstance.address);
+      expect(validTradeExtension).to.eq(true);
+    });
   });
 
   describe("DelegatedManagerFactory", async () => {
@@ -95,6 +116,11 @@ describe("Delegated Manager System", () => {
       expect(managerCore).to.eq(managerCoreInstance.address);
     });
 
+    it("should have the correct Controller address", async () => {
+      const controller = await delegatedManagerFactoryInstance.controller();
+      expect(controller).to.eq(await findDependency(CONTROLLER));
+    });
+
     it("should have the correct SetTokenFactory address", async () => {
       const setTokenFactory = await delegatedManagerFactoryInstance.setTokenFactory();
       expect(setTokenFactory).to.eq(await findDependency(SET_TOKEN_CREATOR));

utils/deploys/deployUtils.ts

@@ -525,90 +525,4 @@ export async function updateSetManager(
     });
     await writeTransactionToOutputs(setManagerTransaction.transactionHash, description);
   }
-}
-
-export async function initializeManagerCore(
-  factoryName: string,
-  hre: HardhatRuntimeEnvironment,
-  skipProductionCheck: boolean = false,
-): Promise<void> {
-  const {
-    rawTx,
-    deployer,
-    networkConstant,
-  } = await prepareDeployment(hre);
-
-  const [owner] = await getAccounts();
-  const instanceGetter: InstanceGetter = new InstanceGetter(owner.wallet);
-
-  const factoryAddress = await getContractAddress(factoryName);
-  const managerCoreAddress = await getContractAddress("ManagerCore");
-  const managerCoreInstance = await instanceGetter.getManagerCore(managerCoreAddress);
-
-  if (!await managerCoreInstance.isInitialized()) {
-    const data = managerCoreInstance.interface.encodeFunctionData(
-      "initialize",
-      [[factoryAddress]]
-    );
-    const description = `Initialized ManagerCore with ${factoryName}`;
-
-    if ((networkConstant === "production" || process.env.TESTING_PRODUCTION) && !skipProductionCheck) {
-      await saveDeferredTransactionData({
-        data,
-        description,
-        contractName: "ManagerCore",
-      });
-    } else {
-      const addModuleTransaction: any = await rawTx({
-        from: deployer,
-        to: managerCoreAddress,
-        data,
-        log: true,
-      });
-      await writeTransactionToOutputs(addModuleTransaction.transactionHash, description);
-    }
-  }
-}
-
-export async function enableFactoryOnManagerCore(
-  factoryName: string,
-  hre: HardhatRuntimeEnvironment,
-  skipProductionCheck: boolean = false,
-): Promise<void> {
-  const {
-    rawTx,
-    deployer,
-    networkConstant,
-  } = await prepareDeployment(hre);
-
-  const [owner] = await getAccounts();
-  const instanceGetter: InstanceGetter = new InstanceGetter(owner.wallet);
-
-  const factoryAddress = await getContractAddress(factoryName);
-  const managerCoreAddress = await getContractAddress("ManagerCore");
-  const managerCoreInstance = await instanceGetter.getManagerCore(managerCoreAddress);
-
-  if (!await managerCoreInstance.isFactory(factoryAddress)) {
-    const data = managerCoreInstance.interface.encodeFunctionData(
-      "addFactory",
-      [factoryAddress]
-    );
-    const description = `Add ${factoryName} to ManagerCore`;
-
-    if ((networkConstant === "production" || process.env.TESTING_PRODUCTION) && !skipProductionCheck) {
-      await saveDeferredTransactionData({
-        data,
-        description,
-        contractName: "ManagerCore",
-      });
-    } else {
-      const addModuleTransaction: any = await rawTx({
-        from: deployer,
-        to: managerCoreAddress,
-        data,
-        log: true,
-      });
-      await writeTransactionToOutputs(addModuleTransaction.transactionHash, description);
-    }
-  }
 }

yarn.lock

@@ -1271,10 +1271,10 @@
     module-alias "^2.2.2"
     replace-in-file "^6.1.0"
 
-"@setprotocol/set-v2-strategies@^0.0.6":
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/@setprotocol/set-v2-strategies/-/set-v2-strategies-0.0.6.tgz#f9a3a39acbddf376c355275dee323a544e3fe2fb"
-  integrity sha512-4Qwgvf05klsrfWC16rzcppL7BCtldlsRZNLXrwZhnx8iUqqb+CGzbE2kEuSJU0vZG0Q0jTEPF6R+GPGIvk0sxA==
+"@setprotocol/set-v2-strategies@^0.0.7":
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/@setprotocol/set-v2-strategies/-/set-v2-strategies-0.0.7.tgz#dca84f40c31b7118b6ff527f372d7fe2906f53ad"
+  integrity sha512-YfA1obWvj2v/lsNnwrCHf2wRud+mdUZutHJggZyziqMokFi6dsej9StczSt8ftWUsWQqQnnGshVcBAjSL0T1sQ==
   dependencies:
     "@setprotocol/set-protocol-v2" "^0.1.11-hardhat.0"
     "@uniswap/v3-sdk" "^3.5.1"