Improving the tests

packages/contracts/test/helpers/test-psp.ts

@@ -2,23 +2,21 @@ import {
   DAO,
   PluginSetupProcessor,
   PluginSetupProcessor__factory,
-} from '../../typechain';
-import {osxContracts} from '../../utils/helpers';
-import {Operation} from './types';
-import {SignerWithAddress} from '@nomiclabs/hardhat-ethers/signers';
+} from "../../typechain";
+import { osxContracts } from "../../utils/helpers";
+import { Operation } from "./types";
+import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
 
 export async function createPluginSetupProcessor(
   deployer: SignerWithAddress,
-  dao: DAO
+  dao: DAO,
 ): Promise<PluginSetupProcessor> {
   // Create the PluginSetupProcessor
 
-  const hardhatForkNetwork = process.env.NETWORK_NAME
-    ? process.env.NETWORK_NAME
-    : 'mainnet';
+  const hardhatForkNetwork = process.env.NETWORK_NAME ?? "mainnet";
 
   const psp = new PluginSetupProcessor__factory(deployer).attach(
-    osxContracts[hardhatForkNetwork].PluginSetupProcessor
+    osxContracts[hardhatForkNetwork].PluginSetupProcessor,
   );
 
   // grant the owner full permission for plugins

packages/contracts/test/integration-testing/deployment.ts

@@ -48,9 +48,7 @@ describe("PluginRepo Deployment", function () {
   setups.forEach((pluginSetupParams) => {
     context(pluginSetupParams.PLUGIN_CONTRACT_NAME, () => {
       before(() => {
-        const hardhatForkNetwork = process.env.NETWORK_NAME
-          ? process.env.NETWORK_NAME
-          : "mainnet";
+        const hardhatForkNetwork = process.env.NETWORK_NAME ?? "mainnet";
 
         // plugin repo registry
         repoRegistry = PluginRepoRegistry__factory.connect(

packages/contracts/test/integration-testing/main-voting-setup.ts

@@ -0,0 +1,152 @@
+import { MainVotingPluginSetupParams } from "../../plugin-setup-params";
+import {
+  MainVotingPlugin,
+  MainVotingPlugin__factory,
+  MainVotingPluginSetup,
+  MainVotingPluginSetup__factory,
+  MajorityVotingBase,
+  PluginRepo,
+} from "../../typechain";
+import { PluginSetupRefStruct } from "../../typechain/@aragon/osx/framework/dao/DAOFactory";
+import { osxContracts } from "../../utils/helpers";
+import { getPluginRepoInfo } from "../../utils/plugin-repo-info";
+import { installPlugin, uninstallPlugin } from "../helpers/setup";
+import { deployTestDao } from "../helpers/test-dao";
+import { getNamedTypesFromMetadata } from "../helpers/types";
+import {
+  DAO,
+  PluginRepo__factory,
+  PluginSetupProcessor,
+  PluginSetupProcessor__factory,
+} from "@aragon/osx-ethers";
+import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
+import { expect } from "chai";
+import { BigNumber } from "ethers";
+import { ethers } from "hardhat";
+import { ADDRESS_ZERO } from "../unit-testing/common";
+
+describe("MainVotingPluginSetup processing", function () {
+  let alice: SignerWithAddress;
+
+  let psp: PluginSetupProcessor;
+  let dao: DAO;
+  let pluginRepo: PluginRepo;
+
+  before(async () => {
+    [alice] = await ethers.getSigners();
+
+    const hardhatForkNetwork = process.env.NETWORK_NAME ?? "mainnet";
+
+    const pluginRepoInfo = getPluginRepoInfo(
+      MainVotingPluginSetupParams.PLUGIN_REPO_ENS_NAME,
+      "hardhat",
+    );
+    if (!pluginRepoInfo) {
+      throw new Error("The plugin setup details are not available");
+    }
+
+    // PSP
+    psp = PluginSetupProcessor__factory.connect(
+      osxContracts[hardhatForkNetwork]["PluginSetupProcessor"],
+      alice,
+    );
+
+    // Deploy DAO.
+    dao = await deployTestDao(alice);
+
+    await dao.grant(
+      dao.address,
+      psp.address,
+      ethers.utils.id("ROOT_PERMISSION"),
+    );
+    await dao.grant(
+      psp.address,
+      alice.address,
+      ethers.utils.id("APPLY_INSTALLATION_PERMISSION"),
+    );
+    await dao.grant(
+      psp.address,
+      alice.address,
+      ethers.utils.id("APPLY_UNINSTALLATION_PERMISSION"),
+    );
+    await dao.grant(
+      psp.address,
+      alice.address,
+      ethers.utils.id("APPLY_UPDATE_PERMISSION"),
+    );
+
+    pluginRepo = PluginRepo__factory.connect(
+      pluginRepoInfo.address,
+      alice,
+    );
+  });
+
+  context("Build 1", async () => {
+    let setup: MainVotingPluginSetup;
+    let pluginSetupRef: PluginSetupRefStruct;
+    let plugin: MainVotingPlugin;
+    const pluginUpgrader = ADDRESS_ZERO;
+
+    before(async () => {
+      const release = 1;
+
+      // Deploy setups.
+      setup = MainVotingPluginSetup__factory.connect(
+        (await pluginRepo["getLatestVersion(uint8)"](release)).pluginSetup,
+        alice,
+      );
+
+      pluginSetupRef = {
+        versionTag: {
+          release: BigNumber.from(release),
+          build: BigNumber.from(1),
+        },
+        pluginSetupRepo: pluginRepo.address,
+      };
+    });
+
+    beforeEach(async () => {
+      const settings: MajorityVotingBase.VotingSettingsStruct = {
+        minDuration: 60 * 60 * 24,
+        minParticipation: 1,
+        supportThreshold: 1,
+        minProposerVotingPower: 0,
+        votingMode: 0,
+      };
+
+      // Install build 1.
+      const data = ethers.utils.defaultAbiCoder.encode(
+        getNamedTypesFromMetadata(
+          MainVotingPluginSetupParams.METADATA.build.pluginSetup
+            .prepareInstallation
+            .inputs,
+        ),
+        [settings, [alice.address], pluginUpgrader],
+      );
+      const results = await installPlugin(psp, dao, pluginSetupRef, data);
+
+      plugin = MainVotingPlugin__factory.connect(
+        results.preparedEvent.args.plugin,
+        alice,
+      );
+    });
+
+    it("installs & uninstalls", async () => {
+      expect(await plugin.implementation()).to.be.eq(
+        await setup.implementation(),
+      );
+      expect(await plugin.dao()).to.be.eq(dao.address);
+
+      // Uninstall build 1.
+      const data = ethers.utils.defaultAbiCoder.encode(
+        getNamedTypesFromMetadata(
+          MainVotingPluginSetupParams.METADATA.build.pluginSetup
+            .prepareUninstallation
+            .inputs,
+        ),
+        [pluginUpgrader],
+      );
+      await uninstallPlugin(psp, dao, plugin, pluginSetupRef, data, []);
+    });
+  });
+});

packages/contracts/test/integration-testing/member-access-setup.ts

@@ -0,0 +1,164 @@
+import { MemberAccessPluginSetupParams } from "../../plugin-setup-params";
+import {
+  MainVotingPlugin__factory,
+  MajorityVotingBase,
+  MemberAccessPlugin,
+  MemberAccessPlugin__factory,
+  MemberAccessPluginSetup,
+  MemberAccessPluginSetup__factory,
+  PluginRepo,
+} from "../../typechain";
+import { PluginSetupRefStruct } from "../../typechain/@aragon/osx/framework/dao/DAOFactory";
+import { osxContracts } from "../../utils/helpers";
+import { getPluginRepoInfo } from "../../utils/plugin-repo-info";
+import { installPlugin, uninstallPlugin } from "../helpers/setup";
+import { deployTestDao } from "../helpers/test-dao";
+import { getNamedTypesFromMetadata } from "../helpers/types";
+import {
+  DAO,
+  PluginRepo__factory,
+  PluginSetupProcessor,
+  PluginSetupProcessor__factory,
+} from "@aragon/osx-ethers";
+import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
+import { expect } from "chai";
+import { BigNumber } from "ethers";
+import { ethers } from "hardhat";
+import { ADDRESS_ZERO } from "../unit-testing/common";
+
+describe("MemberAccessPluginSetup processing", function () {
+  let alice: SignerWithAddress;
+
+  let psp: PluginSetupProcessor;
+  let dao: DAO;
+  let pluginRepo: PluginRepo;
+
+  before(async () => {
+    [alice] = await ethers.getSigners();
+
+    const hardhatForkNetwork = process.env.NETWORK_NAME ?? "mainnet";
+
+    const pluginRepoInfo = getPluginRepoInfo(
+      MemberAccessPluginSetupParams.PLUGIN_REPO_ENS_NAME,
+      "hardhat",
+    );
+    if (!pluginRepoInfo) {
+      throw new Error("The plugin setup details are not available");
+    }
+
+    // PSP
+    psp = PluginSetupProcessor__factory.connect(
+      osxContracts[hardhatForkNetwork]["PluginSetupProcessor"],
+      alice,
+    );
+
+    // Deploy DAO.
+    dao = await deployTestDao(alice);
+
+    await dao.grant(
+      dao.address,
+      psp.address,
+      ethers.utils.id("ROOT_PERMISSION"),
+    );
+    await dao.grant(
+      psp.address,
+      alice.address,
+      ethers.utils.id("APPLY_INSTALLATION_PERMISSION"),
+    );
+    await dao.grant(
+      psp.address,
+      alice.address,
+      ethers.utils.id("APPLY_UNINSTALLATION_PERMISSION"),
+    );
+    await dao.grant(
+      psp.address,
+      alice.address,
+      ethers.utils.id("APPLY_UPDATE_PERMISSION"),
+    );
+
+    pluginRepo = PluginRepo__factory.connect(
+      pluginRepoInfo.address,
+      alice,
+    );
+  });
+
+  context("Build 1", async () => {
+    let setup: MemberAccessPluginSetup;
+    let pluginSetupRef: PluginSetupRefStruct;
+    let plugin: MemberAccessPlugin;
+    const pluginUpgrader = ADDRESS_ZERO;
+
+    before(async () => {
+      const release = 1;
+
+      // Deploy setups.
+      setup = MemberAccessPluginSetup__factory.connect(
+        (await pluginRepo["getLatestVersion(uint8)"](release)).pluginSetup,
+        alice,
+      );
+
+      pluginSetupRef = {
+        versionTag: {
+          release: BigNumber.from(release),
+          build: BigNumber.from(1),
+        },
+        pluginSetupRepo: pluginRepo.address,
+      };
+    });
+
+    beforeEach(async () => {
+      // dependencies
+      const mainVotingPlugin = await new MainVotingPlugin__factory(alice)
+        .deploy();
+      // const mvSettings: MajorityVotingBase.VotingSettingsStruct = {
+      //   minDuration: 60 * 60 * 24,
+      //   minParticipation: 1,
+      //   supportThreshold: 1,
+      //   minProposerVotingPower: 0,
+      //   votingMode: 0,
+      // };
+      // await mainVotingPlugin.initialize(dao.address, mvSettings, [
+      //   alice.address,
+      // ]);
+
+      const settings: MemberAccessPlugin.MultisigSettingsStruct = {
+        mainVotingPlugin: mainVotingPlugin.address,
+        proposalDuration: 60 * 60 * 24,
+      };
+
+      // Install build 1.
+      const data = ethers.utils.defaultAbiCoder.encode(
+        getNamedTypesFromMetadata(
+          MemberAccessPluginSetupParams.METADATA.build.pluginSetup
+            .prepareInstallation
+            .inputs,
+        ),
+        [settings, pluginUpgrader],
+      );
+      const results = await installPlugin(psp, dao, pluginSetupRef, data);
+
+      plugin = MemberAccessPlugin__factory.connect(
+        results.preparedEvent.args.plugin,
+        alice,
+      );
+    });
+
+    it("installs & uninstalls", async () => {
+      expect(await plugin.implementation()).to.be.eq(
+        await setup.implementation(),
+      );
+      expect(await plugin.dao()).to.be.eq(dao.address);
+
+      // Uninstall build 1.
+      const data = ethers.utils.defaultAbiCoder.encode(
+        getNamedTypesFromMetadata(
+          MemberAccessPluginSetupParams.METADATA.build.pluginSetup
+            .prepareUninstallation
+            .inputs,
+        ),
+        [pluginUpgrader],
+      );
+      await uninstallPlugin(psp, dao, plugin, pluginSetupRef, data, []);
+    });
+  });
+});