Merge pull request #894 from DXgovernance/develop

v1.0.14
DXgovernance · May 26, 2022 · 5c28989 · 5c28989
2 parents 737e56c + db3bd46
commit 5c28989
Show file tree

Hide file tree

Showing 83 changed files with 6,851 additions and 2,942 deletions.
diff --git a/hardhat.config.js b/hardhat.config.js
@@ -1,11 +1,48 @@
 const moment = require('moment');
 require('@nomiclabs/hardhat-truffle5');
 require('hardhat-dependency-compiler');
-require('./node_modules/dxdao-contracts/scripts/deploy-dxvote');
+require('./node_modules/dxdao-contracts/scripts/deploy-dxdao-contracts');
 require('@typechain/hardhat');
 
 const MNEMONIC =
-  'dxdao dxdao dxdao dxdao dxdao dxdao dxdao dxdao dxdao dxdao dxdao dxdao';
+  'cream core pear sure dinner indoor citizen divorce sudden captain subject remember';
+
+
+// # Accounts
+// # ========
+// # Account #0: 0x9578e973bba0cc33bdbc93c7f77bb3fe6d47d68a (10000 ETH)
+// # Private Key #0: 0x2edaf5755c340d57c68ab5c084a0afd867caafcbcf556838f404468e2ad0ea94
+
+// # Account #1: 0xc5b20ade9c9cd5e0cc087c62b26b815a4bc1881f (10000 ETH)
+// # Private Key #1: 0x40126ad770c1ff59937436ddab2872193c01d5353213d297fdb0ea2c13b5981e
+
+// # Account #2: 0xaf8eb8c3a5d9d900aa0b98e3df0bcc17d3c5f698 (10000 ETH)
+// # Private Key #2: 0x4db6b61624bd4a9bf87ff59e7fca0991b02ff605664a3ad97dc237c84ba0e013
+
+// # Account #3: 0x84eeb305da0a4309a696d43de9f79f04e66eb4f8 (10000 ETH)
+// # Private Key #3: 0x6d8b1b46346a00fec52fd0e2edba75592e8814b11aec5815ec0f6b882e072131
+
+// # Account #4: 0x1b929bdde0fb3b7b759696f23d6cac0963d326e6 (10000 ETH)
+// # Private Key #4: 0x19ea21f217094f12da6bab83fe697f902caea0dcf5a2914d7c000b73938f7d85
+
+// # Account #5: 0xd507743abcdb265f5fcef125e3f6cf7250cfe9da (10000 ETH)
+// # Private Key #5: 0x6a944885ff4551fd546c59a2322a967af9906f596f60ecd110505c278f464f6e
+
+// # Account #6: 0x9af7a0d34fcf09a735ddaa03adc825398a6557ae (10000 ETH)
+// # Private Key #6: 0x4299ee99407089bfc51e829734c0f6c1b366f515d5ddb5ece4f880a2f8fd430c
+
+// # Account #7: 0x2154cdc3632db21a2635819afa450f2dda08aebd (10000 ETH)
+// # Private Key #7: 0x0e7ee7881e497062427ed392d310f09ca993fa964040c751cc383c10f55efc7c
+
+// # Account #8: 0x73c8825893ba6b197f883f60a20b4926c0f32a2c (10000 ETH)
+// # Private Key #8: 0xd84954f2cea66fd01a872496f25ddb86db79ee81366609fbcff8087c9739b63a
+
+// # Account #9: 0x73d2888f96bc0eb530490ca5342d0c274d95654d (10000 ETH)
+// # Private Key #9: 0xd20a2f6a6656d291ca4c4e6121b479db81b3b281e64707ff4a068acf549dc03c
+
+// # Account #10: 0xf8a3681248934f1139be67e0c22a6af450eb9d7c (10000 ETH)
+// # Private Key #10: 0x8188d555d06262bfa3a343fa809b59b6368f02aa5a1ac5a3d2cb24e18e2b556e
+
 const INFURA_API_KEY = process.env.REACT_APP_KEY_INFURA_API_KEY;
 const ALCHEMY_API_KEY = process.env.REACT_APP_KEY_ALCHEMY_API_KEY || '';
 
@@ -21,9 +58,9 @@ module.exports = {
       'dxdao-contracts/contracts/dxdao/DxToken.sol',
       'dxdao-contracts/contracts/dxvote/DXDVotingMachine.sol',
       'dxdao-contracts/contracts/dxvote/WalletScheme.sol',
-      'dxdao-contracts/contracts/dxvote/PermissionRegistry.sol',
-      'dxdao-contracts/contracts/dxvote/utils/DXDVestingFactory.sol',
-      'dxdao-contracts/contracts/dxvote/utils/DXdaoNFT.sol',
+      'dxdao-contracts/contracts/dxvote/utils/ERC20VestingFactory.sol',
+      'dxdao-contracts/contracts/dxvote/utils/ERC721Factory.sol',
+      'dxdao-contracts/contracts/utils/PermissionRegistry.sol',
       'dxdao-contracts/contracts/utils/Multicall.sol',
       'dxdao-contracts/contracts/test/ERC20Mock.sol',
       'dxdao-contracts/contracts/daostack/universalSchemes/ContributionReward.sol',

diff --git a/package.json b/package.json
@@ -29,6 +29,10 @@
   },
   "dependencies": {
     "@0xsequence/multicall": "^0.35.5",
+    "@dnd-kit/core": "^5.0.3",
+    "@dnd-kit/modifiers": "^5.0.0",
+    "@dnd-kit/sortable": "^6.0.1",
+    "@dnd-kit/utilities": "^3.1.0",
     "@nomiclabs/hardhat-truffle5": "^2.0.5",
     "@nomiclabs/hardhat-web3": "^2.0.0",
     "@testing-library/jest-dom": "^5.16.2",
@@ -54,7 +58,7 @@
     "bignumber.js": "^9.0.2",
     "content-hash": "^2.5.2",
     "copy-to-clipboard": "^3.3.1",
-    "dxdao-contracts": "https://github.com/DXGovernance/dxdao-contracts.git#develop",
+    "dxdao-contracts": "https://github.com/DXGovernance/dxdao-contracts.git#12ea7f4e1ea070699d148d8c4ced4aaa88f08627",
     "eslint-plugin-cypress": "^2.12.1",
     "ether-swr": "^2.0.1",
     "ethers": "^5.5.2",

diff --git a/scripts/dev.sh b/scripts/dev.sh
@@ -12,75 +12,17 @@ cleanup() {
     kill -9 $hardhat_pid
   fi
 }
-mnemonic="dxdao dxdao dxdao dxdao dxdao dxdao dxdao dxdao dxdao dxdao dxdao dxdao"
+mnemonic="cream core pear sure dinner indoor citizen divorce sudden captain subject remember"
 
 hardhat_running() {
   nc -z localhost 8545
 }
 
 start-hardhat_node() {
 
-  npx hardhat node > /dev/null &
+  yarn hardhat compile
 
-  # Account #0: 0x79706c8e413cdaee9e63f282507287b9ea9c0928 (10000 ETH)
-  # Private Key: 0xe408e147b1335674887c1ac7dc3c45de9762aa824cf6255fd8bd61fecf15f021
-  # 
-  # Account #1: 0xc73480525e9d1198d448ece4a01daea851f72a9d (10000 ETH)
-  # Private Key: 0x6c8a6a9a7dbad13d6b41089648ae4b7971116611e4acd8f052c478dd8c62673e
-  # 
-  # Account #2: 0x3f943f38b2fbe1ee5daf0516cecfe4e0f8734351 (10000 ETH)
-  # Private Key: 0x0054b824c2083e7db09f36edb2ab24eb31f8276fa6cd62e30b42e3a185b37179
-  # 
-  # Account #3: 0xaf1a6415202453d79b84d8a9d055b8f9141f696b (10000 ETH)
-  # Private Key: 0x3688ff0d0a95dd8b90bc68739505b488ff4908291eeb36380a94227d22653ce3
-  # 
-  # Account #4: 0x02803e2cdff171d1910d178dac948c711937bd3f (10000 ETH)
-  # Private Key: 0x530caa05cf058253ed14a2e6ccc5dcb952f09c7bcdcfb4be37e572e85dcafd1e
-  # 
-  # Account #5: 0x797c62953ef866a1ece855c4033cc5dc3c11290b (10000 ETH)
-  # Private Key: 0x88ae5259286213d051e99da743d79be5d69dc75ee317bc887f5996ff004b83a6
-  # 
-  # Account #6: 0x016f70459e4ba98e0d60a5f5855e117e8ff39cae (10000 ETH)
-  # Private Key: 0x68f5bc4b52a67b3d800d0d8832ae3b89067a3bbee68c66544147e312d996d994
-  # 
-  # Account #7: 0x073f4fdc12f805b8d98e58551fc10d0a71bbc7db (10000 ETH)
-  # Private Key: 0x9adc9dfdce8383a1634716bf7a2e317a145f37a176a7b42538ace5ac20e223a1
-  # 
-  # Account #8: 0x6829556f30899d70403947590ffe8900e8c0d0d7 (10000 ETH)
-  # Private Key: 0x13436bc37e24487c2f1739d1ce6b8271a8465fee93aa3685ce543e56a50e1692
-  # 
-  # Account #9: 0x2b410bcb3b8096164fa8c6a06220a66bfb77058d (10000 ETH)
-  # Private Key: 0x4fe097bbfe75d9531d253b7f917f89dcee6664d832e40a8d82d717602dfeeb6c
-  # 
-  # Account #10: 0x309f75c54a57937a7a0c6eb9b36eb1dbca82407e (10000 ETH)
-  # Private Key: 0xb10da35e4abe181d1143aa28a7da6c5f303660b954cf283accfeba2dfb56ab51
-  # 
-  # Account #11: 0xec9d2d34ad6acda19ab8afe71595051b206e3e4d (10000 ETH)
-  # Private Key: 0xfdf0c66289fafea1803c64522d073d6cc9ec71ba76e945a7c207f1f5ebb8e3b1
-  # 
-  # Account #12: 0x40c23c536bad1fe206ce911114f2c70309a7e487 (10000 ETH)
-  # Private Key: 0x97c63b257e8f86e05ae5a7bbb025b02d179b8d00fb9fbcdbfcdf04dcf9173cf2
-  # 
-  # Account #13: 0x28d254f2ddb522c43a21d338e337fd8d2f820db2 (10000 ETH)
-  # Private Key: 0xcdef57c095755d77bbbb327a187e67039c62fe39425e29b3646d334f54d28808
-  # 
-  # Account #14: 0xaf7386ce842cc0cffef91361059b0ca9ae48d6a0 (10000 ETH)
-  # Private Key: 0x4739bf3390cd5be10d0f58d2c1e887a186b544af563fa62717a6c324b36fed59
-  # 
-  # Account #15: 0x46c18451aaead6a2cb888b5bd6193c0f2c402329 (10000 ETH)
-  # Private Key: 0xc6b5889c8fbd0f3304ddd53b85f056a32b8338f99e5b8877ecb1d1c5543c8d6a
-  # 
-  # Account #16: 0xc707c8143a6e1274ae7f637946f685870925261f (10000 ETH)
-  # Private Key: 0x4b00e0c8e17e88d588b204121594f14d20d1abe50e280d599ff39d6b35c44533
-  # 
-  # Account #17: 0x5b14a88dbbb04abcb6e5bf6384491be8d939cf57 (10000 ETH)
-  # Private Key: 0x18eecce45e3211ce6ce967f66c404798e36e8298b4b5222ebf597b841ebd868a
-  # 
-  # Account #18: 0x92d356240dda25d050aa441690b92b2fa0011b84 (10000 ETH)
-  # Private Key: 0xe53525f97971b006e14820a8a7b74f8aae375b6635735d89b4db2e4cbdf0e8e0
-  # 
-  # Account #19: 0x5a485c203d9537095a6be2acc5a7ad83805d301d (10000 ETH)
-  # Private Key: 0xb86f3287c11a77c7317c2484be2bd386816876ead8ceaf86971b7b7c1afbb12b
+  npx hardhat node > /dev/null &
 
   hardhat_pid=$!