fix: path resolution for contract artifacts

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

Author: tmigone

packages/toolshed/src/deployments/horizon/contracts.ts

@@ -1,4 +1,4 @@
-import { resolveNodeModulesPath } from '../../lib/path'
+import { resolvePackagePath } from '../../lib/path'
 
 import type {
   Controller,
@@ -35,8 +35,8 @@ export const GraphHorizonContractNameList = [
   'GraphTallyCollector',
 ] as const
 
-export const CONTRACTS_ARTIFACTS_PATH = resolveNodeModulesPath('@graphprotocol/contracts/build/contracts')
-export const HORIZON_ARTIFACTS_PATH = resolveNodeModulesPath('@graphprotocol/horizon/build/contracts')
+export const CONTRACTS_ARTIFACTS_PATH = resolvePackagePath('@graphprotocol/contracts', 'build/contracts')
+export const HORIZON_ARTIFACTS_PATH = resolvePackagePath('@graphprotocol/horizon', 'build/contracts')
 
 export const GraphHorizonArtifactsMap = {
   // @graphprotocol/contracts

packages/toolshed/src/deployments/horizon/index.ts

@@ -1,6 +1,5 @@
 import { GraphHorizonAddressBook } from './address-book'
 import { loadActions } from './actions'
-import { resolveNodeModulesPath } from '../../lib/path'
 
 import type { Provider, Signer } from 'ethers'
 import type { HardhatEthersProvider } from '@nomicfoundation/hardhat-ethers/internal/hardhat-ethers-provider'
@@ -37,7 +36,7 @@ export function loadGraphHorizon(addressBookPath: string, chainId: number, provi
 
 export function connectGraphHorizon(chainId: number, signerOrProvider: Signer | Provider, addressBookPath?: string) {
   const addressBook = new GraphHorizonAddressBook(
-    addressBookPath ?? resolveNodeModulesPath('@graphprotocol/horizon/addresses.json'),
+    addressBookPath ?? require.resolve('@graphprotocol/horizon/addresses.json'),
     chainId,
   )
   return addressBook.loadContracts(signerOrProvider)

packages/toolshed/src/deployments/subgraph-service/contracts.ts

@@ -1,4 +1,4 @@
-import { resolveNodeModulesPath } from '../../lib/path'
+import { resolvePackagePath } from '../../lib/path'
 
 import type {
   DisputeManager,
@@ -11,6 +11,7 @@ import type {
   LegacyServiceRegistry,
 } from './types'
 import type { ContractList } from '../contract'
+
 export const SubgraphServiceContractNameList = [
   // @graphprotocol/contracts
   'L2Curation',
@@ -26,8 +27,8 @@ export const SubgraphServiceContractNameList = [
   'LegacyServiceRegistry',
 ] as const
 
-export const CONTRACTS_ARTIFACTS_PATH = resolveNodeModulesPath('@graphprotocol/contracts/build/contracts')
-export const SUBGRAPH_SERVICE_ARTIFACTS_PATH = resolveNodeModulesPath('@graphprotocol/subgraph-service/build/contracts')
+export const CONTRACTS_ARTIFACTS_PATH = resolvePackagePath('@graphprotocol/contracts', 'build/contracts')
+export const SUBGRAPH_SERVICE_ARTIFACTS_PATH = resolvePackagePath('@graphprotocol/subgraph-service', 'build/contracts')
 
 export const SubgraphServiceArtifactsMap = {
   // @graphprotocol/contracts

packages/toolshed/src/deployments/subgraph-service/index.ts

@@ -1,6 +1,5 @@
 import { HardhatEthersProvider } from '@nomicfoundation/hardhat-ethers/internal/hardhat-ethers-provider'
 import { loadActions } from './actions'
-import { resolveNodeModulesPath } from '../../lib/path'
 import { SubgraphServiceAddressBook } from './address-book'
 
 import type { Provider, Signer } from 'ethers'
@@ -20,7 +19,7 @@ export function loadSubgraphService(addressBookPath: string, chainId: number, pr
 
 export function connectSubgraphService(chainId: number, signerOrProvider: Signer | Provider, addressBookPath?: string) {
   const addressBook = new SubgraphServiceAddressBook(
-    addressBookPath ?? resolveNodeModulesPath('@graphprotocol/subgraph-service/addresses.json'),
+    addressBookPath ?? require.resolve('@graphprotocol/subgraph-service/addresses.json'),
     chainId,
   )
   return addressBook.loadContracts(signerOrProvider)

packages/toolshed/src/lib/path.ts

@@ -21,10 +21,18 @@ export function findPathUp(startPath: string, pathToFind: string): string | null
   return null
 }
 
-export function resolveNodeModulesPath(packageName: string): string {
+// Useful if you need to resolve a path to a file that might not exist but you
+// know it will eventually exist in the node_modules directory
+export function resolveNodeModulesPath(fileName: string): string {
   const basePath = findPathUp(__dirname, 'node_modules')
   if (!basePath) {
     throw new Error('Could not find node_modules directory')
   }
-  return path.resolve(basePath, packageName)
+  return path.resolve(basePath, fileName)
+}
+
+// Useful if you need to resolve a path to a file that exists in a package
+export function resolvePackagePath(packageName: string, relativePath: string): string {
+  const packageRoot = path.dirname(require.resolve(`${packageName}/package.json`))
+  return path.join(packageRoot, relativePath)
 }