Merge pull request #29 from DXgovernance/develop

v1.0.0
DXgovernance · May 5, 2022 · 54410e2 · 54410e2
2 parents cc22856 + a59a5d4
commit 54410e2
Show file tree

Hide file tree

Showing 129 changed files with 20,196 additions and 15,628 deletions.
diff --git a/.contracts.json b/.contracts.json
@@ -10,7 +10,8 @@
     "utils": {
       "multicall": "0x742121cD0BB9784c1f17f25B8da1bF3445b93ED4",
       "dxDaoNFT": "0x0000000000000000000000000000000000000000",
-      "dxdVestingFactory": "0x0000000000000000000000000000000000000000"
+      "dxdVestingFactory": "0x0000000000000000000000000000000000000000",
+      "create2Deployer": "0x60eb77a1d81cd80db4cdd589a7bbcd1f29a38ae8"
     },
     "votingMachines": {
       "gen": {
@@ -29,11 +30,13 @@
     "reputation": "0xED77eaA9590cfCE0a126Bab3D8A6ada9A393d4f6",
     "token": "0xf255B9d83db924820ee23A7dCC30b7542e201Bb1",
     "controller": "0xfBEcdD3360E2A9040383980AB3863BE9d57256fd",
+    "permissionRegistry": "0x757bbdC3dF870202f28e5cF92a0005158D5e0786",
     "schemes": {
       "QuickWalletScheme": "0x0A08ECa47C56C305F4FeB4fa062AEcd5807BeBb8"
     },
     "utils": {
-      "multicall": "0xDD032cd0dfCB54050E1FA30Be59056403e292700"
+      "multicall": "0xDD032cd0dfCB54050E1FA30Be59056403e292700",
+      "create2Deployer": "0x60eb77a1d81cd80db4cdd589a7bbcd1f29a38ae8"
     },
     "votingMachines": {
       "dxd": {
@@ -44,8 +47,7 @@
         "address": "0xDA309aDF1c84242Bb446F7CDBa96B570E901D4CF",
         "token": "0x543ff227f64aa17ea132bf9886cab5db55dcaddf"
       }
-    },
-    "permissionRegistry": "0x757bbdC3dF870202f28e5cF92a0005158D5e0786"
+    }
   },
   "rinkeby": {
     "fromBlock": 9234792,
@@ -63,14 +65,27 @@
     "utils": {
       "multicall": "0x1FDD273e0B7E0d921Bda044Ebf64811428A79f15",
       "dxDaoNFT": "0xF7A2f72E8f6aeb884905a1fE515c1BB5752D342f",
-      "dxdVestingFactory": "0xB5D42c8cA3B04479200E3782C41D99b46Cf8A6E1"
+      "dxdVestingFactory": "0xB5D42c8cA3B04479200E3782C41D99b46Cf8A6E1",
+      "create2Deployer": "0x60eb77a1d81cd80db4cdd589a7bbcd1f29a38ae8",
+      "globalPermissionRegistry": "0x7d5Cc70B1d1778B8bEdeaD40283056CDb71E32B2"
     },
     "votingMachines": {
       "dxd": {
         "token": "0x417A288152A5a13b843135Db5Dc72Ea007a9EB8d",
         "address": "0xBa51391385A6bD5ECA0217d7e843B29227E72508"
       }
-    }
+    },
+    "guilds": [
+      {
+        "name": "DXGovTestRepGuild",
+        "address": "0xEc352bAE6352a7cE95bb86c45E791380C48B38aA",
+        "token": "0x9d1f784bc0f3E34E6104388116abC703fAa79d8a"
+      },{
+        "name": "DXGovTestTokenGuild",
+        "address": "0x9cDC16b5f95229b856cBA5F38095fD8E00f8edeF",
+        "token": "0x698Dd4dDEeda3Cca704Dc4c2Ae4942137edd99D5"
+      }
+    ]
   },
   "arbitrumTestnet": {
     "fromBlock": 3995726,
@@ -88,14 +103,27 @@
     "utils": {
       "multicall": "0xac380E8434Db942B5902956E8Dc7cD9d6A66bc74",
       "dxDaoNFT": "0xDC50FE5862D5541C6D0b9B07f15Fe016Cdacb431",
-      "dxdVestingFactory": "0xA5431A66874627948d4Ab68E033177f8982C3A2C"
+      "dxdVestingFactory": "0xA5431A66874627948d4Ab68E033177f8982C3A2C",
+      "create2Deployer": "0x60eb77a1d81cd80db4cdd589a7bbcd1f29a38ae8",
+      "globalPermissionRegistry": "0x7d5Cc70B1d1778B8bEdeaD40283056CDb71E32B2"
     },
     "votingMachines": {
       "dxd": {
         "token": "0x5d47100B0854525685907D5D773b92c22c0c745e",
         "address": "0x5786e7a0A1aB6a4040a77fcbcD144E649A6d4939"
       }
-    }
+    },
+    "guilds": [
+      {
+        "name": "DXGovTestRepGuild",
+        "address": "0xEc352bAE6352a7cE95bb86c45E791380C48B38aA",
+        "token": "0x9d1f784bc0f3E34E6104388116abC703fAa79d8a"
+      },{
+        "name": "DXGovTestTokenGuild",
+        "address": "0x9cDC16b5f95229b856cBA5F38095fD8E00f8edeF",
+        "token": "0x698Dd4dDEeda3Cca704Dc4c2Ae4942137edd99D5"
+      }
+    ]
   },
   "arbitrum": {
     "fromBlock": 338923,
@@ -112,7 +140,8 @@
       "TestWalletScheme": "0xcab5367De13B5409Ee85689465B4553C375FB20d"
     },
     "utils": {
-      "multicall": "0x9645D0CEC58F0D28Be9660b9a4D464AB193817B3"
+      "multicall": "0x9645D0CEC58F0D28Be9660b9a4D464AB193817B3",
+      "create2Deployer": "0x60eb77a1d81cd80db4cdd589a7bbcd1f29a38ae8"
     },
     "votingMachines": {
       "dxd": {

diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,14 +1,16 @@
 {
   "extends": "eslint:recommended",
-  "parser": "babel-eslint",
+  "parser": "@babel/eslint-parser",
   "parserOptions": {
     "ecmaVersion": 6,
     "sourceType": "module",
+    "requireConfigFile": false,
     "ecmaFeatures": {
       "jsx": true
     }
   },
   "rules": {
+    "no-console": "off",
     "semi": 2,
     "no-undef": "off",
     "eol-last": 2,
@@ -18,9 +20,9 @@
     "comma-spacing": "error",
     "brace-style": "error",
     "function-paren-newline": ["error", "consistent"],
-    "max-len": ["warning", 120],
+    "max-len": ["warn", 120],
     "key-spacing": "error",
-    "quotes": ["warning", "double"],
+    "quotes": ["warn", "double"],
     "space-infix-ops": "error"
   }
 }
diff --git a/.github/workflows/main.yml → .github/workflows/lint.yml b/.github/workflows/main.yml → .github/workflows/lint.yml
@@ -1,28 +1,36 @@
-name: main
-  
+name: Lint
+
 on:
+  pull_request:
+    branches:
+      - develop
   push:
-    branches: [ '**' ]
+    branches: ["**"]
   workflow_dispatch:
 
 jobs:
-  setup:
+  lint:
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        node-version: [12.13.1]
+        node-version: [16.13.0]
 
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+
       - name: Set up Node.js
         uses: actions/setup-node@v1
         with:
-          node-version: 12.13.1
+          node-version: ${{ matrix.node-version }}
+
       - name: Install Dependencies
         run: yarn
+
+      - name: Format Check
+        run: yarn format-check
+
       - name: Solidity Linter
         run: yarn solidity-linter
-      - name: Solidity Tests
-        run: npx hardhat test
+
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -0,0 +1,38 @@
+name: Tests
+
+on:
+  pull_request:
+    branches:
+      - develop
+  push:
+    branches: ["**"]
+  workflow_dispatch:
+
+jobs:
+  coverage:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [16.13.0]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - name: Install Dependencies
+        run: yarn
+
+      - name: Solidity Tests
+        run: yarn coverage
+
+      - name: Test Coverage Check
+        uses: terencetcf/github-actions-lcov-minimum-coverage-checker@v1
+        with:
+          coverage-file: coverage/lcov.info
+          minimum-coverage: 80
diff --git a/.gitignore b/.gitignore
@@ -21,3 +21,8 @@ cache/
 *.swo
 .bash_hist*
 tags
+.temp
+.log/
+yarn-error.log
+venv/
+contracts/hardhat-dependency-compiler
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+yarn pre-commit
diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1 @@
+OMNGuild.sol
diff --git a/.prettierrc b/.prettierrc
@@ -4,5 +4,13 @@
   "arrowParens": "avoid",
   "endOfLine": "crlf",
   "printWidth": 80,
-  "useTabs": false
+  "useTabs": false,
+  "overrides": [
+    {
+      "files": "*.sol",
+      "options": {
+        "printWidth": 120,
+      }
+    }
+  ]
 }