chore: revert adding collector address to RAV

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

Author: tmigone

packages/horizon/contracts/interfaces/ITAPCollector.sol

@@ -29,8 +29,6 @@ interface ITAPCollector is IPaymentsCollector {
         bytes32 collectionId;
         // The address of the payer the RAV was issued by
         address payer;
-        // 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
@@ -104,13 +102,6 @@ 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 collector,address serviceProvider,address dataService,uint64 timestampNs,uint128 valueAggregate,bytes metadata)"
+            "ReceiptAggregateVoucher(address payer,address serviceProvider,address dataService,uint64 timestampNs,uint128 valueAggregate,bytes metadata)"
         );
 
     /// @notice Authorization details for payer-signer pairs
@@ -168,12 +168,6 @@ contract TAPCollector is EIP712, GraphDirectory, ITAPCollector {
     ) private returns (uint256) {
         (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,
@@ -266,7 +260,6 @@ contract TAPCollector is EIP712, GraphDirectory, ITAPCollector {
                     abi.encode(
                         EIP712_RAV_TYPEHASH,
                         _rav.payer,
-                        _rav.collector,
                         _rav.serviceProvider,
                         _rav.dataService,
                         _rav.timestampNs,

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

@@ -42,7 +42,6 @@ contract TAPCollectorCollectTest is TAPCollectorTest {
     function _getRAV(
         address _allocationId,
         address _payer,
-        address _collector,
         address _indexer,
         address _dataService,
         uint128 _tokens
@@ -51,7 +50,6 @@ contract TAPCollectorCollectTest is TAPCollectorTest {
             ITAPCollector.ReceiptAggregateVoucher({
                 collectionId: bytes32(uint256(uint160(_allocationId))),
                 payer: _payer,
-                collector: _collector,
                 dataService: _dataService,
                 serviceProvider: _indexer,
                 timestampNs: 0,
@@ -111,27 +109,6 @@ 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);