chore: update horizon to latest linting config

Signed-off-by: Tomás Migone <[email protected]>

Author: tmigone

packages/horizon/README.md

@@ -31,13 +31,15 @@ pnpm build
 Note that this instructions will help you deploy Graph Horizon contracts, but no data service will be deployed. If you want to deploy the Subgraph Service please refer to the [Subgraph Service README](../subgraph-service/README.md) for deploy instructions.
 
 ### New deployment
+
 To deploy Graph Horizon from scratch run the following command:
 
 ```bash
 npx hardhat deploy:protocol --network hardhat
 ```
 
 ### Upgrade deployment
+
 Usually you would run this against a network (or a fork) where the original Graph Protocol was previously deployed. To upgrade an existing deployment of the original Graph Protocol to Graph Horizon, run the following commands. Note that some steps might need to be run by different accounts (deployer vs governor):
 
 ```bash
@@ -50,14 +52,15 @@ npx hardhat deploy:migrate --network hardhat --step 4 # Run with governor. Optio
 Steps 2, 3 and 4 require patching the configuration file with addresses from previous steps. The files are located in the `ignition/configs` directory and need to be manually edited. You can also pass `--patch-config` flag to the deploy command to automatically patch the configuration reading values from the address book. Note that this will NOT update the configuration file.
 
 ## Testing
+
 - **unit**: Unit tests can be run with `pnpm test`
 - **integration**: Integration tests can be run with `pnpm test:integration`
       - Need to set `BLOCKCHAIN_RPC` for a chain where The Graph is already deployed
       - If no `BLOCKCHAIN_RPC` is detected it will try using `ARBITRUM_SEPOLIA_RPC`
 - **deployment**: Deployment tests can be run with `pnpm test:deployment --network <network>`, the following environment variables allow customizing the test suite for different scenarios:
-   - `TEST_DEPLOYMENT_STEP` (default: 1) - Specify the latest deployment step that has been executed. Tests for later steps will be skipped.
-   - `TEST_DEPLOYMENT_TYPE` (default: migrate) - The deployment type `protocol/migrate` that is being tested. Test suite has been developed for `migrate` use case but can be run against a `protocol` deployment, likely with some failed tests.
-   - `TEST_DEPLOYMENT_CONFIG` (default: `hre.network.name`) - The Ignition config file name to use for the test suite.
+  - `TEST_DEPLOYMENT_STEP` (default: 1) - Specify the latest deployment step that has been executed. Tests for later steps will be skipped.
+  - `TEST_DEPLOYMENT_TYPE` (default: migrate) - The deployment type `protocol/migrate` that is being tested. Test suite has been developed for `migrate` use case but can be run against a `protocol` deployment, likely with some failed tests.
+  - `TEST_DEPLOYMENT_CONFIG` (default: `hre.network.name`) - The Ignition config file name to use for the test suite.
 
 ## Verification
 
@@ -67,4 +70,4 @@ To verify contracts on a network, run the following commands:
 ./scripts/pre-verify <ignition-deployment-id>
 npx hardhat ignition verify --network <network> --include-unrelated-contracts <ignition-deployment-id>
 ./scripts/post-verify
-```
+```

packages/horizon/contracts/mocks/CurationMock.sol

@@ -2,7 +2,6 @@
 
 pragma solidity 0.8.27;
 
-import { MockGRTToken } from "./MockGRTToken.sol";
 
 contract CurationMock {
     mapping(bytes32 => uint256) public curation;

packages/horizon/eslint.config.js

@@ -1,13 +1,13 @@
-import { hardhatBaseConfig, isProjectBuilt, loadTasks } from '@graphprotocol/toolshed/hardhat'
-import type { HardhatUserConfig } from 'hardhat/types'
-
 // Hardhat plugins
 import '@nomicfoundation/hardhat-foundry'
 import '@nomicfoundation/hardhat-toolbox'
 import '@nomicfoundation/hardhat-ignition-ethers'
 import 'hardhat-contract-sizer'
 import 'hardhat-secure-accounts'
 
+import { hardhatBaseConfig, isProjectBuilt, loadTasks } from '@graphprotocol/toolshed/hardhat'
+import type { HardhatUserConfig } from 'hardhat/types'
+
 // Skip importing hardhat-graph-protocol when building the project, it has circular dependency
 if (isProjectBuilt(__dirname)) {
   require('hardhat-graph-protocol')

packages/horizon/hardhat.config.ts

@@ -1,12 +1,11 @@
 import { buildModule } from '@nomicfoundation/hardhat-ignition/modules'
-import { deployImplementation } from '../proxy/implementation'
-import { upgradeTransparentUpgradeableProxy } from '../proxy/TransparentUpgradeableProxy'
 
+import GraphPaymentsArtifact from '../../../build/contracts/contracts/payments/GraphPayments.sol/GraphPayments.json'
 import GraphPeripheryModule, { MigratePeripheryModule } from '../periphery/periphery'
+import { deployImplementation } from '../proxy/implementation'
+import { upgradeTransparentUpgradeableProxy } from '../proxy/TransparentUpgradeableProxy'
 import HorizonProxiesModule, { MigrateHorizonProxiesDeployerModule } from './HorizonProxies'
 
-import GraphPaymentsArtifact from '../../../build/contracts/contracts/payments/GraphPayments.sol/GraphPayments.json'
-
 export default buildModule('GraphPayments', (m) => {
   const { Controller } = m.useModule(GraphPeripheryModule)
   const { GraphPaymentsProxyAdmin, GraphPaymentsProxy } = m.useModule(HorizonProxiesModule)
@@ -15,21 +14,28 @@ export default buildModule('GraphPayments', (m) => {
   const protocolPaymentCut = m.getParameter('protocolPaymentCut')
 
   // Deploy GraphPayments implementation - requires periphery and proxies to be registered in the controller
-  const GraphPaymentsImplementation = deployImplementation(m, {
-    name: 'GraphPayments',
-    artifact: GraphPaymentsArtifact,
-    constructorArgs: [Controller, protocolPaymentCut],
-  }, { after: [GraphPeripheryModule, HorizonProxiesModule] })
+  const GraphPaymentsImplementation = deployImplementation(
+    m,
+    {
+      name: 'GraphPayments',
+      artifact: GraphPaymentsArtifact,
+      constructorArgs: [Controller, protocolPaymentCut],
+    },
+    { after: [GraphPeripheryModule, HorizonProxiesModule] },
+  )
 
   // Upgrade proxy to implementation contract
-  const GraphPayments = upgradeTransparentUpgradeableProxy(m,
+  const GraphPayments = upgradeTransparentUpgradeableProxy(
+    m,
     GraphPaymentsProxyAdmin,
     GraphPaymentsProxy,
-    GraphPaymentsImplementation, {
+    GraphPaymentsImplementation,
+    {
       name: 'GraphPayments',
       artifact: GraphPaymentsArtifact,
       initArgs: [],
-    })
+    },
+  )
 
   m.call(GraphPaymentsProxyAdmin, 'transferOwnership', [governor], { after: [GraphPayments] })
 
@@ -55,14 +61,17 @@ export const MigrateGraphPaymentsModule = buildModule('GraphPayments', (m) => {
   })
 
   // Upgrade proxy to implementation contract
-  const GraphPayments = upgradeTransparentUpgradeableProxy(m,
+  const GraphPayments = upgradeTransparentUpgradeableProxy(
+    m,
     GraphPaymentsProxyAdmin,
     GraphPaymentsProxy,
-    GraphPaymentsImplementation, {
+    GraphPaymentsImplementation,
+    {
       name: 'GraphPayments',
       artifact: GraphPaymentsArtifact,
       initArgs: [],
-    })
+    },
+  )
 
   m.call(GraphPaymentsProxyAdmin, 'transferOwnership', [governor], { after: [GraphPayments] })
 

packages/horizon/ignition/modules/core/GraphPayments.ts

@@ -1,10 +1,9 @@
 import { buildModule } from '@nomicfoundation/hardhat-ignition/modules'
 
+import GraphTallyCollectorArtifact from '../../../build/contracts/contracts/payments/collectors/GraphTallyCollector.sol/GraphTallyCollector.json'
 import GraphPeripheryModule, { MigratePeripheryModule } from '../periphery/periphery'
 import HorizonProxiesModule from './HorizonProxies'
 
-import GraphTallyCollectorArtifact from '../../../build/contracts/contracts/payments/collectors/GraphTallyCollector.sol/GraphTallyCollector.json'
-
 export default buildModule('GraphTallyCollector', (m) => {
   const { Controller } = m.useModule(GraphPeripheryModule)
 
@@ -33,11 +32,12 @@ export const MigrateGraphTallyCollectorModule = buildModule('GraphTallyCollector
   const version = m.getParameter('eip712Version')
   const revokeSignerThawingPeriod = m.getParameter('revokeSignerThawingPeriod')
 
-  const GraphTallyCollector = m.contract(
-    'GraphTallyCollector',
-    GraphTallyCollectorArtifact,
-    [name, version, Controller, revokeSignerThawingPeriod],
-  )
+  const GraphTallyCollector = m.contract('GraphTallyCollector', GraphTallyCollectorArtifact, [
+    name,
+    version,
+    Controller,
+    revokeSignerThawingPeriod,
+  ])
 
   return { GraphTallyCollector }
 })

packages/horizon/ignition/modules/core/GraphTallyCollector.ts

@@ -1,13 +1,12 @@
 import { buildModule } from '@nomicfoundation/hardhat-ignition/modules'
-import { deployGraphProxy } from '../proxy/GraphProxy'
-import { deployTransparentUpgradeableProxy } from '../proxy/TransparentUpgradeableProxy'
 import { ethers } from 'ethers'
 
-import GraphPeripheryModule from '../periphery/periphery'
-import { MigrateControllerGovernorModule } from '../periphery/Controller'
-
 import GraphPaymentsArtifact from '../../../build/contracts/contracts/payments/GraphPayments.sol/GraphPayments.json'
 import PaymentsEscrowArtifact from '../../../build/contracts/contracts/payments/PaymentsEscrow.sol/PaymentsEscrow.json'
+import { MigrateControllerGovernorModule } from '../periphery/Controller'
+import GraphPeripheryModule from '../periphery/periphery'
+import { deployGraphProxy } from '../proxy/GraphProxy'
+import { deployTransparentUpgradeableProxy } from '../proxy/TransparentUpgradeableProxy'
 
 // HorizonStaking, GraphPayments and PaymentsEscrow use GraphDirectory but they are also in the directory.
 // So we need to deploy their proxies, register them in the controller before being able to deploy the implementations
@@ -16,32 +15,38 @@ export default buildModule('HorizonProxies', (m) => {
 
   // Deploy HorizonStaking proxy with no implementation
   const HorizonStakingProxy = deployGraphProxy(m, GraphProxyAdmin)
-  m.call(Controller, 'setContractProxy',
-    [ethers.keccak256(ethers.toUtf8Bytes('Staking')), HorizonStakingProxy],
-    { id: 'setContractProxy_HorizonStaking' },
-  )
+  m.call(Controller, 'setContractProxy', [ethers.keccak256(ethers.toUtf8Bytes('Staking')), HorizonStakingProxy], {
+    id: 'setContractProxy_HorizonStaking',
+  })
 
   // Deploy and register GraphPayments proxy
   const { Proxy: GraphPaymentsProxy, ProxyAdmin: GraphPaymentsProxyAdmin } = deployTransparentUpgradeableProxy(m, {
     name: 'GraphPayments',
     artifact: GraphPaymentsArtifact,
   })
-  m.call(Controller, 'setContractProxy',
-    [ethers.keccak256(ethers.toUtf8Bytes('GraphPayments')), GraphPaymentsProxy],
-    { id: 'setContractProxy_GraphPayments' },
-  )
+  m.call(Controller, 'setContractProxy', [ethers.keccak256(ethers.toUtf8Bytes('GraphPayments')), GraphPaymentsProxy], {
+    id: 'setContractProxy_GraphPayments',
+  })
 
   // Deploy and register PaymentsEscrow proxy
   const { Proxy: PaymentsEscrowProxy, ProxyAdmin: PaymentsEscrowProxyAdmin } = deployTransparentUpgradeableProxy(m, {
     name: 'PaymentsEscrow',
     artifact: PaymentsEscrowArtifact,
   })
-  m.call(Controller, 'setContractProxy',
+  m.call(
+    Controller,
+    'setContractProxy',
     [ethers.keccak256(ethers.toUtf8Bytes('PaymentsEscrow')), PaymentsEscrowProxy],
     { id: 'setContractProxy_PaymentsEscrow' },
   )
 
-  return { HorizonStakingProxy, GraphPaymentsProxy, PaymentsEscrowProxy, GraphPaymentsProxyAdmin, PaymentsEscrowProxyAdmin }
+  return {
+    HorizonStakingProxy,
+    GraphPaymentsProxy,
+    PaymentsEscrowProxy,
+    GraphPaymentsProxyAdmin,
+    PaymentsEscrowProxyAdmin,
+  }
 })
 
 export const MigrateHorizonProxiesDeployerModule = buildModule('HorizonProxiesDeployer', (m) => {
@@ -67,15 +72,19 @@ export const MigrateHorizonProxiesGovernorModule = buildModule('HorizonProxiesGo
   const paymentsEscrowAddress = m.getParameter('paymentsEscrowAddress')
 
   // Register proxies in controller
-  m.call(Controller, 'setContractProxy',
+  m.call(
+    Controller,
+    'setContractProxy',
     [ethers.keccak256(ethers.toUtf8Bytes('GraphPayments')), graphPaymentsAddress],
     { id: 'setContractProxy_GraphPayments' },
   )
 
-  m.call(Controller, 'setContractProxy',
+  m.call(
+    Controller,
+    'setContractProxy',
     [ethers.keccak256(ethers.toUtf8Bytes('PaymentsEscrow')), paymentsEscrowAddress],
     { id: 'setContractProxy_PaymentsEscrow' },
   )
 
-  return { }
+  return {}
 })

packages/horizon/ignition/modules/core/HorizonProxies.ts

@@ -1,15 +1,14 @@
+import GraphProxyArtifact from '@graphprotocol/contracts/artifacts/contracts/upgrades/GraphProxy.sol/GraphProxy.json'
+import GraphProxyAdminArtifact from '@graphprotocol/contracts/artifacts/contracts/upgrades/GraphProxyAdmin.sol/GraphProxyAdmin.json'
 import { buildModule } from '@nomicfoundation/hardhat-ignition/modules'
-import { deployImplementation } from '../proxy/implementation'
-import { upgradeGraphProxy } from '../proxy/GraphProxy'
 
-import GraphPeripheryModule, { MigratePeripheryModule } from '../periphery/periphery'
-import HorizonProxiesModule from './HorizonProxies'
-
-import ExponentialRebatesArtifact from '../../../build/contracts/contracts/staking/libraries/ExponentialRebates.sol/ExponentialRebates.json'
-import GraphProxyAdminArtifact from '@graphprotocol/contracts/artifacts/contracts/upgrades/GraphProxyAdmin.sol/GraphProxyAdmin.json'
-import GraphProxyArtifact from '@graphprotocol/contracts/artifacts/contracts/upgrades/GraphProxy.sol/GraphProxy.json'
 import HorizonStakingArtifact from '../../../build/contracts/contracts/staking/HorizonStaking.sol/HorizonStaking.json'
 import HorizonStakingExtensionArtifact from '../../../build/contracts/contracts/staking/HorizonStakingExtension.sol/HorizonStakingExtension.json'
+import ExponentialRebatesArtifact from '../../../build/contracts/contracts/staking/libraries/ExponentialRebates.sol/ExponentialRebates.json'
+import GraphPeripheryModule, { MigratePeripheryModule } from '../periphery/periphery'
+import { upgradeGraphProxy } from '../proxy/GraphProxy'
+import { deployImplementation } from '../proxy/implementation'
+import HorizonProxiesModule from './HorizonProxies'
 
 export default buildModule('HorizonStaking', (m) => {
   const { Controller, GraphProxyAdmin } = m.useModule(GraphPeripheryModule)
@@ -20,14 +19,17 @@ export default buildModule('HorizonStaking', (m) => {
 
   // Deploy HorizonStakingExtension - requires periphery and proxies to be registered in the controller
   const ExponentialRebates = m.library('ExponentialRebates', ExponentialRebatesArtifact)
-  const HorizonStakingExtension = m.contract('HorizonStakingExtension',
+  const HorizonStakingExtension = m.contract(
+    'HorizonStakingExtension',
     HorizonStakingExtensionArtifact,
-    [Controller, subgraphServiceAddress], {
+    [Controller, subgraphServiceAddress],
+    {
       libraries: {
         ExponentialRebates: ExponentialRebates,
       },
       after: [GraphPeripheryModule, HorizonProxiesModule],
-    })
+    },
+  )
 
   // Deploy HorizonStaking implementation
   const HorizonStakingImplementation = deployImplementation(m, {
@@ -60,13 +62,16 @@ export const MigrateHorizonStakingDeployerModule = buildModule('HorizonStakingDe
 
   // Deploy HorizonStakingExtension - requires periphery and proxies to be registered in the controller
   const ExponentialRebates = m.library('ExponentialRebates', ExponentialRebatesArtifact)
-  const HorizonStakingExtension = m.contract('HorizonStakingExtension',
+  const HorizonStakingExtension = m.contract(
+    'HorizonStakingExtension',
     HorizonStakingExtensionArtifact,
-    [Controller, subgraphServiceAddress], {
+    [Controller, subgraphServiceAddress],
+    {
       libraries: {
         ExponentialRebates: ExponentialRebates,
       },
-    })
+    },
+  )
 
   // Deploy HorizonStaking implementation
   const HorizonStakingImplementation = deployImplementation(m, {
@@ -84,7 +89,11 @@ export const MigrateHorizonStakingGovernorModule = buildModule('HorizonStakingGo
   const horizonStakingAddress = m.getParameter('horizonStakingAddress')
   const horizonStakingImplementationAddress = m.getParameter('horizonStakingImplementationAddress')
 
-  const HorizonStakingImplementation = m.contractAt('HorizonStakingImplementation', HorizonStakingArtifact, horizonStakingImplementationAddress)
+  const HorizonStakingImplementation = m.contractAt(
+    'HorizonStakingImplementation',
+    HorizonStakingArtifact,
+    horizonStakingImplementationAddress,
+  )
   const HorizonStakingProxy = m.contractAt('HorizonStakingProxy', GraphProxyArtifact, horizonStakingAddress)
   const GraphProxyAdmin = m.contractAt('GraphProxyAdmin', GraphProxyAdminArtifact, graphProxyAdminAddress)