Feat/polygon deployment

.github/workflows/contract-tests.yml

@@ -21,11 +21,9 @@ jobs:
         uses: actions/setup-node@v3
         with:
           cache: 'yarn'
-          node-version: 14
-      - name: Install yarn
-        run: npm i -G yarn
+          node-version: 16
       - name: Install dependencies
-        run: yarn
+        run: cd ../../ && yarn install --pure-lockfile
       - name: Check formatting
         run: yarn run formatting:check
       - name: Compile contracts

.github/workflows/documentation-update.yml

@@ -16,7 +16,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           cache: 'yarn'
-          node-version: 14
+          node-version: 16
       - name: Install dependencies
         run: yarn install --frozen-lockfile
       - name: Generate Docs

.github/workflows/mythx-changed.yml

@@ -46,7 +46,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           cache: "yarn"
-          node-version: 14
+          node-version: 16
       - uses: actions/setup-python@v4
       - name: Install mythx-cli
         run: pip install mythx-cli

.github/workflows/mythx-full.yml

@@ -48,7 +48,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           cache: "yarn"
-          node-version: 14
+          node-version: 16
       - uses: actions/setup-python@v4
       - name: Install mythx-cli
         run: pip install mythx-cli

.github/workflows/npm-release-reusable.yml

@@ -53,7 +53,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           cache: "yarn"
-          node-version: 14
+          node-version: 16
           registry-url: 'https://registry.npmjs.org'
       - name: Install dependencies
         run: yarn install --pure-lockfile

.github/workflows/subgraph-deploy.yaml

@@ -95,7 +95,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           cache: 'yarn'
-          node-version: 14
+          node-version: 16
       - name: Install dependencies
         run: yarn install --pure-lockfile
       - name: Build Contracts

.github/workflows/subgraph-tests.yml

@@ -34,7 +34,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           cache: "yarn"
-          node-version: 14
+          node-version: 16
       - name: Install dependencies
         run: yarn install --pure-lockfile
       - name: Build manifest
@@ -53,7 +53,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           cache: "yarn"
-          node-version: 14
+          node-version: 16
       - name: Install dependencies
         run: yarn
       - name: Build contracts

active_contracts.json

@@ -46,29 +46,53 @@
     "multisig-repo": "0x8c278e37D0817210E18A7958524b7D0a1fAA6F7b"
   },
   "mumbai": {
-    "managingDAOImplemenation": "0x38e85D5A0A7F49EcfD24FF191E543a7c7001068d",
-    "managingDAO": "0xd3d5A6b2dB077B5eBBDe90f85eAF4b8466e7EA25",
-    "ENSRegistry": "0x42256AD2900d4eCd684ceAF2107f78a25433a526",
-    "PublicResolver": "0x9540237cb446979839AbeC89d5861ce327d4EF75",
-    "DAO_ENSSubdomainRegistrar_Implementation": "0xB7BbDb76AAF2822Fa8DA356409f53EFF4356044b",
-    "DAO_ENSSubdomainRegistrar": "0x4c98505008C78A83F0Dec3c756645cEfb5080AEE",
-    "Plugin_ENSSubdomainRegistrar_Implementation": "0x4975261C62C0575B2166981a38f1EA4a3C2759Ca",
-    "Plugin_ENSSubdomainRegistrar": "0x0FC876E0D465Bb90bA9b463A9C079211aC13F9b8",
-    "DAORegistry_Implementation": "0xFf65396a237901f9d878e012BDA193B0539ec950",
-    "DAORegistry": "0xef928847d1F2860459F7005b61B632C7De5878A3",
-    "PluginRepoRegistry_Implementation": "0x4DEA9d628E2c929D3C8377c46e4223099fE337EE",
-    "PluginRepoRegistry": "0x847d61e6fff6a266298886Ff88Cbd9B3102721C5",
-    "PluginRepoFactory": "0x667754e946335C72d828A2bedc1AD83e1805d6dE",
-    "PluginSetupProcessor": "0xc4fD92b543fE2808B0ad9237E74cdfE619152abF",
-    "DAOFactory": "0xe15f84B083Fc73027318DD78c83853F91cC84E53",
-    "AddresslistVotingSetup": "0xbF06efe19627fa4D694e362B8eB708D610f98481",
-    "TokenVotingSetup": "0x5C1f7Dca99dF07beBDD9B07507A002D1e4c67Dd2",
-    "AdminSetup": "0xD6AA80b85E422F2DdFB5107bCD3a21E09F0dDa93",
-    "MultisigSetup": "0x1ECa622BF49b6b98a6eB7A07171Faf0530c15ee7",
-    "PlaceholderSetup": "0x4F6f58b1683cc8f11743dDB96078a5937Fe932a9",
-    "address-list-voting-repo": "0x9531c5c5C1207a319cBDe3A944f6dC54FA088243",
-    "token-voting-repo": "0x296c00A28B6e532e37b8D4665ad3Dc40CE588cB8",
-    "admin-repo": "0x746E5F3fCBFc797EF98f38483c6B955349D1542D",
-    "multisig-repo": "0x6E8dA9b20078657c18397407d2a2671AC907F83B"
+    "managingDAOImplemenation": "0x5E993db91Fd2c713Df1110358396EAc60d54fE66",
+    "managingDAO": "0xE1De373E219a0d19a0500e599adb903477bCA0f9",
+    "ENSRegistry": "0xD24A78824dF3C29CA03661368e6437b767A5422D",
+    "PublicResolver": "0xdbFf6be618180E0FF0d74dd3B6BdC1b5de074273",
+    "DAO_ENSSubdomainRegistrar_Implementation": "0xD5baCA29C944A28f1f568F7e69B119030914c15D",
+    "DAO_ENSSubdomainRegistrar": "0xC528B8AA6a4D0f21455a06b6D7A41fd795619C31",
+    "Plugin_ENSSubdomainRegistrar_Implementation": "0x99965D7cFFE21C4AC94526AAFEd33E9EaA27f004",
+    "Plugin_ENSSubdomainRegistrar": "0x2EfcED958034c3BC455273153C3e604D34C78e46",
+    "DAORegistry_Implementation": "0xE5058D785C934279Af1EF7E90BB5D58048829256",
+    "DAORegistry": "0x6dD0C8b7F9406206ceAA01B5576D9d46e9298f0E",
+    "PluginRepoRegistry_Implementation": "0xab27e29F579C870F66F48F4825A4D294AE540818",
+    "PluginRepoRegistry": "0xc796bB1AfEBc56daDF6CAcD2aDa78055e5381971",
+    "PluginRepoFactory": "0xDcC5933bc3567E7798Ff00Ab3413cF5f5801BD41",
+    "PluginSetupProcessor": "0x9227b311C5cecB416707F1C8B7Ca1b52649AabEc",
+    "DAOFactory": "0x5bDBaAfd90B908058567080513635f560F896918",
+    "AddresslistVotingSetup": "0xD1CE76c26bc20255157C8ef478276eb115eC02a7",
+    "TokenVotingSetup": "0x76D3795Df5acF2e2141557BA1Cf094fd54d4e10C",
+    "AdminSetup": "0x40a3EF0f0780e044EbDDEdAa9AB225158f315afd",
+    "MultisigSetup": "0x8b2361C65E898F40372a0DD5E1BfEE9895A676B3",
+    "address-list-voting-repo": "0x71570268A86A80B5cCa3F5e430c2BAa3F4b26278",
+    "token-voting-repo": "0xaCa70D8c462940B839DE386BcDD4CACf745632cA",
+    "admin-repo": "0x0DF9b15550fF39149e491dDD154b28f587e0cD16",
+    "multisig-repo": "0x2c4690b8be39adAd4F15A69340d5035aC6E53eEF"
+  },
+  "polygon": {
+    "AddresslistVotingSetup": "0x622DB36633643E4A4075ecc3A309a4f0B942922a",
+    "AdminSetup": "0x82aBAfBf46759358c705c7E323543A7Be47AbAf0",
+    "managingDAO": "0x6d4FB6Ff01A172774f42789fcfcdd84E68c28494",
+    "DAOFactory": "0x51Ead12DEcD31ea75e1046EdFAda14dd639789b8",
+    "DAORegistry": "0x96E54098317631641703404C06A5afAD89da7373",
+    "DAORegistry_Implementation": "0x5B3B36BdC9470963A2734D6a0d2F6a64C21C159f",
+    "DAO_ENSSubdomainRegistrar": "0x07f49c49Ce2A99CF7C28F66673d406386BDD8Ff4",
+    "DAO_ENSSubdomainRegistrar_Implementation": "0x35B62715459cB60bf6dC17fF8cfe138EA305E7Ee",
+    "managingDAOImplemenation": "0xCa834B3F404c97273f34e108029eEd776144d324",
+    "ENSRegistry": "0x57bf333951967a0cC0afcD58FC7959Ca0Eae6905",
+    "PluginRepoFactory": "0x6E924eA5864044D8642385683fFA5AD42FB687f2",
+    "PluginRepoRegistry": "0xA03C2182af8eC460D498108C92E8638a580b94d4",
+    "PluginRepoRegistry_Implementation": "0xE978942c691e43f65c1B7c7F8f1dc8cDF061B13f",
+    "PluginSetupProcessor": "0x879D9dfe3F36d7684BeC1a2bB4Aa8E8871A7245B",
+    "Plugin_ENSSubdomainRegistrar": "0x7a62da7B56fB3bfCdF70E900787010Bc4c9Ca42e",
+    "Plugin_ENSSubdomainRegistrar_Implementation": "0xC24188a73dc09aA7C721f96Ad8857B469C01dC9f",
+    "PublicResolver": "0x74b3B3504B5d6D1c6247009c9b1e3D8cFF7bd445",
+    "TokenVotingSetup": "0x03445b197271CB3BE5E453745eD98a05793a4538",
+    "MultisigSetup": "0xD63A8Cfb0eec960C3e70F96a9e3F3091f3FD70b6",
+    "address-list-voting-repo": "0x641DdEdc2139d9948e8dcC936C1Ab2314D9181E6",
+    "token-voting-repo": "0xae67aea0B830ed4504B36670B5Fa70c5C386Bb58",
+    "admin-repo": "0x7fF570473d0876db16A59e8F04EE7F17Ab117309",
+    "multisig-repo": "0x5A5035E7E8aeff220540F383a9cf8c35929bcF31"
   }
 }

packages/contracts-ethers/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aragon/osx-ethers",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "The Aragon OSx contract definitions for ethers.js",
   "main": "dist/bundle-cjs.js",
   "module": "dist/bundle-esm.js",

packages/contracts/Releases.md

@@ -1,5 +1,57 @@
 # Contract Releases
 
+Commit: [cb0621dc5185a73240a6ca33fccc7698f059fdf5](https://github.com/aragon/osx/commit/cb0621dc5185a73240a6ca33fccc7698f059fdf5)
+Network: polygon
+AddresslistVotingSetup: 0x622DB36633643E4A4075ecc3A309a4f0B942922a
+AdminSetup: 0x82aBAfBf46759358c705c7E323543A7Be47AbAf0
+managingDAO: 0x6d4FB6Ff01A172774f42789fcfcdd84E68c28494
+DAOFactory: 0x51Ead12DEcD31ea75e1046EdFAda14dd639789b8
+DAORegistry: 0x96E54098317631641703404C06A5afAD89da7373
+DAORegistry_Implementation: 0x5B3B36BdC9470963A2734D6a0d2F6a64C21C159f
+DAO_ENSSubdomainRegistrar: 0x07f49c49Ce2A99CF7C28F66673d406386BDD8Ff4
+DAO_ENSSubdomainRegistrar_Implementation: 0x35B62715459cB60bf6dC17fF8cfe138EA305E7Ee
+managingDAOImplemenation: 0xCa834B3F404c97273f34e108029eEd776144d324
+ENSRegistry: 0x57bf333951967a0cC0afcD58FC7959Ca0Eae6905
+PluginRepoFactory: 0x6E924eA5864044D8642385683fFA5AD42FB687f2
+PluginRepoRegistry: 0xA03C2182af8eC460D498108C92E8638a580b94d4
+PluginRepoRegistry_Implementation: 0xE978942c691e43f65c1B7c7F8f1dc8cDF061B13f
+PluginSetupProcessor: 0x879D9dfe3F36d7684BeC1a2bB4Aa8E8871A7245B
+Plugin_ENSSubdomainRegistrar: 0x7a62da7B56fB3bfCdF70E900787010Bc4c9Ca42e
+Plugin_ENSSubdomainRegistrar_Implementation: 0xC24188a73dc09aA7C721f96Ad8857B469C01dC9f
+PublicResolver: 0x74b3B3504B5d6D1c6247009c9b1e3D8cFF7bd445
+TokenVotingSetup: 0x03445b197271CB3BE5E453745eD98a05793a4538
+MultisigSetup: 0xD63A8Cfb0eec960C3e70F96a9e3F3091f3FD70b6
+address-list-voting-repo: 0x641DdEdc2139d9948e8dcC936C1Ab2314D9181E6
+token-voting-repo: 0xae67aea0B830ed4504B36670B5Fa70c5C386Bb58
+admin-repo: 0x7fF570473d0876db16A59e8F04EE7F17Ab117309
+multisig-repo: 0x5A5035E7E8aeff220540F383a9cf8c35929bcF31
+
+Commit: [cb0621dc5185a73240a6ca33fccc7698f059fdf5](https://github.com/aragon/osx/commit/cb0621dc5185a73240a6ca33fccc7698f059fdf5)
+Network: mumbai
+managingDAOImplemenation: 0x5E993db91Fd2c713Df1110358396EAc60d54fE66
+managingDAO: 0xE1De373E219a0d19a0500e599adb903477bCA0f9
+ENSRegistry: 0xD24A78824dF3C29CA03661368e6437b767A5422D
+PublicResolver: 0xdbFf6be618180E0FF0d74dd3B6BdC1b5de074273
+DAO_ENSSubdomainRegistrar_Implementation: 0xD5baCA29C944A28f1f568F7e69B119030914c15D
+DAO_ENSSubdomainRegistrar: 0xC528B8AA6a4D0f21455a06b6D7A41fd795619C31
+Plugin_ENSSubdomainRegistrar_Implementation: 0x99965D7cFFE21C4AC94526AAFEd33E9EaA27f004
+Plugin_ENSSubdomainRegistrar: 0x2EfcED958034c3BC455273153C3e604D34C78e46
+DAORegistry_Implementation: 0xE5058D785C934279Af1EF7E90BB5D58048829256
+DAORegistry: 0x6dD0C8b7F9406206ceAA01B5576D9d46e9298f0E
+PluginRepoRegistry_Implementation: 0xab27e29F579C870F66F48F4825A4D294AE540818
+PluginRepoRegistry: 0xc796bB1AfEBc56daDF6CAcD2aDa78055e5381971
+PluginRepoFactory: 0xDcC5933bc3567E7798Ff00Ab3413cF5f5801BD41
+PluginSetupProcessor: 0x9227b311C5cecB416707F1C8B7Ca1b52649AabEc
+DAOFactory: 0x5bDBaAfd90B908058567080513635f560F896918
+AddresslistVotingSetup: 0xD1CE76c26bc20255157C8ef478276eb115eC02a7
+TokenVotingSetup: 0x76D3795Df5acF2e2141557BA1Cf094fd54d4e10C
+AdminSetup: 0x40a3EF0f0780e044EbDDEdAa9AB225158f315afd
+MultisigSetup: 0x8b2361C65E898F40372a0DD5E1BfEE9895A676B3
+address-list-voting-repo: 0x71570268A86A80B5cCa3F5e430c2BAa3F4b26278
+token-voting-repo: 0xaCa70D8c462940B839DE386BcDD4CACf745632cA
+admin-repo: 0x0DF9b15550fF39149e491dDD154b28f587e0cD16
+multisig-repo: 0x2c4690b8be39adAd4F15A69340d5035aC6E53eEF
+
 Commit: [054f89908fa881dba230b7f3815f081463138fed](https://github.com/aragon/osx/commit/054f89908fa881dba230b7f3815f081463138fed)
 Network: mumbai
 managingDAOImplemenation: 0x38e85D5A0A7F49EcfD24FF191E543a7c7001068d

packages/contracts/deploy/30_plugins/00_plugin-setups/01_addresslist_voting_setup_conclude.ts

@@ -1,12 +1,13 @@
 import {DeployFunction} from 'hardhat-deploy/types';
+import {setTimeout} from 'timers/promises';
 import {AddresslistVotingSetup__factory} from '../../../typechain';
 import {EHRE} from '../../../utils/types';
 
 const func: DeployFunction = async function (hre: EHRE) {
   console.log(`Concluding addresslist voting setup deployment.\n`);
   const [deployer] = await hre.ethers.getSigners();
 
-  const {deployments} = hre;
+  const {deployments, network} = hre;
 
   const AddresslistVotingSetupDeployment = await deployments.get(
     'AddresslistVotingSetup'
@@ -16,6 +17,12 @@ const func: DeployFunction = async function (hre: EHRE) {
     deployer
   );
 
+  // add a timeout for polygon because the call to `implementation()` can fail for newly deployed contracts in the first few seconds
+  if (network.name === 'polygon') {
+    console.log(`Waiting 30secs for ${network.name} to finish up...`);
+    await setTimeout(30000);
+  }
+
   hre.aragonToVerifyContracts.push(AddresslistVotingSetupDeployment);
   hre.aragonToVerifyContracts.push({
     address: await addresslistVotingSetup.implementation(),

packages/contracts/deploy/30_plugins/00_plugin-setups/11_token_voting_setup_conclude.ts

@@ -2,19 +2,26 @@ import {ethers} from 'ethers';
 import {DeployFunction} from 'hardhat-deploy/types';
 import {TokenVotingSetup__factory} from '../../../typechain';
 import {EHRE} from '../../../utils/types';
+import {setTimeout} from 'timers/promises';
 
 const func: DeployFunction = async function (hre: EHRE) {
   console.log(`Concluding token voting setup deployment.\n`);
   const [deployer] = await hre.ethers.getSigners();
 
-  const {deployments} = hre;
+  const {deployments, network} = hre;
 
   const TokenVotingSetupDeployment = await deployments.get('TokenVotingSetup');
   const tokenVotingSetup = TokenVotingSetup__factory.connect(
     TokenVotingSetupDeployment.address,
     deployer
   );
 
+  // add a timeout for polygon because the call to `implementation()` can fail for newly deployed contracts in the first few seconds
+  if (network.name === 'polygon') {
+    console.log(`Waiting 30secs for ${network.name} to finish up...`);
+    await setTimeout(30000);
+  }
+
   hre.aragonToVerifyContracts.push(TokenVotingSetupDeployment);
   hre.aragonToVerifyContracts.push({
     address: await tokenVotingSetup.implementation(),

packages/contracts/deploy/30_plugins/00_plugin-setups/21_admin_setup_conclude.ts

@@ -1,19 +1,26 @@
 import {DeployFunction} from 'hardhat-deploy/types';
 import {AdminSetup__factory} from '../../../typechain';
 import {EHRE} from '../../../utils/types';
+import {setTimeout} from 'timers/promises';
 
 const func: DeployFunction = async function (hre: EHRE) {
   console.log(`Concluding admin setup deployment.\n`);
   const [deployer] = await hre.ethers.getSigners();
 
-  const {deployments} = hre;
+  const {deployments, network} = hre;
 
   const AdminSetupDeployment = await deployments.get('AdminSetup');
   const adminSetup = AdminSetup__factory.connect(
     AdminSetupDeployment.address,
     deployer
   );
 
+  // add a timeout for polygon because the call to `implementation()` can fail for newly deployed contracts in the first few seconds
+  if (network.name === 'polygon') {
+    console.log(`Waiting 30secs for ${network.name} to finish up...`);
+    await setTimeout(30000);
+  }
+
   hre.aragonToVerifyContracts.push(AdminSetupDeployment);
   hre.aragonToVerifyContracts.push({
     address: await adminSetup.implementation(),

packages/contracts/deploy/30_plugins/00_plugin-setups/31_multisig_setup_conclude.ts

@@ -1,19 +1,26 @@
 import {DeployFunction} from 'hardhat-deploy/types';
 import {MultisigSetup__factory} from '../../../typechain';
 import {EHRE} from '../../../utils/types';
+import {setTimeout} from 'timers/promises';
 
 const func: DeployFunction = async function (hre: EHRE) {
   console.log(`Concluding multisig setup deployment.\n`);
   const [deployer] = await hre.ethers.getSigners();
 
-  const {deployments} = hre;
+  const {deployments, network} = hre;
 
   const MultisigSetupDeployment = await deployments.get('MultisigSetup');
   const multisigSetup = MultisigSetup__factory.connect(
     MultisigSetupDeployment.address,
     deployer
   );
 
+  // add a timeout for polygon because the call to `implementation()` can fail for newly deployed contracts in the first few seconds
+  if (network.name === 'polygon') {
+    console.log(`Waiting 30secs for ${network.name} to finish up...`);
+    await setTimeout(30000);
+  }
+
   hre.aragonToVerifyContracts.push(MultisigSetupDeployment);
   hre.aragonToVerifyContracts.push({
     address: await multisigSetup.implementation(),

packages/contracts/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aragon/osx-artifacts",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "The Aragon OSx Solidity contracts",
   "main": "dist/bundle-cjs.js",
   "module": "dist/bundle-esm.js",

packages/subgraph/manifest/data/mumbai.json

@@ -4,17 +4,17 @@
   "dataSources": {
     "DAORegistry": {
       "name": "DAORegistry",
-      "address": "0xef928847d1F2860459F7005b61B632C7De5878A3",
+      "address": "0x6dD0C8b7F9406206ceAA01B5576D9d46e9298f0E",
       "startBlock": 33514164
     },
     "PluginRepoRegistry": {
       "name": "PluginRepoRegistry",
-      "address": "0x847d61e6fff6a266298886Ff88Cbd9B3102721C5",
+      "address": "0xc796bB1AfEBc56daDF6CAcD2aDa78055e5381971",
       "startBlock": 33514164
     },
     "PluginSetupProcessor": {
       "name": "PluginRepoRegistry",
-      "address": "0xc4fD92b543fE2808B0ad9237E74cdfE619152abF",
+      "address": "0x9227b311C5cecB416707F1C8B7Ca1b52649AabEc",
       "startBlock": 33514164
     }
   }

packages/subgraph/manifest/data/polygon.json

@@ -0,0 +1,21 @@
+{
+  "info": "# Do not edit subgraph.yaml,this is a generated file. \n# Instead, edit subgraph.placeholder.yaml and run: yarn manifest",
+  "network": "matic",
+  "dataSources": {
+    "DAORegistry": {
+      "name": "DAORegistry",
+      "address": "0x96E54098317631641703404C06A5afAD89da7373",
+      "startBlock": 40817440
+    },
+    "PluginRepoRegistry": {
+      "name": "PluginRepoRegistry",
+      "address": "0xA03C2182af8eC460D498108C92E8638a580b94d4",
+      "startBlock": 40817440
+    },
+    "PluginSetupProcessor": {
+      "name": "PluginRepoRegistry",
+      "address": "0x879D9dfe3F36d7684BeC1a2bB4Aa8E8871A7245B",
+      "startBlock": 40817440
+    }
+  }
+}