refactor: remove Aragon plugins from the OSx core repository

package.json

@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "description": "Aragon DAO Framework",
   "repository": "https://github.com/aragon/osx",
-  "author": "Aragon Association",
+  "author": "Aragon X",
   "license": "AGPL-3.0-or-later",
   "private": true,
   "workspaces": {

packages/contracts/CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- Use `ProxyLib` and `PluginUpgradeableSetup` from `osx-commons-contracts`.
 - Added `VersionComparisonLib` to compare semantic versioning numbers.
 - Inherit `ProtocolVersion` in `Plugin`, `PluginCloneable`, `PluginUUPSUpgradeable`, `PluginSetup`, `PermissionCondition`, `PermissionConditionUpgradeable` `PluginSetupProcessor`, `PluginRepoRegistry`, `DAORegistry`, and `ENSSubdomainRegistrar`.
 - Added the `FunctionDeprecated` error to `DAO`.
@@ -17,15 +18,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Changed the solidity compiler pragma from `0.8.17` to `^0.8.8` for all files.
 - Improved type safety by using `abi.encodeCall` instead of `abi.encodeWithSelector` and the more explicit bracket syntax for permissions.
-- Bumped OpenZeppelin dependencies to `4.9.3`.
+- Bumped OpenZeppelin dependencies to `4.9.6`.
 - Refactored the fallback in the `isGranted` function in `PermissionManager` to make conditions mutually exclusive: Specific conditions answering `false` do not fall back to generic caller conditions (`_who: ANY_ADDR`) or generic target conditions (`_where: ANY_ADDR`).
 - Renamed the `signatureValidator` variable in `DAO` to `__removed0`.
 - Use the DAOs permission manager functionality to validate signatures.
-- Renamed `managingDAO` during deployment to `managmentDAO`.
+- Renamed `managingDAO` during deployment to `managementDAO`.
 - Aligned contract names during deployment with the names given in `@aragon/osx-commons-configs`.
 
 ### Removed
 
+- Deleted `AddresslistVoting`, `AddresslistVotingSetup` and related metadata.
+- Moved `TokenVoting`, `TokenVotingSetup` and related metadata to the [aragon/token-voting-plugin](https://github.com/aragon/token-voting-plugin) repo.
+- Moved `Multisig`, `MultisigSetup` and related metadata to the [aragon/multisig-plugin](https://github.com/aragon/multisig-plugin) repo.
+- Moved `Admin`, `AdminSetup` and related metadata to the [aragon/admin-plugin](https://github.com/aragon/admin-plugin) repo.
 - Moved
 
   - interfaces `IDAO`, `IPermissionCondition`, `IPlugin`, `IMembership`, `IProposal`, `IPluginSetup`, `IProtocolVersion`,

packages/contracts/deploy/helpers.ts

@@ -33,24 +33,6 @@ export const ENS_PUBLIC_RESOLVERS: {[key: string]: string} = {
   sepolia: '0x8FADE66B79cC9f707aB26799354482EB93a5B7dD',
 };
 
-export const MANAGEMENT_DAO_METADATA = {
-  name: 'Aragon Management DAO',
-  description:
-    'Aragon OSx includes a group of global smart contracts that allow for a DAO ecosystem to be built on top. These contracts will require future improvements and general maintenance. The Management DAO is intended to perform such maintenance tasks and holds the permissions to deliver any new capabilities that are added in the future.',
-  avatar:
-    'https://ipfs.eth.aragon.network/ipfs/QmVyy3ci7F2zHG6JUJ1XbcwLKuxWrQ6hqNvSnjmDmdYJzP/',
-  links: [
-    {
-      name: 'Web site',
-      url: 'https://www.aragon.org',
-    },
-    {
-      name: 'Developer Portal',
-      url: 'https://devs.aragon.org/',
-    },
-  ],
-};
-
 export const DAO_PERMISSIONS = [
   'ROOT_PERMISSION',
   'UPGRADE_DAO_PERMISSION',
@@ -158,170 +140,6 @@ export async function detemineDeployerNextAddress(
   return futureAddress;
 }
 
-export async function createPluginRepo(
-  hre: HardhatRuntimeEnvironment,
-  pluginName: string,
-  subdomain: string
-): Promise<void> {
-  const {network} = hre;
-  const signers = await ethers.getSigners();
-
-  const pluginDomain = pluginDomainEnv(network);
-  if (
-    await isENSDomainRegistered(
-      `${subdomain}.${pluginDomain}`,
-      await getENSAddress(hre),
-      signers[0]
-    )
-  ) {
-    // not beeing able to register the plugin repo means that something is not right with the framework deployment used.
-    // Either a frontrun happened or something else. Thus we abort here
-    throw new Error(`${subdomain} is already present! Aborting...`);
-  }
-
-  const pluginRepoFactoryAddress = await getContractAddress(
-    'PluginRepoFactory',
-    hre
-  );
-
-  const pluginRepoFactoryFactory = new PluginRepoFactory__factory(signers[0]);
-  const pluginRepoFactoryContract = pluginRepoFactoryFactory.attach(
-    pluginRepoFactoryAddress
-  );
-
-  const {deployer} = await hre.getNamedAccounts();
-
-  const tx = await pluginRepoFactoryContract.createPluginRepo(
-    subdomain,
-    deployer
-  );
-  console.log(
-    `Creating & registering repo for ${pluginName} with tx ${tx.hash}`
-  );
-  await tx.wait();
-
-  const event = await findEventTopicLog<PluginRepoRegisteredEvent>(
-    tx,
-    PluginRepoRegistry__factory.createInterface(),
-    'PluginRepoRegistered'
-  );
-  const repoAddress = event.args.pluginRepo;
-
-  hre.aragonPluginRepos[pluginName] = repoAddress;
-
-  console.log(
-    `Created & registered repo for ${pluginName} at address: ${repoAddress}` //, with contentURI ${ethers.utils.toUtf8String(releaseMetadata)}`
-  );
-}
-
-export async function createVersion(
-  pluginRepoContract: string,
-  pluginSetupContract: string,
-  releaseNumber: number,
-  releaseMetadata: string,
-  buildMetadata: string
-): Promise<void> {
-  const signers = await ethers.getSigners();
-
-  const PluginRepo = new PluginRepo__factory(signers[0]);
-  const pluginRepo = PluginRepo.attach(pluginRepoContract);
-
-  const tx = await pluginRepo.createVersion(
-    releaseNumber,
-    pluginSetupContract,
-    buildMetadata,
-    releaseMetadata
-  );
-
-  console.log(`Creating build for release ${releaseNumber} with tx ${tx.hash}`);
-
-  await tx.wait();
-
-  const versionCreatedEvent = await findEvent<VersionCreatedEvent>(
-    tx,
-    'VersionCreated'
-  );
-
-  console.log(
-    `Created build ${versionCreatedEvent.args.build} for release ${
-      versionCreatedEvent.args.release
-    } with setup address: ${
-      versionCreatedEvent.args.pluginSetup
-    }, with build metadata ${ethers.utils.toUtf8String(
-      buildMetadata
-    )} and release metadata ${ethers.utils.toUtf8String(releaseMetadata)}`
-  );
-}
-
-export type LatestVersion = {
-  versionTag: VersionTag;
-  pluginSetupContract: string;
-  releaseMetadata: string;
-  buildMetadata: string;
-};
-
-function isSorted(latestVersions: LatestVersion[]): boolean {
-  // The list of latest versions has to start with the first release, otherwise something is wrong and we must stop.
-  if (latestVersions[0].versionTag[0] != 1) {
-    return false;
-  }
-
-  for (let i = 0; i < latestVersions.length - 1; i++) {
-    if (
-      !(
-        latestVersions[i + 1].versionTag[0] ==
-        latestVersions[i].versionTag[0] + 1
-      )
-    ) {
-      return false;
-    }
-  }
-  return true;
-}
-
-export async function populatePluginRepo(
-  hre: HardhatRuntimeEnvironment,
-  pluginRepoName: string,
-  latestVersions: LatestVersion[]
-): Promise<void> {
-  // make sure that the latestVersions array is sorted by version tag
-  if (!isSorted(latestVersions)) {
-    throw new Error(`${latestVersions} is not sorted in ascending order`);
-  }
-
-  for (const latestVersion of latestVersions) {
-    const releaseNumber = latestVersion.versionTag[0];
-    const latestBuildNumber = latestVersion.versionTag[1];
-
-    const placeholderSetup = await getContractAddress('PlaceholderSetup', hre);
-
-    const emptyJsonObject = ethers.utils.hexlify(
-      ethers.utils.toUtf8Bytes('{}')
-    );
-
-    for (let i = 1; i < latestBuildNumber; i++) {
-      await createVersion(
-        hre.aragonPluginRepos[pluginRepoName],
-        placeholderSetup,
-        releaseNumber,
-        emptyJsonObject,
-        ethers.utils.hexlify(
-          ethers.utils.toUtf8Bytes(`ipfs://${hre.placeholderBuildCIDPath}`)
-        )
-      );
-    }
-
-    // create latest builds
-    await createVersion(
-      hre.aragonPluginRepos[pluginRepoName],
-      latestVersion.pluginSetupContract,
-      releaseNumber,
-      latestVersion.releaseMetadata,
-      latestVersion.buildMetadata
-    );
-  }
-}
-
 export async function checkSetManagementDao(
   contract: Contract,
   expectedDaoAddress: string
@@ -567,26 +385,5 @@ export async function transferSubnodeChain(
   }
 }
 
-/**
- * Returns the management DAO' multisig address defined in the environment variables. Throws if not found
- *
- * @export
- * @param {HardhatRuntimeEnvironment} hre
- * @return {string}
- */
-export function getManagementDAOMultisigAddress(
-  hre: HardhatRuntimeEnvironment
-): string {
-  const {network} = hre;
-  const address =
-    process.env[`${network.name.toUpperCase()}_MANAGEMENT_DAO_MULTISIG`];
-  if (!address) {
-    throw new Error(
-      `Failed to find management DAO multisig address in env variables for ${network.name}`
-    );
-  }
-  return address;
-}
-
 // hh-deploy cannot process files without default exports
 export default async () => {};

packages/contracts/deploy/management-dao-metadata.json

@@ -0,0 +1,15 @@
+{
+  "name": "Aragon Management DAO",
+  "description": "Aragon OSx includes a group of global smart contracts that allow for a DAO ecosystem to be built on top. These contracts will require future improvements and general maintenance. The Management DAO is intended to perform such maintenance tasks and holds the permissions to deliver any new capabilities that are added in the future.",
+  "avatar": "https://ipfs.eth.aragon.network/ipfs/QmVyy3ci7F2zHG6JUJ1XbcwLKuxWrQ6hqNvSnjmDmdYJzP/",
+  "links": [
+    {
+      "name": "Web site",
+      "url": "https://www.aragon.org"
+    },
+    {
+      "name": "Developer Portal",
+      "url": "https://devs.aragon.org/"
+    }
+  ]
+}

packages/contracts/deploy/new/00_management-dao/01_management-dao-permissions.ts

@@ -21,7 +21,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     deployer
   );
 
-  // grant the deployer execute permissions during deployment. This will be revoked in 40_finalize-management-dao/40_revoke-permissions
+  // grant the deployer execute permissions.
   await managePermissions(managementDaoContract, [
     {
       operation: Operation.Grant,