chore: linting and other minor issues

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

Author: tmigone

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

@@ -1,8 +1,8 @@
 import fs from 'fs'
 import path from 'path'
 
-import { GraphPluginError } from './error'
 import { logDebug, logError } from './logger'
+import { GraphPluginError } from './error'
 
 import type { GraphDeploymentName } from '@graphprotocol/toolshed/deployments'
 import type { GraphRuntimeEnvironmentOptions } from './types'

packages/horizon/contracts/interfaces/IGraphPayments.sol

@@ -66,7 +66,7 @@ interface IGraphPayments {
     /**
      * @notice Collects funds from a payer.
      * It will pay cuts to all relevant parties and forward the rest to the receiver destination address. If the
-     * destination address is zero the funds are automatically staked to the receiver. Note that the receiver 
+     * destination address is zero the funds are automatically staked to the receiver. Note that the receiver
      * destination address can be set to the receiver address to collect funds on the receiver without re-staking.
      *
      * Note that the collected amount can be zero.

packages/horizon/contracts/mocks/imports.sol

@@ -27,4 +27,4 @@ interface IL2CurationToolshed is IL2Curation {
 
 interface IEpochManagerToolshed is IEpochManager {
     function epochLength() external view returns (uint256);
-}
+}

packages/horizon/tasks/deploy.ts

@@ -41,6 +41,7 @@ task('deploy:protocol', 'Deploy a new version of the Graph Protocol Horizon cont
 
     // Save the addresses to the address book
     console.log('\n========== 📖 Updating address book ==========')
+    // @ts-expect-error - @graphprotocol/toolshed/hardhat exports ts files so types mismatch here
     saveToAddressBook(deployment, graph.horizon.addressBook)
     console.log(`Address book at ${graph.horizon.addressBook.file} updated!`)
 
@@ -113,6 +114,7 @@ task('deploy:migrate', 'Upgrade an existing version of the Graph Protocol v1 to
 
     // Update address book
     console.log('\n========== 📖 Updating address book ==========')
+    // @ts-expect-error - @graphprotocol/toolshed/hardhat exports ts files so types mismatch here
     saveToAddressBook(deployment, graph.horizon.addressBook)
     console.log(`Address book at ${graph.horizon.addressBook.file} updated!`)
 

packages/horizon/test/deployment/Controller.test.ts

@@ -1,8 +1,8 @@
 import hre from 'hardhat'
 
 import { expect } from 'chai'
-import { toUtf8Bytes } from 'ethers'
 import { testIf } from './lib/testIf'
+import { toUtf8Bytes } from 'ethers'
 
 const graph = hre.graph()
 const addressBook = graph.horizon.addressBook

packages/horizon/test/deployment/lib/GraphProxy.test.ts

@@ -4,7 +4,7 @@ import { assert, expect } from 'chai'
 import { AddressBookEntry } from '@graphprotocol/toolshed/deployments'
 import { zeroPadValue } from 'ethers'
 
-export function graphProxyTests(contractName: string, addressBookEntry: AddressBookEntry, proxyAdmin: string, upgraded: boolean = false): void {
+export function graphProxyTests(contractName: string, addressBookEntry: AddressBookEntry, proxyAdmin: string, upgraded = false): void {
   const testIf = () => (upgraded ? it : it.skip)
 
   describe(`${contractName}: GraphProxy`, function () {

packages/horizon/test/integration/after-transition-period/upgrade.test.ts

@@ -54,7 +54,7 @@ describe('Upgrading contracts', () => {
   it('GraphPayments should be upgradeable by the governor', async () => {
     const entry = graph.horizon.addressBook.getEntry('GraphPayments')
     const proxyAdmin = entry.proxyAdmin!
-    const proxy = entry.address!
+    const proxy = entry.address
 
     // Upgrade the contract to a different implementation
     // the implementation we use is the GraphTallyCollector, this is obviously absurd but we just need an address with code on it
@@ -69,7 +69,7 @@ describe('Upgrading contracts', () => {
   it('PaymentsEscrow should be upgradeable by the governor', async () => {
     const entry = graph.horizon.addressBook.getEntry('PaymentsEscrow')
     const proxyAdmin = entry.proxyAdmin!
-    const proxy = entry.address!
+    const proxy = entry.address
 
     // Upgrade the contract to a different implementation
     // the implementation we use is the GraphTallyCollector, this is obviously absurd but we just need an address with code on it

packages/horizon/test/integration/during-transition-period/multicall.test.ts

@@ -1,8 +1,8 @@
 import hre from 'hardhat'
 
+import { ONE_MILLION, PaymentTypes } from '@graphprotocol/toolshed'
 import { ethers } from 'hardhat'
 import { expect } from 'chai'
-import { ONE_MILLION, PaymentTypes } from '@graphprotocol/toolshed'
 import { setGRTBalance } from '@graphprotocol/toolshed/hardhat'
 
 import type { HardhatEthersSigner } from '@nomicfoundation/hardhat-ethers/signers'

packages/subgraph-service/.solhintignore

@@ -0,0 +1 @@
+contracts/mocks/*

packages/subgraph-service/contracts/mocks/imports.sol

@@ -15,5 +15,5 @@ interface IL2CurationToolshed is IL2Curation {
 }
 
 interface IServiceRegistryToolshed is IServiceRegistry {
-    function services(address _indexer) external view returns (IServiceRegistry.IndexerService memory);
-}
+    function services(address indexer) external view returns (IServiceRegistry.IndexerService memory);
+}

packages/subgraph-service/natspec-smells.config.js

@@ -5,6 +5,6 @@
 /** @type {import('@defi-wonderland/natspec-smells').Config} */
 module.exports = {
   include: 'contracts/**/*.sol',
-  exclude: 'test/**/*.sol',
+  exclude: ['test/**/*.sol', 'contracts/mocks/**/*.sol'],
   constructorNatspec: true,
 }

packages/subgraph-service/scripts/ops/protocol-activity.ts

@@ -165,6 +165,7 @@ async function main() {
           const curate = Math.random() < 0.5
           if (curate) {
             await GraphToken.connect(signer).approve(Curation.target, 12345n)
+            // @ts-expect-error - TODO: Fix this?
             await Curation.connect(signer).mint(subgraphDeploymentId, 12345n, 0)
           }
         }

packages/subgraph-service/tasks/deploy.ts

@@ -80,8 +80,11 @@ task('deploy:protocol', 'Deploy a new version of the Graph Protocol Horizon cont
 
     // Save the addresses to the address book
     console.log('\n========== 📖 Updating address book ==========')
+    // @ts-expect-error - @graphprotocol/toolshed/hardhat exports ts files so types mismatch here
     saveToAddressBook(horizonDeployment, graph.horizon.addressBook)
+    // @ts-expect-error - @graphprotocol/toolshed/hardhat exports ts files so types mismatch here
     saveToAddressBook(proxiesDeployment, graph.subgraphService.addressBook)
+    // @ts-expect-error - @graphprotocol/toolshed/hardhat exports ts files so types mismatch here
     saveToAddressBook(subgraphServiceDeployment, graph.subgraphService.addressBook)
     console.log(`Address book at ${graph.horizon.addressBook.file} updated!`)
     console.log(`Address book at ${graph.subgraphService.addressBook.file} updated!`)
@@ -146,6 +149,7 @@ task('deploy:migrate', 'Deploy the Subgraph Service on an existing Horizon deplo
 
     // Update address book
     console.log('\n========== 📖 Updating address book ==========')
+    // @ts-expect-error - @graphprotocol/toolshed/hardhat exports ts files so types mismatch here
     saveToAddressBook(deployment, graph.subgraphService.addressBook)
     console.log(`Address book at ${graph.subgraphService.addressBook.file} updated!`)
 

packages/subgraph-service/test/integration/after-transition-period/upgrade.test.ts

@@ -54,7 +54,7 @@ describe('Upgrading contracts', () => {
   it('subgraph service should be upgradeable by the governor', async () => {
     const entry = graph.subgraphService.addressBook.getEntry('SubgraphService')
     const proxyAdmin = entry.proxyAdmin!
-    const proxy = entry.address!
+    const proxy = entry.address
 
     // Upgrade the contract to a different implementation
     // the implementation we use is the GraphTallyCollector, this is obviously absurd but we just need an address with code on it
@@ -69,7 +69,7 @@ describe('Upgrading contracts', () => {
   it('dispute manager should be upgradeable by the governor', async () => {
     const entry = graph.subgraphService.addressBook.getEntry('DisputeManager')
     const proxyAdmin = entry.proxyAdmin!
-    const proxy = entry.address!
+    const proxy = entry.address
 
     // Upgrade the contract to a different implementation
     // the implementation we use is the GraphTallyCollector, this is obviously absurd but we just need an address with code on it

packages/subgraph-service/test/integration/during-transition-period/dispute-manager.test.ts

@@ -1,7 +1,6 @@
 import { ethers } from 'hardhat'
 import { expect } from 'chai'
 import hre from 'hardhat'
-import { EventLog } from 'ethers'
 
 import { DisputeManager, IGraphToken, SubgraphService } from '../../../typechain-types'
 import { generateLegacyIndexingDisputeId, generateLegacyTypeDisputeId } from '@graphprotocol/toolshed'
@@ -98,7 +97,7 @@ describe('Dispute Manager', () => {
           allocationId,
           fisherman.address,
           tokensToSlash,
-          tokensToReward
+          tokensToReward,
         )
 
         // Get dispute ID from event
@@ -130,8 +129,8 @@ describe('Dispute Manager', () => {
             ethers.Wallet.createRandom().address,
             fisherman.address,
             tokensToSlash,
-            tokensToReward
-          )
+            tokensToReward,
+          ),
         ).to.be.revertedWithCustomError(disputeManager, 'DisputeManagerIndexerNotFound')
       })
     })
@@ -146,8 +145,8 @@ describe('Dispute Manager', () => {
           allocationId,
           fisherman.address,
           tokensToSlash,
-          tokensToReward
-        )
+          tokensToReward,
+        ),
       ).to.be.revertedWithCustomError(disputeManager, 'DisputeManagerNotArbitrator')
     })
   })

packages/subgraph-service/test/integration/during-transition-period/legacy-dispute-manager.test.ts

@@ -135,7 +135,7 @@ describe('Legacy Dispute Manager', () => {
         responseHash,
         subgraphDeploymentId,
         indexer.address,
-        fisherman.address
+        fisherman.address,
       )
 
       // Verify dispute was created
@@ -209,14 +209,14 @@ describe('Legacy Dispute Manager', () => {
         responseHash1,
         subgraphDeploymentId,
         indexer.address,
-        fisherman.address
+        fisherman.address,
       )
       const disputeId2 = generateLegacyQueryDisputeId(
         queryHash,
         responseHash2,
         subgraphDeploymentId,
         indexer.address,
-        fisherman.address
+        fisherman.address,
       )
 
       // Verify both disputes were created

packages/subgraph-service/test/unit/disputeManager/disputes/legacy.t.sol

@@ -3,9 +3,9 @@ pragma solidity 0.8.27;
 
 import "forge-std/Test.sol";
 
-import { Attestation } from "../../../../../contracts/libraries/Attestation.sol";
+import { Attestation } from "../../../../contracts/libraries/Attestation.sol";
 import { PPMMath } from "@graphprotocol/horizon/contracts/libraries/PPMMath.sol";
-import { IDisputeManager } from "../../../../../contracts/interfaces/IDisputeManager.sol";
+import { IDisputeManager } from "../../../../contracts/interfaces/IDisputeManager.sol";
 import { DisputeManagerTest } from "../DisputeManager.t.sol";
 
 contract DisputeManagerLegacyDisputeTest is DisputeManagerTest {

packages/subgraph-service/test/unit/shared/SubgraphServiceShared.t.sol

@@ -186,7 +186,7 @@ abstract contract SubgraphServiceSharedTest is HorizonStakingSharedTest {
         staking.delegate(users.indexer, address(subgraphService), tokens, 0);
     }
 
-    function _calculateStakeSnapshot(uint256 _tokens, uint256 _tokensDelegated) internal view returns (uint256) {
+    function _calculateStakeSnapshot(uint256 _tokens, uint256 _tokensDelegated) internal pure returns (uint256) {
         return _tokens + _tokensDelegated;
     }
 

packages/toolshed/src/core/disputes.ts

@@ -22,6 +22,6 @@ export function generateLegacyQueryDisputeId(
 export function generateLegacyTypeDisputeId(allocationId: string) {
   return ethers.solidityPackedKeccak256(
     ['address', 'string'],
-    [allocationId, 'legacy']
+    [allocationId, 'legacy'],
   )
 }