Skip to content

Commit 7d70566

Browse files
authored
Merge pull request #1116 from graphprotocol/tmigone/horizon-post-oz-audit2
2 parents c0e83cf + d5bc312 commit 7d70566

File tree

577 files changed

+386184
-35774
lines changed

Some content is hidden

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

577 files changed

+386184
-35774
lines changed

.changeset/smooth-balloons-stare.md

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

.github/actions/setup/action.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,17 @@ runs:
66
steps:
77
- name: Install Foundry
88
uses: foundry-rs/foundry-toolchain@v1
9-
- name: Enable corepack for modern yarn
9+
- name: Enable Corepack
1010
shell: bash
1111
run: corepack enable
1212
- name: Install Node.js
1313
uses: actions/setup-node@v4
1414
with:
1515
node-version: 18
16-
cache: 'yarn'
16+
cache: 'pnpm'
17+
- name: Set up pnpm via Corepack
18+
shell: bash
19+
run: corepack prepare [email protected] --activate
1720
- name: Install dependencies
1821
shell: bash
19-
run: yarn --immutable
22+
run: pnpm install --frozen-lockfile

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ jobs:
2222
- name: Set up environment
2323
uses: ./.github/actions/setup
2424
- name: Build
25-
run: yarn build || yarn build
25+
run: pnpm build || pnpm build

.github/workflows/ci-contracts.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ jobs:
2727
- name: Build
2828
run: |
2929
pushd packages/contracts
30-
yarn build || yarn build
30+
pnpm build || pnpm build
3131
- name: Run tests
3232
run: |
3333
pushd packages/contracts
34-
yarn test:coverage
34+
pnpm test:coverage
3535
- name: Upload coverage report
3636
uses: codecov/codecov-action@v3
3737
with:

.github/workflows/ci-data-edge.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ jobs:
2525
- name: Build
2626
run: |
2727
pushd packages/data-edge
28-
yarn build
28+
pnpm build
2929
- name: Run tests
30-
run: yarn test
30+
run: pnpm test
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: CI - packages/toolshed
2+
3+
env:
4+
CI: true
5+
6+
on:
7+
push:
8+
branches: "*"
9+
paths:
10+
- packages/toolshed/**
11+
pull_request:
12+
branches: "*"
13+
paths:
14+
- packages/toolshed/**
15+
workflow_dispatch:
16+
17+
jobs:
18+
test-ci:
19+
runs-on: ubuntu-latest
20+
steps:
21+
- name: Checkout
22+
uses: actions/checkout@v4
23+
with:
24+
submodules: recursive
25+
- name: Set up environment
26+
uses: ./.github/actions/setup
27+
- name: Build contracts
28+
run: |
29+
pushd packages/contracts
30+
pnpm build
31+
popd
32+
- name: Build horizon
33+
run: |
34+
pushd packages/horizon
35+
pnpm build
36+
popd
37+
- name: Build subgraph service
38+
run: |
39+
pushd packages/subgraph-service
40+
pnpm build
41+
popd
42+
- name: Build toolshed
43+
run: |
44+
pushd packages/toolshed
45+
pnpm build
46+
popd
47+
- name: Build hardhat-graph-protocol
48+
run: |
49+
pushd packages/hardhat-graph-protocol
50+
pnpm build
51+
popd

.github/workflows/ci-horizon.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,24 +27,29 @@ jobs:
2727
- name: Build contracts
2828
run: |
2929
pushd packages/contracts
30-
yarn build
30+
pnpm build
3131
popd
3232
- name: Build horizon
3333
run: |
3434
pushd packages/horizon
35-
yarn build
35+
pnpm build
3636
popd
3737
- name: Build subgraph service
3838
run: |
3939
pushd packages/subgraph-service
40-
yarn build
40+
pnpm build
41+
popd
42+
- name: Build toolshed
43+
run: |
44+
pushd packages/toolshed
45+
pnpm build
4146
popd
4247
- name: Build hardhat-graph-protocol
4348
run: |
4449
pushd packages/hardhat-graph-protocol
45-
yarn build
50+
pnpm build
4651
popd
4752
- name: Run tests
4853
run: |
4954
pushd packages/horizon
50-
yarn test
55+
pnpm test

.github/workflows/ci-subgraph-service.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,24 +27,29 @@ jobs:
2727
- name: Build contracts
2828
run: |
2929
pushd packages/contracts
30-
yarn build
30+
pnpm build
3131
popd
3232
- name: Build horizon
3333
run: |
3434
pushd packages/horizon
35-
yarn build
35+
pnpm build
3636
popd
3737
- name: Build subgraph service
3838
run: |
3939
pushd packages/subgraph-service
40-
yarn build
40+
pnpm build
41+
popd
42+
- name: Build toolshed
43+
run: |
44+
pushd packages/toolshed
45+
pnpm build
4146
popd
4247
- name: Build hardhat-graph-protocol
4348
run: |
4449
pushd packages/hardhat-graph-protocol
45-
yarn build
50+
pnpm build
4651
popd
4752
- name: Run tests
4853
run: |
4954
pushd packages/subgraph-service
50-
yarn test
55+
pnpm test

.github/workflows/ci-token-dist.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ jobs:
2828
- name: Build
2929
run: |
3030
pushd packages/token-distribution
31-
yarn build
31+
pnpm build
3232
- name: Run tests
3333
run: |
3434
pushd packages/token-distribution
35-
yarn test
35+
pnpm test

.github/workflows/ci-toolshed.yml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
name: CI - packages/toolshed
2+
3+
env:
4+
CI: true
5+
6+
on:
7+
push:
8+
branches: "*"
9+
paths:
10+
- packages/toolshed/**
11+
pull_request:
12+
branches: "*"
13+
paths:
14+
- packages/toolshed/**
15+
workflow_dispatch:
16+
17+
jobs:
18+
test-ci:
19+
runs-on: ubuntu-latest
20+
steps:
21+
- name: Checkout
22+
uses: actions/checkout@v4
23+
with:
24+
submodules: recursive
25+
- name: Set up environment
26+
uses: ./.github/actions/setup
27+
- name: Build contracts
28+
run: |
29+
pushd packages/contracts
30+
pnpm build
31+
popd
32+
- name: Build horizon
33+
run: |
34+
pushd packages/horizon
35+
pnpm build
36+
popd
37+
- name: Build subgraph service
38+
run: |
39+
pushd packages/subgraph-service
40+
pnpm build
41+
popd
42+
- name: Build toolshed
43+
run: |
44+
pushd packages/toolshed
45+
pnpm build
46+
popd

.github/workflows/publish.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ on:
88
required: true
99
type: choice
1010
options:
11-
- contracts
12-
- sdk
11+
- contracts
12+
- sdk
1313
tag:
1414
description: 'Tag to publish'
1515
required: true
@@ -27,10 +27,10 @@ jobs:
2727
submodules: recursive
2828
- name: Set up environment
2929
uses: ./.github/actions/setup
30+
- name: Set npm token for publishing
31+
run: pnpm config set //registry.npmjs.org/:_authToken ${{ secrets.GRAPHPROTOCOL_NPM_TOKEN }}
3032
- name: Publish 🚀
3133
shell: bash
3234
run: |
3335
pushd packages/${{ inputs.package }}
34-
yarn npm publish --tag ${{ inputs.tag }} --access public
35-
env:
36-
YARN_NPM_AUTH_TOKEN: ${{ secrets.GRAPHPROTOCOL_NPM_TOKEN }}
36+
pnpm publish --tag ${{ inputs.tag }} --access public --no-git-checks

.github/workflows/verifydeployed.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: Build
3434
run: |
3535
pushd packages/contracts
36-
yarn build || yarn build
36+
pnpm build || pnpm build
3737
3838
- name: Save build artifacts
3939
uses: actions/upload-artifact@v3
@@ -55,14 +55,14 @@ jobs:
5555
- name: Build
5656
run: |
5757
pushd packages/contracts
58-
yarn build || yarn build
58+
pnpm build || pnpm build
5959
- name: Get build artifacts
6060
uses: actions/download-artifact@v3
6161
with:
6262
name: contract-artifacts
6363

6464
- name: Verify contracts on Defender
65-
run: cd packages/contracts && yarn hardhat --network ${{ inputs.network }} verify-defender ${{ inputs.contracts }}
65+
run: cd packages/contracts && pnpm hardhat --network ${{ inputs.network }} verify-defender ${{ inputs.contracts }}
6666
env:
6767
DEFENDER_API_KEY: "${{ secrets.DEFENDER_API_KEY }}"
6868
DEFENDER_API_SECRET: "${{ secrets.DEFENDER_API_SECRET }}"

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Logs
22
yarn-debug.log*
33
yarn-error.log*
4+
node.log
45

56
# Dependency directories
67
node_modules/
@@ -45,7 +46,9 @@ localNetwork.json
4546
arbitrum-addresses-local.json
4647
tx-*.log
4748
addresses-fork.json
48-
49+
addresses-hardhat.json
50+
addresses-localhost.json
51+
addresses-local-network.json
4952
# Keys
5053
.keystore
5154

.yarnrc.yml

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

0 commit comments

Comments
 (0)