fix: add some missing interface details

tmigone · tmigone · commit 2bfd7e0a663c · 2025-06-13T15:17:43.000-03:00
Signed-off-by: Tomás Migone &lt;tomas@edgeandnode.com&gt;
diff --git a/packages/horizon/tasks/test/ownership.ts b/packages/horizon/tasks/test/ownership.ts
@@ -30,7 +30,7 @@ task('test:transfer-ownership', 'Transfer ownership of protocol contracts to a n
     const graphProxyAdmin = graph.horizon.contracts.GraphProxyAdmin
 
     // Get current owners
-    const controllerGovernor = await controller.governor()
+    const controllerGovernor = await controller.getGovernor()
     const proxyAdminGovernor = await graphProxyAdmin.governor()
 
     console.log(`Current Controller governor: ${controllerGovernor}`)
@@ -49,7 +49,7 @@ task('test:transfer-ownership', 'Transfer ownership of protocol contracts to a n
 
     // Accept ownership of Controller
     await controller.connect(newGovernor).acceptOwnership()
-    console.log(`New Controller governor: ${await controller.governor()}`)
+    console.log(`New Controller governor: ${await controller.getGovernor()}`)
 
     console.log('\n--- STEP 2: Transfer ownership of GraphProxyAdmin ---')
 
diff --git a/packages/horizon/test/integration/during-transition-period/operator.test.ts b/packages/horizon/test/integration/during-transition-period/operator.test.ts
@@ -1,5 +1,4 @@
 import { generatePOI } from '@graphprotocol/toolshed'
-import type { HorizonStakingExtension } from '@graphprotocol/toolshed/deployments'
 import { getEventData } from '@graphprotocol/toolshed/hardhat'
 import type { HardhatEthersSigner } from '@nomicfoundation/hardhat-ethers/signers'
 import { expect } from 'chai'
@@ -70,7 +69,7 @@ describe('Operator', () => {
       const idleStakeBefore = await horizonStaking.getIdleStake(indexer.address)
 
       // Close allocation
-      const tx = await (horizonStaking as HorizonStakingExtension).connect(operator).closeAllocation(allocationID, poi)
+      const tx = await horizonStaking.connect(operator).closeAllocation(allocationID, poi)
       const eventData = await getEventData(
         tx,
         'event HorizonRewardsAssigned(address indexed indexer, address indexed allocationID, uint256 amount)',
diff --git a/packages/horizon/test/integration/during-transition-period/permissionless.test.ts b/packages/horizon/test/integration/during-transition-period/permissionless.test.ts
@@ -1,5 +1,4 @@
 import { generatePOI } from '@graphprotocol/toolshed'
-import type { HorizonStakingExtension } from '@graphprotocol/toolshed/deployments'
 import type { HardhatEthersSigner } from '@nomicfoundation/hardhat-ethers/signers'
 import { expect } from 'chai'
 import hre from 'hardhat'
@@ -56,7 +55,7 @@ describe('Permissionless', () => {
 
       // Close allocation
       const poi = generatePOI('poi')
-      await (horizonStaking as HorizonStakingExtension).connect(anySigner).closeAllocation(allocationID, poi)
+      await horizonStaking.connect(anySigner).closeAllocation(allocationID, poi)
 
       // Get indexer's idle stake after closing allocation
       const idleStakeAfter = await horizonStaking.getIdleStake(indexer.address)
diff --git a/packages/horizon/test/integration/during-transition-period/service-provider.test.ts b/packages/horizon/test/integration/during-transition-period/service-provider.test.ts
@@ -1,5 +1,4 @@
 import { generatePOI, ONE_MILLION } from '@graphprotocol/toolshed'
-import type { HorizonStakingExtension } from '@graphprotocol/toolshed/deployments'
 import { getEventData, setGRTBalance } from '@graphprotocol/toolshed/hardhat'
 import type { HardhatEthersSigner } from '@nomicfoundation/hardhat-ethers/signers'
 import { expect } from 'chai'
@@ -14,7 +13,6 @@ describe('Service Provider', () => {
   const graph = hre.graph()
   const { stake, collect } = graph.horizon.actions
   const horizonStaking = graph.horizon.contracts.HorizonStaking
-  const horizonStakingExtension = horizonStaking as HorizonStakingExtension
   const graphToken = graph.horizon.contracts.L2GraphToken
 
   // Subgraph service address is not set for integration tests
@@ -257,7 +255,7 @@ describe('Service Provider', () => {
           const idleStakeBefore = await horizonStaking.getIdleStake(indexer.address)
 
           // Close allocation
-          const tx = await horizonStakingExtension.connect(indexer).closeAllocation(allocationID, poi)
+          const tx = await horizonStaking.connect(indexer).closeAllocation(allocationID, poi)
           const eventData = await getEventData(
             tx,
             'event HorizonRewardsAssigned(address indexed indexer, address indexed allocationID, uint256 amount)',
@@ -332,7 +330,7 @@ describe('Service Provider', () => {
           }
 
           // Close allocation
-          await horizonStakingExtension.connect(indexer).closeAllocation(allocationID, poi)
+          await horizonStaking.connect(indexer).closeAllocation(allocationID, poi)
 
           // Tokens to collect
           const tokensToCollect = ethers.parseEther('1000')
@@ -407,7 +405,7 @@ describe('Service Provider', () => {
           const balanceBefore = await graphToken.balanceOf(rewardsDestination)
 
           // Close allocation
-          const tx = await horizonStakingExtension.connect(indexer).closeAllocation(allocationID, poi)
+          const tx = await horizonStaking.connect(indexer).closeAllocation(allocationID, poi)
           const eventData = await getEventData(
             tx,
             'event HorizonRewardsAssigned(address indexed indexer, address indexed allocationID, uint256 amount)',
diff --git a/packages/interfaces/contracts/contracts/governance/IGoverned.sol b/packages/interfaces/contracts/contracts/governance/IGoverned.sol
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+pragma solidity ^0.7.6 || 0.8.27;
+
+/**
+ * @title IGoverned
+ * @dev Interface for the Governed contract.
+ */
+interface IGoverned {
+    // -- State getters --
+
+    function governor() external view returns (address);
+
+    function pendingGovernor() external view returns (address);
+
+    // -- External functions --
+
+    /**
+     * @notice Admin function to begin change of governor.
+     * @param _newGovernor Address of new `governor`
+     */
+    function transferOwnership(address _newGovernor) external;
+
+    /**
+     * @notice Admin function for pending governor to accept role and update governor.
+     */
+    function acceptOwnership() external;
+
+    // -- Events --
+
+    event NewPendingOwnership(address indexed from, address indexed to);
+
+    event NewOwnership(address indexed from, address indexed to);
+}
diff --git a/packages/interfaces/contracts/contracts/upgrades/IGraphProxyAdmin.sol b/packages/interfaces/contracts/contracts/upgrades/IGraphProxyAdmin.sol
@@ -3,15 +3,16 @@
 pragma solidity 0.8.27;
 
 import { IGraphProxy } from "./IGraphProxy.sol";
+import { IGoverned } from "../governance/IGoverned.sol";
 
 /**
  * @title IGraphProxyAdmin
- * @dev Empty interface to allow the GraphProxyAdmin contract to be used
- * in the GraphDirectory contract.
+ * @dev GraphProxyAdmin contract interface
+ * @dev Note that this interface is not used by the contract implementation, just used for types and abi generation
  * @custom:security-contact Please email security+contracts@thegraph.com if you find any
  * bugs. We may have an active bug bounty program.
  */
-interface IGraphProxyAdmin {
+interface IGraphProxyAdmin is IGoverned {
     function getProxyImplementation(IGraphProxy proxy) external view returns (address);
 
     function getProxyPendingImplementation(IGraphProxy proxy) external view returns (address);
@@ -29,4 +30,7 @@ interface IGraphProxyAdmin {
     function acceptProxy(IGraphProxy proxy) external;
 
     function acceptProxyAndCall(IGraphProxy proxy, bytes calldata data) external;
+
+    // storage
+    function governor() external view returns (address);
 }
diff --git a/packages/interfaces/contracts/horizon/IAuthorizable.sol b/packages/interfaces/contracts/horizon/IAuthorizable.sol
@@ -92,6 +92,12 @@ interface IAuthorizable {
      */
     error AuthorizableSignerStillThawing(uint256 currentTimestamp, uint256 thawEndTimestamp);
 
+    /**
+     * @notice The period after which a signer can be revoked after thawing
+     * @return The period in seconds
+     */
+    function REVOKE_AUTHORIZATION_THAWING_PERIOD() external view returns (uint256);
+
     /**
      * @notice Authorize a signer to sign on behalf of the authorizer
      * @dev Requirements:
diff --git a/packages/interfaces/contracts/horizon/IGraphPayments.sol b/packages/interfaces/contracts/horizon/IGraphPayments.sol
@@ -58,6 +58,12 @@ interface IGraphPayments {
      */
     error GraphPaymentsInvalidCut(uint256 cut);
 
+    /**
+     * @notice Returns the protocol payment cut
+     * @return The protocol payment cut in PPM
+     */
+    function PROTOCOL_PAYMENT_CUT() external view returns (uint256);
+
     /**
      * @notice Initialize the contract
      */
diff --git a/packages/interfaces/contracts/horizon/IGraphTallyCollector.sol b/packages/interfaces/contracts/horizon/IGraphTallyCollector.sol
@@ -3,6 +3,7 @@ pragma solidity 0.8.27;
 
 import { IPaymentsCollector } from "./IPaymentsCollector.sol";
 import { IGraphPayments } from "./IGraphPayments.sol";
+import { IAuthorizable } from "./IAuthorizable.sol";
 
 /**
  * @title Interface for the {GraphTallyCollector} contract
@@ -13,7 +14,7 @@ import { IGraphPayments } from "./IGraphPayments.sol";
  * @custom:security-contact Please email security+contracts@thegraph.com if you find any
  * bugs. We may have an active bug bounty program.
  */
-interface IGraphTallyCollector is IPaymentsCollector {
+interface IGraphTallyCollector is IPaymentsCollector, IAuthorizable {
     /**
      * @notice The Receipt Aggregate Voucher (RAV) struct
      * @param collectionId The ID of the collection "bucket" the RAV belongs to. Note that multiple RAVs can be collected for the same collection id.
diff --git a/packages/interfaces/contracts/horizon/IPaymentsEscrow.sol b/packages/interfaces/contracts/horizon/IPaymentsEscrow.sol
@@ -143,6 +143,18 @@ interface IPaymentsEscrow {
      */
     error PaymentsEscrowInvalidZeroTokens();
 
+    /**
+     * @notice The maximum thawing period for escrow funds withdrawal
+     * @return The maximum thawing period in seconds
+     */
+    function MAX_WAIT_PERIOD() external view returns (uint256);
+
+    /**
+     * @notice The thawing period for escrow funds withdrawal
+     * @return The thawing period in seconds
+     */
+    function WITHDRAW_ESCROW_THAWING_PERIOD() external view returns (uint256);
+
     /**
      * @notice Initialize the contract
      */
diff --git a/packages/interfaces/contracts/horizon/internal/IMulticall.sol b/packages/interfaces/contracts/horizon/internal/IMulticall.sol
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+pragma solidity ^0.7.6 || ^0.8.27;
+
+/**
+ * @title IMulticall
+ * @dev Interface for the Multicall contract.
+ */
+interface IMulticall {
+    /**
+     * @notice Receives and executes a batch of function calls on this contract.
+     * @param data Calldata for each function call.
+     * @return results Return data from each function call.
+     */
+    function multicall(bytes[] calldata data) external returns (bytes[] memory results);
+}
diff --git a/packages/interfaces/contracts/toolshed/IControllerToolshed.sol b/packages/interfaces/contracts/toolshed/IControllerToolshed.sol
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+pragma solidity ^0.7.6 || 0.8.27;
+
+import { IController } from "../contracts/governance/IController.sol";
+import { IGoverned } from "../contracts/governance/IGoverned.sol";
+
+interface IControllerToolshed is IController, IGoverned {}
diff --git a/packages/interfaces/contracts/toolshed/IHorizonStakingToolshed.sol b/packages/interfaces/contracts/toolshed/IHorizonStakingToolshed.sol
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+pragma solidity ^0.7.6 || 0.8.27;
+
+import { IHorizonStaking } from "../horizon/IHorizonStaking.sol";
+import { IMulticall } from "../horizon/internal/IMulticall.sol";
+
+interface IHorizonStakingToolshed is IHorizonStaking, IMulticall {}
diff --git a/packages/toolshed/src/deployments/horizon/contracts.ts b/packages/toolshed/src/deployments/horizon/contracts.ts
@@ -6,7 +6,6 @@ import type {
   GraphProxyAdmin,
   GraphTallyCollector,
   HorizonStaking,
-  HorizonStakingExtension,
   L2Curation,
   L2GNS,
   L2GraphToken,
@@ -51,7 +50,7 @@ export interface GraphHorizonContracts extends ContractList<GraphHorizonContract
   SubgraphNFT: SubgraphNFT
 
   // @graphprotocol/horizon
-  HorizonStaking: HorizonStaking & HorizonStakingExtension
+  HorizonStaking: HorizonStaking
   GraphPayments: GraphPayments
   PaymentsEscrow: PaymentsEscrow
   GraphTallyCollector: GraphTallyCollector
diff --git a/packages/toolshed/src/deployments/horizon/types.ts b/packages/toolshed/src/deployments/horizon/types.ts
@@ -1,31 +1,26 @@
 import type {
-  IController,
+  IControllerToolshed,
   IEpochManagerToolshed,
   IGNSToolshed,
   IGraphPayments,
   IGraphProxyAdmin,
   IGraphTallyCollector,
   IGraphToken,
-  IHorizonStaking,
-  IHorizonStakingExtension,
+  IHorizonStakingToolshed,
   IL2CurationToolshed,
   IPaymentsEscrow,
   IRewardsManagerToolshed,
   IStaking,
   ISubgraphNFT,
 } from '@graphprotocol/interfaces'
 
-// These are just type re-declarations to keep naming conventions consistent
-type HorizonStaking = IHorizonStaking & IHorizonStakingExtension
-
 export {
-  IController as Controller,
+  IControllerToolshed as Controller,
   IEpochManagerToolshed as EpochManager,
   IGraphPayments as GraphPayments,
   IGraphProxyAdmin as GraphProxyAdmin,
   IGraphTallyCollector as GraphTallyCollector,
-  HorizonStaking,
-  IHorizonStakingExtension as HorizonStakingExtension,
+  IHorizonStakingToolshed as HorizonStaking,
   IL2CurationToolshed as L2Curation,
   IGNSToolshed as L2GNS,
   IGraphToken as L2GraphToken,
