HACK: remove extension - 22.884

Author: matiasedgeandnode

packages/horizon/contracts/data-service/libraries/ProvisionManagerLib.sol

@@ -9,7 +9,6 @@ import { PPMMath } from "../../libraries/PPMMath.sol";
 import { Initializable } from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 import { GraphDirectory } from "../../utilities/GraphDirectory.sol";
 import { ProvisionManagerV1Storage } from "./ProvisionManagerStorage.sol";
-import { ProvisionManagerLib } from "../libraries/ProvisionManagerLib.sol";
 
 /**
  * @title ProvisionManager contract
@@ -112,7 +111,10 @@ abstract contract ProvisionManager is Initializable, GraphDirectory, ProvisionMa
      * @param serviceProvider The address of the service provider.
      */
     modifier onlyAuthorizedForProvision(address serviceProvider) {
-        ProvisionManagerLib.requireAuthorizedForProvision(_graphStaking(), serviceProvider, address(this), msg.sender);
+        require(
+            _graphStaking().isAuthorized(serviceProvider, address(this), msg.sender),
+            ProvisionManagerNotAuthorized(serviceProvider, msg.sender)
+        );
         _;
     }
 
@@ -126,10 +128,6 @@ abstract contract ProvisionManager is Initializable, GraphDirectory, ProvisionMa
         _;
     }
 
-    function requireValidProvision(address serviceProvider) external view {
-        _requireValidProvision(serviceProvider);
-    }
-
     /**
      * @notice Initializes the contract and any parent contracts.
      */

packages/horizon/contracts/data-service/utilities/ProvisionManager.sol

@@ -5,7 +5,6 @@ import { IGraphToken } from "@graphprotocol/contracts/contracts/token/IGraphToke
 import { IHorizonStaking } from "@graphprotocol/horizon/contracts/interfaces/IHorizonStaking.sol";
 import { IDisputeManager } from "./interfaces/IDisputeManager.sol";
 import { ISubgraphService } from "./interfaces/ISubgraphService.sol";
-import { ISubgraphServiceExtended } from "./interfaces/ISubgraphServiceExtended.sol";
 
 import { TokenUtils } from "@graphprotocol/contracts/contracts/utils/TokenUtils.sol";
 import { PPMMath } from "@graphprotocol/horizon/contracts/libraries/PPMMath.sol";
@@ -536,9 +535,7 @@ contract DisputeManager is
         uint256 _entities,
         uint256 _blockNumber
     ) private returns (bytes32) {
-        IndexingAgreement.AgreementWrapper memory wrapper = _getSubgraphServiceExtended().getIndexingAgreement(
-            _agreementId
-        );
+        IndexingAgreement.AgreementWrapper memory wrapper = _getSubgraphService().getIndexingAgreement(_agreementId);
 
         // Agreement must have been collected on and be a version 1
         require(
@@ -768,16 +765,6 @@ contract DisputeManager is
         return subgraphService;
     }
 
-    /**
-     * @notice Get the address of the extended subgraph service
-     * @dev Will revert if the subgraph service is not set
-     * @return The extended subgraph service address
-     */
-    function _getSubgraphServiceExtended() private view returns (ISubgraphServiceExtended) {
-        require(address(subgraphService) != address(0), DisputeManagerSubgraphServiceNotSet());
-        return ISubgraphServiceExtended(address(subgraphService));
-    }
-
     /**
      * @notice Returns whether the dispute is for a conflicting attestation or not.
      * @param _dispute Dispute

packages/subgraph-service/contracts/DisputeManager.sol

@@ -73,11 +73,10 @@ contract SubgraphService is
         address disputeManager,
         address graphTallyCollector,
         address curation,
-        address recurringCollector,
-        address extension
+        address recurringCollector
     )
         DataService(graphController)
-        Directory(address(this), disputeManager, graphTallyCollector, curation, recurringCollector, extension)
+        Directory(address(this), disputeManager, graphTallyCollector, curation, recurringCollector)
     {
         _disableInitializers();
     }
@@ -100,35 +99,6 @@ contract SubgraphService is
         _setStakeToFeesRatio(stakeToFeesRatio_);
     }
 
-    /**
-     * @notice Delegates the call to the SubgraphServiceExtension implementation.
-     * @dev This function does not return to its internal call site, it will return directly to the
-     * external caller.
-     */
-    // solhint-disable-next-line payable-fallback, no-complex-fallback
-    fallback() external {
-        address extImpl = _subgraphServiceExtensionImpl();
-        require(extImpl != address(0), "only through proxy");
-
-        // solhint-disable-next-line no-inline-assembly
-        assembly {
-            // copy function selector and any arguments
-            calldatacopy(0, 0, calldatasize())
-            // execute function call using the extension implementation
-            let result := delegatecall(gas(), extImpl, 0, calldatasize(), 0, 0)
-            // get any return value
-            returndatacopy(0, 0, returndatasize())
-            // return any return value or error back to the caller
-            switch result
-            case 0 {
-                revert(0, returndatasize())
-            }
-            default {
-                return(0, returndatasize())
-            }
-        }
-    }
-
     /**
      * @notice
      * @dev Implements {IDataService.register}
@@ -420,7 +390,7 @@ contract SubgraphService is
 
     /**
      * @notice Accept an indexing agreement.
-     * See {ISubgraphServiceExtended.acceptIndexingAgreement}.
+     * See {ISubgraphService.acceptIndexingAgreement}.
      *
      * Requirements:
      * - The agreement's indexer must be registered
@@ -452,8 +422,76 @@ contract SubgraphService is
         IndexingAgreement._getManager().accept(_allocations, allocationId, signedRCA);
     }
 
-    function requireRegisteredIndexer(address indexer) external view {
-        _requireRegisteredIndexer(indexer);
+    /**
+     * @notice Update an indexing agreement.
+     * See {IndexingAgreement.update}.
+     *
+     * Requirements:
+     * - The contract must not be paused
+     * - The indexer must be valid
+     *
+     * @param indexer The indexer address
+     * @param signedRCAU The signed Recurring Collection Agreement Update
+     */
+    function updateIndexingAgreement(
+        address indexer,
+        IRecurringCollector.SignedRCAU calldata signedRCAU
+    )
+        external
+        whenNotPaused
+        onlyAuthorizedForProvision(indexer)
+        onlyValidProvision(indexer)
+        onlyRegisteredIndexer(indexer)
+    {
+        IndexingAgreement._getManager().update(indexer, signedRCAU);
+    }
+
+    /**
+     * @notice Cancel an indexing agreement by indexer / operator.
+     * See {IndexingAgreement.cancel}.
+     *
+     * @dev Can only be canceled on behalf of a valid indexer.
+     *
+     * Requirements:
+     * - The contract must not be paused
+     * - The indexer must be valid
+     *
+     * @param indexer The indexer address
+     * @param agreementId The id of the agreement
+     */
+    function cancelIndexingAgreement(
+        address indexer,
+        bytes16 agreementId
+    )
+        external
+        whenNotPaused
+        onlyAuthorizedForProvision(indexer)
+        onlyValidProvision(indexer)
+        onlyRegisteredIndexer(indexer)
+    {
+        IndexingAgreement._getManager().cancel(indexer, agreementId);
+    }
+
+    /**
+     * @notice Cancel an indexing agreement by payer / signer.
+     * See {ISubgraphService.cancelIndexingAgreementByPayer}.
+     *
+     * Requirements:
+     * - The caller must be authorized by the payer
+     * - The agreement must be active
+     *
+     * Emits {IndexingAgreementCanceled} event
+     *
+     * @param agreementId The id of the agreement
+     */
+    function cancelIndexingAgreementByPayer(bytes16 agreementId) external whenNotPaused {
+        IndexingAgreement._getManager().cancelByPayer(agreementId);
+    }
+
+    function getIndexingAgreement(
+        bytes16 agreementId
+    ) external view returns (IndexingAgreement.AgreementWrapper memory) {
+        return IndexingAgreement._getManager().get(agreementId);
     }
 
     /// @inheritdoc ISubgraphService

packages/subgraph-service/contracts/SubgraphService.sol

@@ -4,6 +4,7 @@ pragma solidity 0.8.27;
 import { IDataServiceFees } from "@graphprotocol/horizon/contracts/data-service/interfaces/IDataServiceFees.sol";
 import { IGraphPayments } from "@graphprotocol/horizon/contracts/interfaces/IGraphPayments.sol";
 
+import { IndexingAgreement } from "../libraries/IndexingAgreement.sol";
 import { Allocation } from "../libraries/Allocation.sol";
 import { LegacyAllocation } from "../libraries/LegacyAllocation.sol";
 
@@ -266,6 +267,34 @@ interface ISubgraphService is IDataServiceFees {
      */
     function acceptIndexingAgreement(address allocationId, IRecurringCollector.SignedRCA calldata signedRCA) external;
 
+    /**
+     * @notice Update an indexing agreement.
+     * @param indexer The address of the indexer
+     * @param signedRCAU The signed recurring collector agreement update (RCAU) that the indexer accepts
+     */
+    function updateIndexingAgreement(address indexer, IRecurringCollector.SignedRCAU calldata signedRCAU) external;
+
+    /**
+     * @notice Cancel an indexing agreement by indexer / operator.
+     * @param indexer The address of the indexer
+     * @param agreementId The id of the indexing agreement
+     */
+    function cancelIndexingAgreement(address indexer, bytes16 agreementId) external;
+
+    /**
+     * @notice Cancel an indexing agreement by payer / signer.
+     * @param agreementId The id of the indexing agreement
+     */
+    function cancelIndexingAgreementByPayer(bytes16 agreementId) external;
+
+    /**
+     * @notice Get the indexing agreement for a given agreement ID.
+     * @param agreementId The id of the indexing agreement
+     */
+    function getIndexingAgreement(
+        bytes16 agreementId
+    ) external view returns (IndexingAgreement.AgreementWrapper memory);
+
     /**
      * @notice Gets the details of an allocation
      * For legacy allocations use {getLegacyAllocation}