Skip to content

Commit 58a8fbd

Browse files
davekay100davekay100
authored
Final beta PR - scripts, new contracts deployed (#221)
* Update GNS script for new gns. Update contract addresses * Get ENS scripts working on kovan with test registrar * Lint the scripts * Get erc 1056 account data script working * Allocate() script working * Update all scripts to use checkFuncInput for inputs * Add in .env file, remove .privkey.txt and .infurakey.txt * Deploy new contracts with the cli deployer. These are the beta contracts * Update scripts README
1 parent 25897b7 commit 58a8fbd

24 files changed

+800
-323
lines changed

Diff for: ‎.eslintignore

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
build/
22
cache/
33
coverage/
4-
node_modules/
4+
node_modules/
5+
truffle.js
6+
cache/
7+
dist/

Diff for: ‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ cached/
1616
bin/
1717

1818
# Others
19+
.env
1920
.privkey.txt
2021
.infurakey.txt
2122
.DS_Store

Diff for: ‎addresses.json

+209-13
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,213 @@
11
{
2-
"updated-on": "June 2nd, 2020",
2+
"42": {
3+
"EpochManager": {
4+
"address": "0xe18D453563d367984fb214d90BDCDd3743Ef5719",
5+
"constructorArgs": [
6+
{
7+
"name": "governor",
8+
"value": "0x93606b27cB5e4c780883eC4F6b7Bed5f6572d1dd"
9+
},
10+
{
11+
"name": "lengthInBlocks",
12+
"value": 5760
13+
}
14+
],
15+
"creationCodeHash": "0xdf77b4cdcdb26fb0036b5d6ad41c42e6691caa0ea614d5c918ff81445966a8cb",
16+
"runtimeCodeHash": "0x2b573256df4f4a98b977edccd50581264257196731b3f29150a3359bc166a219",
17+
"txHash": "0x2c8cc32d318ecd1c1ff07aa0bdfb0dbde02709498940a7ee6f8f1a26c8a2215d"
18+
},
19+
"GNS": {
20+
"address": "0x094807C86162329eFF3d1781F46eF6Bd5580e766",
21+
"constructorArgs": [
22+
{
23+
"name": "governor",
24+
"value": "0x93606b27cB5e4c780883eC4F6b7Bed5f6572d1dd"
25+
},
26+
{
27+
"name": "didRegistry",
28+
"value": "0xdca7ef03e98e0dc2b855be647c39abe984fcf21b"
29+
}
30+
],
31+
"creationCodeHash": "0xd945cfeb350eafa39bf050b6cb5208eaf1890bb37f92a78ac176f5d584bc0918",
32+
"runtimeCodeHash": "0x62f4a637a2896da4365f72adeefe32b57ee155ff98c0d24132910e0d0588b079",
33+
"txHash": "0x86b9becc7d8da21a2141d154a6e7bf1b16913d47715b171a5de75d4f91b861c3"
34+
},
35+
"GraphToken": {
36+
"address": "0x9db7918f1E54ab644ee438FAE5FC670B71E0d528",
37+
"constructorArgs": [
38+
{
39+
"name": "governor",
40+
"value": "0x93606b27cB5e4c780883eC4F6b7Bed5f6572d1dd"
41+
},
42+
{
43+
"name": "initialSupply",
44+
"value": "10000000000000000000000000"
45+
}
46+
],
47+
"creationCodeHash": "0x7a3b41088c34a6d9d2233acb63426725b91196f4859f0aee191a1f9ce6d66790",
48+
"runtimeCodeHash": "0x5ae50683bfd5bb06f4bb849eeea7d0085e6c15797fa96f7272ba3d5acc50568b",
49+
"txHash": "0xc4765511d24987562169e54d37f77727ecb5d9d5b2d5d0528723417f71a70912"
50+
},
51+
"ServiceRegistry": {
52+
"address": "0x2538f2107222e45e2074A337C5f6a4e3dC44c5C6",
53+
"creationCodeHash": "0x0bba22e30783c4b2acc78b906bbc784e741b5b7d94e2c9caff0033e873214153",
54+
"runtimeCodeHash": "0x71293814a2ba0b4bf9a29dac340eef2a38ff554ae423aff85a211ad7d019448d",
55+
"txHash": "0x0406f81dd550ff375ea2092a741b04a2c13849e21c3ed7198ba002e382ffc99a"
56+
},
57+
"Curation": {
58+
"address": "0x5A8b493f9cf79ca22452b4511b55e0Ff91C850d9",
59+
"constructorArgs": [
60+
{
61+
"name": "governor",
62+
"value": "0x93606b27cB5e4c780883eC4F6b7Bed5f6572d1dd"
63+
},
64+
{
65+
"name": "token",
66+
"value": "0x9db7918f1E54ab644ee438FAE5FC670B71E0d528"
67+
},
68+
{
69+
"name": "reserveRatio",
70+
"value": 500000
71+
},
72+
{
73+
"name": "minimumCurationStake",
74+
"value": "100000000000000000000"
75+
}
76+
],
77+
"creationCodeHash": "0xf7c9eeda8efefca0d25aeee82535008f33fd252dc60f5d146dd3dfc3c52d6cc7",
78+
"runtimeCodeHash": "0xc69fa19913f7d2bc0b90e49443958d185825e9d6ad1da1eae27e68dad55d94b5",
79+
"txHash": "0x3f0f7051fbe5ec7aa246d398aec48a8554a5450ecc13b473c32ae7018a58e3b2"
80+
},
81+
"RewardsManager": {
82+
"address": "0x6304AE0C965B54724C0B34B2611c93c24Ed4B98d",
83+
"constructorArgs": [
84+
{
85+
"name": "governor",
86+
"value": "0x93606b27cB5e4c780883eC4F6b7Bed5f6572d1dd"
87+
}
88+
],
89+
"creationCodeHash": "0x3554999ca479cb97bfb0f74eedb5a7056b4c055a7a8f27d2eca1c55e280c0e78",
90+
"runtimeCodeHash": "0xbdfa9b703de03a1d712594d47a46f08900c37fefcc66f0e0f2b0743c21a3636e",
91+
"txHash": "0xe69ad34fcde1256e736922ce45cd3017b7b10a01e4f44236972b9d46cb826baf"
92+
},
93+
"Staking": {
94+
"address": "0xCDC02fBf4dc559923A82CfCf8116442b542e86c1",
95+
"constructorArgs": [
96+
{
97+
"name": "governor",
98+
"value": "0x93606b27cB5e4c780883eC4F6b7Bed5f6572d1dd"
99+
},
100+
{
101+
"name": "token",
102+
"value": "0x9db7918f1E54ab644ee438FAE5FC670B71E0d528"
103+
},
104+
{
105+
"name": "epochManager",
106+
"value": "0xe18D453563d367984fb214d90BDCDd3743Ef5719"
107+
}
108+
],
109+
"creationCodeHash": "0x63c2da6b34be2919f8ed446c310f4353a784db6933645d3175e24bbbb12dd73c",
110+
"runtimeCodeHash": "0x6a7f66f97dbb741a812047441884e936a34a50b539c754963470e76d1bfd32ea",
111+
"txHash": "0x3cdfefd785d755183dee01a7fd91124cea1f076b81aa724c7032fde03c93b245"
112+
},
113+
"DisputeManager": {
114+
"address": "0xCb3bA107b7096Fe8CF69d4b83b122e0e0BAEaACe",
115+
"constructorArgs": [
116+
{
117+
"name": "governor",
118+
"value": "0x93606b27cB5e4c780883eC4F6b7Bed5f6572d1dd"
119+
},
120+
{
121+
"name": "arbitrator",
122+
"value": "0x93606b27cB5e4c780883eC4F6b7Bed5f6572d1dd"
123+
},
124+
{
125+
"name": "token",
126+
"value": "0x9db7918f1E54ab644ee438FAE5FC670B71E0d528"
127+
},
128+
{
129+
"name": "staking",
130+
"value": "0xCDC02fBf4dc559923A82CfCf8116442b542e86c1"
131+
},
132+
{
133+
"name": "minimumDeposit",
134+
"value": "100000000000000000000"
135+
},
136+
{
137+
"name": "fishermanRewardPercentage",
138+
"value": 1000
139+
},
140+
{
141+
"name": "slashingPercentage",
142+
"value": 1000
143+
}
144+
],
145+
"creationCodeHash": "0x5f0f60b3a52a4ca320bba2ae9160e36c900050443e2e68c5685a03c39ce254d3",
146+
"runtimeCodeHash": "0xe2d13b28f3a5518ee95e13b53ab27d435efdc4b35fa03432b40bf438c68119c5",
147+
"txHash": "0x317f51e2372189fc92de081ade980109322ba23ff3fc6205fb829c3af3a0f9b1"
148+
},
149+
"IndexerCTDT": {
150+
"address": "0xF537B2b434840D021b92fD99f51ae85c5c6672C1",
151+
"creationCodeHash": "0x545816357620fe4b754c6762a145897f6bb3a1dbc9fd8f84592e4dad381b5c78",
152+
"runtimeCodeHash": "0x6efbe2de686d7a695463f0a427a3f37ce556ec438d09e105f37fadd31565a30e",
153+
"txHash": "0xdc780890c5e256294699e8d19af585b6f7d4e31ac9e3aa1b3ef093f9518488a7"
154+
},
155+
"IndexerSingleAssetInterpreter": {
156+
"address": "0xe64E6ecf07C81d88bc344284888F772431c4e98c",
157+
"creationCodeHash": "0xcbc980af13c5d2f76e8277429dcbcf10d16d1616731a5c24481dbf13eb065357",
158+
"runtimeCodeHash": "0x8235a58e9ee9a6057b9b40749c3bc7a0da6f7f0e98c715287042cb219eed12c7",
159+
"txHash": "0xacf66e3982d206096c12cdf30bcbfcdfed749701884a656a100124f578455260"
160+
},
161+
"IndexerMultiAssetInterpreter": {
162+
"address": "0x9C62F260D7CCfbf8C553f17140a94C76083958ea",
163+
"creationCodeHash": "0xcf680c95414066ae46789c3f56befffb0ccf53128e20e47d11163eabdca7eadd",
164+
"runtimeCodeHash": "0x4f0c291f8a7bf98accde0c58a1a93eec0bed054d5fa2d04c87c17d7716283b21",
165+
"txHash": "0xf6eadc68890a3e3f4b9428621c59f99565d30f891bea14c3ad9c8d673c7c4121"
166+
},
167+
"IndexerWithdrawInterpreter": {
168+
"address": "0xAB0cCB064DAaa462cBbCF25073A0E70778c79361",
169+
"creationCodeHash": "0x6fb667bf67a16df6880624be4ed5585f4c3b0d30aeb8e7d8abf01cacbb7f5993",
170+
"runtimeCodeHash": "0xe91f02039850e2776be90485801baedb5ae89d77828ccd5bcfa0a726a9364edb",
171+
"txHash": "0x9c724a9e5db720a79709206773676158a6f567ccd2202a17f8b7d0a900c03b2f"
172+
},
173+
"MinimumViableMultisig": {
174+
"address": "0xBcdd062Aa401d12762D39a78eCD407e9Aa38Dcaa",
175+
"constructorArgs": [
176+
{
177+
"name": "node",
178+
"value": "0x0000000000000000000000000000000000000000"
179+
},
180+
{
181+
"name": "staking",
182+
"value": "0xCDC02fBf4dc559923A82CfCf8116442b542e86c1"
183+
},
184+
{
185+
"name": "CTDT",
186+
"value": "0xF537B2b434840D021b92fD99f51ae85c5c6672C1"
187+
},
188+
{
189+
"name": "singleAssetInterpreter",
190+
"value": "0xe64E6ecf07C81d88bc344284888F772431c4e98c"
191+
},
192+
{
193+
"name": "multiAssetInterpreter",
194+
"value": "0x9C62F260D7CCfbf8C553f17140a94C76083958ea"
195+
},
196+
{
197+
"name": "withdrawInterpreter",
198+
"value": "0xAB0cCB064DAaa462cBbCF25073A0E70778c79361"
199+
}
200+
],
201+
"creationCodeHash": "0xe0038bd2d6a782a6992d6694508e9ddb297328d11d896c1b03a45321ab80b53a",
202+
"runtimeCodeHash": "0xf1a4aef85dc2fa6fa33a2d4ed683bbcd50857b779010eed187ed888cbafc15b2",
203+
"txHash": "0x2be17f242352c6c31d2c24c8d17693e251defba8dea7a3fb8ef3a51c1f860f0b"
204+
}
205+
},
3206
"kovan": {
4-
"commit-hash": "https://github.com/graphprotocol/contracts/tree/d59900ddeb0ef433326de940e14341a6befa8cf7",
5-
"blockNumber": "18838602",
6-
"governor": "0x93606b27cB5e4c780883eC4F6b7Bed5f6572d1dd",
7-
"graphToken": "0x5E32393c1C3DEC28228458d60A66B35ED40f96C6",
8-
"epochManager": "0x2eE455eBb75D90a80b38BbF7De5C931403f15736",
9-
"disputeManager": "0x8a714a02feEFd3CD763BF9d626650dCb0692be9A",
10-
"staking": "0xB3c62a4a46e00E85dC63E3BBF851a33aFa928386",
11-
"curation": "0x9ce3085eC642414bDFE8CfF7DE603e1DA6f1F702",
12-
"rewardsManager": "0xd1a9930A53D7Ef7126EF2E8A7C51eC40419E37B8",
13-
"serviceRegistry": "0x2aF5CcB503292937171228E72858793160fb6560",
14-
"gns": "0xdc845c78D4eB360CE77794FDbE74E707799D0eBE"
207+
"ens": "0xB66B2f307B6e46a6D038a85997B401aE87455772",
208+
"ensTestRegistrar": "0x327033bA7B23A6E3a3Ca165e44D619E3dd675f8b",
209+
"ensPublicResolver": "0xc30F6CCc48F1eA5374aC618dfe5243ddD1e264E7",
210+
"ethereumDIDRegistry": "0xdCa7EF03e98e0DC2B855bE647C39ABe984fcF21B"
15211
},
16212
"mainnet": {}
17-
}
213+
}

Diff for: ‎contracts/ens/IENS.sol

+3
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,7 @@ pragma solidity ^0.6.4;
33
// Needed for abi and typechain in the npm package
44
interface IENS {
55
function owner(bytes32 node) external view returns (address);
6+
// Must call setRecord, not setOwner, We must namehash it ourselves as well
7+
function setSubnodeRecord(bytes32 node, bytes32 label, address owner, address resolver, uint64 ttl) external;
8+
69
}

Diff for: ‎contracts/ens/ITestRegistrar.sol

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pragma solidity ^0.6.4;
2+
3+
interface ITestRegistrar {
4+
function register(bytes32 label, address owner) external;
5+
}

Diff for: ‎contracts/erc1056/IEthereumDIDRegistry.sol

+6
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,10 @@ pragma solidity ^0.6.4;
22

33
interface IEthereumDIDRegistry {
44
function identityOwner(address identity) external view returns (address);
5+
function setAttribute(
6+
address identity,
7+
bytes32 name,
8+
bytes calldata value,
9+
uint256 validity
10+
) external;
511
}

Diff for: ‎index.d.ts

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
declare module 'ipfs-http-client'

Diff for: ‎package-lock.json

+8-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
"@nomiclabs/buidler-ethers": "^1.3.3",
2121
"@nomiclabs/buidler-waffle": "^1.3.4",
2222
"@typechain/ethers-v4": "^1.0.0",
23+
"@types/bs58": "^4.0.1",
24+
"@types/minimist": "^1.2.0",
2325
"@typechain/truffle-v4": "^2.0.3",
2426
"@typechain/truffle-v5": "^2.0.2",
2527
"@typechain/web3-v1": "^1.0.0",
26-
"@types/bs58": "^4.0.1",
2728
"@types/dotenv": "^8.2.0",
28-
"@types/minimist": "^1.2.0",
2929
"@types/mocha": "^7.0.2",
3030
"@types/node": "^14.0.5",
3131
"@types/yargs": "^15.0.5",
@@ -51,7 +51,7 @@
5151
"minimist": "^1.2.5",
5252
"prettier": "^1.19.1",
5353
"prettier-plugin-solidity": "^1.0.0-alpha.51",
54-
"solidity-coverage": "^0.7.7",
54+
"solidity-coverage": "^0.7.5",
5555
"truffle-abi": "^1.0.3",
5656
"truffle-flattener": "^1.4.4",
5757
"ts-node": "^8.10.1",

0 commit comments

Comments
 (0)