Merge branch 'develop' into feat/deploy_v1.3.0

Author: mathewmeconry

.github/ISSUE_TEMPLATE/bug_report.md

@@ -4,19 +4,19 @@ about: Create a bug report to help us
 title: 'Bug: <add-text-here>'
 labels: bug
 assignees: ''
-
 ---
 
 **Describe the bug**
 A short summary of what the bug is. Please be clear and concise.
 
 **To Reproduce (please complete the following information)**
+
 - Config and flags: [e.g. variable="xyz"]
 - Steps to reproduce the behavior:
-    1. node '...'
-    2. make request with '....'
-    3. '...'
-    4. See error 
+  1. node '...'
+  2. make request with '....'
+  3. '...'
+  4. See error
 
 **Current behavior**
 In depth explanation, if required, or a clear and concise description of what actually happens.
@@ -25,9 +25,10 @@ In depth explanation, if required, or a clear and concise description of what ac
 A clear and concise description of what you expected to happen.
 
 **System (please complete the following information):**
- - OS: [e.g. Fedora 35]
- - Software version [e.g. Docker 8, Node 14.19.1]
- - Commit hash [e.g. e84617d]
+
+- OS: [e.g. Fedora 35]
+- Software version [e.g. Docker 8, Node 14.19.1]
+- Commit hash [e.g. e84617d]
 
 **Additional context**
 Add any other context about the problem here.

.github/helpers/contracts/register-ens-subdomain.js

@@ -45,7 +45,7 @@ async function main() {
       resolver,
       0
     );
-    console.log(`Creation tx hash ${creationTx.hash}`)
+    console.log(`Creation tx hash ${creationTx.hash}`);
     await creationTx.wait();
     console.log('Created');
   } else {
@@ -58,7 +58,7 @@ async function main() {
         labelHash,
         wallet.address
       );
-      console.log(`Ownership transfer tx hash ${ownerTx.hash}`)
+      console.log(`Ownership transfer tx hash ${ownerTx.hash}`);
       await ownerTx.wait();
     } else {
       console.log('Already owner.');
@@ -76,7 +76,7 @@ const RegistryAbi = [
     inputs: [{internalType: 'contract ENS', name: '_old', type: 'address'}],
     payable: false,
     stateMutability: 'nonpayable',
-    type: 'constructor'
+    type: 'constructor',
   },
   {
     anonymous: false,
@@ -86,22 +86,22 @@ const RegistryAbi = [
         indexed: true,
         internalType: 'address',
         name: 'operator',
-        type: 'address'
+        type: 'address',
       },
-      {indexed: false, internalType: 'bool', name: 'approved', type: 'bool'}
+      {indexed: false, internalType: 'bool', name: 'approved', type: 'bool'},
     ],
     name: 'ApprovalForAll',
-    type: 'event'
+    type: 'event',
   },
   {
     anonymous: false,
     inputs: [
       {indexed: true, internalType: 'bytes32', name: 'node', type: 'bytes32'},
       {indexed: true, internalType: 'bytes32', name: 'label', type: 'bytes32'},
-      {indexed: false, internalType: 'address', name: 'owner', type: 'address'}
+      {indexed: false, internalType: 'address', name: 'owner', type: 'address'},
     ],
     name: 'NewOwner',
-    type: 'event'
+    type: 'event',
   },
   {
     anonymous: false,
@@ -111,41 +111,41 @@ const RegistryAbi = [
         indexed: false,
         internalType: 'address',
         name: 'resolver',
-        type: 'address'
-      }
+        type: 'address',
+      },
     ],
     name: 'NewResolver',
-    type: 'event'
+    type: 'event',
   },
   {
     anonymous: false,
     inputs: [
       {indexed: true, internalType: 'bytes32', name: 'node', type: 'bytes32'},
-      {indexed: false, internalType: 'uint64', name: 'ttl', type: 'uint64'}
+      {indexed: false, internalType: 'uint64', name: 'ttl', type: 'uint64'},
     ],
     name: 'NewTTL',
-    type: 'event'
+    type: 'event',
   },
   {
     anonymous: false,
     inputs: [
       {indexed: true, internalType: 'bytes32', name: 'node', type: 'bytes32'},
-      {indexed: false, internalType: 'address', name: 'owner', type: 'address'}
+      {indexed: false, internalType: 'address', name: 'owner', type: 'address'},
     ],
     name: 'Transfer',
-    type: 'event'
+    type: 'event',
   },
   {
     constant: true,
     inputs: [
       {internalType: 'address', name: 'owner', type: 'address'},
-      {internalType: 'address', name: 'operator', type: 'address'}
+      {internalType: 'address', name: 'operator', type: 'address'},
     ],
     name: 'isApprovedForAll',
     outputs: [{internalType: 'bool', name: '', type: 'bool'}],
     payable: false,
     stateMutability: 'view',
-    type: 'function'
+    type: 'function',
   },
   {
     constant: true,
@@ -154,7 +154,7 @@ const RegistryAbi = [
     outputs: [{internalType: 'contract ENS', name: '', type: 'address'}],
     payable: false,
     stateMutability: 'view',
-    type: 'function'
+    type: 'function',
   },
   {
     constant: true,
@@ -163,7 +163,7 @@ const RegistryAbi = [
     outputs: [{internalType: 'address', name: '', type: 'address'}],
     payable: false,
     stateMutability: 'view',
-    type: 'function'
+    type: 'function',
   },
   {
     constant: true,
@@ -172,7 +172,7 @@ const RegistryAbi = [
     outputs: [{internalType: 'bool', name: '', type: 'bool'}],
     payable: false,
     stateMutability: 'view',
-    type: 'function'
+    type: 'function',
   },
   {
     constant: true,
@@ -181,70 +181,70 @@ const RegistryAbi = [
     outputs: [{internalType: 'address', name: '', type: 'address'}],
     payable: false,
     stateMutability: 'view',
-    type: 'function'
+    type: 'function',
   },
   {
     constant: false,
     inputs: [
       {internalType: 'address', name: 'operator', type: 'address'},
-      {internalType: 'bool', name: 'approved', type: 'bool'}
+      {internalType: 'bool', name: 'approved', type: 'bool'},
     ],
     name: 'setApprovalForAll',
     outputs: [],
     payable: false,
     stateMutability: 'nonpayable',
-    type: 'function'
+    type: 'function',
   },
   {
     constant: false,
     inputs: [
       {internalType: 'bytes32', name: 'node', type: 'bytes32'},
-      {internalType: 'address', name: 'owner', type: 'address'}
+      {internalType: 'address', name: 'owner', type: 'address'},
     ],
     name: 'setOwner',
     outputs: [],
     payable: false,
     stateMutability: 'nonpayable',
-    type: 'function'
+    type: 'function',
   },
   {
     constant: false,
     inputs: [
       {internalType: 'bytes32', name: 'node', type: 'bytes32'},
       {internalType: 'address', name: 'owner', type: 'address'},
       {internalType: 'address', name: 'resolver', type: 'address'},
-      {internalType: 'uint64', name: 'ttl', type: 'uint64'}
+      {internalType: 'uint64', name: 'ttl', type: 'uint64'},
     ],
     name: 'setRecord',
     outputs: [],
     payable: false,
     stateMutability: 'nonpayable',
-    type: 'function'
+    type: 'function',
   },
   {
     constant: false,
     inputs: [
       {internalType: 'bytes32', name: 'node', type: 'bytes32'},
-      {internalType: 'address', name: 'resolver', type: 'address'}
+      {internalType: 'address', name: 'resolver', type: 'address'},
     ],
     name: 'setResolver',
     outputs: [],
     payable: false,
     stateMutability: 'nonpayable',
-    type: 'function'
+    type: 'function',
   },
   {
     constant: false,
     inputs: [
       {internalType: 'bytes32', name: 'node', type: 'bytes32'},
       {internalType: 'bytes32', name: 'label', type: 'bytes32'},
-      {internalType: 'address', name: 'owner', type: 'address'}
+      {internalType: 'address', name: 'owner', type: 'address'},
     ],
     name: 'setSubnodeOwner',
     outputs: [{internalType: 'bytes32', name: '', type: 'bytes32'}],
     payable: false,
     stateMutability: 'nonpayable',
-    type: 'function'
+    type: 'function',
   },
   {
     constant: false,
@@ -253,25 +253,25 @@ const RegistryAbi = [
       {internalType: 'bytes32', name: 'label', type: 'bytes32'},
       {internalType: 'address', name: 'owner', type: 'address'},
       {internalType: 'address', name: 'resolver', type: 'address'},
-      {internalType: 'uint64', name: 'ttl', type: 'uint64'}
+      {internalType: 'uint64', name: 'ttl', type: 'uint64'},
     ],
     name: 'setSubnodeRecord',
     outputs: [],
     payable: false,
     stateMutability: 'nonpayable',
-    type: 'function'
+    type: 'function',
   },
   {
     constant: false,
     inputs: [
       {internalType: 'bytes32', name: 'node', type: 'bytes32'},
-      {internalType: 'uint64', name: 'ttl', type: 'uint64'}
+      {internalType: 'uint64', name: 'ttl', type: 'uint64'},
     ],
     name: 'setTTL',
     outputs: [],
     payable: false,
     stateMutability: 'nonpayable',
-    type: 'function'
+    type: 'function',
   },
   {
     constant: true,
@@ -280,6 +280,6 @@ const RegistryAbi = [
     outputs: [{internalType: 'uint64', name: '', type: 'uint64'}],
     payable: false,
     stateMutability: 'view',
-    type: 'function'
-  }
+    type: 'function',
+  },
 ];

.github/labeler.yml

@@ -1,7 +1,7 @@
 contracts:
-- packages/contracts/**/*
-- packages/contracts/*
+  - packages/contracts/**/*
+  - packages/contracts/*
 
 subgraph:
-- packages/subgraph/**/*
-- packages/subgraph/*
+  - packages/subgraph/**/*
+  - packages/subgraph/*

.github/pull_request_template.md

@@ -2,10 +2,12 @@
 
 Please include a summary of the change and be sure you follow the contributions rules we do provide [here](./CONTRIBUTIONS.md)
 
-Task: [ID]()
+Task ID: [OS-?](https://aragonassociation.atlassian.net/browse/OS-?)
 
 ## Type of change
 
+See the framework lifecylce in `packages/contracts/docs/framework-lifecycle` to decide what kind of change this pull request is.
+
 <!--- Please delete options that are not relevant. -->
 
 - [ ] Bug fix (non-breaking change which fixes an issue)
@@ -17,7 +19,6 @@ Task: [ID]()
 - [ ] I have selected the correct base branch.
 - [ ] I have performed a self-review of my own code.
 - [ ] I have commented my code, particularly in hard-to-understand areas.
-- [ ] I have made corresponding changes to the documentation.
 - [ ] My changes generate no new warnings.
 - [ ] Any dependent changes have been merged and published in downstream modules.
 - [ ] I ran all tests with success and extended them if necessary.

.github/workflows/comment-triggers.yml

@@ -5,7 +5,7 @@ on:
   issue_comment:
     types: [created]
 
-jobs:  
+jobs:
   check_user_permission:
     runs-on: ubuntu-latest
     name: A job to check user's permission level
@@ -82,8 +82,6 @@ jobs:
       mode: ${{ needs.mythx_full.outputs.mode }}
     secrets: inherit
 
-
-
   release_label:
     needs: [check_user_permission]
     runs-on: ubuntu-latest
@@ -134,4 +132,4 @@ jobs:
         if: steps.check.outputs.triggered == 'true'
         uses: actions-ecosystem/action-add-labels@v1
         with:
-          labels: subgraph:${{ steps.type.outputs.type }}
+          labels: subgraph:${{ steps.type.outputs.type }}

.github/workflows/contract-tests.yml

@@ -28,17 +28,17 @@ jobs:
           node-version: 16
       - name: Install dependencies
         run: cd ../../ && yarn install --pure-lockfile
-      - name: Check formatting
-        run: yarn run formatting:check
       - name: Compile contracts
         run: yarn run build && yarn run build:npm
       - name: Run Hardhat Tests
         env:
           REPORT_GAS: true
-          ETH_KEY: ''
           HARDHAT_DAO_ENS_DOMAIN: 'dao.eth'
           HARDHAT_PLUGIN_ENS_DOMAIN: 'plugin.dao.eth'
-          MANAGINGDAO_SUBDOMAIN: 'aragon-management'
+          MANAGINGDAO_SUBDOMAIN: 'management'
+          MANAGINGDAO_MULTISIG_LISTEDONLY: ${{ vars.MANAGINGDAO_MULTISIG_LISTEDONLY }}
+          MANAGINGDAO_MULTISIG_APPROVERS: ${{ vars.MANAGINGDAO_MULTISIG_APPROVERS }}
+          MANAGINGDAO_MULTISIG_MINAPPROVALS: ${{ vars.MANAGINGDAO_MULTISIG_MINAPPROVALS }}
         run: yarn run test
       - name: Run solidity-docgen
         run: yarn run docgen

.github/workflows/contracts-deploy.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Install node
         uses: actions/setup-node@v3
         with:
-          cache: "yarn"
+          cache: 'yarn'
           node-version: 16
       - name: Install dependencies
         run: yarn install --pure-lockfile
@@ -53,7 +53,7 @@ jobs:
       - name: Install node
         uses: actions/setup-node@v3
         with:
-          cache: "yarn"
+          cache: 'yarn'
           node-version: 16
       - name: Install dependencies
         run: yarn install --pure-lockfile