feat: add collector address to the RAV

Signed-off-by: Tomás Migone <[email protected]>

Author: tmigone

packages/horizon/contracts/interfaces/ITAPCollector.sol

@@ -29,10 +29,12 @@ interface ITAPCollector is IPaymentsCollector {
         bytes32 collectionId;
         // The address of the payer the RAV was issued by
         address payer;
-        // The address of the data service the RAV was issued to
-        address dataService;
+        // The address of the collector where the RAV can be collected
+        address collector;
         // The address of the service provider the RAV was issued to
         address serviceProvider;
+        // The address of the data service the RAV was issued to
+        address dataService;
         // The RAV timestamp, indicating the latest TAP Receipt in the RAV
         uint64 timestampNs;
         // Total amount owed to the service provider since the beginning of the
@@ -102,6 +104,13 @@ interface ITAPCollector is IPaymentsCollector {
         bytes signature
     );
 
+    /**
+     * Thrown when attempting to collect a RAV that was not issued to this collector
+     * @param collector The address of this collector processing the RAV
+     * @param ravCollector The collector address noted in the RAV
+     */
+    error TAPCollectorInvalidCollector(address collector, address ravCollector);
+
     /**
      * Thrown when the signer is already authorized
      * @param authorizingPayer The address of the payer authorizing the signer

packages/horizon/contracts/payments/collectors/TAPCollector.sol

@@ -29,7 +29,7 @@ contract TAPCollector is EIP712, GraphDirectory, ITAPCollector {
     /// @notice The EIP712 typehash for the ReceiptAggregateVoucher struct
     bytes32 private constant EIP712_RAV_TYPEHASH =
         keccak256(
-            "ReceiptAggregateVoucher(address payer,address dataService,address serviceProvider,uint64 timestampNs,uint128 valueAggregate,bytes metadata)"
+            "ReceiptAggregateVoucher(address payer,address collector,address serviceProvider,address dataService,uint64 timestampNs,uint128 valueAggregate,bytes metadata)"
         );
 
     /// @notice Authorization details for payer-signer pairs
@@ -166,8 +166,15 @@ contract TAPCollector is EIP712, GraphDirectory, ITAPCollector {
         bytes memory _data,
         uint256 _tokensToCollect
     ) private returns (uint256) {
-        // Ensure caller is the RAV data service
         (SignedRAV memory signedRAV, uint256 dataServiceCut) = abi.decode(_data, (SignedRAV, uint256));
+
+        // Ensure the RAV was issued to this collector
+        require(
+            signedRAV.rav.collector == address(this),
+            TAPCollectorInvalidCollector(address(this), signedRAV.rav.collector)
+        );
+
+        // Ensure caller is the RAV data service
         require(
             signedRAV.rav.dataService == msg.sender,
             TAPCollectorCallerNotDataService(msg.sender, signedRAV.rav.dataService)
@@ -259,8 +266,9 @@ contract TAPCollector is EIP712, GraphDirectory, ITAPCollector {
                     abi.encode(
                         EIP712_RAV_TYPEHASH,
                         _rav.payer,
-                        _rav.dataService,
+                        _rav.collector,
                         _rav.serviceProvider,
+                        _rav.dataService,
                         _rav.timestampNs,
                         _rav.valueAggregate,
                         keccak256(_rav.metadata)

packages/horizon/test/payments/tap-collector/collect/collect.t.sol

@@ -42,15 +42,17 @@ contract TAPCollectorCollectTest is TAPCollectorTest {
     function _getRAV(
         address _allocationId,
         address _payer,
-        address _indexer,
         address _collector,
+        address _indexer,
+        address _dataService,
         uint128 _tokens
     ) private pure returns (ITAPCollector.ReceiptAggregateVoucher memory rav) {
         return
             ITAPCollector.ReceiptAggregateVoucher({
                 collectionId: bytes32(uint256(uint160(_allocationId))),
                 payer: _payer,
-                dataService: _collector,
+                collector: _collector,
+                dataService: _dataService,
                 serviceProvider: _indexer,
                 timestampNs: 0,
                 valueAggregate: _tokens,
@@ -109,6 +111,27 @@ contract TAPCollectorCollectTest is TAPCollectorTest {
         }
     }
 
+    function testTAPCollector_Collect_RevertWhen_OtherCollector() public useGateway useSigner {
+        address otherCollector = makeAddr("otherCollector");
+        bytes memory data = _getQueryFeeEncodedData(
+            signerPrivateKey,
+            users.gateway,
+            otherCollector,
+            users.indexer,
+            users.verifier,
+            uint128(0)
+        );
+
+        resetPrank(users.verifier);
+        bytes memory expectedError = abi.encodeWithSelector(
+            ITAPCollector.TAPCollectorInvalidCollector.selector,
+            address(tapCollector),
+            otherCollector
+        );
+        vm.expectRevert(expectedError);
+        tapCollector.collect(IGraphPayments.PaymentTypes.QueryFee, data);
+    }
+
     function testTAPCollector_Collect_RevertWhen_NoProvision(uint256 tokens) public useGateway useSigner {
         tokens = bound(tokens, 1, type(uint128).max);
 

packages/subgraph-service/test/subgraphService/collect/query/query.t.sol

@@ -49,8 +49,9 @@ contract SubgraphServiceRegisterTest is SubgraphServiceTest {
             ITAPCollector.ReceiptAggregateVoucher({
                 collectionId: collectionId,
                 payer: users.gateway,
-                dataService: address(subgraphService),
+                collector: address(tapCollector),
                 serviceProvider: indexer,
+                dataService: address(subgraphService),
                 timestampNs: 0,
                 valueAggregate: tokens,
                 metadata: ""