chore: update toolshed to use latest lint config

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

Author: tmigone

.gitignore

@@ -47,20 +47,17 @@ bin/
 
 # Coverage and other reports
 coverage/
-coverage/
 reports/
 coverage.json
 lcov.info
 hardhat-dependency-compiler/
 
 # Local test files
-addresses-local.json
 localNetwork.json
 arbitrum-addresses-local.json
-tx-*.log
 addresses-fork.json
 addresses-hardhat.json
-addresses-local-network.json
+addresses-local*.json
 
 # Keys
 .keystore
@@ -74,6 +71,8 @@ packages/issuance/lib/forge-std/
 # Graph client
 .graphclient
 
+# Tx builder and logger
+tx-*.log
 tx-builder-*.json
 !tx-builder-template.json
 

eslint.config.mjs

@@ -154,15 +154,6 @@ export default [
     },
     rules: {
       'unused-imports/no-unused-imports': 'warn',
-      'unused-imports/no-unused-vars': [
-        'warn',
-        {
-          vars: 'all',
-          varsIgnorePattern: '^_',
-          args: 'after-used',
-          argsIgnorePattern: '^_',
-        },
-      ],
     },
   },
 
@@ -205,8 +196,9 @@ export default [
       '@typescript-eslint/no-unused-vars': [
         'error',
         {
-          varsIgnorePattern: 'Null|Active|Closed|graph|_i',
-          argsIgnorePattern: '_',
+          varsIgnorePattern: '^_|Null|Active|Closed|graph|_i',
+          argsIgnorePattern: '^_',
+          caughtErrorsIgnorePattern: '^_',
         },
       ],
     },
@@ -231,8 +223,8 @@ export default [
       'no-unused-vars': [
         'error',
         {
-          varsIgnorePattern: 'Null|Active|Closed|graph|_i',
-          argsIgnorePattern: '_',
+          varsIgnorePattern: '^_|Null|Active|Closed|graph|_i',
+          argsIgnorePattern: '^_',
         },
       ],
     },
@@ -266,12 +258,16 @@ export default [
   // Additional global ignores and unignores
   {
     ignores: [
-      // Keep any patterns that might not be in .gitignore
+      // Autogenerated GraphClient files (committed but should not be linted)
+      '**/.graphclient-extracted/**',
+      '**/.graphclient/**',
+      // Third-party dependencies (Forge libraries, etc.)
+      '**/lib/**',
     ],
   },
 
   // Explicitly include packages that should be linted
   {
     files: ['packages/**/*.{js,ts,cjs,mjs,jsx,tsx}'],
   },
-]
+]

packages/toolshed/README.md

@@ -31,4 +31,4 @@ import { hardhatBaseConfig } from '@graphprotocol/toolshed/hardhat';
 
 // Import utility functions
 import { printBanner } from '@graphprotocol/toolshed/utils';
-```
+```

packages/toolshed/eslint.config.js

@@ -31,7 +31,7 @@
     "build": "tsc",
     "watch": "tsc --watch",
     "prepublishOnly": "tsc",
-    "lint": "eslint '**/*.{js,ts}' --fix",
+    "lint": "eslint --fix --cache '**/*.{js,ts,cjs,mjs,jsx,tsx}'; prettier -w --cache --log-level warn '**/*.{js,ts,cjs,mjs,jsx,tsx}'",
     "clean": "rm -rf dist"
   },
   "keywords": [

packages/toolshed/package.json

@@ -0,0 +1,5 @@
+const baseConfig = require('../../prettier.config.cjs')
+
+module.exports = {
+  ...baseConfig,
+}

packages/toolshed/prettier.config.cjs

@@ -1,12 +1,10 @@
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function mergeABIs(abi1: any[], abi2: any[]) {
   for (const item of abi2) {
-    if (abi1.find(v => v.name === item.name) === undefined) {
+    if (abi1.find((v) => v.name === item.name) === undefined) {
       abi1.push(item)
     }
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-return
   return abi1
 }

packages/toolshed/src/core/abi.ts

@@ -35,7 +35,10 @@ export async function getAccounts(provider: HardhatEthersProvider): Promise<Grap
     governor: await getGovernor(provider, GraphAccountIndex.Governor),
     arbitrator: await getArbitrator(provider, GraphAccountIndex.Arbitrator),
     pauseGuardian: await getPauseGuardian(provider, GraphAccountIndex.PauseGuardian),
-    subgraphAvailabilityOracle: await getSubgraphAvailabilityOracle(provider, GraphAccountIndex.SubgraphAvailabilityOracle),
+    subgraphAvailabilityOracle: await getSubgraphAvailabilityOracle(
+      provider,
+      GraphAccountIndex.SubgraphAvailabilityOracle,
+    ),
     gateway: await getGateway(provider, GraphAccountIndex.Gateway),
     test: await getTestAccounts(provider),
   }
@@ -53,11 +56,17 @@ export async function getArbitrator(provider: HardhatEthersProvider, accountInde
   return _getAccount(provider, accountIndex)
 }
 
-export async function getPauseGuardian(provider: HardhatEthersProvider, accountIndex = GraphAccountIndex.PauseGuardian) {
+export async function getPauseGuardian(
+  provider: HardhatEthersProvider,
+  accountIndex = GraphAccountIndex.PauseGuardian,
+) {
   return _getAccount(provider, accountIndex)
 }
 
-export async function getSubgraphAvailabilityOracle(provider: HardhatEthersProvider, accountIndex = GraphAccountIndex.SubgraphAvailabilityOracle) {
+export async function getSubgraphAvailabilityOracle(
+  provider: HardhatEthersProvider,
+  accountIndex = GraphAccountIndex.SubgraphAvailabilityOracle,
+) {
   return _getAccount(provider, accountIndex)
 }
 
@@ -66,15 +75,13 @@ export async function getGateway(provider: HardhatEthersProvider, accountIndex =
 }
 
 export async function getTestAccounts(provider: HardhatEthersProvider) {
-  const accounts = await provider.send('eth_accounts', []) as string[]
-  const numReservedAccounts = Object.values(GraphAccountIndex).filter(v => typeof v === 'number').length
+  const accounts = (await provider.send('eth_accounts', [])) as string[]
+  const numReservedAccounts = Object.values(GraphAccountIndex).filter((v) => typeof v === 'number').length
   if (accounts.length < numReservedAccounts) {
     return []
   }
   return await Promise.all(
-    accounts
-      .slice(numReservedAccounts)
-      .map(async account => await _getAccount(provider, account)),
+    accounts.slice(numReservedAccounts).map(async (account) => await _getAccount(provider, account)),
   )
 }
 

packages/toolshed/src/core/accounts.ts

@@ -1,13 +1,11 @@
 import { ethers, id } from 'ethers'
+
 import { randomHexBytes } from '../lib/bytes'
 
 // For legacy allocations in the staking contract
 export async function generateLegacyAllocationProof(indexerAddress: string, allocationPrivateKey: string) {
   const wallet = new ethers.Wallet(allocationPrivateKey)
-  const messageHash = ethers.solidityPackedKeccak256(
-    ['address', 'address'],
-    [indexerAddress, wallet.address],
-  )
+  const messageHash = ethers.solidityPackedKeccak256(['address', 'address'], [indexerAddress, wallet.address])
   const messageHashBytes = ethers.getBytes(messageHash)
   return wallet.signMessage(messageHashBytes)
 }

packages/toolshed/src/core/allocation.ts

@@ -1,8 +1,12 @@
 import { ethers, id, Wallet } from 'ethers'
 
-export const EIP712_DISPUTE_MANAGER_DOMAIN_SALT = ethers.getBytes('0xa070ffb1cd7409649bf77822cce74495468e06dbfaef09556838bf188679b9c2')
+export const EIP712_DISPUTE_MANAGER_DOMAIN_SALT = ethers.getBytes(
+  '0xa070ffb1cd7409649bf77822cce74495468e06dbfaef09556838bf188679b9c2',
+)
 
-export const EIP712_ATTESTATION_PROOF_TYPEHASH = id('Receipt(bytes32 requestCID,bytes32 responseCID,bytes32 subgraphDeploymentID)')
+export const EIP712_ATTESTATION_PROOF_TYPEHASH = id(
+  'Receipt(bytes32 requestCID,bytes32 responseCID,bytes32 subgraphDeploymentID)',
+)
 export const EIP712_ATTESTATION_PROOF_TYPES = {
   Receipt: [
     { name: 'requestCID', type: 'bytes32' },