chore: update subgraph service to use latest lint config

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

Author: tmigone

packages/subgraph-service/.solhintignore

@@ -31,13 +31,15 @@ pnpm build
 Note that this instructions will help you deploy Graph Horizon contracts alongside the Subgraph Service. If you want to deploy just the core Horizon contracts please refer to the [Horizon README](../horizon/README.md) for deploy instructions.
 
 ### New deployment
+
 To deploy Graph Horizon from scratch including the Subgraph Service 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 including the Subgraph Service, run the following commands. Note that some steps might need to be run by different accounts (deployer vs governor):
 
 ```bash
@@ -53,14 +55,15 @@ cd horizon && npx hardhat deploy:migrate --network hardhat --step 4 && cd .. # R
 Horizon Steps 2, 3 and 4, and Subgraph Service Step 2 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
 
@@ -70,4 +73,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/subgraph-service/README.md

@@ -11,7 +11,9 @@ import { ISubgraphService } from "./interfaces/ISubgraphService.sol";
 import { OwnableUpgradeable } from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 import { MulticallUpgradeable } from "@openzeppelin/contracts-upgradeable/utils/MulticallUpgradeable.sol";
 import { Initializable } from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
-import { DataServicePausableUpgradeable } from "@graphprotocol/horizon/contracts/data-service/extensions/DataServicePausableUpgradeable.sol";
+import {
+    DataServicePausableUpgradeable
+} from "@graphprotocol/horizon/contracts/data-service/extensions/DataServicePausableUpgradeable.sol";
 import { DataService } from "@graphprotocol/horizon/contracts/data-service/DataService.sol";
 import { DataServiceFees } from "@graphprotocol/horizon/contracts/data-service/extensions/DataServiceFees.sol";
 import { Directory } from "./utilities/Directory.sol";

packages/subgraph-service/contracts/SubgraphService.sol

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

packages/subgraph-service/eslint.config.js

@@ -1,6 +1,5 @@
-import { buildModule } from '@nomicfoundation/ignition-core'
-
 import CurationArtifact from '@graphprotocol/contracts/artifacts/contracts/l2/curation/L2Curation.sol/L2Curation.json'
+import { buildModule } from '@nomicfoundation/ignition-core'
 
 // Note that this module is a no-op, we only run it to get curation addresses into the address book.
 // Curation deployment should be managed by ignition scripts in subgraph-service package however
@@ -11,7 +10,11 @@ export default buildModule('L2Curation', (m) => {
   const curationImplementationAddress = m.getParameter('curationImplementationAddress')
 
   const L2Curation = m.contractAt('L2CurationAddressBook', CurationArtifact, curationProxyAddress)
-  const L2CurationImplementation = m.contractAt('L2CurationImplementationAddressBook', CurationArtifact, curationImplementationAddress)
+  const L2CurationImplementation = m.contractAt(
+    'L2CurationImplementationAddressBook',
+    CurationArtifact,
+    curationImplementationAddress,
+  )
 
   return { L2Curation, L2CurationImplementation }
 })

packages/subgraph-service/hardhat.config.ts

@@ -1,11 +1,11 @@
-import { buildModule } from '@nomicfoundation/hardhat-ignition/modules'
 import { deployImplementation } from '@graphprotocol/horizon/ignition/modules/proxy/implementation'
 import { upgradeTransparentUpgradeableProxy } from '@graphprotocol/horizon/ignition/modules/proxy/TransparentUpgradeableProxy'
-
-import DisputeManagerArtifact from '../../build/contracts/contracts/DisputeManager.sol/DisputeManager.json'
+import { buildModule } from '@nomicfoundation/hardhat-ignition/modules'
 import ProxyAdminArtifact from '@openzeppelin/contracts/build/contracts/ProxyAdmin.json'
 import TransparentUpgradeableProxyArtifact from '@openzeppelin/contracts/build/contracts/TransparentUpgradeableProxy.json'
 
+import DisputeManagerArtifact from '../../build/contracts/contracts/DisputeManager.sol/DisputeManager.json'
+
 export default buildModule('DisputeManager', (m) => {
   const deployer = m.getAccount(0)
   const governor = m.getParameter('governor')
@@ -20,7 +20,11 @@ export default buildModule('DisputeManager', (m) => {
   const maxSlashingCut = m.getParameter('maxSlashingCut')
 
   const DisputeManagerProxyAdmin = m.contractAt('ProxyAdmin', ProxyAdminArtifact, disputeManagerProxyAdminAddress)
-  const DisputeManagerProxy = m.contractAt('DisputeManagerProxy', TransparentUpgradeableProxyArtifact, disputeManagerProxyAddress)
+  const DisputeManagerProxy = m.contractAt(
+    'DisputeManagerProxy',
+    TransparentUpgradeableProxyArtifact,
+    disputeManagerProxyAddress,
+  )
 
   // Deploy implementation
   const DisputeManagerImplementation = deployImplementation(m, {
@@ -30,21 +34,17 @@ export default buildModule('DisputeManager', (m) => {
   })
 
   // Upgrade implementation
-  const DisputeManager = upgradeTransparentUpgradeableProxy(m,
+  const DisputeManager = upgradeTransparentUpgradeableProxy(
+    m,
     DisputeManagerProxyAdmin,
     DisputeManagerProxy,
-    DisputeManagerImplementation, {
+    DisputeManagerImplementation,
+    {
       name: 'DisputeManager',
       artifact: DisputeManagerArtifact,
-      initArgs: [
-        deployer,
-        arbitrator,
-        disputePeriod,
-        disputeDeposit,
-        fishermanRewardCut,
-        maxSlashingCut,
-      ],
-    })
+      initArgs: [deployer, arbitrator, disputePeriod, disputeDeposit, fishermanRewardCut, maxSlashingCut],
+    },
+  )
 
   const callSetSubgraphService = m.call(DisputeManager, 'setSubgraphService', [subgraphServiceProxyAddress])
 

packages/subgraph-service/ignition/modules/Curation.ts

@@ -1,7 +1,6 @@
-import { buildModule } from '@nomicfoundation/hardhat-ignition/modules'
-
-import L2GNSArtifact from '@graphprotocol/contracts/artifacts/contracts/l2/discovery/L2GNS.sol/L2GNS.json'
 import SubgraphNFTArtifact from '@graphprotocol/contracts/artifacts/contracts/discovery/SubgraphNFT.sol/SubgraphNFT.json'
+import L2GNSArtifact from '@graphprotocol/contracts/artifacts/contracts/l2/discovery/L2GNS.sol/L2GNS.json'
+import { buildModule } from '@nomicfoundation/hardhat-ignition/modules'
 
 // Note that this module is a no-op, we only run it to get gns addresses into the address book.
 // GNS deployment should be managed by ignition scripts in subgraph-service package however

packages/subgraph-service/ignition/modules/DisputeManager.ts

@@ -1,22 +1,16 @@
-import { buildModule } from '@nomicfoundation/hardhat-ignition/modules'
 import { deployTransparentUpgradeableProxy } from '@graphprotocol/horizon/ignition/modules/proxy/TransparentUpgradeableProxy'
+import { buildModule } from '@nomicfoundation/hardhat-ignition/modules'
 
 import DisputeManagerArtifact from '../../build/contracts/contracts/DisputeManager.sol/DisputeManager.json'
 import SubgraphServiceArtifact from '../../build/contracts/contracts/SubgraphService.sol/SubgraphService.json'
 
 export default buildModule('SubgraphServiceProxies', (m) => {
   // Deploy proxies contracts using OZ TransparentUpgradeableProxy
-  const {
-    Proxy: DisputeManagerProxy,
-    ProxyAdmin: DisputeManagerProxyAdmin,
-  } = deployTransparentUpgradeableProxy(m, {
+  const { Proxy: DisputeManagerProxy, ProxyAdmin: DisputeManagerProxyAdmin } = deployTransparentUpgradeableProxy(m, {
     name: 'DisputeManager',
     artifact: DisputeManagerArtifact,
   })
-  const {
-    Proxy: SubgraphServiceProxy,
-    ProxyAdmin: SubgraphServiceProxyAdmin,
-  } = deployTransparentUpgradeableProxy(m, {
+  const { Proxy: SubgraphServiceProxy, ProxyAdmin: SubgraphServiceProxyAdmin } = deployTransparentUpgradeableProxy(m, {
     name: 'SubgraphService',
     artifact: SubgraphServiceArtifact,
   })

packages/subgraph-service/ignition/modules/GNS.ts

@@ -1,11 +1,11 @@
-import { buildModule } from '@nomicfoundation/hardhat-ignition/modules'
 import { deployImplementation } from '@graphprotocol/horizon/ignition/modules/proxy/implementation'
 import { upgradeTransparentUpgradeableProxy } from '@graphprotocol/horizon/ignition/modules/proxy/TransparentUpgradeableProxy'
-
+import { buildModule } from '@nomicfoundation/hardhat-ignition/modules'
 import ProxyAdminArtifact from '@openzeppelin/contracts/build/contracts/ProxyAdmin.json'
-import SubgraphServiceArtifact from '../../build/contracts/contracts/SubgraphService.sol/SubgraphService.json'
 import TransparentUpgradeableProxyArtifact from '@openzeppelin/contracts/build/contracts/TransparentUpgradeableProxy.json'
 
+import SubgraphServiceArtifact from '../../build/contracts/contracts/SubgraphService.sol/SubgraphService.json'
+
 export default buildModule('SubgraphService', (m) => {
   const deployer = m.getAccount(0)
   const governor = m.getParameter('governor')
@@ -23,7 +23,11 @@ export default buildModule('SubgraphService', (m) => {
   const curationCut = m.getParameter('curationCut')
 
   const SubgraphServiceProxyAdmin = m.contractAt('ProxyAdmin', ProxyAdminArtifact, subgraphServiceProxyAdminAddress)
-  const SubgraphServiceProxy = m.contractAt('SubgraphServiceProxy', TransparentUpgradeableProxyArtifact, subgraphServiceProxyAddress)
+  const SubgraphServiceProxy = m.contractAt(
+    'SubgraphServiceProxy',
+    TransparentUpgradeableProxyArtifact,
+    subgraphServiceProxyAddress,
+  )
 
   // Deploy implementation
   const SubgraphServiceImplementation = deployImplementation(m, {
@@ -32,27 +36,43 @@ export default buildModule('SubgraphService', (m) => {
   })
 
   // Upgrade implementation
-  const SubgraphService = upgradeTransparentUpgradeableProxy(m,
+  const SubgraphService = upgradeTransparentUpgradeableProxy(
+    m,
     SubgraphServiceProxyAdmin,
     SubgraphServiceProxy,
-    SubgraphServiceImplementation, {
+    SubgraphServiceImplementation,
+    {
       name: 'SubgraphService',
       artifact: SubgraphServiceArtifact,
-      initArgs: [
-        deployer,
-        minimumProvisionTokens,
-        maximumDelegationRatio,
-        stakeToFeesRatio,
-      ],
-    })
-
-  const callSetPauseGuardianGovernor = m.call(SubgraphService, 'setPauseGuardian', [governor, true], { id: 'setPauseGuardianGovernor' })
-  const callSetPauseGuardianPauseGuardian = m.call(SubgraphService, 'setPauseGuardian', [pauseGuardian, true], { id: 'setPauseGuardianPauseGuardian' })
+      initArgs: [deployer, minimumProvisionTokens, maximumDelegationRatio, stakeToFeesRatio],
+    },
+  )
+
+  const callSetPauseGuardianGovernor = m.call(SubgraphService, 'setPauseGuardian', [governor, true], {
+    id: 'setPauseGuardianGovernor',
+  })
+  const callSetPauseGuardianPauseGuardian = m.call(SubgraphService, 'setPauseGuardian', [pauseGuardian, true], {
+    id: 'setPauseGuardianPauseGuardian',
+  })
   const callSetMaxPOIStaleness = m.call(SubgraphService, 'setMaxPOIStaleness', [maxPOIStaleness])
   const callSetCurationCut = m.call(SubgraphService, 'setCurationCut', [curationCut])
 
-  m.call(SubgraphService, 'transferOwnership', [governor], { after: [callSetPauseGuardianGovernor, callSetPauseGuardianPauseGuardian, callSetMaxPOIStaleness, callSetCurationCut] })
-  m.call(SubgraphServiceProxyAdmin, 'transferOwnership', [governor], { after: [callSetPauseGuardianGovernor, callSetPauseGuardianPauseGuardian, callSetMaxPOIStaleness, callSetCurationCut] })
+  m.call(SubgraphService, 'transferOwnership', [governor], {
+    after: [
+      callSetPauseGuardianGovernor,
+      callSetPauseGuardianPauseGuardian,
+      callSetMaxPOIStaleness,
+      callSetCurationCut,
+    ],
+  })
+  m.call(SubgraphServiceProxyAdmin, 'transferOwnership', [governor], {
+    after: [
+      callSetPauseGuardianGovernor,
+      callSetPauseGuardianPauseGuardian,
+      callSetMaxPOIStaleness,
+      callSetCurationCut,
+    ],
+  })
 
   return {
     SubgraphService,