f: inject currentEpoch

Author: matiasedgeandnode

packages/horizon/contracts/utilities/GraphDirectory.sol

@@ -131,14 +131,6 @@ abstract contract GraphDirectory {
         );
     }
 
-    /**
-     * @notice Get the Epoch Manager contract
-     * @return The Epoch Manager contract
-     */
-    function graphEpochManager() external view returns (IEpochManager) {
-        return _graphEpochManager();
-    }
-
     /**
      * @notice Get the Graph Token contract
      * @return The Graph Token contract

packages/horizon/test/unit/utilities/GraphDirectoryImplementation.sol

@@ -43,6 +43,10 @@ contract GraphDirectoryImplementation is GraphDirectory {
         return _graphController();
     }
 
+    function graphEpochManager() external view returns (IEpochManager) {
+        return _graphEpochManager();
+    }
+
     function graphRewardsManager() external view returns (IRewardsManager) {
         return _graphRewardsManager();
     }

packages/subgraph-service/contracts/SubgraphService.sol

@@ -682,8 +682,11 @@ contract SubgraphService is
     function _collectIndexingFees(bytes16 _agreementId, bytes memory _data) private returns (uint256) {
         (address indexer, uint256 tokensCollected) = IndexingAgreement._getManager().collect(
             _allocations,
-            _agreementId,
-            _data
+            IndexingAgreement.CollectParams({
+                agreementId: _agreementId,
+                currentEpoch: _graphEpochManager().currentEpoch(),
+                data: _data
+            })
         );
 
         _releaseAndLockStake(indexer, tokensCollected);

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

@@ -74,6 +74,12 @@ library IndexingAgreement {
         uint256 tokensPerEntityPerSecond;
     }
 
+    struct CollectParams {
+        bytes16 agreementId;
+        uint256 currentEpoch;
+        bytes data;
+    }
+
     bytes32 private constant INDEXING_AGREEMENT_MANAGER_STORAGE_V1_SLOT = keccak256("v1.manager.indexing-agreement");
 
     /**
@@ -323,32 +329,31 @@ library IndexingAgreement {
     function collect(
         Manager storage self,
         mapping(address allocationId => Allocation.State allocation) storage allocations,
-        bytes16 agreementId,
-        bytes memory data
+        CollectParams memory params
     ) external returns (address, uint256) {
-        AgreementWrapper memory wrapper = _get(self, agreementId);
+        AgreementWrapper memory wrapper = _get(self, params.agreementId);
         Allocation.State memory allocation = allocations.requireValidAllocation(
             wrapper.agreement.allocationId,
             wrapper.collectorAgreement.serviceProvider
         );
-        require(_isActive(wrapper), IndexingAgreementNotActive(agreementId));
+        require(_isActive(wrapper), IndexingAgreementNotActive(params.agreementId));
 
         require(
             wrapper.agreement.version == IndexingAgreementVersion.V1,
             InvalidIndexingAgreementVersion(wrapper.agreement.version)
         );
 
-        (uint256 entities, bytes32 poi, uint256 poiEpoch) = Decoder.decodeCollectIndexingFeeDataV1(data);
+        (uint256 entities, bytes32 poi, uint256 poiEpoch) = Decoder.decodeCollectIndexingFeeDataV1(params.data);
 
         uint256 expectedTokens = (entities == 0 && poi == bytes32(0))
             ? 0
-            : _tokensToCollect(self, agreementId, wrapper.collectorAgreement, entities);
+            : _tokensToCollect(self, params.agreementId, wrapper.collectorAgreement, entities);
 
         uint256 tokensCollected = _directory().recurringCollector().collect(
             IGraphPayments.PaymentTypes.IndexingFee,
             abi.encode(
                 IRecurringCollector.CollectParams({
-                    agreementId: agreementId,
+                    agreementId: params.agreementId,
                     collectionId: bytes32(uint256(uint160(wrapper.agreement.allocationId))),
                     tokens: expectedTokens,
                     dataServiceCut: 0
@@ -359,10 +364,10 @@ library IndexingAgreement {
         emit IndexingFeesCollectedV1(
             wrapper.collectorAgreement.serviceProvider,
             wrapper.collectorAgreement.payer,
-            agreementId,
+            params.agreementId,
             wrapper.agreement.allocationId,
             allocation.subgraphDeploymentId,
-            _graphDirectory().graphEpochManager().currentEpoch(),
+            params.currentEpoch,
             tokensCollected,
             entities,
             poi,