Skip to content

Commit ba40a74

Browse files
tmigonetmigone
committed
chore: bump ignition version to 0.15.7
Signed-off-by: Tomás Migone <[email protected]>
1 parent a256d74 commit ba40a74

File tree

8 files changed

+74
-50
lines changed

8 files changed

+74
-50
lines changed

‎packages/horizon/README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,16 @@ Graph Horizon is the next evolution of the Graph Protocol.
44

55
## Deployment
66

7-
We use Hardhat Ignition to deploy the contracts. To build and deploy the contracts run the following commands:
7+
We use Hardhat Ignition to deploy the contracts. To build and deploy Graph Horizon run the following commands:
88

99
```bash
1010
yarn install
1111
yarn build
1212
npx hardhat ignition deploy ./ignition/modules/horizon.ts \
13-
--parameters ./ignition/configs/horizon.hardhat.json \
13+
--parameters ./ignition/configs/horizon.hardhat.json5 \
1414
--network hardhat
1515
```
1616

17-
You can use any network defined in `hardhat.config.ts` by replacing `hardhat` with the network name.
17+
You can use any network defined in `hardhat.config.ts` by replacing `hardhat` with the network name.
18+
19+
Note that this will deploy a standalone version of Graph Horizon contracts, meaning the Subgraph Service will not be deployed. If you want to deploy both please refer to the [Subgraph Service README](../subgraph-service/README.md) for deploy instructions.

‎packages/horizon/ignition/configs/horizon.hardhat.json renamed to ‎packages/horizon/ignition/configs/horizon.hardhat.json5

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,27 @@
11
{
2-
"GraphProxyAdmin": {
3-
"governor": "0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0"
4-
},
5-
"Controller": {
2+
"$global": {
63
"governor": "0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0",
7-
"pauseGuardian": "0x95cED938F7991cd0dFcb48F0a06a40FA1aF46EBC"
8-
},
9-
"RewardsManager": {
4+
"pauseGuardian": "0x95cED938F7991cd0dFcb48F0a06a40FA1aF46EBC",
105
"subgraphAvailabilityOracle": "0xd03ea8624C8C5987235048901fB614fDcA89b117",
11-
"issuancePerBlock": "114155251141552511415n",
6+
// Placeholder address for a standalone Horizon deployment, see README.md for more detals
127
"subgraphServiceAddress": "0x0000000000000000000000000000000000000000"
138
},
9+
"RewardsManager": {
10+
"issuancePerBlock": "114155251141552511415n"
11+
},
1412
"EpochManager": {
1513
"epochLength": 60
1614
},
17-
"GraphTokenGateway": {
18-
"pauseGuardian": "0x95cED938F7991cd0dFcb48F0a06a40FA1aF46EBC"
19-
},
2015
"Curation": {
2116
"curationTaxPercentage": 10000,
2217
"minimumCurationDeposit": 1
2318
},
2419
"GraphToken": {
25-
"initialSupply": "10000000000000000000000000000n",
26-
"governor": "0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0"
20+
"initialSupply": "10000000000000000000000000000n"
2721
},
2822
"HorizonStaking": {
29-
"subgraphServiceAddress": "0x0000000000000000000000000000000000000000",
3023
"maxThawingPeriod": 2419200
3124
},
32-
"HorizonStakingExtension": {
33-
"subgraphServiceAddress": "0x0000000000000000000000000000000000000000"
34-
},
3525
"GraphPayments": {
3626
"protocolPaymentCut": 10000
3727
},

‎packages/horizon/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"@nomicfoundation/hardhat-chai-matchers": "^2.0.0",
1818
"@nomicfoundation/hardhat-ethers": "^3.0.8",
1919
"@nomicfoundation/hardhat-foundry": "^1.1.1",
20-
"@nomicfoundation/hardhat-ignition": "^0.15.5",
20+
"@nomicfoundation/hardhat-ignition": "^0.15.7",
2121
"@nomicfoundation/hardhat-ignition-ethers": "^0.15.5",
2222
"@nomicfoundation/hardhat-network-helpers": "^1.0.0",
2323
"@nomicfoundation/hardhat-toolbox": "^4.0.0",

‎packages/horizon/scripts/deploy.ts

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

‎packages/subgraph-service/README.md

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
1-
# Sample Hardhat Project
1+
# 🌅 Subgraph Service 🌅
22

3-
This project demonstrates a basic Hardhat use case. It comes with a sample contract, a test for that contract, and a script that deploys that contract.
3+
The Subgraph Service is a data service designed to work with Graph Horizon that supports indexing subgraphs and serving queries to consumers.
44

5-
Try running some of the following tasks:
5+
## Deployment
66

7-
```shell
8-
npx hardhat help
9-
npx hardhat test
10-
REPORT_GAS=true npx hardhat test
11-
npx hardhat node
12-
npx hardhat run scripts/deploy.ts
7+
We use Hardhat Ignition to deploy the contracts. To build and deploy the Subgraph Service run the following commands:
8+
9+
```bash
10+
yarn install
11+
yarn build
12+
npx hardhat run scripts/deploy.ts --network hardhat
1313
```
14+
15+
You can use any network defined in `hardhat.config.ts` by replacing `hardhat` with the network name.
16+
17+
Note that this will deploy and configure Graph Horizon contracts as well as the Subgraph Service.

‎packages/subgraph-service/ignition/configs/subgraph-service.hardhat.json renamed to ‎packages/subgraph-service/ignition/configs/subgraph-service.hardhat.json5

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{
2+
"$global": {
3+
"arbitrator": "0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0"
4+
},
25
"DisputeManager": {
3-
"arbitrator": "0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0",
46
"disputePeriod": 2419200,
57
"disputeDeposit": "10000000000000000000000n",
68
"fishermanRewardCut": 500000,

‎packages/subgraph-service/scripts/deploy.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import SubgraphServiceProxiesModule from '../ignition/modules/Proxies'
1717
// - Deploy SubgraphService and DisputeManager implementations
1818
async function main() {
1919
// TODO: Dynamically load config file based on the hardhat --network value
20-
const HorizonConfig = removeNFromBigInts(require('@graphprotocol/horizon/ignition/configs/horizon.hardhat.json'))
21-
const SubgraphServiceConfig = removeNFromBigInts(require('../ignition/configs/subgraph-service.hardhat.json'))
20+
const HorizonConfig = removeNFromBigInts(require('@graphprotocol/horizon/ignition/configs/horizon.hardhat.json5'))
21+
const SubgraphServiceConfig = removeNFromBigInts(require('../ignition/configs/subgraph-service.hardhat.json5'))
2222

2323
// Deploy proxies
2424
const { DisputeManagerProxy, DisputeManagerProxyAdmin, SubgraphServiceProxy, SubgraphServiceProxyAdmin } = await ignition.deploy(SubgraphServiceProxiesModule)

‎yarn.lock

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2933,7 +2933,7 @@ __metadata:
29332933
"@nomicfoundation/hardhat-chai-matchers": "npm:^2.0.0"
29342934
"@nomicfoundation/hardhat-ethers": "npm:^3.0.8"
29352935
"@nomicfoundation/hardhat-foundry": "npm:^1.1.1"
2936-
"@nomicfoundation/hardhat-ignition": "npm:^0.15.5"
2936+
"@nomicfoundation/hardhat-ignition": "npm:^0.15.7"
29372937
"@nomicfoundation/hardhat-ignition-ethers": "npm:^0.15.5"
29382938
"@nomicfoundation/hardhat-network-helpers": "npm:^1.0.0"
29392939
"@nomicfoundation/hardhat-toolbox": "npm:^4.0.0"
@@ -4707,6 +4707,24 @@ __metadata:
47074707
languageName: node
47084708
linkType: hard
47094709

4710+
"@nomicfoundation/hardhat-ignition@npm:^0.15.7":
4711+
version: 0.15.7
4712+
resolution: "@nomicfoundation/hardhat-ignition@npm:0.15.7"
4713+
dependencies:
4714+
"@nomicfoundation/ignition-core": "npm:^0.15.7"
4715+
"@nomicfoundation/ignition-ui": "npm:^0.15.7"
4716+
chalk: "npm:^4.0.0"
4717+
debug: "npm:^4.3.2"
4718+
fs-extra: "npm:^10.0.0"
4719+
json5: "npm:^2.2.3"
4720+
prompts: "npm:^2.4.2"
4721+
peerDependencies:
4722+
"@nomicfoundation/hardhat-verify": ^2.0.1
4723+
hardhat: ^2.18.0
4724+
checksum: a5ed2b4fb862185d25c7b718faacafb23b818bc22c4c80c9bab6baaa228cf430196058a9374649de99dd831b98b9088b7b337ef44e4cadbf370d75a8a325ced9
4725+
languageName: node
4726+
linkType: hard
4727+
47104728
"@nomicfoundation/hardhat-network-helpers@npm:^1.0.0, @nomicfoundation/hardhat-network-helpers@npm:^1.0.9":
47114729
version: 1.0.10
47124730
resolution: "@nomicfoundation/hardhat-network-helpers@npm:1.0.10"
@@ -4779,13 +4797,37 @@ __metadata:
47794797
languageName: node
47804798
linkType: hard
47814799

4800+
"@nomicfoundation/ignition-core@npm:^0.15.7":
4801+
version: 0.15.7
4802+
resolution: "@nomicfoundation/ignition-core@npm:0.15.7"
4803+
dependencies:
4804+
"@ethersproject/address": "npm:5.6.1"
4805+
"@nomicfoundation/solidity-analyzer": "npm:^0.1.1"
4806+
cbor: "npm:^9.0.0"
4807+
debug: "npm:^4.3.2"
4808+
ethers: "npm:^6.7.0"
4809+
fs-extra: "npm:^10.0.0"
4810+
immer: "npm:10.0.2"
4811+
lodash: "npm:4.17.21"
4812+
ndjson: "npm:2.0.0"
4813+
checksum: b0d5717e7835da76595886e2729a0ee34536699091ad509b63fe2ec96b186495886c313c1c748dcc658524a5f409840031186f3af76975250be424248369c495
4814+
languageName: node
4815+
linkType: hard
4816+
47824817
"@nomicfoundation/ignition-ui@npm:^0.15.5":
47834818
version: 0.15.5
47844819
resolution: "@nomicfoundation/ignition-ui@npm:0.15.5"
47854820
checksum: 7d10e30c3078731e4feb91bd7959dfb5a0eeac6f34f6261fada2bf330ff8057ecd576ce0fb3fe856867af2d7c67f31bd75a896110b58d93ff3f27f04f6771278
47864821
languageName: node
47874822
linkType: hard
47884823

4824+
"@nomicfoundation/ignition-ui@npm:^0.15.7":
4825+
version: 0.15.7
4826+
resolution: "@nomicfoundation/ignition-ui@npm:0.15.7"
4827+
checksum: 4e53ff1e5267e9882ee3f7bae3d39c0e0552e9600fd2ff12ccc49f22436e1b97e9cec215999fda0ebcfbdf6db054a1ad8c0d940641d97de5998dbb4c864ce649
4828+
languageName: node
4829+
linkType: hard
4830+
47894831
"@nomicfoundation/solidity-analyzer-darwin-arm64@npm:0.1.1":
47904832
version: 0.1.1
47914833
resolution: "@nomicfoundation/solidity-analyzer-darwin-arm64@npm:0.1.1"

0 commit comments

Comments
 (0)