Feat/update scrips

.github/helpers/contracts/dummy-dao/createDao.js

@@ -44,9 +44,9 @@ async function createDao() {
     ],
   };
   const client = IPFS.create({
-    url: 'https://ipfs-0.aragon.network/api/v0',
+    url: 'https://prod.ipfs.aragon.network/api/v0',
     headers: {
-      'X-API-KEY': 'yRERPRwFAb5ZiV94XvJdgvDKoGEeFerfFsAQ65',
+      'X-API-KEY': 'b477RhECf8s8sdM7XrkLBs2wHc4kCMwpbcFC55Kt',
     },
   });
   const cid = await client.add(JSON.stringify(metadataObj));

.github/helpers/contracts/dummy-dao/proposal.js

@@ -45,9 +45,9 @@ async function proposal() {
     ],
   };
   const client = IPFS.create({
-    url: 'https://ipfs-0.aragon.network/api/v0',
+    url: 'https://prod.ipfs.aragon.network/api/v0',
     headers: {
-      'X-API-KEY': 'yRERPRwFAb5ZiV94XvJdgvDKoGEeFerfFsAQ65',
+      'X-API-KEY': 'b477RhECf8s8sdM7XrkLBs2wHc4kCMwpbcFC55Kt',
     },
   });
   const cid = await client.add(JSON.stringify(metadataObj));

DEPLOYMENT_CHECKLIST.md

@@ -4,6 +4,7 @@ This checklist is seen as a guide to deploy the stack to a new chain.
 
 ## Pre-Deployment
 
+- [ ] Make sure you are using Node v16 
 - [ ] Bump the OSx protocol version in the `ProtocolVersion.sol` file.
 - [ ] Choose an ENS domain for DAOs
 - [ ] Choose an ENS domain for plugins

UPDATE_CHECKLIST.md

@@ -4,6 +4,7 @@ This checklist is seen as a guide to update the existing deployment.
 
 ## Pre-Update
 
+- [ ] Make sure you are using Node v16
 - [ ] Verify that all changes of this update are reflected in [contracts/CHANGELOG.md](packages/contracts/CHANGELOG.md) by comparing the diff with the previous release commit.
 - [ ] Check that all contracts that undergo an upgrade and
   - [ ] require reinitialzation are reinitialized correctly by an `upgradeToAndCall` call to a respective method with an incremented `renitializer(X)` number

active_contracts.json

@@ -60,11 +60,11 @@
     "PluginRepoRegistry": "0xc796bB1AfEBc56daDF6CAcD2aDa78055e5381971",
     "PluginRepoFactory": "0xDcC5933bc3567E7798Ff00Ab3413cF5f5801BD41",
     "PluginSetupProcessor": "0x9227b311C5cecB416707F1C8B7Ca1b52649AabEc",
-    "DAOFactory": "0x3ff1681f31f68Ff2723d25Cf839bA7500FE5d218",
+    "DAOFactory": "0x5bDBaAfd90B908058567080513635f560F896918",
     "AddresslistVotingSetup": "0xD1CE76c26bc20255157C8ef478276eb115eC02a7",
     "TokenVotingSetup": "0x76D3795Df5acF2e2141557BA1Cf094fd54d4e10C",
     "AdminSetup": "0x40a3EF0f0780e044EbDDEdAa9AB225158f315afd",
-    "MultisigSetup": "0x2C233F09CaB08BC66b750CB80da401Bd700B74a0",
+    "MultisigSetup": "0x8b2361C65E898F40372a0DD5E1BfEE9895A676B3",
     "address-list-voting-repo": "0x71570268A86A80B5cCa3F5e430c2BAa3F4b26278",
     "token-voting-repo": "0xaCa70D8c462940B839DE386BcDD4CACf745632cA",
     "admin-repo": "0x0DF9b15550fF39149e491dDD154b28f587e0cD16",

packages/contracts/deploy/helpers.ts

@@ -57,9 +57,9 @@ export async function uploadToIPFS(
   networkName: string
 ): Promise<string> {
   const client = IPFS.create({
-    url: 'https://ipfs-0.aragon.network/api/v0',
+    url: 'https://prod.ipfs.aragon.network/api/v0',
     headers: {
-      'X-API-KEY': 'yRERPRwFAb5ZiV94XvJdgvDKoGEeFerfFsAQ65',
+      'X-API-KEY': 'b477RhECf8s8sdM7XrkLBs2wHc4kCMwpbcFC55Kt',
     },
   });
 
@@ -70,6 +70,7 @@ export async function uploadToIPFS(
 
   const cid = await client.add(metadata);
   await client.pin.add(cid.cid);
+  console.log(`Uploaded to IPFS with cid ${cid.cid}`);
   return cid.path;
 }
 
@@ -81,7 +82,7 @@ export async function getContractAddress(
 
   let networkName = network.name;
 
-  if (hre.testingFork) {
+  if (hre.testingFork.network) {
     networkName = hre.testingFork.network;
   }
 
@@ -104,6 +105,26 @@ export async function getContractAddress(
     }
   } catch (e) {}
 
+  return getActiveContractAddressInNetwork(contractName, networkName);
+}
+
+export async function getActiveContractAddress(
+  contractName: string,
+  hre: HardhatRuntimeEnvironment
+): Promise<string> {
+  let networkName = hre.network.name;
+
+  if (hre.testingFork.network) {
+    networkName = hre.testingFork.network;
+  }
+
+  return getActiveContractAddressInNetwork(contractName, networkName);
+}
+
+export async function getActiveContractAddressInNetwork(
+  contractName: string,
+  networkName: string
+): Promise<string> {
   const activeContracts = await getActiveContractsJSON();
   try {
     return activeContracts[networkName][contractName];

packages/contracts/deploy/update/to_v1.3.0/01_DAOFactory.ts

@@ -1,7 +1,7 @@
 import {DeployFunction} from 'hardhat-deploy/types';
 import {HardhatRuntimeEnvironment} from 'hardhat/types';
 import {Operation} from '../../../utils/types';
-import {getContractAddress} from '../../helpers';
+import {getActiveContractAddress} from '../../helpers';
 import {DAO__factory} from '../../../typechain';
 import {UPDATE_INFOS} from '../../../utils/updates';
 
@@ -13,13 +13,16 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const {deploy} = deployments;
   const [deployer] = await ethers.getSigners();
 
-  const managingDAOAddress = await getContractAddress('managingDAO', hre);
-  const pluginSetupProcessorAddress = await getContractAddress(
+  const managingDAOAddress = await getActiveContractAddress('managingDAO', hre);
+  const pluginSetupProcessorAddress = await getActiveContractAddress(
     'PluginSetupProcessor',
     hre
   );
-  const daoRegistryAddress = await getContractAddress('DAORegistry', hre);
-  const previousDAOFactoryAddress = await getContractAddress('DAOFactory', hre);
+  const daoRegistryAddress = await getActiveContractAddress('DAORegistry', hre);
+  const previousDAOFactoryAddress = await getActiveContractAddress(
+    'DAOFactory',
+    hre
+  );
   console.log(`Using managingDAO ${managingDAOAddress}`);
   console.log(`Using PluginSetupProcessor ${pluginSetupProcessorAddress}`);
   console.log(`Using DAORegistry ${daoRegistryAddress}`);

packages/contracts/deploy/update/to_v1.3.0/99_ManagingDAO.ts

@@ -18,8 +18,9 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     managingDAOAddress,
     hre.ethers.provider
   );
-  const upgradeTX = await daoInterface.populateTransaction.upgradeTo(
-    daoImplementation
+  const upgradeTX = await daoInterface.populateTransaction.upgradeToAndCall(
+    daoImplementation,
+    daoInterface.interface.encodeFunctionData('initializeFrom', [[1, 0, 0], ''])
   );
 
   if (!upgradeTX.to || !upgradeTX.data) {

packages/contracts/networks.json

@@ -3,13 +3,13 @@
     "url": "https://goerli.infura.io/v3/481a4cdc7c774286b8627f21c6827f48",
     "isTestnet": true,
     "chainId": 5,
-    "deploy": ["./deploy/update/to_v1.2.0", "./deploy/verification"]
+    "deploy": ["./deploy/update/to_v1.3.0", "./deploy/verification"]
   },
   "mainnet": {
     "url": "https://mainnet.infura.io/v3/481a4cdc7c774286b8627f21c6827f48",
     "isTestnet": false,
     "chainId": 1,
-    "deploy": ["./deploy/update/to_v1.2.0", "./deploy/verification"]
+    "deploy": ["./deploy/update/to_v1.3.0", "./deploy/verification"]
   },
   "arbitrum": {
     "url": "https://arbitrum-mainnet.infura.io/v3/481a4cdc7c774286b8627f21c6827f48",
@@ -21,13 +21,13 @@
     "isTestnet": false,
     "chainId": 137,
     "feesUrl": "https://gasstation-mainnet.matic.network/v2",
-    "deploy": ["./deploy/update/to_v1.2.0", "./deploy/verification"]
+    "deploy": ["./deploy/update/to_v1.3.0", "./deploy/verification"]
   },
   "mumbai": {
-    "url": "https://rpc.ankr.com/polygon_mumbai",
+    "url": "https://polygon-mumbai.infura.io/v3/481a4cdc7c774286b8627f21c6827f48",
     "isTestnet": true,
     "chainId": 80001,
     "feesUrl": "https://gasstation-mumbai.matic.today/v2",
-    "deploy": ["./deploy/update/to_v1.2.0", "./deploy/verification"]
+    "deploy": ["./deploy/update/to_v1.3.0", "./deploy/verification"]
   }
 }