Feat: update deploy script

packages/contracts/deploy/00_info/01_info.ts

@@ -4,6 +4,7 @@ import {
   getProductionNetworkName,
   isLocal,
 } from '../../utils/helpers';
+import {forkNetwork} from '../helpers';
 import {getNetworkByNameOrAlias} from '@aragon/osx-commons-configs';
 import {UnsupportedNetworkError} from '@aragon/osx-commons-sdk';
 import {DeployFunction} from 'hardhat-deploy/types';
@@ -20,7 +21,10 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   console.log(`\n✨ ${path.basename(__filename)}:`);
 
   const [deployer] = await hre.ethers.getSigners();
-  if (isLocal(hre)) {
+
+  if (process.env.FORKING_RPC_URL) {
+    await forkNetwork(hre, process.env.FORKING_RPC_URL);
+  } else if (isLocal(hre)) {
     const productionNetworkName: string = getProductionNetworkName(hre);
 
     console.log(
@@ -32,16 +36,11 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     if (networkConfig === null) {
       throw new UnsupportedNetworkError(productionNetworkName);
     }
-    await hre.network.provider.request({
-      method: 'hardhat_reset',
-      params: [
-        {
-          forking: {
-            jsonRpcUrl: networkConfig.url,
-          },
-        },
-      ],
-    });
+    if (!networkConfig.url) {
+      throw new Error('RPC Url on network not defined');
+    }
+
+    await forkNetwork(hre, networkConfig.url);
   } else {
     console.log(`Production deployment on network '${hre.network.name}'.`);
   }

packages/contracts/deploy/10_create_repo/11_create_repo.ts

@@ -1,9 +1,14 @@
-import {PLUGIN_REPO_ENS_SUBDOMAIN_NAME} from '../../plugin-settings';
+import {
+  PLUGIN_REPO_ENS_SUBDOMAIN_NAME,
+  PLUGIN_CONTRACT_NAME,
+} from '../../plugin-settings';
 import {
   findPluginRepo,
   getProductionNetworkName,
   pluginEnsDomain,
+  isValidAddress,
 } from '../../utils/helpers';
+import {saveToDeployedJson} from '../helpers';
 import {
   getLatestNetworkDeployment,
   getNetworkNameByAlias,
@@ -18,6 +23,7 @@ import {
   PluginRepo__factory,
   PluginRepoFactory__factory,
 } from '@aragon/osx-ethers';
+import {ethers} from 'hardhat';
 import {DeployFunction} from 'hardhat-deploy/types';
 import {HardhatRuntimeEnvironment} from 'hardhat/types';
 import path from 'path';
@@ -27,6 +33,7 @@ import path from 'path';
  * @param {HardhatRuntimeEnvironment} hre
  */
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
+  // todo change this log
   console.log(
     `Creating the '${pluginEnsDomain(
       hre
@@ -35,24 +42,54 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
 
   const [deployer] = await hre.ethers.getSigners();
 
-  // Get the Aragon `PluginRepoFactory` from the `osx-commons-configs`
-  const productionNetworkName = getProductionNetworkName(hre);
-  const network = getNetworkNameByAlias(productionNetworkName);
-  if (network === null) {
-    throw new UnsupportedNetworkError(productionNetworkName);
-  }
-  const networkDeployments = getLatestNetworkDeployment(network);
-  if (networkDeployments === null) {
-    throw `Deployments are not available on network ${network}.`;
+  let pluginRepoFactoryAddress = process.env.PLUGIN_REPO_FACTORY_ADDRESS;
+  let subdomainRegistrar;
+
+  if (pluginRepoFactoryAddress) {
+    if (!isValidAddress(pluginRepoFactoryAddress)) {
+      throw new Error('Plugin Repo Factory in .env is not of type Address');
+    }
+    // use this factory
+    const pluginRepoFactory = PluginRepoFactory__factory.connect(
+      pluginRepoFactoryAddress,
+      deployer
+    );
+
+    const pluginRepoRegistry = PluginRepoRegistry__factory.connect(
+      await pluginRepoFactory.pluginRepoRegistry(),
+      deployer
+    );
+    subdomainRegistrar = await pluginRepoRegistry.subdomainRegistrar();
+  } else {
+    // get the factory from osx-commons-configs deployments
+    const productionNetworkName = getProductionNetworkName(hre);
+    const network = getNetworkNameByAlias(productionNetworkName);
+    if (network === null) {
+      throw new UnsupportedNetworkError(productionNetworkName);
+    }
+    const networkDeployments = getLatestNetworkDeployment(network);
+    if (networkDeployments === null) {
+      throw `Deployments are not available on network ${network}.`;
+    }
+    pluginRepoFactoryAddress = networkDeployments.PluginRepoFactory.address;
+
+    subdomainRegistrar =
+      networkDeployments.PluginENSSubdomainRegistrarProxy.address;
   }
+  // subdomain will depend on if the framework has the ens or not
+  const subdomain =
+    subdomainRegistrar !== ethers.constants.AddressZero
+      ? PLUGIN_REPO_ENS_SUBDOMAIN_NAME
+      : '';
+
   const pluginRepoFactory = PluginRepoFactory__factory.connect(
-    networkDeployments.PluginRepoFactory.address,
+    pluginRepoFactoryAddress,
     deployer
   );
 
   // Create the `PluginRepo` through the Aragon `PluginRepoFactory`
   const tx = await pluginRepoFactory.createPluginRepo(
-    PLUGIN_REPO_ENS_SUBDOMAIN_NAME,
+    subdomain,
     deployer.address
   );
 
@@ -70,13 +107,35 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   );
 
   console.log(
-    `PluginRepo '${pluginEnsDomain(hre)}' deployed at '${pluginRepo.address}'.`
+    `PluginRepo ${
+      subdomainRegistrar !== ethers.constants.AddressZero
+        ? 'with ens:' + pluginEnsDomain(hre)
+        : 'without ens'
+    } deployed at '${pluginRepo.address}'.`
   );
 
   hre.aragonToVerifyContracts.push({
     address: pluginRepo.address,
     args: [],
   });
+
+  saveToDeployedJson(
+    [
+      {
+        name: PLUGIN_CONTRACT_NAME + 'RepoProxy',
+        address: pluginRepo.address,
+        blockNumber: tx.blockNumber,
+        txHash: tx.hash,
+      },
+      {
+        name: PLUGIN_CONTRACT_NAME + 'RepoImplementation',
+        address: await pluginRepoFactory.pluginRepoBase(),
+        blockNumber: null,
+        txHash: null,
+      },
+    ],
+    true
+  );
 };
 
 export default func;
@@ -89,25 +148,35 @@ func.tags = ['CreateRepo'];
 func.skip = async (hre: HardhatRuntimeEnvironment) => {
   console.log(`\n🏗️  ${path.basename(__filename)}:`);
 
-  // Check if the ens record exists already
-  const {pluginRepo, ensDomain} = await findPluginRepo(hre);
+  // try getting the plugin repo.
+  const res = await findPluginRepo(hre);
+  const pluginRepoAddress = res.pluginRepo?.address;
+  const ensDomain = res.ensDomain;
 
-  if (pluginRepo !== null) {
-    console.log(
-      `ENS name '${ensDomain}' was claimed already at '${
-        pluginRepo.address
-      }' on network '${getProductionNetworkName(hre)}'. Skipping deployment...`
-    );
+  if (pluginRepoAddress) {
+    if (ensDomain != '') {
+      console.log(
+        `ENS name '${ensDomain}' was claimed already at '${pluginRepoAddress}' on network '${getProductionNetworkName(
+          hre
+        )}'. Skipping deployment...`
+      );
+    } else {
+      console.log(
+        `Plugin Repo already deployed at '${pluginRepoAddress}' on network '${getProductionNetworkName(
+          hre
+        )}'. Skipping deployment...`
+      );
+    }
 
     hre.aragonToVerifyContracts.push({
-      address: pluginRepo.address,
+      address: pluginRepoAddress,
       args: [],
     });
 
     return true;
-  } else {
-    console.log(`ENS name '${ensDomain}' is unclaimed. Deploying...`);
-
-    return false;
   }
+
+  console.log('Deploying Plugin Repo');
+
+  return false;
 };

packages/contracts/deploy/20_new_version/23_publish.ts

@@ -12,6 +12,7 @@ import {
   impersonatedManagementDaoSigner,
   isLocal,
   pluginEnsDomain,
+  isValidAddress,
 } from '../../utils/helpers';
 import {getLatestContractAddress} from '../helpers';
 import {PLUGIN_REPO_PERMISSIONS, uploadToPinata} from '@aragon/osx-commons-sdk';
@@ -38,6 +39,7 @@ async function createVersion(
       ethers.utils.hexlify(ethers.utils.toUtf8Bytes(buildMetadataURI)),
       ethers.utils.hexlify(ethers.utils.toUtf8Bytes(releaseMetadataURI))
     );
+
   await tx.wait();
 }
 
@@ -76,7 +78,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   // Get PluginRepo
   const {pluginRepo, ensDomain} = await findPluginRepo(hre);
   if (pluginRepo === null) {
-    throw `PluginRepo '${ensDomain}' does not exist yet.`;
+    throw `Can't find Plugin Repo...`;
   }
 
   // Check release number
@@ -140,13 +142,19 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
       []
     )
   ) {
-    const placeholderSetup = getLatestContractAddress('PlaceholderSetup', hre);
-    if (placeholderSetup == '') {
-      throw new Error(
-        'Aborting. Placeholder setup not present in this network'
-      );
-    }
     if (latestBuild == 0 && VERSION.build > 1) {
+      // We are publishing the first version as build > 1.
+      // So we need to publish placeholders first..
+      const placeholderSetup =
+        process.env.PLACEHOLDER_SETUP ??
+        getLatestContractAddress('PlaceholderSetup', hre);
+
+      if (!isValidAddress(placeholderSetup)) {
+        throw new Error(
+          'Aborting. Placeholder setup not present in this network or in .env or is not a valid address (is not an address or is address zero)'
+        );
+      }
+
       for (let i = 0; i < VERSION.build - 1; i++) {
         console.log('Publishing placeholder', i + 1);
         await createVersion(
@@ -160,6 +168,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
       }
     }
 
+    // Create the new version
     await createVersion(
       pluginRepo,
       VERSION.release,

packages/contracts/deploy/30_upgrade_repo/_common.ts

@@ -1,10 +1,18 @@
-import {findPluginRepo, getProductionNetworkName} from '../../utils/helpers';
+import {
+  findPluginRepo,
+  getProductionNetworkName,
+  isValidAddress,
+} from '../../utils/helpers';
 import {
   getLatestNetworkDeployment,
   getNetworkNameByAlias,
 } from '@aragon/osx-commons-configs';
 import {UnsupportedNetworkError} from '@aragon/osx-commons-sdk';
-import {PluginRepo, PluginRepo__factory} from '@aragon/osx-ethers';
+import {
+  PluginRepo,
+  PluginRepo__factory,
+  PluginRepoFactory__factory,
+} from '@aragon/osx-ethers';
 import {SignerWithAddress} from '@nomiclabs/hardhat-ethers/signers';
 import {DeployFunction} from 'hardhat-deploy/types';
 import {HardhatRuntimeEnvironment} from 'hardhat/types';
@@ -30,10 +38,6 @@ export async function fetchData(
   if (network === null) {
     throw new UnsupportedNetworkError(productionNetworkName);
   }
-  const networkDeployments = getLatestNetworkDeployment(network);
-  if (networkDeployments === null) {
-    throw `Deployments are not available on network ${network}.`;
-  }
 
   // Get PluginRepo
   const {pluginRepo, ensDomain} = await findPluginRepo(hre);
@@ -46,10 +50,34 @@ export async function fetchData(
   );
 
   // Get the latest `PluginRepo` implementation as the upgrade target
-  const latestPluginRepoImplementation = PluginRepo__factory.connect(
-    networkDeployments.PluginRepoBase.address,
-    deployer
-  );
+  let latestPluginRepoImplementation;
+  const pluginRepoFactoryAddress = process.env.PLUGIN_REPO_FACTORY_ADDRESS;
+
+  if (pluginRepoFactoryAddress) {
+    if (!isValidAddress(pluginRepoFactoryAddress)) {
+      throw new Error(
+        'Plugin Repo Factory in .env is not a valid address (is not an address or is address zero)'
+      );
+    }
+
+    const pluginRepoFactory = PluginRepoFactory__factory.connect(
+      pluginRepoFactoryAddress,
+      deployer
+    );
+    latestPluginRepoImplementation = PluginRepo__factory.connect(
+      await pluginRepoFactory.pluginRepoBase(),
+      deployer
+    );
+  } else {
+    const networkDeployments = getLatestNetworkDeployment(network);
+    if (networkDeployments === null) {
+      throw `Deployments are not available on network ${network}.`;
+    }
+    latestPluginRepoImplementation = PluginRepo__factory.connect(
+      networkDeployments.PluginRepoBase.address,
+      deployer
+    );
+  }
 
   // Get the current OSX protocol version from the current plugin repo implementation
   let current: SemVer;

packages/contracts/deploy/40_conclude/41_transfer_ownership.ts

@@ -30,7 +30,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   );
 
   const permissions: DAOStructs.MultiTargetPermissionStruct[] = [
-    // Grant to the managment DAO
+    // Grant to the management DAO
     {
       operation: Operation.Grant,
       where: pluginRepo.address,