Skip to content

Commit fdc0bae

Browse files
tmigonetmigone
authored
chore: remove rinkeby and kovan references (#729)
1 parent 04cfd3a commit fdc0bae

File tree

7 files changed

+5
-444
lines changed

7 files changed

+5
-444
lines changed

‎DEPLOYMENT.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ To deploy to a different network execute:
4040
yarn deploy -- --network {networkName}
4141
4242
# Example
43-
yarn deploy -- --network kovan
43+
yarn deploy -- --network goerli
4444
```
4545

4646
The network must be configured in the `hardhat.config.ts` as explained in https://hardhat.org/config.
@@ -100,7 +100,7 @@ Some contracts require the address from previously deployed contracts. For that
100100
### Deploying a new testnet
101101

102102
1. Make sure contracts are up to date as you please.
103-
2. `yarn deploy-rinkeby` to deploy to Rinkeby. This will create new contracts with new addresses in `addresses.json`.
103+
2. `yarn deploy-goerli` to deploy to Goerli. This will create new contracts with new addresses in `addresses.json`.
104104
3. Update the `package.json` and `package-lock.json` files with the new package version and publish a new npm package with `npm publish`. You can dry-run the files to be uploaded by running `npm publish --dry-run`.
105105
4. Merge this update into master, branch off and save for whatever version of the testnet is going on, and then tag this on the github repo, pointing to your branch (ex. at `testnet-phase-1` branch). This way we can always get the contract code for testnet, while continuing to do work on mainnet.
106106
5. Pull the updated package into the subgraph, and other apps that depend on the package.json.

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ yarn add @graphprotocol/contracts
6363

6464
# Contract Addresses
6565

66-
The testnet runs on Rinkeby, while mainnet is on Ethereum Mainnet. The addresses for both of these can be found in `./addresses.json`.
66+
The testnet runs on Goerli, while mainnet is on Ethereum Mainnet. The addresses for both of these can be found in `./addresses.json`.
6767

6868
# Local Setup
6969

@@ -92,7 +92,7 @@ The most straightforward way to interact with the contracts is through the hardh
9292

9393
```
9494
# A console to interact with testnet contracts
95-
npx hardhat console --network rinkeby
95+
npx hardhat console --network goerli
9696
```
9797

9898
### Hardhat Tasks

‎addresses.json

Lines changed: 0 additions & 318 deletions
Original file line numberDiff line numberDiff line change
@@ -303,324 +303,6 @@
303303
"txHash": "0x106c31f2c24a5285c47a766422823766f1c939034513e85613d70d99ef697173"
304304
}
305305
},
306-
"4": {
307-
"IENS": {
308-
"address": "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e"
309-
},
310-
"IEthereumDIDRegistry": {
311-
"address": "0xdCa7EF03e98e0DC2B855bE647C39ABe984fcF21B"
312-
},
313-
"EpochManager": {
314-
"address": "0x23090b246Ad47dB85352b666cAff36760D087a69",
315-
"initArgs": [
316-
{
317-
"name": "controller",
318-
"value": "0x23B1aD50996ff1b21552cDD6430868D60bF342c5"
319-
},
320-
{
321-
"name": "lengthInBlocks",
322-
"value": 1108
323-
}
324-
],
325-
"creationCodeHash": "0xa02709eb59b9cca8bee1271845b42db037dc1d042dad93410ba532d378a7c79f",
326-
"runtimeCodeHash": "0xdb307489fd9a4a438b5b48909e12020b209280ad777561c0a7451655db097e75",
327-
"txHash": "0xcf271ece428e4e0539337bc2eb79c97a9d5337fae86d76f824ce6f92abb367ae",
328-
"proxy": true,
329-
"implementation": {
330-
"address": "0x5fDB51B4126D28b176AC1FE41dd47f72F047eF63",
331-
"creationCodeHash": "0xf03074bb7f026a2574b6ffb5d0f63f0c4fee81e004e1c46ef262dd5802d3384f",
332-
"runtimeCodeHash": "0x0d078a0bf778c6c713c46979ac668161a0a0466356252e47082f80912e4495b2",
333-
"txHash": "0xcc086cfaa1441412731ca073dfa68ca76d634b129b416dc75af7cea1b5292e52"
334-
}
335-
},
336-
"GraphToken": {
337-
"address": "0x54Fe55d5d255b8460fB3Bc52D5D676F9AE5697CD",
338-
"constructorArgs": [
339-
{
340-
"name": "initialSupply",
341-
"value": "10000000000000000000000000000"
342-
}
343-
],
344-
"creationCodeHash": "0x30da7a30d71fbd41d3327e4d0183401f257af3e905a0c68ebfd18b590b27b530",
345-
"runtimeCodeHash": "0xb964f76194a04272e7582382a4d6bd6271bbb90deb5c1fd3ae3913504ea3a830",
346-
"txHash": "0xfd3da9962b88397134b71259287bb056b60cdd092f91c114dcd7c794e6237c78"
347-
},
348-
"ServiceRegistry": {
349-
"address": "0xB2cD4D1205A55303ef0DeC2e4EfB5338f9c182bc",
350-
"initArgs": [
351-
{
352-
"name": "controller",
353-
"value": "0x23B1aD50996ff1b21552cDD6430868D60bF342c5"
354-
}
355-
],
356-
"creationCodeHash": "0xa02709eb59b9cca8bee1271845b42db037dc1d042dad93410ba532d378a7c79f",
357-
"runtimeCodeHash": "0xdb307489fd9a4a438b5b48909e12020b209280ad777561c0a7451655db097e75",
358-
"txHash": "0x230cde8f618e46f42299e19dced8dcbe1f99b4ee8423441fc7572dea0f457935",
359-
"proxy": true,
360-
"implementation": {
361-
"address": "0x4BaED79823A50c2b3387211f178235FEe8Cc7Ab7",
362-
"creationCodeHash": "0xf5fa541b43d15fade518feb63a95a73b9c67626108ead259e444af3a7ae1804f",
363-
"runtimeCodeHash": "0x9856d2c2985f410f2f77e456fe6163827ea5251eb5e3f3768d3d4f8868187882",
364-
"txHash": "0xd17bdc8e05933c7146105e0e22ab5390677544cad224eb0dcd56c8088585d29a"
365-
}
366-
},
367-
"GraphCurationToken": {
368-
"address": "0x37014c7b321da7927b6662859dc9a929543386c6",
369-
"creationCodeHash": "0x7e9a56b6fc05d428d1c1116eaa88a658f05487b493d847bfe5c69e35ec34f092",
370-
"runtimeCodeHash": "0x587f9d4e9ecf9e7048d9f42f027957ca34ee6a95ca37d9758d8cd0ee16e89818",
371-
"txHash": "0xd108447808e285fcde0b9aaee9e8446af91e9983041aa47ff9410c2c2862938b"
372-
},
373-
"Curation": {
374-
"address": "0x5cCaB32d30Ca0969a8f3D495e1F67b3A90d39b14",
375-
"initArgs": [
376-
{
377-
"name": "controller",
378-
"value": "0x23B1aD50996ff1b21552cDD6430868D60bF342c5"
379-
},
380-
{
381-
"name": "bondingCurve",
382-
"value": "0xB4B6857dFcE1a31851c0fAde87E94Fc05053916D"
383-
},
384-
{
385-
"name": "reserveRatio",
386-
"value": 500000
387-
},
388-
{
389-
"name": "curationTaxPercentage",
390-
"value": 25000
391-
},
392-
{
393-
"name": "minimumCurationDeposit",
394-
"value": "1000000000000000000"
395-
}
396-
],
397-
"creationCodeHash": "0xa02709eb59b9cca8bee1271845b42db037dc1d042dad93410ba532d378a7c79f",
398-
"runtimeCodeHash": "0xdb307489fd9a4a438b5b48909e12020b209280ad777561c0a7451655db097e75",
399-
"txHash": "0x1d8707dc7b85d4fc7fe83819acc40b8e4b3ad0b3e8257a44edcc8fb587768dfb",
400-
"proxy": true,
401-
"implementation": {
402-
"address": "0x6cafc4eb2be922505ff8dedcb73e2c1599d7e352",
403-
"creationCodeHash": "0x4aea53d73a1b7b00db3ba36023a70f4e53df68f9b42cb8932afb9cf1837a8cf7",
404-
"runtimeCodeHash": "0x6e5cb73148de597888b628c2e0d97fa0f66ee4867ee0905314034f9031d52872",
405-
"txHash": "0x9188f422354f01613cac4e270fb053235f9071c3c987c7eaf120601d16fa6d6e"
406-
}
407-
},
408-
"GNS": {
409-
"address": "0x4beb7299221807Cd47C2fa118c597C51Cc2fEC99",
410-
"initArgs": [
411-
{
412-
"name": "controller",
413-
"value": "0x23B1aD50996ff1b21552cDD6430868D60bF342c5"
414-
},
415-
{
416-
"name": "bondingCurve",
417-
"value": "0xB4B6857dFcE1a31851c0fAde87E94Fc05053916D"
418-
},
419-
{
420-
"name": "didRegistry",
421-
"value": "0xdca7ef03e98e0dc2b855be647c39abe984fcf21b"
422-
}
423-
],
424-
"creationCodeHash": "0xa02709eb59b9cca8bee1271845b42db037dc1d042dad93410ba532d378a7c79f",
425-
"runtimeCodeHash": "0xdb307489fd9a4a438b5b48909e12020b209280ad777561c0a7451655db097e75",
426-
"txHash": "0x4b3882c3ed81f8b937f207e303d7c16074369da9c72e47212c8004ed799332d7",
427-
"proxy": true,
428-
"implementation": {
429-
"address": "0xA05B12aa4913082562b79ceCcDDe27E19fA00972",
430-
"creationCodeHash": "0x86499a1c90a73b062c0d25777379cdf52085e36c7f4ce44016adc7775ea24355",
431-
"runtimeCodeHash": "0x85cc02c86b4ee2c1b080c6f70500f775bb0fab7960ce62444a8018f3af07af75",
432-
"txHash": "0xfc5f3fe67f9c72e88dc5ab99debe9e30e79fddf5ff4f8d06a66180759eb72177"
433-
}
434-
},
435-
"RewardsManager": {
436-
"address": "0x460cA3721131BC978e3CF3A49EfC545A2901A828",
437-
"initArgs": [
438-
{
439-
"name": "controller",
440-
"value": "0x23B1aD50996ff1b21552cDD6430868D60bF342c5"
441-
},
442-
{
443-
"name": "issuanceRate",
444-
"value": "1000000012184945188"
445-
}
446-
],
447-
"creationCodeHash": "0xa02709eb59b9cca8bee1271845b42db037dc1d042dad93410ba532d378a7c79f",
448-
"runtimeCodeHash": "0xdb307489fd9a4a438b5b48909e12020b209280ad777561c0a7451655db097e75",
449-
"txHash": "0xfff3ccaaeb64a173f9461416d6e3f37ae1e6d8beaeb17ca1e23c264c1d3bbc02",
450-
"proxy": true,
451-
"implementation": {
452-
"address": "0x7Cd54459a1B92c14554b857325AfeE1d2B065bbe",
453-
"creationCodeHash": "0xfec6d35d9de8a7234e77484ee4fa5d6867697d607b591ed5a8e01679fa1f0394",
454-
"runtimeCodeHash": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
455-
"txHash": "0x0a89f7f97368815af26d0fc00cd0157a57717db97bbb734b66c894c5a65e8df6"
456-
}
457-
},
458-
"Staking": {
459-
"address": "0x2d44C0e097F6cD0f514edAC633d82E01280B4A5c",
460-
"initArgs": [
461-
{
462-
"name": "controller",
463-
"value": "0x23B1aD50996ff1b21552cDD6430868D60bF342c5"
464-
},
465-
{
466-
"name": "minimumIndexerStake",
467-
"value": "100000000000000000000000"
468-
},
469-
{
470-
"name": "thawingPeriod",
471-
"value": 6646
472-
},
473-
{
474-
"name": "protocolPercentage",
475-
"value": 10000
476-
},
477-
{
478-
"name": "curationPercentage",
479-
"value": 100000
480-
},
481-
{
482-
"name": "channelDisputeEpochs",
483-
"value": 2
484-
},
485-
{
486-
"name": "maxAllocationEpochs",
487-
"value": 6
488-
},
489-
{
490-
"name": "delegationUnbondingPeriod",
491-
"value": 6
492-
},
493-
{
494-
"name": "delegationRatio",
495-
"value": 16
496-
},
497-
{
498-
"name": "rebateAlphaNumerator",
499-
"value": 77
500-
},
501-
{
502-
"name": "rebateAlphaDenominator",
503-
"value": 100
504-
}
505-
],
506-
"creationCodeHash": "0xa02709eb59b9cca8bee1271845b42db037dc1d042dad93410ba532d378a7c79f",
507-
"runtimeCodeHash": "0xdb307489fd9a4a438b5b48909e12020b209280ad777561c0a7451655db097e75",
508-
"txHash": "0x9febc188c44c0d9b1162c100833e59e72c1795d999c2ff906f723bfca118c12d",
509-
"proxy": true,
510-
"implementation": {
511-
"address": "0xcf464bf68d3183ae631c1f61c3f66792f9c05da9",
512-
"creationCodeHash": "0x4844ebc5802b1a2171f41f8dac6f83c50421bbf5a334e5a251d9ec257d45554d",
513-
"runtimeCodeHash": "0x4844ebc5802b1a2171f41f8dac6f83c50421bbf5a334e5a251d9ec257d45554d",
514-
"txHash": "0xef6d48956c31adced59d6ee6954c921b645021100dec573e30255fa6b2e35d2b",
515-
"libraries": {
516-
"LibCobbDouglas": "0x504dc6069d7307c3fba5caa7674a927a0a511563"
517-
}
518-
}
519-
},
520-
"DisputeManager": {
521-
"address": "0x4e4B04008C0f7875CDe80e7546d8b3b03Cf1eCf1",
522-
"initArgs": [
523-
{
524-
"name": "controller",
525-
"value": "0x23B1aD50996ff1b21552cDD6430868D60bF342c5"
526-
},
527-
{
528-
"name": "arbitrator",
529-
"value": "0xE1FDD398329C6b74C14cf19100316f0826a492d3"
530-
},
531-
{
532-
"name": "minimumDeposit",
533-
"value": "10000000000000000000000"
534-
},
535-
{
536-
"name": "fishermanRewardPercentage",
537-
"value": 500000
538-
},
539-
{
540-
"name": "slashingPercentage",
541-
"value": 25000
542-
}
543-
],
544-
"creationCodeHash": "0xa02709eb59b9cca8bee1271845b42db037dc1d042dad93410ba532d378a7c79f",
545-
"runtimeCodeHash": "0xdb307489fd9a4a438b5b48909e12020b209280ad777561c0a7451655db097e75",
546-
"txHash": "0xb629195f313e8214e48f5a3fc741072d710f9f9ed6079331908341761f582760",
547-
"proxy": true,
548-
"implementation": {
549-
"address": "0x9CD121b6018A78c08Fc72b9948A6a43E6CEfBC07",
550-
"creationCodeHash": "0x7508a0ca0cb8f88ef54aa2cd1a464dc93a51b5cf500f763f7192a704985d91f3",
551-
"runtimeCodeHash": "0xc8f0b38c011925dbf847c05e73e2b23e8e14553121d58600173ba61731b0a807",
552-
"txHash": "0x7679f2bfab93883af93bdf1166a42d1b3a87c1cbb3fb3cff5c7f860644409fd5"
553-
}
554-
},
555-
"BancorFormula": {
556-
"address": "0xB4B6857dFcE1a31851c0fAde87E94Fc05053916D",
557-
"creationCodeHash": "0x17f6de9ab8a9bcf03a548c01d620a32caf1f29be8d90a9688ebee54295f857ef",
558-
"runtimeCodeHash": "0x97a57f69b0029383398d02587a3a357168950d61622fe9f9710bf02b59740d63",
559-
"txHash": "0x6cf07aed737aee71fa67c40864495124d7c6c6f203c3ed482cbdcc12f998dbb1"
560-
},
561-
"Controller": {
562-
"address": "0x23B1aD50996ff1b21552cDD6430868D60bF342c5",
563-
"creationCodeHash": "0x7f37a1844c38fffd5390d2114804ffc4e5cf66dfb5c7bd67a32a4f5d10eebd2d",
564-
"runtimeCodeHash": "0x929c62381fbed59483f832611752177cc2642e1e35fedeeb6cd9703e278448a0",
565-
"txHash": "0x8cbcfe1f800f88c501f8bdeab8aaf36134e88757c28cbbe74d58c13be36832da"
566-
},
567-
"GraphProxyAdmin": {
568-
"address": "0xC96d71957bbB06f75e1b0ae9d22AC751BE14975C",
569-
"creationCodeHash": "0x26a6f47e71ad242e264768571ce7223bf5a86fd0113ab6cb8200f65820232904",
570-
"runtimeCodeHash": "0xd5330527cfb09df657adc879d8ad704ce6b8d5917265cabbd3eb073d1399f122",
571-
"txHash": "0xca463b34d7967c4351d24b2af779817bd1da75e53a48957cfa32abd1ebf3a56c"
572-
},
573-
"GraphGovernance": {
574-
"address": "0x47241861A3918eaa9097c0345bb5A91660D7AEE1",
575-
"initArgs": ["0x1679a1d1caf1252ba43fb8fc17ebf914a0c725ae"],
576-
"creationCodeHash": "0xa02709eb59b9cca8bee1271845b42db037dc1d042dad93410ba532d378a7c79f",
577-
"runtimeCodeHash": "0xdb307489fd9a4a438b5b48909e12020b209280ad777561c0a7451655db097e75",
578-
"txHash": "0x5101e33eb13504780b225a2557a7062bef93cada0838937e02e879fb3d5c2c01",
579-
"proxy": true,
580-
"implementation": {
581-
"address": "0xa96F8468362e6A109ABFaAF6BBfDa303347B450e",
582-
"creationCodeHash": "0x5bd7ee7fbf6eb49914ffc91c747d18c0909ca18c495a8b163499ebfdd82b29d2",
583-
"runtimeCodeHash": "0xd77099bdfc3f66aec158303be46e92f8e434271d6b0c7643753cd8ac96b460b9",
584-
"txHash": "0xb12705249777b5d955dd25ea7aebf46c5d1e3062b10bc9a0a5755b40f55e11e9"
585-
}
586-
},
587-
"AllocationExchange": {
588-
"address": "0x58ce0a0f41449e349c1a91dd9f3d9286bf32c161",
589-
"initArgs": [
590-
{
591-
"name": "graphToken",
592-
"value": "0x54fe55d5d255b8460fb3bc52d5d676f9ae5697cd"
593-
},
594-
{
595-
"name": "staking",
596-
"value": "0x2d44c0e097f6cd0f514edac633d82e01280b4a5c"
597-
},
598-
{
599-
"name": "governor",
600-
"value": "0x87d11bd744b882b7bc5a6b5450cba8c35d90eb10"
601-
},
602-
{
603-
"name": "authority",
604-
"value": "0x2c0c3c48190d7c69f469eb586aa75e4705cfa203"
605-
}
606-
],
607-
"creationCodeHash": "0x2f052eda2faa00c8dd54ec9bffab95be79075e528f24c3fa9f722c77dcc26d20",
608-
"runtimeCodeHash": "0xec837eb756268aa8a18c5d3182a5c2bf89bd0369f1de07ffa33b1ec5d3bef41a",
609-
"txHash": "0x359cf3945b2584f45633c6f6f37ce5a46129b462232107bb29c456d7fdcb66d0"
610-
},
611-
"SubgraphNFTDescriptor": {
612-
"address": "0x08400283bCCa108d95e25dC2A7498c236134C8a4",
613-
"creationCodeHash": "0x7ac0757e66857e512df199569ee11c47a61b00a8d812469b79afa5dafa98c0ed",
614-
"runtimeCodeHash": "0x9a34ad6b202bdfa95ea85654ea2e0dd40a4b8b10847f1c3d3d805fa95a078a3d",
615-
"txHash": "0x1bf820c2defccdb8a125b8b417463a2577b255b208e7d815045dcee188786f5a"
616-
},
617-
"SubgraphNFT": {
618-
"address": "0xcF1Cd42a28caEE626b6A6Cc62b6d0e9a290bAe20",
619-
"creationCodeHash": "0x8c9929ec6293458209f9cbadd96821604765e3656fe3c7b289b99194ede15336",
620-
"runtimeCodeHash": "0x6309a51754b6bec245685c7a81059dc28e3756f1045f18d059abc9294f454a6a",
621-
"txHash": "0xe16a77593a05fdf02bc61bdf61393327e38bc055dcf57832bed308dff8249ef0"
622-
}
623-
},
624306
"5": {
625307
"GraphProxyAdmin": {
626308
"address": "0x6D47902c3358E0BCC06171DE935cB23D8E276fdd",

‎cli/network.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ export const toGRT = (value: string | number): BigNumber => {
2525
export const getProvider = (providerUrl: string, network?: number): providers.JsonRpcProvider =>
2626
new providers.JsonRpcProvider(providerUrl, network)
2727

28-
export const getChainID = (): number => {
29-
return 4 // Only works for rinkeby right now
30-
}
31-
3228
export const hashHexString = (input: string): string => keccak256(`0x${input.replace(/^0x/, '')}`)
3329

3430
type ContractParam = string | BigNumber | number
@@ -89,7 +85,7 @@ export const waitTransaction = async (
8985
): Promise<providers.TransactionReceipt> => {
9086
const receipt = await sender.provider.waitForTransaction(tx.hash)
9187
const networkName = (await sender.provider.getNetwork()).name
92-
if (networkName === 'kovan' || networkName === 'rinkeby') {
88+
if (networkName === 'goerli') {
9389
receipt.status // 1 = success, 0 = failure
9490
? logger.info(`Transaction succeeded: 'https://${networkName}.etherscan.io/tx/${tx.hash}'`)
9591
: logger.warn(`Transaction failed: 'https://${networkName}.etherscan.io/tx/${tx.hash}'`)

0 commit comments

Comments
 (0)