Skip to content

Commit efbee4b

Browse files
pcarranzavpcarranzav
committed
fix: update configs for L1 and L2 networks including testnets
BREAKING CHANGE: remove configuration file for Rinkeby
1 parent 87ccc54 commit efbee4b

File tree

5 files changed

+140
-41
lines changed

5 files changed

+140
-41
lines changed

‎config/graph.rinkeby.yml‎ renamed to ‎config/graph.arbitrum-goerli.yml‎

Lines changed: 45 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
general:
2-
arbitrator: &arbitrator "0x87D11BD744b882b7bc5A6b5450cbA8C35D90eb10" # Arbitration Council
3-
governor: &governor "0x1679A1D1caf1252BA43Fb8Fc17ebF914a0C725AE" # Graph Council
4-
authority: &authority "0xe1EC4339019eC9628438F8755f847e3023e4ff9c" # Authority that signs payment vouchers
2+
arbitrator: &arbitrator "0x113DC95e796836b8F0Fa71eE7fB42f221740c3B0" # Arbitration Council (TODO: update)
3+
governor: &governor "0x3e43EF77fAAd296F65eF172E8eF06F8231c9DeAd" # Graph Council (TODO: update)
4+
authority: &authority "0x79fd74da4c906509862c8fe93e87a9602e370bc4" # Authority that signs payment vouchers (TODO: update)
5+
availabilityOracle: &availabilityOracle "0x5d3B6F98F1cCdF873Df0173CDE7335874a396c4d" # Subgraph Availability Oracle (TODO: update)
6+
pauseGuardian: &pauseGuardian "0x8290362Aba20D17c51995085369E001Bad99B21c" # Protocol pause guardian (TODO: update)
7+
allocationExchangeOwner: &allocationExchangeOwner "0x74Db79268e63302d3FC69FB5a7627F7454a41732" # Allocation Exchange owner (TODO: update)
58

69
contracts:
710
Controller:
@@ -26,7 +29,21 @@ contracts:
2629
contractAddress: "${{Staking.address}}"
2730
- fn: "setContractProxy"
2831
id: "0x45fc200c7e4544e457d3c5709bfe0d520442c30bbcbdaede89e8d4a4bbc19247" # keccak256('GraphToken')
29-
contractAddress: "${{GraphToken.address}}"
32+
contractAddress: "${{L2GraphToken.address}}"
33+
- fn: "setContractProxy"
34+
id: "0xd362cac9cb75c10d67bcc0b7eeb0b1ef48bb5420b556c092d4fd7f758816fcf0" # keccak256('GraphTokenGateway')
35+
contractAddress: "${{L2GraphTokenGateway.address}}"
36+
- fn: "setContractProxy"
37+
id: "0x96ba401694892957e25e29c7a1e4171ae9945b5ee36339de79b199a530436e9e" # keccak256('Reservoir')
38+
contractAddress: "${{L2Reservoir.address}}"
39+
- fn: "setPauseGuardian"
40+
pauseGuardian: *pauseGuardian
41+
- fn: "transferOwnership"
42+
owner: *governor
43+
GraphProxyAdmin:
44+
calls:
45+
- fn: "transferOwnership"
46+
owner: *governor
3047
ServiceRegistry:
3148
proxy: true
3249
init:
@@ -35,13 +52,11 @@ contracts:
3552
proxy: true
3653
init:
3754
controller: "${{Controller.address}}"
38-
lengthInBlocks: 277 # length in hours = lengthInBlocks*13/60/60 (~13 second blocks)
39-
GraphToken:
55+
lengthInBlocks: 554 # length in hours = lengthInBlocks*13/60/60 (~13 second blocks)
56+
L2GraphToken:
57+
proxy: true
4058
init:
41-
initialSupply: "10000000000000000000000000000" # in wei
42-
calls:
43-
- fn: "addMinter"
44-
minter: "${{RewardsManager.address}}"
59+
owner: *governor
4560
Curation:
4661
proxy: true
4762
init:
@@ -58,8 +73,8 @@ contracts:
5873
arbitrator: *arbitrator
5974
minimumDeposit: "10000000000000000000000" # in wei
6075
fishermanRewardPercentage: 500000 # in parts per million
61-
idxSlashingPercentage: 20000 # in parts per million
62-
qrySlashingPercentage: 5000 # in parts per million
76+
idxSlashingPercentage: 25000 # in parts per million
77+
qrySlashingPercentage: 25000 # in parts per million
6378
GNS:
6479
proxy: true
6580
init:
@@ -76,6 +91,8 @@ contracts:
7691
tokenDescriptor: "${{SubgraphNFTDescriptor.address}}"
7792
- fn: "setMinter"
7893
minter: "${{GNS.address}}"
94+
- fn: "transferOwnership"
95+
owner: *governor
7996
Staking:
8097
proxy: true
8198
init:
@@ -85,8 +102,8 @@ contracts:
85102
protocolPercentage: 10000 # in parts per million
86103
curationPercentage: 100000 # in parts per million
87104
channelDisputeEpochs: 2 # in epochs
88-
maxAllocationEpochs: 2 # in epochs
89-
delegationUnbondingPeriod: 6 # in epochs
105+
maxAllocationEpochs: 4 # in epochs
106+
delegationUnbondingPeriod: 12 # in epochs
90107
delegationRatio: 16 # delegated stake to indexer stake multiplier
91108
rebateAlphaNumerator: 77 # rebateAlphaNumerator / rebateAlphaDenominator
92109
rebateAlphaDenominator: 100 # rebateAlphaNumerator / rebateAlphaDenominator
@@ -103,12 +120,24 @@ contracts:
103120
proxy: true
104121
init:
105122
controller: "${{Controller.address}}"
106-
issuanceRate: "1000000012184945188" # per block increase of total supply, blocks in a year = 365*60*60*24/13
123+
calls:
124+
- fn: "setSubgraphAvailabilityOracle"
125+
subgraphAvailabilityOracle: *availabilityOracle
107126
AllocationExchange:
108127
init:
109128
graphToken: "${{GraphToken.address}}"
110129
staking: "${{Staking.address}}"
111-
governor: *governor
130+
governor: *allocationExchangeOwner
112131
authority: *authority
113132
calls:
114133
- fn: "approveAll"
134+
L2GraphTokenGateway:
135+
proxy: true
136+
init:
137+
controller: "${{Controller.address}}"
138+
L2Reservoir:
139+
proxy: true
140+
init:
141+
controller: "${{Controller.address}}"
142+
calls:
143+
- fn: "approveRewardsManager"

‎config/graph.arbitrum-one.yml‎

Lines changed: 34 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ general:
22
arbitrator: &arbitrator "0x113DC95e796836b8F0Fa71eE7fB42f221740c3B0" # Arbitration Council
33
governor: &governor "0x3e43EF77fAAd296F65eF172E8eF06F8231c9DeAd" # Graph Council
44
authority: &authority "0x79fd74da4c906509862c8fe93e87a9602e370bc4" # Authority that signs payment vouchers
5+
availabilityOracle: &availabilityOracle "0x5d3B6F98F1cCdF873Df0173CDE7335874a396c4d" # Subgraph Availability Oracle (TODO: update)
6+
pauseGuardian: &pauseGuardian "0x8290362Aba20D17c51995085369E001Bad99B21c" # Protocol pause guardian (TODO: update)
7+
allocationExchangeOwner: &allocationExchangeOwner "0x74Db79268e63302d3FC69FB5a7627F7454a41732" # Allocation Exchange owner (TODO: update)
58

69
contracts:
710
Controller:
@@ -33,6 +36,14 @@ contracts:
3336
- fn: "setContractProxy"
3437
id: "0x96ba401694892957e25e29c7a1e4171ae9945b5ee36339de79b199a530436e9e" # keccak256('Reservoir')
3538
contractAddress: "${{L2Reservoir.address}}"
39+
- fn: "setPauseGuardian"
40+
pauseGuardian: *pauseGuardian
41+
- fn: "transferOwnership"
42+
owner: *governor
43+
GraphProxyAdmin:
44+
calls:
45+
- fn: "transferOwnership"
46+
owner: *governor
3647
ServiceRegistry:
3748
proxy: true
3849
init:
@@ -41,7 +52,7 @@ contracts:
4152
proxy: true
4253
init:
4354
controller: "${{Controller.address}}"
44-
lengthInBlocks: 1108 # 4 hours (in 13 second blocks)
55+
lengthInBlocks: 6646 # length in hours = lengthInBlocks*13/60/60 (~13 second blocks)
4556
L2GraphToken:
4657
proxy: true
4758
init:
@@ -52,18 +63,18 @@ contracts:
5263
controller: "${{Controller.address}}"
5364
bondingCurve: "${{BancorFormula.address}}"
5465
curationTokenMaster: "${{GraphCurationToken.address}}"
55-
reserveRatio: 500000 # 50% (parts per million)
56-
curationTaxPercentage: 10000 # 1% (parts per million)
57-
minimumCurationDeposit: "1000000000000000000" # 1 GRT
66+
reserveRatio: 500000 # in parts per million
67+
curationTaxPercentage: 10000 # in parts per million
68+
minimumCurationDeposit: "1000000000000000000" # in wei
5869
DisputeManager:
5970
proxy: true
6071
init:
6172
controller: "${{Controller.address}}"
6273
arbitrator: *arbitrator
63-
minimumDeposit: "10000000000000000000000" # 10,000 GRT (in wei)
64-
fishermanRewardPercentage: 500000 # 50% (parts per million)
65-
idxSlashingPercentage: 25000 # 2.5% (parts per million)
66-
qrySlashingPercentage: 5000 # 0.5% (parts per million)
74+
minimumDeposit: "10000000000000000000000" # in wei
75+
fishermanRewardPercentage: 500000 # in parts per million
76+
idxSlashingPercentage: 25000 # in parts per million
77+
qrySlashingPercentage: 25000 # in parts per million
6778
GNS:
6879
proxy: true
6980
init:
@@ -80,23 +91,25 @@ contracts:
8091
tokenDescriptor: "${{SubgraphNFTDescriptor.address}}"
8192
- fn: "setMinter"
8293
minter: "${{GNS.address}}"
94+
- fn: "transferOwnership"
95+
owner: *governor
8396
Staking:
8497
proxy: true
8598
init:
8699
controller: "${{Controller.address}}"
87-
minimumIndexerStake: "100000000000000000000000" # 100,000 GRT (in wei)
88-
thawingPeriod: 6646 # 10 days (in blocks)
89-
protocolPercentage: 10000 # 1% (parts per million)
90-
curationPercentage: 100000 # 10% (parts per million)
91-
channelDisputeEpochs: 2 # (in epochs)
92-
maxAllocationEpochs: 6 # Based on epoch length this is 28 days (in epochs)
93-
delegationUnbondingPeriod: 6 # Based on epoch length this is 28 days (in epochs)
94-
delegationRatio: 16 # 16x (delegated stake to indexer stake multiplier)
100+
minimumIndexerStake: "100000000000000000000000" # in wei
101+
thawingPeriod: 186092 # in blocks
102+
protocolPercentage: 10000 # in parts per million
103+
curationPercentage: 100000 # in parts per million
104+
channelDisputeEpochs: 7 # in epochs
105+
maxAllocationEpochs: 28 # in epochs
106+
delegationUnbondingPeriod: 28 # in epochs
107+
delegationRatio: 16 # delegated stake to indexer stake multiplier
95108
rebateAlphaNumerator: 77 # rebateAlphaNumerator / rebateAlphaDenominator
96109
rebateAlphaDenominator: 100 # rebateAlphaNumerator / rebateAlphaDenominator
97110
calls:
98111
- fn: "setDelegationTaxPercentage"
99-
delegationTaxPercentage: 5000 # 0.5% (parts per million)
112+
delegationTaxPercentage: 5000 # parts per million
100113
- fn: "setSlasher"
101114
slasher: "${{DisputeManager.address}}"
102115
allowed: true
@@ -107,11 +120,14 @@ contracts:
107120
proxy: true
108121
init:
109122
controller: "${{Controller.address}}"
123+
calls:
124+
- fn: "setSubgraphAvailabilityOracle"
125+
subgraphAvailabilityOracle: *availabilityOracle
110126
AllocationExchange:
111127
init:
112128
graphToken: "${{GraphToken.address}}"
113129
staking: "${{Staking.address}}"
114-
governor: *governor
130+
governor: *allocationExchangeOwner
115131
authority: *authority
116132
calls:
117133
- fn: "approveAll"

‎config/graph.goerli.yml‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@ contracts:
3030
- fn: "setContractProxy"
3131
id: "0x45fc200c7e4544e457d3c5709bfe0d520442c30bbcbdaede89e8d4a4bbc19247" # keccak256('GraphToken')
3232
contractAddress: "${{GraphToken.address}}"
33+
- fn: "setContractProxy"
34+
id: "0xd362cac9cb75c10d67bcc0b7eeb0b1ef48bb5420b556c092d4fd7f758816fcf0" # keccak256('GraphTokenGateway')
35+
contractAddress: "${{L1GraphTokenGateway.address}}"
36+
- fn: "setContractProxy"
37+
id: "0x96ba401694892957e25e29c7a1e4171ae9945b5ee36339de79b199a530436e9e" # keccak256('Reservoir')
38+
contractAddress: "${{L1Reservoir.address}}"
3339
- fn: "setPauseGuardian"
3440
pauseGuardian: *pauseGuardian
3541
- fn: "transferOwnership"
@@ -52,7 +58,7 @@ contracts:
5258
initialSupply: "10000000000000000000000000000" # in wei
5359
calls:
5460
- fn: "addMinter"
55-
minter: "${{RewardsManager.address}}"
61+
minter: "${{L1Reservoir.address}}"
5662
- fn: "renounceMinter"
5763
- fn: "transferOwnership"
5864
owner: *governor
@@ -120,8 +126,6 @@ contracts:
120126
init:
121127
controller: "${{Controller.address}}"
122128
calls:
123-
- fn: "setIssuanceRate"
124-
issuanceRate: "1000000012184945188" # per block increase of total supply, blocks in a year = 365*60*60*24/13
125129
- fn: "setSubgraphAvailabilityOracle"
126130
subgraphAvailabilityOracle: *availabilityOracle
127131
AllocationExchange:
@@ -132,3 +136,18 @@ contracts:
132136
authority: *authority
133137
calls:
134138
- fn: "approveAll"
139+
L1GraphTokenGateway:
140+
proxy: true
141+
init:
142+
controller: "${{Controller.address}}"
143+
BridgeEscrow:
144+
proxy: true
145+
init:
146+
controller: "${{Controller.address}}"
147+
L1Reservoir:
148+
proxy: true
149+
init:
150+
controller: "${{Controller.address}}"
151+
dripInterval: 50400
152+
calls:
153+
- fn: "approveRewardsManager"

‎config/graph.localhost.yml‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@ contracts:
3030
- fn: "setContractProxy"
3131
id: "0x45fc200c7e4544e457d3c5709bfe0d520442c30bbcbdaede89e8d4a4bbc19247" # keccak256('GraphToken')
3232
contractAddress: "${{GraphToken.address}}"
33+
- fn: "setContractProxy"
34+
id: "0xd362cac9cb75c10d67bcc0b7eeb0b1ef48bb5420b556c092d4fd7f758816fcf0" # keccak256('GraphTokenGateway')
35+
contractAddress: "${{L1GraphTokenGateway.address}}"
36+
- fn: "setContractProxy"
37+
id: "0x96ba401694892957e25e29c7a1e4171ae9945b5ee36339de79b199a530436e9e" # keccak256('Reservoir')
38+
contractAddress: "${{L1Reservoir.address}}"
3339
- fn: "setPauseGuardian"
3440
pauseGuardian: *pauseGuardian
3541
- fn: "transferOwnership"
@@ -52,7 +58,7 @@ contracts:
5258
initialSupply: "10000000000000000000000000000" # in wei
5359
calls:
5460
- fn: "addMinter"
55-
minter: "${{RewardsManager.address}}"
61+
minter: "${{L1Reservoir.address}}"
5662
- fn: "renounceMinter"
5763
- fn: "transferOwnership"
5864
owner: *governor
@@ -120,8 +126,6 @@ contracts:
120126
init:
121127
controller: "${{Controller.address}}"
122128
calls:
123-
- fn: "setIssuanceRate"
124-
issuanceRate: "1000000012184945188" # per block increase of total supply, blocks in a year = 365*60*60*24/13
125129
- fn: "setSubgraphAvailabilityOracle"
126130
subgraphAvailabilityOracle: *availabilityOracle
127131
AllocationExchange:
@@ -132,3 +136,18 @@ contracts:
132136
authority: *authority
133137
calls:
134138
- fn: "approveAll"
139+
L1GraphTokenGateway:
140+
proxy: true
141+
init:
142+
controller: "${{Controller.address}}"
143+
BridgeEscrow:
144+
proxy: true
145+
init:
146+
controller: "${{Controller.address}}"
147+
L1Reservoir:
148+
proxy: true
149+
init:
150+
controller: "${{Controller.address}}"
151+
dripInterval: 50400
152+
calls:
153+
- fn: "approveRewardsManager"

‎config/graph.mainnet.yml‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,14 @@ contracts:
3636
- fn: "setContractProxy"
3737
id: "0x96ba401694892957e25e29c7a1e4171ae9945b5ee36339de79b199a530436e9e" # keccak256('Reservoir')
3838
contractAddress: "${{L1Reservoir.address}}"
39+
- fn: "setPauseGuardian"
40+
pauseGuardian: *pauseGuardian
41+
- fn: "transferOwnership"
42+
owner: *governor
43+
GraphProxyAdmin:
44+
calls:
45+
- fn: "transferOwnership"
46+
owner: *governor
3947
ServiceRegistry:
4048
proxy: true
4149
init:
@@ -51,6 +59,9 @@ contracts:
5159
calls:
5260
- fn: "addMinter"
5361
minter: "${{L1Reservoir.address}}"
62+
- fn: "renounceMinter"
63+
- fn: "transferOwnership"
64+
owner: *governor
5465
Curation:
5566
proxy: true
5667
init:
@@ -85,6 +96,8 @@ contracts:
8596
tokenDescriptor: "${{SubgraphNFTDescriptor.address}}"
8697
- fn: "setMinter"
8798
minter: "${{GNS.address}}"
99+
- fn: "transferOwnership"
100+
owner: *governor
88101
Staking:
89102
proxy: true
90103
init:
@@ -112,11 +125,14 @@ contracts:
112125
proxy: true
113126
init:
114127
controller: "${{Controller.address}}"
128+
calls:
129+
- fn: "setSubgraphAvailabilityOracle"
130+
subgraphAvailabilityOracle: *availabilityOracle
115131
AllocationExchange:
116132
init:
117133
graphToken: "${{GraphToken.address}}"
118134
staking: "${{Staking.address}}"
119-
governor: *governor
135+
governor: *allocationExchangeOwner
120136
authority: *authority
121137
calls:
122138
- fn: "approveAll"

0 commit comments

Comments
 (0)