Merge pull request #1101 from graphprotocol/tmigone/horizon-fix-ci

Author: tmigone

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

@@ -24,10 +24,26 @@ jobs:
           submodules: recursive
       - name: Set up environment
         uses: ./.github/actions/setup
-      - name: Build
+      - 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

packages/hardhat-graph-protocol/src/sdk/hardhat.base.config.ts

@@ -2,30 +2,23 @@ import { vars } from 'hardhat/config'
 
 import type { HardhatUserConfig, NetworksUserConfig, ProjectPathsUserConfig, SolidityUserConfig } from 'hardhat/types'
 import type { EtherscanConfig } from '@nomicfoundation/hardhat-verify/types'
+import type { GraphRuntimeEnvironmentOptions } from '../types'
 
-// This next import ensures secure accounts config is correctly typed
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-import 'hardhat-secure-accounts'
-
-// Environment variables
-const ARBISCAN_API_KEY = vars.get('ARBISCAN_API_KEY', undefined)
+// TODO: this should be imported from hardhat-secure-accounts, but currently it's not exported
+interface SecureAccountsOptions {
+  enabled?: boolean
+}
 
 // RPCs
-const VIRTUAL_ARBITRUM_SEPOLIA_RPC = vars.has('VIRTUAL_ARBITRUM_SEPOLIA_RPC') ? vars.get('VIRTUAL_ARBITRUM_SEPOLIA_RPC') : undefined
+const ARBITRUM_ONE_RPC = vars.get('ARBITRUM_ONE_RPC', 'https://arb1.arbitrum.io/rpc')
 const ARBITRUM_SEPOLIA_RPC = vars.get('ARBITRUM_SEPOLIA_RPC', 'https://sepolia-rollup.arbitrum.io/rpc')
-const VIRTUAL_ARBITRUM_ONE_RPC = vars.has('VIRTUAL_ARBITRUM_ONE_RPC') ? vars.get('VIRTUAL_ARBITRUM_ONE_RPC') : undefined
-
-// Tenderly API Key
-const TENDERLY_API_KEY = vars.has('TENDERLY_API_KEY') ? vars.get('TENDERLY_API_KEY') : undefined
 
 // Accounts
-const DEPLOYER_PRIVATE_KEY = vars.get('DEPLOYER_PRIVATE_KEY', undefined)
-const GOVERNOR_PRIVATE_KEY = vars.get('GOVERNOR_PRIVATE_KEY', undefined)
 const getTestnetAccounts = () => {
   const accounts: string[] = []
-  if (DEPLOYER_PRIVATE_KEY) accounts.push(DEPLOYER_PRIVATE_KEY)
-  if (GOVERNOR_PRIVATE_KEY) accounts.push(GOVERNOR_PRIVATE_KEY)
-  return accounts.length > 0 ? accounts : undefined
+  if (vars.has('DEPLOYER_PRIVATE_KEY')) accounts.push(vars.get('DEPLOYER_PRIVATE_KEY'))
+  if (vars.has('GOVERNOR_PRIVATE_KEY')) accounts.push(vars.get('GOVERNOR_PRIVATE_KEY'))
+  return accounts
 }
 const getHardhatAccounts = () => {
   return {
@@ -50,42 +43,43 @@ export const projectPathsUserConfig: ProjectPathsUserConfig = {
 
 export const etherscanUserConfig: Partial<EtherscanConfig> = {
   apiKey: {
-    arbitrumSepolia: ARBISCAN_API_KEY,
-    ...(TENDERLY_API_KEY && {
-      virtualArbitrumSepolia: TENDERLY_API_KEY,
-      virtualArbitrumOne: TENDERLY_API_KEY,
+    ...(vars.has('ARBISCAN_API_KEY') && {
+      arbitrumSepolia: vars.get('ARBISCAN_API_KEY'),
+    }),
+    ...(vars.has('TENDERLY_API_KEY') && {
+      virtualArbitrumSepolia: vars.get('TENDERLY_API_KEY'),
+      virtualArbitrumOne: vars.get('TENDERLY_API_KEY'),
     }),
   },
   customChains: [
-    {
-      network: 'arbitrumSepolia',
-      chainId: 421614,
-      urls: { apiURL: 'https://api-sepolia.arbiscan.io/api', browserURL: 'https://sepolia.arbiscan.io/' },
-    },
-    {
-      network: 'virtualArbitrumSepolia',
-      chainId: 421615,
-      urls: {
-        apiURL: VIRTUAL_ARBITRUM_SEPOLIA_RPC + '/verify/etherscan',
-        browserURL: VIRTUAL_ARBITRUM_SEPOLIA_RPC || 'https://sepolia.arbiscan.io/',
-      },
-    },
-    {
-      network: 'virtualArbitrumOne',
-      chainId: 42162,
-      urls: {
-        apiURL: VIRTUAL_ARBITRUM_ONE_RPC + '/verify/etherscan',
-        browserURL: VIRTUAL_ARBITRUM_SEPOLIA_RPC || 'https://arbiscan.io/',
-      },
-    },
+    ...(vars.has('VIRTUAL_ARBITRUM_SEPOLIA_RPC')
+      ? [{
+          network: 'virtualArbitrumSepolia',
+          chainId: 421615,
+          urls: {
+            apiURL: `${vars.get('VIRTUAL_ARBITRUM_SEPOLIA_RPC')}/verify/etherscan`,
+            browserURL: vars.get('VIRTUAL_ARBITRUM_SEPOLIA_RPC') || 'https://sepolia.arbiscan.io/',
+          },
+        }]
+      : []),
+    ...(vars.has('VIRTUAL_ARBITRUM_ONE_RPC')
+      ? [{
+          network: 'virtualArbitrumOne',
+          chainId: 42162,
+          urls: {
+            apiURL: `${vars.get('VIRTUAL_ARBITRUM_ONE_RPC')}/verify/etherscan`,
+            browserURL: vars.get('VIRTUAL_ARBITRUM_ONE_RPC') || 'https://arbiscan.io/',
+          },
+        }]
+      : []),
   ],
 }
 
 // In general:
 // - hardhat is used for unit tests
 // - localhost is used for local development on a hardhat network or fork
 // - virtualArbitrumSepolia is for Tenderly Virtual Testnet
-export const networksUserConfig: NetworksUserConfig = {
+export const networksUserConfig: NetworksUserConfig & Record<string, { secureAccounts?: SecureAccountsOptions }> = {
   hardhat: {
     chainId: 31337,
     accounts: getHardhatAccounts(),
@@ -95,30 +89,41 @@ export const networksUserConfig: NetworksUserConfig = {
     url: 'http://localhost:8545',
     accounts: getTestnetAccounts(),
   },
+  arbitrumOne: {
+    chainId: 42161,
+    url: ARBITRUM_ONE_RPC,
+    secureAccounts: {
+      enabled: true,
+    },
+  },
   arbitrumSepolia: {
     chainId: 421614,
     url: ARBITRUM_SEPOLIA_RPC,
     secureAccounts: {
       enabled: true,
     },
   },
-  ...(VIRTUAL_ARBITRUM_SEPOLIA_RPC && {
+  ...(vars.has('VIRTUAL_ARBITRUM_SEPOLIA_RPC') && {
     virtualArbitrumSepolia: {
       chainId: 421615,
-      url: VIRTUAL_ARBITRUM_SEPOLIA_RPC,
+      url: vars.get('VIRTUAL_ARBITRUM_SEPOLIA_RPC'),
       accounts: getTestnetAccounts(),
     },
   }),
-  ...(VIRTUAL_ARBITRUM_ONE_RPC && {
+  ...(vars.has('VIRTUAL_ARBITRUM_ONE_RPC') && {
     virtualArbitrumOne: {
       chainId: 42162,
-      url: VIRTUAL_ARBITRUM_ONE_RPC,
+      url: vars.get('VIRTUAL_ARBITRUM_ONE_RPC'),
       accounts: getTestnetAccounts(),
     },
   }),
 }
 
-export const hardhatBaseConfig: HardhatUserConfig & { etherscan: Partial<EtherscanConfig> } = {
+type HardhatBaseConfig = HardhatUserConfig &
+  { etherscan: Partial<EtherscanConfig> } &
+  { graph: GraphRuntimeEnvironmentOptions } &
+  { secureAccounts: SecureAccountsOptions }
+export const hardhatBaseConfig: HardhatBaseConfig = {
   solidity: solidityUserConfig,
   paths: projectPathsUserConfig,
   secureAccounts: {

packages/horizon/contracts/data-service/DataService.sol

@@ -35,21 +35,6 @@ abstract contract DataService is GraphDirectory, ProvisionManager, DataServiceV1
      */
     constructor(address controller) GraphDirectory(controller) {}
 
-    /**
-     * @notice Initializes the contract and any parent contracts.
-     */
-    // solhint-disable-next-line func-name-mixedcase
-    function __DataService_init() internal onlyInitializing {
-        __ProvisionManager_init_unchained();
-        __DataService_init_unchained();
-    }
-
-    /**
-     * @notice Initializes the contract.
-     */
-    // solhint-disable-next-line func-name-mixedcase
-    function __DataService_init_unchained() internal onlyInitializing {}
-
     /**
      * @notice See {IDataService-getThawingPeriodRange}.
      */
@@ -77,4 +62,19 @@ abstract contract DataService is GraphDirectory, ProvisionManager, DataServiceV1
     function getDelegationRatio() external view returns (uint32) {
         return _getDelegationRatio();
     }
+
+    /**
+     * @notice Initializes the contract and any parent contracts.
+     */
+    // solhint-disable-next-line func-name-mixedcase
+    function __DataService_init() internal onlyInitializing {
+        __ProvisionManager_init_unchained();
+        __DataService_init_unchained();
+    }
+
+    /**
+     * @notice Initializes the contract.
+     */
+    // solhint-disable-next-line func-name-mixedcase
+    function __DataService_init_unchained() internal onlyInitializing {}
 }

packages/horizon/contracts/interfaces/ITAPCollector.sol

@@ -239,20 +239,6 @@ interface ITAPCollector is IPaymentsCollector {
      */
     function revokeAuthorizedSigner(address signer) external;
 
-    /**
-     * @dev Recovers the signer address of a signed ReceiptAggregateVoucher (RAV).
-     * @param signedRAV The SignedRAV containing the RAV and its signature.
-     * @return The address of the signer.
-     */
-    function recoverRAVSigner(SignedRAV calldata signedRAV) external view returns (address);
-
-    /**
-     * @dev Computes the hash of a ReceiptAggregateVoucher (RAV).
-     * @param rav The RAV for which to compute the hash.
-     * @return The hash of the RAV.
-     */
-    function encodeRAV(ReceiptAggregateVoucher calldata rav) external view returns (bytes32);
-
     /**
      * @notice See {IPaymentsCollector.collect}
      * This variant adds the ability to partially collect a RAV by specifying the amount of tokens to collect.
@@ -269,4 +255,18 @@ interface ITAPCollector is IPaymentsCollector {
         bytes calldata data,
         uint256 tokensToCollect
     ) external returns (uint256);
+
+    /**
+     * @dev Recovers the signer address of a signed ReceiptAggregateVoucher (RAV).
+     * @param signedRAV The SignedRAV containing the RAV and its signature.
+     * @return The address of the signer.
+     */
+    function recoverRAVSigner(SignedRAV calldata signedRAV) external view returns (address);
+
+    /**
+     * @dev Computes the hash of a ReceiptAggregateVoucher (RAV).
+     * @param rav The RAV for which to compute the hash.
+     * @return The hash of the RAV.
+     */
+    function encodeRAV(ReceiptAggregateVoucher calldata rav) external view returns (bytes32);
 }

packages/horizon/contracts/interfaces/internal/IHorizonStakingExtension.sol

@@ -105,6 +105,16 @@ interface IHorizonStakingExtension is IRewardsIssuer {
      */
     function collect(uint256 tokens, address allocationID) external;
 
+    /**
+     * @notice Slash the indexer stake. Delegated tokens are not subject to slashing.
+     * @dev Can only be called by the slasher role.
+     * @param indexer Address of indexer to slash
+     * @param tokens Amount of tokens to slash from the indexer stake
+     * @param reward Amount of reward tokens to send to a beneficiary
+     * @param beneficiary Address of a beneficiary to receive a reward for the slashing
+     */
+    function legacySlash(address indexer, uint256 tokens, uint256 reward, address beneficiary) external;
+
     /**
      * @notice Return true if operator is allowed for indexer.
      * @param operator Address of the operator
@@ -154,14 +164,4 @@ interface IHorizonStakingExtension is IRewardsIssuer {
      */
     // solhint-disable-next-line func-name-mixedcase
     function __DEPRECATED_getThawingPeriod() external view returns (uint64);
-
-    /**
-     * @notice Slash the indexer stake. Delegated tokens are not subject to slashing.
-     * @dev Can only be called by the slasher role.
-     * @param indexer Address of indexer to slash
-     * @param tokens Amount of tokens to slash from the indexer stake
-     * @param reward Amount of reward tokens to send to a beneficiary
-     * @param beneficiary Address of a beneficiary to receive a reward for the slashing
-     */
-    function legacySlash(address indexer, uint256 tokens, uint256 reward, address beneficiary) external;
 }