❄️ 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

.github/workflows/build.yml

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

.github/workflows/ci-contracts.yml

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

.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,50 @@
+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 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/subgraph-service
+          yarn test

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

@@ -21,11 +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/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,6 +25,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+        with:
+          submodules: recursive
       - name: Set up environment
         uses: ./.github/actions/setup
 

.gitignore

@@ -21,6 +21,8 @@ cached/
 # Build artifacts
 dist/
 build/
+typechain/
+typechain-types/
 deployments/hardhat/
 
 # Ignore solc bin output
@@ -32,8 +34,10 @@ bin/
 .vscode
 
 # Coverage and other reports
+coverage/
 reports/
 coverage.json
+lcov.info
 
 # Local test files
 addresses-local.json
@@ -45,8 +49,20 @@ 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/
+**/chain-1377/
+**/horizon-localhost/
+**/horizon-hardhat/
+**/subgraph-service-localhost/
+**/subgraph-service-hardhat/
+!**/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

@@ -35,9 +35,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) | - | Shared linting and formatting rules for TypeScript projects. |
-| [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 |
+| [horizon](./packages/horizon) | - | 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/solhint-graph-config) | - | Shared linting and formatting rules for Solidity projects. |
+| [solhint-plugin-graph](./packages/solhint-plugin-graph) | - | Plugin for Solhint with specific Graph linting rules. |
+| [subgraph-service](./packages/subgraph-service) | - | Contracts for the Subgraph data service in Graph Horizon. |
+| [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 |
 
 
 ## 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/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.

packages/contracts/contracts/arbitrum/ITokenGateway.sol

@@ -23,7 +23,7 @@
  *
  */
 
-pragma solidity ^0.7.6;
+pragma solidity ^0.7.6 || 0.8.27;
 
 interface ITokenGateway {
     /// @notice event deprecated in favor of DepositInitiated and WithdrawalInitiated
@@ -47,20 +47,20 @@ interface ITokenGateway {
     // );
 
     function outboundTransfer(
-        address _token,
-        address _to,
-        uint256 _amount,
-        uint256 _maxGas,
-        uint256 _gasPriceBid,
-        bytes calldata _data
+        address token,
+        address to,
+        uint256 amunt,
+        uint256 maxas,
+        uint256 gasPiceBid,
+        bytes calldata data
     ) external payable returns (bytes memory);
 
     function finalizeInboundTransfer(
-        address _token,
-        address _from,
-        address _to,
-        uint256 _amount,
-        bytes calldata _data
+        address token,
+        address from,
+        address to,
+        uint256 amount,
+        bytes calldata data
     ) external payable;
 
     /**

packages/contracts/contracts/curation/Curation.sol

@@ -257,7 +257,7 @@ contract Curation is CurationV2Storage, GraphUpgradeable {
 
     /**
      * @notice Get the amount of token reserves in a curation pool.
-     * @param _subgraphDeploymentID Subgraph deployment curation poool
+     * @param _subgraphDeploymentID Subgraph deployment curation pool
      * @return Amount of token reserves in the curation pool
      */
     function getCurationPoolTokens(bytes32 _subgraphDeploymentID) external view override returns (uint256) {
@@ -286,7 +286,7 @@ contract Curation is CurationV2Storage, GraphUpgradeable {
 
     /**
      * @notice Get the amount of signal in a curation pool.
-     * @param _subgraphDeploymentID Subgraph deployment curation poool
+     * @param _subgraphDeploymentID Subgraph deployment curation pool
      * @return Amount of signal minted for the subgraph deployment
      */
     function getCurationPoolSignal(bytes32 _subgraphDeploymentID) public view override returns (uint256) {

packages/contracts/contracts/curation/CurationStorage.sol

@@ -68,3 +68,16 @@ abstract contract CurationV1Storage is Managed, ICuration {
 abstract contract CurationV2Storage is CurationV1Storage, Initializable {
     // Nothing here, just adding Initializable
 }
+
+/**
+ * @title Curation Storage version 3
+ * @dev This contract holds the third version of the storage variables
+ * for the Curation and L2Curation contracts.
+ * It adds a new variable subgraphService to the storage.
+ * When adding new variables, create a new version that inherits this and update
+ * the contracts to use the new version instead.
+ */
+abstract contract CurationV3Storage is CurationV2Storage {
+    // Address of the subgraph service
+    address public subgraphService;
+}