f: public buildStakeClaimId

Author: matiasedgeandnode

packages/horizon/contracts/data-service/extensions/DataServiceFees.sol

@@ -47,6 +47,7 @@ abstract contract DataServiceFees is DataService, DataServiceFeesV1Storage, IDat
             claims,
             claimsLists,
             _graphStaking(),
+            address(this),
             _delegationRatio,
             _serviceProvider,
             _tokens,

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

@@ -22,6 +22,7 @@ library StakeClaims {
      * @param claims The mapping that stores stake claims by their ID
      * @param claimsLists The mapping that stores linked lists of stake claims by service provider
      * @param graphStaking The Horizon staking contract used to lock the tokens
+     * @param _dataService The address of the data service
      * @param _delegationRatio The delegation ratio to use for the stake claim
      * @param _serviceProvider The address of the service provider
      * @param _tokens The amount of tokens to lock in the claim
@@ -32,6 +33,7 @@ library StakeClaims {
         mapping(bytes32 => IDataServiceFees.StakeClaim) storage claims,
         mapping(address serviceProvider => LinkedList.List list) storage claimsLists,
         IHorizonStaking graphStaking,
+        address _dataService,
         uint32 _delegationRatio,
         address _serviceProvider,
         uint256 _tokens,
@@ -43,7 +45,7 @@ library StakeClaims {
         LinkedList.List storage claimsList = claimsLists[_serviceProvider];
 
         // Save item and add to list
-        bytes32 claimId = _buildStakeClaimId(_serviceProvider, claimsList.nonce);
+        bytes32 claimId = _buildStakeClaimId(_dataService, _serviceProvider, claimsList.nonce);
         claims[claimId] = IDataServiceFees.StakeClaim({
             tokens: _tokens,
             createdAt: block.timestamp,
@@ -121,11 +123,31 @@ library StakeClaims {
 
     /**
      * @notice Builds a stake claim ID
+     * @param dataService The address of the data service
      * @param serviceProvider The address of the service provider
      * @param nonce A nonce of the stake claim
      * @return The stake claim ID
      */
-    function _buildStakeClaimId(address serviceProvider, uint256 nonce) internal view returns (bytes32) {
-        return keccak256(abi.encodePacked(address(this), serviceProvider, nonce));
+    function buildStakeClaimId(
+        address dataService,
+        address serviceProvider,
+        uint256 nonce
+    ) public pure returns (bytes32) {
+        return _buildStakeClaimId(dataService, serviceProvider, nonce);
+    }
+
+    /**
+     * @notice Builds a stake claim ID
+     * @param _dataService The address of the data service
+     * @param _serviceProvider The address of the service provider
+     * @param _nonce A nonce of the stake claim
+     * @return The stake claim ID
+     */
+    function _buildStakeClaimId(
+        address _dataService,
+        address _serviceProvider,
+        uint256 _nonce
+    ) internal pure returns (bytes32) {
+        return keccak256(abi.encodePacked(_dataService, _serviceProvider, _nonce));
     }
 }

packages/subgraph-service/test/unit/subgraphService/SubgraphService.t.sol

@@ -12,6 +12,7 @@ import { ECDSA } from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
 import { LinkedList } from "@graphprotocol/horizon/contracts/libraries/LinkedList.sol";
 import { IDataServiceFees } from "@graphprotocol/horizon/contracts/data-service/interfaces/IDataServiceFees.sol";
 import { IHorizonStakingTypes } from "@graphprotocol/horizon/contracts/interfaces/internal/IHorizonStakingTypes.sol";
+import { StakeClaims } from "@graphprotocol/horizon/contracts/data-service/libraries/StakeClaims.sol";
 
 import { Allocation } from "../../../contracts/libraries/Allocation.sol";
 import { AllocationManager } from "../../../contracts/utilities/AllocationManager.sol";
@@ -513,7 +514,7 @@ contract SubgraphServiceTest is SubgraphServiceSharedTest {
     }
 
     function _buildStakeClaimId(address _indexer, uint256 _nonce) private view returns (bytes32) {
-        return keccak256(abi.encodePacked(address(subgraphService), _indexer, _nonce));
+        return StakeClaims.buildStakeClaimId(address(subgraphService), _indexer, _nonce);
     }
 
     function _getStakeClaim(bytes32 _claimId) private view returns (IDataServiceFees.StakeClaim memory) {