Skip to content

Commit 750522f

Browse files
MaikolMaikol
authored
Merge pull request #882 from graphprotocol/mde/sam-contract
feat: subgraph availability manager contract
2 parents 3eb16c8 + 7fe43b8 commit 750522f

File tree

17 files changed

+832
-61
lines changed

17 files changed

+832
-61
lines changed

‎packages/contracts/addresses-staging.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,25 @@
203203
"runtimeCodeHash": "0xd853da2001c213dd00d674114c254f18a7b5a36aabc5452fb492b9b4faf2faa9",
204204
"txHash": "0xf868871475dc711c5c03818b16a922f740bc2fc314d24586df2255161a907422"
205205
}
206+
},
207+
"SubgraphAvailabilityManager": {
208+
"address": "0xF00AA63f1a8eE67BAD135759eC7a6542b1d56a8f",
209+
"constructorArgs": [
210+
"0x72ee30d43Fb5A90B3FE983156C5d2fBE6F6d07B3",
211+
"0x00b9d319E3D09E83c62f453B44354049Dd93a345",
212+
"3",
213+
"300",
214+
[
215+
"0xb4d396a40BB976118Bb2c9DB9C5539e65c7Fe64A",
216+
"0x633259dB4A33DB664d4C3Fa57BEc45E5030131E2",
217+
"0x9FC436A69E290227b99A9CE0468a1b9D73068E80",
218+
"0xC9b90ab0B9cA63fDBfB46f66BE813ea94561614d",
219+
"0xf3B8F917EcFA569089CF6A0988F9a9F5155cEF83"
220+
]
221+
],
222+
"creationCodeHash": "0xc34842fa42ee2f21e3a435b52fa69a122a5de795448faa890fbc63d4838f45da",
223+
"runtimeCodeHash": "0xe6c0ccd0b0514dd55e58806b1c84f09805dd6202985722579c11d7e252df6b8d",
224+
"txHash": "0x5c1dd91c76e547fe31a5df822353b50e93eb795b915aac0ea8f8364229e9c29c"
206225
}
207226
},
208227
"11155111": {

‎packages/contracts/addresses.json

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -790,6 +790,25 @@
790790
"creationCodeHash": "0xbfc20ab9b880712ab90b5dec9d2a14c724b0bf7c20f02ede8ea76610bd41b6ef",
791791
"runtimeCodeHash": "0xd7fdd744c7a88993435a2978876b1e4341c5e0fb4d611011bb56e8738ab2485d",
792792
"txHash": "0xcc449d1ca1007fba76b25e987ea0d39164acf4027c10c40bd669ede1c65dc569"
793+
},
794+
"SubgraphAvailabilityManager": {
795+
"address": "0x1cB555359319A94280aCf85372Ac2323AaE2f5fd",
796+
"constructorArgs": [
797+
"0x8C6de8F8D562f3382417340A6994601eE08D3809",
798+
"0x971B9d3d0Ae3ECa029CAB5eA1fB0F72c85e6a525",
799+
"3",
800+
"300",
801+
[
802+
"0xdcAA0a094F2Eb7cF7f73248EE64217D59B7B938d",
803+
"0xBD9dc46cb1dd9F31dCbF0617c2Dd5f77A21dB8e8",
804+
"0x16eAd4088d4308a7A4E0F7a1455ed56CDf1AC8AA",
805+
"0x61923453906Eadc15fc1F610B8D1b67bc27658c2",
806+
"0x10eb33C5E2fb6c7a37B110Cc4930d03A9e4C4D09"
807+
]
808+
],
809+
"creationCodeHash": "0xc34842fa42ee2f21e3a435b52fa69a122a5de795448faa890fbc63d4838f45da",
810+
"runtimeCodeHash": "0x52fcfd39c6ab3cf5ed4a736bc38eb1153d73c8cf1ca9e23370badc7843467ab4",
811+
"txHash": "0x2eb44036d157e39c56377403029aebde4961028b404fc8c3f4cadc0f299d06dd"
793812
}
794813
},
795814
"421613": {
@@ -1221,6 +1240,25 @@
12211240
"creationCodeHash": "0x20cd202f7991716a84c097da5fbd365fd27f7f35f241f82c529ad7aba18b814b",
12221241
"runtimeCodeHash": "0x5f396ffd54b6cd6b3faded0f366c5d7e148cc54743926061be2dfd12a75391de",
12231242
"txHash": "0x2cefbc169b8ae51c263d0298956d86a397b05f11f076b71c918551f63fe33784"
1243+
},
1244+
"SubgraphAvailabilityManager": {
1245+
"address": "0x71D9aE967d1f31fbbD1817150902de78f8f2f73E",
1246+
"constructorArgs": [
1247+
"0x72ee30d43Fb5A90B3FE983156C5d2fBE6F6d07B3",
1248+
"0x1F49caE7669086c8ba53CC35d1E9f80176d67E79",
1249+
"3",
1250+
"300",
1251+
[
1252+
"0x5e4e823Ed094c035133eEC5Ec0d08ae1Af04e9Fa",
1253+
"0x5aeE4c46cF9260E85E630ca7d9D757D5D5DbaFD6",
1254+
"0x7369Cf2a917296c36f506144f3dE552403d1e1f1",
1255+
"0x1e1f84c07e0471fc979f6f08228b0bd34cda9e54",
1256+
"0x711aEA1f358DFAf74D34B4B525F9190e631F406C"
1257+
]
1258+
],
1259+
"creationCodeHash": "0xc34842fa42ee2f21e3a435b52fa69a122a5de795448faa890fbc63d4838f45da",
1260+
"runtimeCodeHash": "0x3907d0fe5a1fa28fee51100e57a3b193dfcee6720163067011e787262b1749bb",
1261+
"txHash": "0xb00751b4dc1c0603fe1b8b9ae9de8840ad1c29b42489c5bb267d80b10ae44ef0"
12241262
}
12251263
},
12261264
"11155111": {

‎packages/contracts/config/graph.arbitrum-hardhat.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@ general:
22
arbitrator: &arbitrator "0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0" # Arbitration Council
33
governor: &governor "0x22d491Bde2303f2f43325b2108D26f1eAbA1e32b" # Graph Council
44
authority: &authority "0xE11BA2b4D45Eaed5996Cd0823791E0C93114882d" # Authority that signs payment vouchers
5-
availabilityOracle: &availabilityOracle "0xd03ea8624C8C5987235048901fB614fDcA89b117" # Subgraph Availability Oracle
5+
availabilityOracles: &availabilityOracles # Subgraph Availability Oracles
6+
- "0xd03ea8624C8C5987235048901fB614fDcA89b117"
7+
- "0xd03ea8624C8C5987235048901fB614fDcA89b117"
8+
- "0xd03ea8624C8C5987235048901fB614fDcA89b117"
9+
- "0xd03ea8624C8C5987235048901fB614fDcA89b117"
10+
- "0xd03ea8624C8C5987235048901fB614fDcA89b117"
611
pauseGuardian: &pauseGuardian "0x95cED938F7991cd0dFcb48F0a06a40FA1aF46EBC" # Protocol pause guardian
712
allocationExchangeOwner: &allocationExchangeOwner "0x3E5e9111Ae8eB78Fe1CC3bb8915d5D461F3Ef9A9" # Allocation Exchange owner
813

@@ -131,7 +136,7 @@ contracts:
131136
- fn: "setIssuancePerBlock"
132137
issuancePerBlock: "114155251141552511415" # per block increase of total supply, blocks in a year = 365*60*60*24/12
133138
- fn: "setSubgraphAvailabilityOracle"
134-
subgraphAvailabilityOracle: *availabilityOracle
139+
subgraphAvailabilityOracle: "${{SubgraphAvailabilityManager.address}}"
135140
- fn: "syncAllContracts"
136141
AllocationExchange:
137142
init:
@@ -149,3 +154,10 @@ contracts:
149154
- fn: "syncAllContracts"
150155
- fn: "setPauseGuardian"
151156
pauseGuardian: *pauseGuardian
157+
SubgraphAvailabilityManager:
158+
init:
159+
governor: *governor
160+
rewardsManager: "${{RewardsManager.address}}"
161+
executionThreshold: 5
162+
voteTimeLimit: 300
163+
oracles: *availabilityOracles

‎packages/contracts/config/graph.arbitrum-localhost.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@ general:
22
arbitrator: &arbitrator "0x4237154FE0510FdE3575656B60c68a01B9dCDdF8" # Arbitration Council
33
governor: &governor "0x1257227a2ECA34834940110f7B5e341A5143A2c4" # Graph Council
44
authority: &authority "0x12B8D08b116E1E3cc29eE9Cf42bB0AA8129C3215" # Authority that signs payment vouchers
5-
availabilityOracle: &availabilityOracle "0x7694a48065f063a767a962610C6717c59F36b445" # Subgraph Availability Oracle
5+
availabilityOracles: &availabilityOracles # Subgraph Availability Oracles
6+
- "0x7694a48065f063a767a962610C6717c59F36b445"
7+
- "0x7694a48065f063a767a962610C6717c59F36b445"
8+
- "0x7694a48065f063a767a962610C6717c59F36b445"
9+
- "0x7694a48065f063a767a962610C6717c59F36b445"
10+
- "0x7694a48065f063a767a962610C6717c59F36b445"
611
pauseGuardian: &pauseGuardian "0x601060e0DC5349AA55EC73df5A58cB0FC1cD2e3C" # Protocol pause guardian
712
allocationExchangeOwner: &allocationExchangeOwner "0xbD38F7b67a591A5cc7D642e1026E5095B819d952" # Allocation Exchange owner
813

@@ -132,7 +137,7 @@ contracts:
132137
- fn: "setIssuancePerBlock"
133138
issuancePerBlock: "6036500000000000000" # per block increase of total supply, blocks in a year = 365*60*60*24/12
134139
- fn: "setSubgraphAvailabilityOracle"
135-
subgraphAvailabilityOracle: *availabilityOracle
140+
subgraphAvailabilityOracle: "${{SubgraphAvailabilityManager.address}}"
136141
- fn: "syncAllContracts"
137142
AllocationExchange:
138143
init:
@@ -150,3 +155,10 @@ contracts:
150155
- fn: "syncAllContracts"
151156
- fn: "setPauseGuardian"
152157
pauseGuardian: *pauseGuardian
158+
SubgraphAvailabilityManager:
159+
init:
160+
governor: *governor
161+
rewardsManager: "${{RewardsManager.address}}"
162+
executionThreshold: 5
163+
voteTimeLimit: 300
164+
oracles: *availabilityOracles

‎packages/contracts/config/graph.arbitrum-sepolia.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@ general:
22
arbitrator: &arbitrator "0x1726A5d52e279d02ff4732eCeB2D67BFE5Add328" # EOA (TODO: update to a multisig)
33
governor: &governor "0x72ee30d43Fb5A90B3FE983156C5d2fBE6F6d07B3" # EOA (TODO: update to a multisig)
44
authority: &authority "0x49D4CFC037430cA9355B422bAeA7E9391e1d3215" # Authority that signs payment vouchers
5-
availabilityOracle: &availabilityOracle "0x5e4e823Ed094c035133eEC5Ec0d08ae1Af04e9Fa" # Subgraph Availability Oracle
5+
availabilityOracles: &availabilityOracles # Array of Subgraph Availability Oracles
6+
- "0x5e4e823Ed094c035133eEC5Ec0d08ae1Af04e9Fa"
7+
- "0x5aeE4c46cF9260E85E630ca7d9D757D5D5DbaFD6"
8+
- "0x7369Cf2a917296c36f506144f3dE552403d1e1f1"
9+
- "0x1e1f84c07e0471fc979f6f08228b0bd34cda9e54"
10+
- "0x711aEA1f358DFAf74D34B4B525F9190e631F406C"
611
pauseGuardian: &pauseGuardian "0xa0444508232dA3FA6C2f96a5f105f3f0cc0d20D7" # Protocol pause guardian
712
allocationExchangeOwner: &allocationExchangeOwner "0x72ee30d43Fb5A90B3FE983156C5d2fBE6F6d07B3" # Allocation Exchange owner
813

@@ -131,7 +136,7 @@ contracts:
131136
- fn: "setIssuancePerBlock"
132137
issuancePerBlock: "6036500000000000000" # per block increase of total supply, blocks in a year = 365*60*60*24/12
133138
- fn: "setSubgraphAvailabilityOracle"
134-
subgraphAvailabilityOracle: *availabilityOracle
139+
subgraphAvailabilityOracle: "${{SubgraphAvailabilityManager.address}}"
135140
- fn: "syncAllContracts"
136141
AllocationExchange:
137142
init:
@@ -149,3 +154,10 @@ contracts:
149154
- fn: "syncAllContracts"
150155
- fn: "setPauseGuardian"
151156
pauseGuardian: *pauseGuardian
157+
SubgraphAvailabilityManager:
158+
init:
159+
governor: *governor
160+
rewardsManager: "${{RewardsManager.address}}"
161+
executionThreshold: 5
162+
voteTimeLimit: 300
163+
oracles: *availabilityOracles

‎packages/contracts/contracts/rewards/IRewardsManager.sol

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ interface IRewardsManager {
2525

2626
function setDenied(bytes32 _subgraphDeploymentID, bool _deny) external;
2727

28-
function setDeniedMany(bytes32[] calldata _subgraphDeploymentID, bool[] calldata _deny) external;
29-
3028
function isDenied(bytes32 _subgraphDeploymentID) external view returns (bool);
3129

3230
// -- Getters --

‎packages/contracts/contracts/rewards/RewardsManager.sol

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -127,22 +127,6 @@ contract RewardsManager is RewardsManagerV4Storage, GraphUpgradeable, IRewardsMa
127127
_setDenied(_subgraphDeploymentID, _deny);
128128
}
129129

130-
/**
131-
* @dev Denies to claim rewards for multiple subgraph.
132-
* NOTE: Can only be called by the subgraph availability oracle
133-
* @param _subgraphDeploymentID Array of subgraph deployment ID
134-
* @param _deny Array of denied status for claiming rewards for each subgraph
135-
*/
136-
function setDeniedMany(
137-
bytes32[] calldata _subgraphDeploymentID,
138-
bool[] calldata _deny
139-
) external override onlySubgraphAvailabilityOracle {
140-
require(_subgraphDeploymentID.length == _deny.length, "!length");
141-
for (uint256 i = 0; i < _subgraphDeploymentID.length; i++) {
142-
_setDenied(_subgraphDeploymentID[i], _deny[i]);
143-
}
144-
}
145-
146130
/**
147131
* @dev Internal: Denies to claim rewards for a subgraph.
148132
* @param _subgraphDeploymentID Subgraph deployment ID

0 commit comments

Comments
 (0)