☀️ Graph Horizon and Subgraph Service ☀️

.github/actions/setup/action.yml

@@ -4,6 +4,8 @@ runs:
   using: composite
 
   steps:
+    - name: Install Foundry
+      uses: foundry-rs/foundry-toolchain@v1
     - name: Enable corepack for modern yarn
       shell: bash
       run: corepack enable
@@ -15,6 +17,3 @@ runs:
     - name: Install dependencies
       shell: bash
       run: yarn --immutable
-    - name: Build
-      shell: bash
-      run: yarn build || yarn build

.github/workflows/build.yml

@@ -2,6 +2,7 @@ name: Build
 
 env:
   CI: true
+  STUDIO_API_KEY: ${{ secrets.STUDIO_API_KEY }}
 
 on:
   push:
@@ -16,5 +17,9 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          submodules: recursive
       - name: Set up environment
-        uses: ./.github/actions/setup
+        uses: ./.github/actions/setup
+      - name: Build
+        run: yarn build || yarn build

.github/workflows/ci-contracts.yml

@@ -20,8 +20,14 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          submodules: recursive
       - name: Set up environment
         uses: ./.github/actions/setup
+      - name: Build
+        run: |
+          pushd packages/contracts
+          yarn build || yarn build
       - name: Run tests
         run: |
           pushd packages/contracts

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

@@ -22,5 +22,9 @@ jobs:
         uses: actions/checkout@v4
       - name: Set up environment
         uses: ./.github/actions/setup
+      - name: Build
+        run: |
+          pushd packages/data-edge
+          yarn build
       - name: Run tests
         run: yarn test

.github/workflows/ci-horizon.yml

@@ -0,0 +1,50 @@
+name: CI - packages/horizon
+
+env:
+  CI: true
+
+on:
+  push:
+    branches: "*"
+    paths:
+      - packages/horizon/**
+  pull_request:
+    branches: "*"
+    paths:
+      - packages/horizon/**
+  workflow_dispatch:
+
+jobs:
+  test-ci:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Set up environment
+        uses: ./.github/actions/setup
+      - name: Build contracts
+        run: |
+          pushd packages/contracts
+          yarn build
+          popd
+      - name: Build horizon
+        run: |
+          pushd packages/horizon
+          yarn build
+          popd
+      - name: Build subgraph service
+        run: |
+          pushd packages/subgraph-service
+          yarn build
+          popd
+      - name: Build hardhat-graph-protocol
+        run: |
+          pushd packages/hardhat-graph-protocol
+          yarn build
+          popd
+      - name: Run tests
+        run: |
+          pushd packages/horizon
+          yarn test

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

@@ -0,0 +1,34 @@
+name: CI - packages/subgraph-service
+
+env:
+  CI: true
+
+on:
+  push:
+    branches: "*"
+    paths:
+      - packages/subgraph-service/**
+  pull_request:
+    branches: "*"
+    paths:
+      - packages/subgraph-service/**
+  workflow_dispatch:
+
+jobs:
+  test-ci:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Set up environment
+        uses: ./.github/actions/setup
+      - name: Build
+        run: |
+          pushd packages/subgraph-service
+          yarn build
+      - name: Run tests
+        run: |
+          pushd packages/subgraph-service
+          yarn test

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

@@ -2,6 +2,7 @@ name: CI - packages/token-distribution
 
 env:
   CI: true
+  STUDIO_API_KEY: ${{ secrets.STUDIO_API_KEY }}
 
 on:
   push:
@@ -20,7 +21,15 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          submodules: recursive
       - name: Set up environment
         uses: ./.github/actions/setup
+      - name: Build
+        run: |
+          pushd packages/token-distribution
+          yarn build
       - name: Run tests
-        run: yarn test
+        run: |
+          pushd packages/token-distribution
+          yarn test

.github/workflows/e2e-contracts.yml

@@ -30,8 +30,14 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          submodules: recursive
       - name: Set up environment
         uses: ./.github/actions/setup
+      - name: Build
+        run: |
+          pushd packages/contracts
+          yarn build || yarn build
       - name: Run e2e tests
         run: |
           git clone https://github.com/OffchainLabs/nitro-testnode/

.github/workflows/publish.yml

@@ -23,6 +23,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          submodules: recursive
       - name: Set up environment
         uses: ./.github/actions/setup
       - name: Publish 🚀

.github/workflows/verifydeployed.yml

@@ -25,11 +25,15 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+        with:
+          submodules: recursive
       - name: Set up environment
         uses: ./.github/actions/setup
 
-      - name: Compile contracts
-        run: yarn build
+      - name: Build
+        run: |
+          pushd packages/contracts
+          yarn build || yarn build
 
       - name: Save build artifacts
         uses: actions/upload-artifact@v3
@@ -48,6 +52,10 @@ jobs:
         uses: actions/checkout@v3
       - name: Set up environment
         uses: ./.github/actions/setup
+      - name: Build
+        run: |
+          pushd packages/contracts
+          yarn build || yarn build
       - name: Get build artifacts
         uses: actions/download-artifact@v3
         with:

.gitignore

@@ -21,6 +21,8 @@ cached/
 # Build artifacts
 dist/
 build/
+typechain/
+typechain-types/
 deployments/hardhat/
 
 # Ignore solc bin output
@@ -45,8 +47,14 @@ addresses-fork.json
 # Keys
 .keystore
 
+# Forge artifacts
+cache_forge
 # Graph client
 .graphclient
 
 tx-builder-*.json
-!tx-builder-template.json
+!tx-builder-template.json
+
+# Hardhat Ignition
+**/chain-31337/
+!**/ignition/**/artifacts/

.gitmodules

@@ -0,0 +1,12 @@
+[submodule "packages/subgraph-service/lib/forge-std"]
+	path = packages/subgraph-service/lib/forge-std
+	url = https://github.com/foundry-rs/forge-std
+[submodule "packages/horizon/lib/forge-std"]
+	path = packages/horizon/lib/forge-std
+	url = https://github.com/foundry-rs/forge-std
+[submodule "packages/horizon/lib/openzeppelin-foundry-upgrades"]
+	path = packages/horizon/lib/openzeppelin-foundry-upgrades
+	url = https://github.com/OpenZeppelin/openzeppelin-foundry-upgrades
+[submodule "packages/subgraph-service/lib/openzeppelin-foundry-upgrades"]
+	path = packages/subgraph-service/lib/openzeppelin-foundry-upgrades
+	url = https://github.com/OpenZeppelin/openzeppelin-foundry-upgrades

.husky/pre-commit

@@ -6,7 +6,17 @@ pushd packages/contracts
 npx --no-install lint-staged
 popd
 
+# subgraph service
+pushd packages/subgraph-service
+npx --no-install lint-staged
+popd
+
 # data-edge
 pushd packages/data-edge
 npx --no-install lint-staged
-popd
+popd
+
+# graph horizon
+pushd packages/horizon
+npx --no-install lint-staged
+popd

README.md

@@ -38,9 +38,12 @@ This repository is a Yarn workspaces monorepo containing the following packages:
 | --- | --- | --- |
 | [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. |
 | [eslint-graph-config](./packages/eslint-graph-config) | [![npm version]()]() | Shared linting and formatting rules for TypeScript projects. |
-| [token-distribution](./packages/token-distribution) | - | Contracts managing token locks for network participants |
+| [horizon](./packages/horizon) | [![npm version]()]() | Contracts for Graph Horizon, the next iteration of The Graph protocol. |
 | [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 |
-| [solhint-graph-config](./packages/eslint-graph-config) | [![npm version]()]() | Shared linting and formatting rules for Solidity projects. |
+| [solhint-graph-config](./packages/solhint-graph-config) | [![npm version]()]() | Shared linting and formatting rules for Solidity projects. |
+| [solhint-plugin-graph](./packages/solhint-plugin-graph) | [![npm version]()]() | Plugin for Solhint with specific Graph linting rules. |
+| [subgraph-service](./packages/subgraph-service) | [![npm version]()]() | Contracts for the Subgraph data service in Graph Horizon. |
+| [token-distribution](./packages/token-distribution) | - | Contracts managing token locks for network participants |
 
 
 ## Development

package.json

@@ -10,15 +10,19 @@
     "packages/contracts",
     "packages/data-edge",
     "packages/eslint-graph-config",
+    "packages/hardhat-graph-protocol",
+    "packages/horizon",
     "packages/sdk",
     "packages/solhint-graph-config",
+    "packages/solhint-plugin-graph",
+    "packages/subgraph-service",
     "packages/token-distribution"
   ],
   "scripts": {
     "postinstall": "husky install",
     "clean": "yarn workspaces foreach --all --parallel --verbose run clean",
     "clean:all": "yarn clean && rm -rf node_modules packages/*/node_modules",
-    "build": "yarn workspaces foreach --all --verbose run build",
+    "build": "chmod +x ./scripts/build && ./scripts/build",
     "lint": "yarn workspaces foreach --all --parallel --verbose run lint",
     "test": "yarn workspaces foreach --all --parallel --verbose --interlaced run test"
   },

packages/contracts/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @graphprotocol/contracts
 
+## 7.0.0
+
+### Major Changes
+
+- 9686ce1: Add Horizon staking interface
+
 ## 6.2.1
 
 ### Patch Changes

packages/contracts/contracts/arbitrum/Arbitrum.md

@@ -0,0 +1,5 @@
+# Arbitrum contracts
+
+These contracts have been copied from the [Arbitrum repo](https://github.com/OffchainLabs/arbitrum).
+
+They are also available as part of the npm packages [arb-bridge-eth](https://www.npmjs.com/package/arb-bridge-eth) and [arb-bridge-peripherals](https://www.npmjs.com/package/arb-bridge-peripherals). The reason for copying them rather than installing those packages is the contracts only support Solidity `^0.6.11`, so we had to change the version to `^0.7.6` for it to be compatible with our other contracts.