f: add now to RecurringCollectorAgreementDeadlineElapsed

Author: matiasedgeandnode

packages/horizon/contracts/interfaces/IRecurringCollector.sol

@@ -238,9 +238,10 @@ interface IRecurringCollector is IAuthorizable, IPaymentsCollector {
 
     /**
      * Thrown when interacting with an agreement with an elapsed deadline
+     * @param currentTimestamp The current timestamp
      * @param deadline The elapsed deadline timestamp
      */
-    error RecurringCollectorAgreementDeadlineElapsed(uint64 deadline);
+    error RecurringCollectorAgreementDeadlineElapsed(uint256 currentTimestamp, uint64 deadline);
 
     /**
      * Thrown when the signer is invalid

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

@@ -83,7 +83,7 @@ contract RecurringCollector is EIP712, GraphDirectory, Authorizable, IRecurringC
         );
         require(
             signedRCA.rca.deadline >= block.timestamp,
-            RecurringCollectorAgreementDeadlineElapsed(signedRCA.rca.deadline)
+            RecurringCollectorAgreementDeadlineElapsed(block.timestamp, signedRCA.rca.deadline)
         );
 
         // check that the voucher is signed by the payer (or proxy)
@@ -175,7 +175,7 @@ contract RecurringCollector is EIP712, GraphDirectory, Authorizable, IRecurringC
     function update(SignedRCAU calldata signedRCAU) external {
         require(
             signedRCAU.rcau.deadline >= block.timestamp,
-            RecurringCollectorAgreementDeadlineElapsed(signedRCAU.rcau.deadline)
+            RecurringCollectorAgreementDeadlineElapsed(block.timestamp, signedRCAU.rcau.deadline)
         );
 
         AgreementData storage agreement = _getAgreementStorage(signedRCAU.rcau.agreementId);

packages/horizon/test/unit/payments/recurring-collector/accept.t.sol

@@ -26,6 +26,7 @@ contract RecurringCollectorAcceptTest is RecurringCollectorSharedTest {
 
         bytes memory expectedErr = abi.encodeWithSelector(
             IRecurringCollector.RecurringCollectorAgreementDeadlineElapsed.selector,
+            block.timestamp,
             fuzzySignedRCA.rca.deadline
         );
         vm.expectRevert(expectedErr);

packages/horizon/test/unit/payments/recurring-collector/update.t.sol

@@ -30,6 +30,7 @@ contract RecurringCollectorUpdateTest is RecurringCollectorSharedTest {
 
         bytes memory expectedErr = abi.encodeWithSelector(
             IRecurringCollector.RecurringCollectorAgreementDeadlineElapsed.selector,
+            block.timestamp,
             rcau.deadline
         );
         vm.expectRevert(expectedErr);