Skip to content

Commit 33557eb

Browse files
tmigonetmigone
committed
Merge branch 'main' into horizon
Signed-off-by: Tomás Migone <[email protected]>
2 parents 6e8335d + 18e1486 commit 33557eb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1115
-256
lines changed

‎.changeset/smooth-balloons-stare.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@graphprotocol/contracts": patch
3+
---
4+
5+
make sdk and console table printer a dev dep

‎.github/workflows/e2e-contracts.yml

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎README.md

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,8 @@
99
<a href="https://github.com/graphprotocol/contracts/actions/workflows/build.yml">
1010
<img src="https://github.com/graphprotocol/contracts/actions/workflows/build.yml/badge.svg" alt="Build">
1111
</a>
12-
<a href="https://github.com/graphprotocol/contracts/actions/workflows/ci.yml">
13-
<img src="https://github.com/graphprotocol/contracts/actions/workflows/ci.yml/badge.svg" alt="CI">
14-
</a>
15-
<a href="https://github.com/graphprotocol/contracts/actions/workflows/e2e.yml">
16-
<img src="https://github.com/graphprotocol/contracts/actions/workflows/e2e.yml/badge.svg" alt="E2E">
12+
<a href="https://github.com/graphprotocol/contracts/actions/workflows/ci-contracts.yml">
13+
<img src="https://github.com/graphprotocol/contracts/actions/workflows/ci-contracts.yml/badge.svg" alt="CI-Contracts">
1714
</a>
1815
</p>
1916

@@ -37,13 +34,13 @@ This repository is a Yarn workspaces monorepo containing the following packages:
3734
| Package | Latest version | Description |
3835
| --- | --- | --- |
3936
| [contracts](./packages/contracts) | [![npm version](https://badge.fury.io/js/@graphprotocol%2Fcontracts.svg)](https://badge.fury.io/js/@graphprotocol%2Fcontracts) | Contracts enabling the open and permissionless decentralized network known as The Graph protocol. |
40-
| [eslint-graph-config](./packages/eslint-graph-config) | [![npm version]()]() | Shared linting and formatting rules for TypeScript projects. |
41-
| [horizon](./packages/horizon) | [![npm version]()]() | Contracts for Graph Horizon, the next iteration of The Graph protocol. |
37+
| [eslint-graph-config](./packages/eslint-graph-config) | - | Shared linting and formatting rules for TypeScript projects. |
38+
| [horizon](./packages/horizon) | - | Contracts for Graph Horizon, the next iteration of The Graph protocol. |
4239
| [sdk](./packages/sdk) | [![npm version](https://badge.fury.io/js/@graphprotocol%2Fsdk.svg)](https://badge.fury.io/js/@graphprotocol%2Fsdk) | TypeScript based SDK to interact with the protocol contracts |
43-
| [solhint-graph-config](./packages/solhint-graph-config) | [![npm version]()]() | Shared linting and formatting rules for Solidity projects. |
44-
| [solhint-plugin-graph](./packages/solhint-plugin-graph) | [![npm version]()]() | Plugin for Solhint with specific Graph linting rules. |
45-
| [subgraph-service](./packages/subgraph-service) | [![npm version]()]() | Contracts for the Subgraph data service in Graph Horizon. |
46-
| [token-distribution](./packages/token-distribution) | - | Contracts managing token locks for network participants |
40+
| [solhint-graph-config](./packages/solhint-graph-config) | - | Shared linting and formatting rules for Solidity projects. |
41+
| [solhint-plugin-graph](./packages/solhint-plugin-graph) | - | Plugin for Solhint with specific Graph linting rules. |
42+
| [subgraph-service](./packages/subgraph-service) | - | Contracts for the Subgraph data service in Graph Horizon. |
43+
| [token-distribution](./packages/token-distribution) | [![npm version](https://badge.fury.io/js/@graphprotocol%2Ftoken-distribution.svg)](https://badge.fury.io/js/@graphprotocol%2Ftoken-distribution) | Contracts managing token locks for network participants |
4744

4845

4946
## Development

‎packages/contracts/CHANGELOG.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# @graphprotocol/contracts
22

3-
## 7.0.0
3+
## 6.3.0
44

5-
### Major Changes
5+
### Minor Changes
66

7-
- 9686ce1: Add Horizon staking interface
7+
- Remove restriction that prevented closing allocations older than 1 epoch.
88

99
## 6.2.1
1010

‎packages/contracts/addresses-staging.json

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,12 +134,12 @@
134134
"txHash": "0x5ae51383f5ad1e434a78c2a6d5393d497be315c40287d827c63c4ca48cc66aca",
135135
"proxy": true,
136136
"implementation": {
137-
"address": "0xC4Cfde877Bc77fD93378D33Ec26330127Ed93bbE",
138-
"creationCodeHash": "0x9319aaf6b70b423fa04ad747f004961123e7833b269f69ecff902db13b010fa2",
139-
"runtimeCodeHash": "0x9a3f54b5f61709d40a71892f241f61fc72cf95346e5d928f1d699ea57065efc4",
140-
"txHash": "0x1e53eadecdb33a8e90e5c9bc3d02d438dd21217c5017b596b3e51f64be4501e2",
137+
"address": "0x0a6b1efb7b2e9A27Cf7C5ED1bdF1Bd03bF8F5600",
138+
"creationCodeHash": "0x60bc1fda6913ef750a1d931e87068d0f6cd62b8b42a4fff13b304b9c0c278557",
139+
"runtimeCodeHash": "0xd8bbd97b94f8ac45a479c55c0416e7b0ebef6a99da8ef7580bebaaad1d8d74d9",
140+
"txHash": "0x5d9276e47f3d1fa1fe5c6d826534722aa73d47f5a114e844de73a3cf0cb22d6b",
141141
"libraries": {
142-
"LibExponential": "0x6f6Db03f7F3bBE43669F81FD954Bd083FEdBb4a5"
142+
"LibExponential": "0xb7fB963257d4f31F88021d2D7Ee53688e38A0938"
143143
}
144144
}
145145
},
@@ -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: 48 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -705,12 +705,12 @@
705705
"txHash": "0xa33c0d58ddaed7e3f7381a33e3d5f63e39219863019f00d54ce2fd2446076ac7",
706706
"proxy": true,
707707
"implementation": {
708-
"address": "0x4a886d3E44C7731Dcf888Da704CA5C51ed63DfC8",
709-
"creationCodeHash": "0xa9796308a637b0bfe091f32c1019e4db8efe4bab80788c052fa334e6810c3a98",
710-
"runtimeCodeHash": "0x19d3491cab54b2aae04d05525a532200e946ce9b55573b58f2e3e1606b4514be",
711-
"txHash": "0xc3235306a51c20b28a8b05da69859e03a081a84c9914156c79da07dcc45b3b4e",
708+
"address": "0x0Dae36adCbE384a31309269448E09465B2288429",
709+
"creationCodeHash": "0x7bd2944ba001c51a42d88f89b10eb894e11be62ee96e76331309ff6a8e9b20ff",
710+
"runtimeCodeHash": "0x0808fafef220cfddb64a51f680a18e455d5b7c6b9c0c7aad8f8067f4775dd204",
711+
"txHash": "0x6bdee0f03f74df2b7e6141075b06a88b201cbc78a131aa0fe6bb1ef1da1e2dc1",
712712
"libraries": {
713-
"LibExponential": "0x208f638d8804e4ccc874ec39e240feea3dc289ee"
713+
"LibExponential": "0x6F436161bBa439FB7D0A6192D22dd8fcE4C26Fb5"
714714
}
715715
}
716716
},
@@ -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": {
@@ -1146,12 +1165,12 @@
11461165
"txHash": "0x326cf1f2849da4bb4d7e39f2783779e3c99fa48e4ee8ef004cfdd50c62e775df",
11471166
"proxy": true,
11481167
"implementation": {
1149-
"address": "0xD07dFD514dc1b57020e6C1F49e05c48d0658C99f",
1150-
"creationCodeHash": "0x6a763345e5f166ea4e73ce9a116a49c9fc0833d9ea235a86fa5a997e91cf09e5",
1151-
"runtimeCodeHash": "0xb4c31859ac132241f04c802d4add70a94c7f2c6eb9dfd4bf224048d249dbc7bc",
1152-
"txHash": "0x68b34eda64287b84582c8f005c4e96162252d36c9c5c9b84332336a7c2e3d6d3",
1168+
"address": "0x64Ed77b164d3B22339DA4DB6d56a1C1d8A051c0A",
1169+
"creationCodeHash": "0x56a3dd587f3f4ae38dd782e9c35125fa7015c708394950de90bc190204502438",
1170+
"runtimeCodeHash": "0x9040ccf84a89ba2e7a32eb297f0da148827e7e272b20d9e57b1acf749baa35da",
1171+
"txHash": "0xbfec14a2dd1a571612076b71b4f2e78ea18f95d7d80e14cd1456ecaa7466db54",
11531172
"libraries": {
1154-
"LibExponential": "0xd844116f6d79a280b117Bb6d9EBf4121D4e8B44b"
1173+
"LibExponential": "0x413d16eF53d3dd8b7e769570115ee5419CF77C98"
11551174
}
11561175
}
11571176
},
@@ -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/audits/OpenZeppelin/2023-08-dispute-manager-status.pdf

237 KB
Binary file not shown.

‎packages/contracts/audits/OpenZeppelin/2023-11-permissionless-payers.pdf

248 KB
Binary file not shown.

‎packages/contracts/audits/OpenZeppelin/2023-11-remove-delegation-parameters-cooldown.pdf

160 KB
Binary file not shown.

‎packages/contracts/audits/OpenZeppelin/2024-02-graph-availability-manager-minimum-allocation-removal.pdf

149 KB
Binary file not shown.

0 commit comments

Comments
 (0)