graphprotocol · pcarranzav · Jan 27, 2025 · Jan 27, 2025 · Jan 27, 2025 · Jan 27, 2025
diff --git a/.github/actions/setup/action.yml b/.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

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,5 +16,7 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          submodules: recursive
       - name: Set up environment
         uses: ./.github/actions/setup
diff --git a/.github/workflows/ci-contracts.yml b/.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: Run tests

diff --git a/.github/workflows/ci-horizon.yml b/.github/workflows/ci-horizon.yml
@@ -0,0 +1,30 @@
+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: Run tests
+        run: |
+          pushd packages/horizon
+          yarn test
diff --git a/.github/workflows/ci-subgraph-service.yml b/.github/workflows/ci-subgraph-service.yml
@@ -0,0 +1,30 @@
+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: Run tests
+        run: |
+          pushd packages/subgraph-service
+          yarn test
diff --git a/.github/workflows/ci-token-dist.yml b/.github/workflows/ci-token-dist.yml
@@ -20,7 +20,11 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          submodules: recursive
       - name: Set up environment
         uses: ./.github/actions/setup
       - name: Run tests
-        run: yarn test
+        run: |
+          pushd packages/token-distribution
+          yarn test
diff --git a/.github/workflows/e2e-contracts.yml b/.github/workflows/e2e-contracts.yml
@@ -30,6 +30,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          submodules: recursive
       - name: Set up environment
         uses: ./.github/actions/setup
       - name: Run e2e tests

diff --git a/.github/workflows/publish.yml b/.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 🚀

diff --git a/.github/workflows/verifydeployed.yml b/.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
 

diff --git a/.gitignore b/.gitignore
@@ -21,6 +21,8 @@ cached/
 # Build artifacts
 dist/
 build/
+typechain/
+typechain-types/
 deployments/hardhat/
 
 # Ignore solc bin output
@@ -45,8 +47,10 @@ addresses-fork.json
 # Keys
 .keystore
 
+# Forge artifacts
+cache_forge
 # Graph client
 .graphclient
 
 tx-builder-*.json
-!tx-builder-template.json
+!tx-builder-template.json
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,9 @@
+[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
diff --git a/.husky/pre-commit b/.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
diff --git a/README.md b/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

diff --git a/package.json b/package.json
@@ -10,8 +10,11 @@
     "packages/contracts",
     "packages/data-edge",
     "packages/eslint-graph-config",
+    "packages/horizon",
     "packages/sdk",
     "packages/solhint-graph-config",
+    "packages/solhint-plugin-graph",
+    "packages/subgraph-service",
     "packages/token-distribution"
   ],
   "scripts": {

diff --git a/packages/contracts/.solhint.json b/packages/contracts/.solhint.json
diff --git a/packages/contracts/.solhintignore b/packages/contracts/.solhintignore
diff --git a/packages/contracts/CHANGELOG.md b/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

diff --git a/packages/contracts/contracts/arbitrum/Arbitrum.md b/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.
diff --git a/packages/contracts/contracts/arbitrum/ITokenGateway.sol b/packages/contracts/contracts/arbitrum/ITokenGateway.sol
@@ -23,7 +23,7 @@
  *
  */
 
-pragma solidity ^0.7.6;
+pragma solidity ^0.7.6 || 0.8.26;
 
 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 oken,
+        address t,
+        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;
 
     /**

diff --git a/packages/contracts/contracts/curation/ICuration.sol b/packages/contracts/contracts/curation/ICuration.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-pragma solidity ^0.7.6;
+pragma solidity ^0.7.6 || 0.8.26;
 
 /**
  * @title Curation Interface

diff --git a/packages/contracts/contracts/epochs/IEpochManager.sol b/packages/contracts/contracts/epochs/IEpochManager.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-pragma solidity ^0.7.6;
+pragma solidity ^0.7.6 || 0.8.26;
 
 interface IEpochManager {
     // -- Configuration --

diff --git a/packages/contracts/contracts/gateway/ICallhookReceiver.sol b/packages/contracts/contracts/gateway/ICallhookReceiver.sol
@@ -6,7 +6,7 @@
  * be allowlisted by the governor, but also implement this interface that contains
  * the function that will actually be called by the L2GraphTokenGateway.
  */
-pragma solidity ^0.7.6;
+pragma solidity ^0.7.6 || 0.8.26;
 
 interface ICallhookReceiver {
     /**

diff --git a/packages/contracts/contracts/governance/Controller.sol b/packages/contracts/contracts/governance/Controller.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-pragma solidity ^0.7.6;
+pragma solidity ^0.7.6 || 0.8.26;
 
 import { IController } from "./IController.sol";
 import { IManaged } from "./IManaged.sol";

diff --git a/packages/contracts/contracts/governance/Governed.sol b/packages/contracts/contracts/governance/Governed.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-pragma solidity ^0.7.6;
+pragma solidity ^0.7.6 || 0.8.26;
 
 /**
  * @title Graph Governance contract

diff --git a/packages/contracts/contracts/governance/IController.sol b/packages/contracts/contracts/governance/IController.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-pragma solidity >=0.6.12 <0.8.0;
+pragma solidity ^0.7.6 || 0.8.26;
 
 interface IController {
     function getGovernor() external view returns (address);

diff --git a/packages/contracts/contracts/governance/IManaged.sol b/packages/contracts/contracts/governance/IManaged.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-pragma solidity ^0.7.6;
+pragma solidity ^0.7.6 || 0.8.26;
 
 import { IController } from "./IController.sol";
 

diff --git a/packages/contracts/contracts/governance/Pausable.sol b/packages/contracts/contracts/governance/Pausable.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-pragma solidity ^0.7.6;
+pragma solidity ^0.7.6 || 0.8.26;
 
 abstract contract Pausable {
     /**

diff --git a/packages/contracts/contracts/l2/staking/IL2Staking.sol b/packages/contracts/contracts/l2/staking/IL2Staking.sol
@@ -5,6 +5,7 @@ pragma abicoder v2;
 
 import { IStaking } from "../../staking/IStaking.sol";
 import { IL2StakingBase } from "./IL2StakingBase.sol";
+import { IL2StakingTypes } from "./IL2StakingTypes.sol";
 
 /**
  * @title Interface for the L2 Staking contract
@@ -15,21 +16,4 @@ import { IL2StakingBase } from "./IL2StakingBase.sol";
  * the custom setup of the Staking contract where part of the functionality is implemented
  * in a separate contract (StakingExtension) to which calls are delegated through the fallback function.
  */
-interface IL2Staking is IStaking, IL2StakingBase {
-    /// @dev Message codes for the L1 -> L2 bridge callhook
-    enum L1MessageCodes {
-        RECEIVE_INDEXER_STAKE_CODE,
-        RECEIVE_DELEGATION_CODE
-    }
-
-    /// @dev Encoded message struct when receiving indexer stake through the bridge
-    struct ReceiveIndexerStakeData {
-        address indexer;
-    }
-
-    /// @dev Encoded message struct when receiving delegation through the bridge
-    struct ReceiveDelegationData {
-        address indexer;
-        address delegator;
-    }
-}
+interface IL2Staking is IStaking, IL2StakingBase, IL2StakingTypes {}
diff --git a/packages/contracts/contracts/l2/staking/IL2StakingBase.sol b/packages/contracts/contracts/l2/staking/IL2StakingBase.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-pragma solidity ^0.7.6;
+pragma solidity ^0.7.6 || 0.8.26;
 
 import { ICallhookReceiver } from "../../gateway/ICallhookReceiver.sol";