fix: couple fixes to make integration tests pass

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

Author: tmigone

packages/interfaces/contracts/horizon/internal/IMulticall.sol

@@ -2,6 +2,6 @@
 pragma solidity ^0.7.6 || 0.8.27;
 
 import { IHorizonStaking } from "../horizon/IHorizonStaking.sol";
-import { IMulticall } from "../horizon/internal/IMulticall.sol";
+import { IMulticall } from "../contracts/base/IMulticall.sol";
 
 interface IHorizonStakingToolshed is IHorizonStaking, IMulticall {}

packages/interfaces/contracts/toolshed/IHorizonStakingToolshed.sol

@@ -77,10 +77,12 @@ export function getAbi(contractName: string): unknown[] {
 export function collectFactoriesMap(obj: unknown): Record<string, ContractFactoryStatic> {
   const factoriesMap: Record<string, ContractFactoryStatic> = {}
 
+  // For factory name 'x', use contract name 'y'
   const factoryNameOverrides: Record<string, string> = {
     'contracts.contracts.disputes.IDisputeManager__factory': 'ILegacyDisputeManager',
   }
 
+  // For contract name 'x', also create an entry for alias 'y' in the factory map
   const factoryNameAliases: Record<string, string> = {
     IServiceRegistry: 'ILegacyServiceRegistry',
   }
@@ -140,11 +142,26 @@ export function collectFactoriesMap(obj: unknown): Record<string, ContractFactor
 /**
  * Gets alternative names for a contract to handle interface naming conventions
  * For any given value passed to it, returns `ContractName` and `IContractName`
+ * Note that this function will apply toolshed overrides, this returns a more complete interface
  * @param {string} contractName - The original contract name
  * @returns {string[]} Array of possible contract names including interface variants
  * @private
  */
 function getContractNameAlternatives(contractName: string): string[] {
+  const nameOverrides: Record<string, string> = {
+    Controller: 'ControllerToolshed',
+    EpochManager: 'EpochManagerToolshed',
+    GNS: 'GNSToolshed',
+    HorizonStaking: 'HorizonStakingToolshed',
+    L2Curation: 'L2CurationToolshed',
+    RewardsManager: 'RewardsManagerToolshed',
+    ServiceRegistry: 'ServiceRegistryToolshed',
+  }
+
+  if (nameOverrides[contractName]) {
+    contractName = nameOverrides[contractName]
+  }
+
   const alternatives: string[] = [contractName]
 
   if (contractName.startsWith('I')) {

packages/interfaces/src/index.ts

@@ -1,4 +1,3 @@
-import { HorizonStakingExtension } from '@graphprotocol/horizon'
 import {
   encodeRegistrationData,
   encodeStartServiceData,
@@ -14,7 +13,6 @@ task('test:seed', 'Seed the test environment, must be run after deployment').set
   // Get contracts
   const graph = hre.graph()
   const horizonStaking = graph.horizon.contracts.HorizonStaking
-  const horizonStakingExtension = graph.horizon.contracts.HorizonStaking as HorizonStakingExtension
   const subgraphService = graph.subgraphService.contracts.SubgraphService
   const disputeManager = graph.subgraphService.contracts.DisputeManager
 
@@ -47,7 +45,7 @@ task('test:seed', 'Seed the test environment, must be run after deployment').set
 
       // Close allocation
       const poi = generatePOI()
-      await horizonStakingExtension.connect(indexerSigner).closeAllocation(allocation.allocationID, poi)
+      await horizonStaking.connect(indexerSigner).closeAllocation(allocation.allocationID, poi)
 
       const allocationData = await horizonStaking.getAllocation(allocation.allocationID)
       console.log(`Allocation closed at epoch: ${allocationData.closedAtEpoch}`)

packages/subgraph-service/tasks/test/seed.ts

@@ -1,6 +1,6 @@
 import type { HardhatEthersSigner } from '@nomicfoundation/hardhat-ethers/signers'
 
-import type { GraphHorizonContracts, HorizonStakingExtension } from '.'
+import type { GraphHorizonContracts } from '.'
 
 /**
  * It's important to use JSDoc in the return functions here for good developer experience as
@@ -166,7 +166,7 @@ async function collect(
   const [tokens, allocationID] = args
 
   await GraphToken.connect(signer).approve(HorizonStaking.target, tokens)
-  await (HorizonStaking as HorizonStakingExtension).connect(signer).collect(tokens, allocationID)
+  await HorizonStaking.connect(signer).collect(tokens, allocationID)
 }
 
 async function delegate(

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

@@ -1,4 +1,4 @@
-import { getInterface, getMergedInterface } from '@graphprotocol/interfaces'
+import { getInterface } from '@graphprotocol/interfaces'
 import { Provider, Signer } from 'ethers'
 import { Contract } from 'ethers'
 
@@ -20,18 +20,6 @@ export class GraphHorizonAddressBook extends AddressBook<number, GraphHorizonCon
 
     const contracts = this._loadContracts(signerOrProvider, enableTxLogging)
 
-    // rewire HorizonStaking to include HorizonStakingExtension abi
-    if (contracts.HorizonStaking) {
-      const stakingOverride = new Contract(
-        this.getEntry('HorizonStaking').address,
-        getMergedInterface(['HorizonStaking', 'HorizonStakingExtension']),
-        signerOrProvider,
-      )
-      contracts.HorizonStaking = enableTxLogging
-        ? wrapTransactionCalls(stakingOverride, 'HorizonStaking')
-        : stakingOverride
-    }
-
     this._assertGraphHorizonContracts(contracts)
 
     // Aliases

packages/toolshed/src/deployments/horizon/address-book.ts

@@ -11,7 +11,7 @@ export * from './types'
 
 export function loadGraphHorizon(addressBookPath: string, chainId: number, provider: HardhatEthersProvider) {
   const addressBook = new GraphHorizonAddressBook(addressBookPath, chainId)
-  const contracts = addressBook.loadContracts(provider, true)
+  const contracts = addressBook.loadContracts(provider, false)
   return {
     addressBook: addressBook,
     contracts: contracts,