f: smaller contract size via proxy

Author: matiasedgeandnode

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

@@ -111,6 +111,14 @@ abstract contract ProvisionManager is Initializable, GraphDirectory, ProvisionMa
         _;
     }
 
+    modifier onlyAuthorizedForProvisionHack(address caller, address serviceProvider) {
+        require(
+            _graphStaking().isAuthorized(serviceProvider, address(this), caller),
+            ProvisionManagerNotAuthorized(serviceProvider, caller)
+        );
+        _;
+    }
+
     /**
      * @notice Checks if a provision of a service provider is valid according
      * to the parameter ranges established.

packages/subgraph-service/contracts/DisputeManager.sol

@@ -5,6 +5,7 @@ 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 { ISubgraphServiceExtension } from "./interfaces/ISubgraphServiceExtension.sol";
 
 import { Math } from "@openzeppelin/contracts/utils/math/Math.sol";
 import { TokenUtils } from "@graphprotocol/contracts/contracts/utils/TokenUtils.sol";
@@ -480,7 +481,9 @@ contract DisputeManager is
         bytes32 _poi,
         uint256 _entities
     ) private returns (bytes32) {
-        IndexingAgreement.AgreementWrapper memory wrapper = _getSubgraphService().getIndexingAgreement(_agreementId);
+        IndexingAgreement.AgreementWrapper memory wrapper = _getSubgraphServiceExtension().getIndexingAgreement(
+            _agreementId
+        );
 
         // Agreement must have been collected on and be a version 1
         require(
@@ -703,6 +706,16 @@ contract DisputeManager is
         return subgraphService;
     }
 
+    /**
+     * @notice Get the address of the subgraph service extension
+     * @dev Will revert if the subgraph service is not set
+     * @return The subgraph service address
+     */
+    function _getSubgraphServiceExtension() private view returns (ISubgraphServiceExtension) {
+        require(address(subgraphService) != address(0), DisputeManagerSubgraphServiceNotSet());
+        return ISubgraphServiceExtension(address(subgraphService));
+    }
+
     /**
      * @notice Returns whether the dispute is for a conflicting attestation or not.
      * @param _dispute Dispute

packages/subgraph-service/contracts/SubgraphService.sol

@@ -16,7 +16,6 @@ import { DataService } from "@graphprotocol/horizon/contracts/data-service/DataS
 import { DataServiceFees } from "@graphprotocol/horizon/contracts/data-service/extensions/DataServiceFees.sol";
 import { Directory } from "./utilities/Directory.sol";
 import { AllocationManager } from "./utilities/AllocationManager.sol";
-import { IndexingAgreementManagerStorageV1 } from "./utilities/IndexingAgreementManagerStorageV1.sol";
 import { SubgraphServiceV1Storage } from "./SubgraphServiceStorage.sol";
 
 import { TokenUtils } from "@graphprotocol/contracts/contracts/utils/TokenUtils.sol";
@@ -44,8 +43,7 @@ contract SubgraphService is
     AllocationManager,
     SubgraphServiceV1Storage,
     IRewardsIssuer,
-    ISubgraphService,
-    IndexingAgreementManagerStorageV1
+    ISubgraphService
 {
     using PPMMath for uint256;
     using Allocation for mapping(address => Allocation.State);
@@ -75,10 +73,11 @@ contract SubgraphService is
         address disputeManager,
         address graphTallyCollector,
         address curation,
-        address recurringCollector
+        address recurringCollector,
+        address extension
     )
         DataService(graphController)
-        Directory(address(this), disputeManager, graphTallyCollector, curation, recurringCollector)
+        Directory(address(this), disputeManager, graphTallyCollector, curation, recurringCollector, extension)
     {
         _disableInitializers();
     }
@@ -553,6 +552,10 @@ contract SubgraphService is
         emit StakeToFeesRatioSet(_stakeToFeesRatio);
     }
 
+    function _cancelAllocationIndexingAgreement(address _allocationId) internal {
+        IndexingAgreement._getManager().cancelForAllocation(_allocationId);
+    }
+
     /**
      * @notice Accept an indexing agreement.
      * See {ISubgraphService.acceptIndexingAgreement}.
@@ -584,75 +587,7 @@ contract SubgraphService is
         onlyValidProvision(signedRCA.rca.serviceProvider)
         onlyRegisteredIndexer(signedRCA.rca.serviceProvider)
     {
-        _indexingAgreementManager.accept(_allocations, allocationId, signedRCA);
-    }
-
-    function upgradeIndexingAgreement(
-        address indexer,
-        IRecurringCollector.SignedRCAU calldata signedRCAU
-    )
-        external
-        whenNotPaused
-        onlyAuthorizedForProvision(indexer)
-        onlyValidProvision(indexer)
-        onlyRegisteredIndexer(indexer)
-    {
-        _indexingAgreementManager.upgrade(indexer, signedRCAU);
-    }
-
-    /**
-     * @notice Cancel an indexing agreement by indexer / operator.
-     * See {ISubgraphService.cancelIndexingAgreement}.
-     *
-     * @dev Can only be canceled on behalf of a valid indexer.
-     *
-     * Requirements:
-     * - The indexer must be registered
-     * - The caller must be authorized by the indexer
-     * - The provision must be valid according to the subgraph service rules
-     * - The agreement must be active
-     *
-     * Emits {IndexingAgreementCanceled} event
-     *
-     * @param agreementId The id of the agreement
-     */
-    function cancelIndexingAgreement(
-        address indexer,
-        bytes16 agreementId
-    )
-        external
-        whenNotPaused
-        onlyAuthorizedForProvision(indexer)
-        onlyValidProvision(indexer)
-        onlyRegisteredIndexer(indexer)
-    {
-        _indexingAgreementManager.cancel(indexer, agreementId);
-    }
-
-    function _cancelAllocationIndexingAgreement(address _allocationId) internal {
-        _indexingAgreementManager.cancelForAllocation(_allocationId);
-    }
-
-    /**
-     * @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 {
-        _indexingAgreementManager.cancelByPayer(agreementId);
-    }
-
-    function getIndexingAgreement(
-        bytes16 agreementId
-    ) external view returns (IndexingAgreement.AgreementWrapper memory) {
-        return _indexingAgreementManager.get(agreementId);
+        IndexingAgreement._getManager().accept(_allocations, allocationId, signedRCA);
     }
 
     /**
@@ -680,7 +615,7 @@ contract SubgraphService is
      * @return The amount of fees collected
      */
     function _collectIndexingFees(bytes16 _agreementId, bytes memory _data) private returns (uint256) {
-        (address indexer, uint256 tokensCollected) = _indexingAgreementManager.collect(
+        (address indexer, uint256 tokensCollected) = IndexingAgreement._getManager().collect(
             _allocations,
             _agreementId,
             _data
@@ -702,4 +637,45 @@ contract SubgraphService is
             );
         }
     }
+
+    function modifiersHack(
+        address caller,
+        address indexer
+    )
+        external
+        view
+        whenNotPaused
+        onlyAuthorizedForProvisionHack(caller, indexer)
+        onlyValidProvision(indexer)
+        onlyRegisteredIndexer(indexer)
+    {}
+
+    /**
+     * @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())
+            }
+        }
+    }
 }

packages/subgraph-service/contracts/SubgraphServiceExtension.sol

@@ -0,0 +1,70 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity 0.8.27;
+
+import { PausableUpgradeable } from "@openzeppelin/contracts-upgradeable/utils/PausableUpgradeable.sol";
+import { IRecurringCollector } from "@graphprotocol/horizon/contracts/interfaces/IRecurringCollector.sol";
+
+import { IndexingAgreement } from "./libraries/IndexingAgreement.sol";
+import { SubgraphService } from "./SubgraphService.sol";
+
+contract SubgraphServiceExtension is PausableUpgradeable {
+    using IndexingAgreement for IndexingAgreement.Manager;
+
+    modifier modifiersHack(address indexer) {
+        SubgraphService(address(this)).modifiersHack(msg.sender, indexer);
+        _;
+    }
+
+    function upgradeIndexingAgreement(
+        address indexer,
+        IRecurringCollector.SignedRCAU calldata signedRCAU
+    ) external modifiersHack(indexer) {
+        IndexingAgreement._getManager().upgrade(indexer, signedRCAU);
+    }
+
+    /**
+     * @notice Cancel an indexing agreement by indexer / operator.
+     * See {ISubgraphService.cancelIndexingAgreement}.
+     *
+     * @dev Can only be canceled on behalf of a valid indexer.
+     *
+     * Requirements:
+     * - The indexer must be registered
+     * - The caller must be authorized by the indexer
+     * - The provision must be valid according to the subgraph service rules
+     * - The agreement must be active
+     *
+     * Emits {IndexingAgreementCanceled} event
+     *
+     * @param agreementId The id of the agreement
+     */
+    function cancelIndexingAgreement(address indexer, bytes16 agreementId) external modifiersHack(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);
+    }
+
+    function _cancelAllocationIndexingAgreement(address _allocationId) internal {
+        IndexingAgreement._getManager().cancelForAllocation(_allocationId);
+    }
+}

packages/subgraph-service/contracts/interfaces/ISubgraphService.sol

@@ -3,11 +3,11 @@ 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 { IRecurringCollector } from "@graphprotocol/horizon/contracts/interfaces/IRecurringCollector.sol";
 
 import { Allocation } from "../libraries/Allocation.sol";
 import { LegacyAllocation } from "../libraries/LegacyAllocation.sol";
-import { IndexingAgreement } from "../libraries/IndexingAgreement.sol";
+
+import { IRecurringCollector } from "@graphprotocol/horizon/contracts/interfaces/IRecurringCollector.sol";
 
 /**
  * @title Interface for the {SubgraphService} contract
@@ -301,23 +301,4 @@ interface ISubgraphService is IDataServiceFees {
      * @notice Accept an indexing agreement.
      */
     function acceptIndexingAgreement(address allocationId, IRecurringCollector.SignedRCA calldata signedRCA) external;
-
-    /**
-     * @notice Upgrade an indexing agreement.
-     */
-    function upgradeIndexingAgreement(address indexer, IRecurringCollector.SignedRCAU calldata signedRCAU) external;
-
-    /**
-     * @notice Cancel an indexing agreement by indexer / operator.
-     */
-    function cancelIndexingAgreement(address indexer, bytes16 agreementId) external;
-
-    /**
-     * @notice Cancel an indexing agreement by payer / signer.
-     */
-    function cancelIndexingAgreementByPayer(bytes16 agreementId) external;
-
-    function getIndexingAgreement(
-        bytes16 agreementId
-    ) external view returns (IndexingAgreement.AgreementWrapper memory);
 }

packages/subgraph-service/contracts/interfaces/ISubgraphServiceExtension.sol

@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity 0.8.27;
+
+import { IRecurringCollector } from "@graphprotocol/horizon/contracts/interfaces/IRecurringCollector.sol";
+
+import { IndexingAgreement } from "../libraries/IndexingAgreement.sol";
+
+interface ISubgraphServiceExtension {
+    /**
+     * @notice Accept an indexing agreement.
+     */
+    // function acceptIndexingAgreement(address allocationId, IRecurringCollector.SignedRCA calldata signedRCA) external;
+
+    /**
+     * @notice Upgrade an indexing agreement.
+     */
+    function upgradeIndexingAgreement(address indexer, IRecurringCollector.SignedRCAU calldata signedRCAU) external;
+
+    /**
+     * @notice Cancel an indexing agreement by indexer / operator.
+     */
+    function cancelIndexingAgreement(address indexer, bytes16 agreementId) external;
+
+    /**
+     * @notice Cancel an indexing agreement by payer / signer.
+     */
+    function cancelIndexingAgreementByPayer(bytes16 agreementId) external;
+
+    function getIndexingAgreement(
+        bytes16 agreementId
+    ) external view returns (IndexingAgreement.AgreementWrapper memory);
+}

packages/subgraph-service/contracts/libraries/IndexingAgreement.sol

@@ -74,6 +74,8 @@ library IndexingAgreement {
         uint256 tokensPerEntityPerSecond;
     }
 
+    bytes32 private constant INDEXING_AGREEMENT_MANAGER_STORAGE_V1_SLOT = keccak256("v1.manager.indexing-agreement");
+
     /**
      * @notice Emitted when an indexer collects indexing fees from a V1 agreement
      * @param indexer The address of the indexer
@@ -377,6 +379,15 @@ library IndexingAgreement {
         return wrapper;
     }
 
+    function _getManager() internal pure returns (Manager storage manager) {
+        bytes32 slot = INDEXING_AGREEMENT_MANAGER_STORAGE_V1_SLOT;
+
+        // solhint-disable-next-line no-inline-assembly
+        assembly {
+            manager.slot := slot
+        }
+    }
+
     function _setTermsV1(Manager storage _manager, bytes16 _agreementId, bytes memory _data) private {
         IndexingAgreementTermsV1 memory newTerms = Decoder.decodeIndexingAgreementTermsV1(_data);
         _manager.termsV1[_agreementId].tokensPerSecond = newTerms.tokensPerSecond;