fix: fix retry failed payments

src/modules/paymentProcessor/PP_Connext_Crosschain_v1.sol

@@ -50,7 +50,7 @@ contract PP_Connext_Crosschain_v1 is PP_Crosschain_v1 {
     mapping(
         address paymentClient
             => mapping(
-                address recipient => mapping(bytes32 intentId => uint amount)
+                address recipient => mapping(bytes intentId => uint amount)
             )
     ) public failedTransfers;
 
@@ -88,76 +88,88 @@ contract PP_Connext_Crosschain_v1 is PP_Crosschain_v1 {
     ) external {
         IERC20PaymentClientBase_v1.PaymentOrder[] memory orders;
         (orders,,) = client.collectPaymentOrders();
-
+        address clientAddress = address(client);
         for (uint i = 0; i < orders.length; i++) {
-            bytes memory bridgeData = _executeBridgeTransfer(
-                orders[i], executionData, address(client)
-            );
-
-            _bridgeData[i] = bridgeData;
-            emit PaymentOrderProcessed(
-                address(client),
-                orders[i].recipient,
-                orders[i].paymentToken,
-                orders[i].amount,
-                orders[i].start,
-                orders[i].cliff,
-                orders[i].end
-            );
-            _paymentId++;
-            intentId[address(client)][orders[i].recipient] = bytes32(bridgeData);
-            client.amountPaid(orders[i].paymentToken, orders[i].amount);
+            bytes memory bridgeData =
+                _executeBridgeTransfer(orders[i], executionData);
+
+            if (bytes32(bridgeData) == bytes32(0)) {
+                // Handle failed transfer
+                failedTransfers[clientAddress][orders[i].recipient][executionData]
+                = orders[i].amount;
+                emit TransferFailed(
+                    clientAddress,
+                    orders[i].recipient,
+                    executionData,
+                    orders[i].amount
+                );
+            } else {
+                // Handle successful transfer
+                _bridgeData[i] = bridgeData;
+                emit PaymentOrderProcessed(
+                    address(client),
+                    orders[i].recipient,
+                    orders[i].paymentToken,
+                    orders[i].amount,
+                    orders[i].start,
+                    orders[i].cliff,
+                    orders[i].end
+                );
+                _paymentId++;
+                intentId[address(client)][orders[i].recipient] =
+                    bytes32(bridgeData);
+                client.amountPaid(orders[i].paymentToken, orders[i].amount);
+            }
         }
     }
 
     /**
      * @notice Cancels a pending transfer and returns funds to the client
      * @param client The payment client address
      * @param recipient The recipient address
-     * @param pendingIntentId The intentId to cancel
+     * @param executionData The execution data to cancel
      * @param order The payment order details
      */
     function cancelTransfer(
         address client,
         address recipient,
-        bytes32 pendingIntentId,
+        bytes memory executionData,
         IERC20PaymentClientBase_v1.PaymentOrder memory order
     ) external {
-        _validateTransferRequest(client, recipient, pendingIntentId);
-        _cleanupFailedTransfer(client, recipient, pendingIntentId);
+        _validateTransferRequest(client, recipient, executionData);
+        _cleanupFailedTransfer(client, recipient, executionData);
 
         if (!IERC20(order.paymentToken).transfer(recipient, order.amount)) {
             revert FailedTransfer();
         }
 
-        emit TransferCancelled(client, recipient, pendingIntentId, order.amount);
+        emit TransferCancelled(client, recipient, executionData, order.amount);
     }
 
     /**
      * @notice Retries a previously failed transfer
      * @param client The payment client address
      * @param recipient The recipient address
-     * @param pendingIntentId The failed intent ID
      * @param order The payment order details
      * @param executionData New execution data for retry
      */
     function retryFailedTransfer(
         address client,
         address recipient,
-        bytes32 pendingIntentId,
-        IERC20PaymentClientBase_v1.PaymentOrder memory order,
-        bytes memory executionData
+        bytes memory executionData,
+        bytes memory newExecutionData,
+        IERC20PaymentClientBase_v1.PaymentOrder memory order
     ) external {
-        _validateTransferRequest(client, recipient, pendingIntentId);
+        _validateTransferRequest(client, recipient, executionData);
 
-        bytes32 newIntentId = _createCrossChainIntent(order, executionData);
+        bytes32 newIntentId = _createCrossChainIntent(order, newExecutionData);
         if (newIntentId == bytes32(0)) {
             revert Module__PP_Crosschain__MessageDeliveryFailed(
                 8453, 8453, executionData
             );
         }
 
-        _cleanupFailedTransfer(client, recipient, pendingIntentId);
+        _cleanupFailedTransfer(client, recipient, executionData);
         intentId[client][recipient] = newIntentId;
     }
 
@@ -181,24 +193,13 @@ contract PP_Connext_Crosschain_v1 is PP_Crosschain_v1 {
      * @dev Execute the cross-chain bridge transfer
      * @param order The payment order containing transfer details
      * @param executionData Additional execution parameters
-     * @param client The client address
      * @return bridgeData Data returned by the bridge implementation
      */
     function _executeBridgeTransfer(
         IERC20PaymentClientBase_v1.PaymentOrder memory order,
-        bytes memory executionData,
-        address client
-    ) internal returns (bytes memory) {
+        bytes memory executionData
+    ) internal override returns (bytes memory) {
         bytes32 _intentId = _createCrossChainIntent(order, executionData);
-
-        if (_intentId == bytes32(0)) {
-            failedTransfers[client][order.recipient][_intentId] = order.amount;
-            intentId[client][order.recipient] = _intentId;
-            emit TransferFailed(
-                client, order.recipient, _intentId, order.amount
-            );
-        }
-
         return abi.encode(_intentId);
     }
 
@@ -252,23 +253,18 @@ contract PP_Connext_Crosschain_v1 is PP_Crosschain_v1 {
      * @dev Validates a transfer request
      * @param client The payment client address
      * @param recipient The recipient address
-     * @param pendingIntentId The intent ID to validate
-     * @return The amount of the failed transfer
+     * @param executionData The execution data
      */
     function _validateTransferRequest(
         address client,
         address recipient,
-        bytes32 pendingIntentId
+        bytes memory executionData
     ) internal view returns (uint) {
         if (msg.sender != client) {
             revert Module__InvalidAddress();
         }
 
-        if (intentId[client][recipient] != pendingIntentId) {
-            revert Module__PP_Crosschain__InvalidIntentId();
-        }
-
-        uint failedAmount = failedTransfers[client][recipient][pendingIntentId];
+        uint failedAmount = failedTransfers[client][recipient][executionData];
         if (failedAmount == 0) {
             revert Module__CrossChainBase__InvalidAmount();
         }
@@ -280,15 +276,15 @@ contract PP_Connext_Crosschain_v1 is PP_Crosschain_v1 {
      * @dev Cleans up storage after handling a failed transfer
      * @param client The payment client address
      * @param recipient The recipient address
-     * @param pendingIntentId The intent ID to clean up
+     * @param executionData The execution data
      */
     function _cleanupFailedTransfer(
         address client,
         address recipient,
-        bytes32 pendingIntentId
+        bytes memory executionData
     ) internal {
         delete intentId[client][recipient];
-        delete failedTransfers[client][recipient][pendingIntentId];
+        delete failedTransfers[client][recipient][executionData];
     }
 
     /**

src/modules/paymentProcessor/abstracts/CrossChainBase_v1.sol

@@ -68,5 +68,5 @@ abstract contract CrossChainBase_v1 is ICrossChainBase_v1, Module_v1 {
     function _executeBridgeTransfer(
         IERC20PaymentClientBase_v1.PaymentOrder memory order,
         bytes memory executionData
-    ) internal virtual returns (bytes memory)
+    ) internal virtual returns (bytes memory);
 }

src/modules/paymentProcessor/interfaces/IPP_Crosschain_v1.sol

@@ -13,12 +13,12 @@ interface IPP_Crosschain_v1 is IPaymentProcessor_v1 {
     /// @notice Emitted when a cross-chain transfer fails to complete
     /// @param client The address initiating the transfer
     /// @param recipient The intended recipient of the transfer
-    /// @param intentId The unique identifier for this transfer attempt
+    /// @param executionData The unique identifier for this transfer attempt
     /// @param amount The amount that failed to transfer
     event TransferFailed(
         address indexed client,
         address indexed recipient,
-        bytes32 indexed intentId,
+        bytes indexed executionData,
         uint amount
     );
 
@@ -42,7 +42,7 @@ interface IPP_Crosschain_v1 is IPaymentProcessor_v1 {
     event TransferCancelled(
         address indexed client,
         address indexed recipient,
-        bytes32 indexed intentId,
+        bytes indexed intentId,
         uint amount
     );
 

test/modules/paymentProcessor/PP_Connext_Crosschain_v1_Test.t.sol

@@ -508,16 +508,21 @@ contract PP_Connext_Crosschain_v1_Test is ModuleTest {
         IERC20PaymentClientBase_v1.PaymentOrder[] memory orders =
             _setupSinglePayment(recipient, amount);
 
+        // Store the initial execution data that will fail
+        bytes memory failingExecutionData = abi.encode(333, 1); // maxFee of 333 will cause failure
+
         // First attempt with high maxFee to force failure
         paymentProcessor.processPayments(
             IERC20PaymentClientBase_v1(address(paymentClient)),
-            abi.encode(333, 1) // maxFee of 333 will cause failure
+            failingExecutionData
         );
 
-        // Verify failed transfer was recorded
+        // Verify failed transfer was recorded with the failing execution data
         assertEq(
             paymentProcessor.failedTransfers(
-                address(paymentClient), recipient, bytes32(0)
+                address(paymentClient),
+                recipient,
+                failingExecutionData // Use the same execution data that was used in processPayments
             ),
             orders[0].amount
         );
@@ -527,16 +532,18 @@ contract PP_Connext_Crosschain_v1_Test is ModuleTest {
         paymentProcessor.retryFailedTransfer(
             address(paymentClient),
             recipient,
-            bytes32(0),
-            orders[0],
-            abi.encode(0, 1) // proper maxFee and ttl
+            failingExecutionData, // Old execution data that failed
+            executionData, // New execution data for retry
+            orders[0]
         );
 
         // Verify:
         // 1. Failed transfer record was cleared
         assertEq(
             paymentProcessor.failedTransfers(
-                address(paymentClient), recipient, bytes32(0)
+                address(paymentClient),
+                recipient,
+                failingExecutionData // Check using the original failing execution data
             ),
             0
         );
@@ -564,30 +571,28 @@ contract PP_Connext_Crosschain_v1_Test is ModuleTest {
         IERC20PaymentClientBase_v1.PaymentOrder[] memory orders =
             _setupSinglePayment(recipient, amount);
         paymentClient.addPaymentOrder(orders[0]);
+        bytes memory executionData = abi.encode(333, 1);
         //call processPayments with maxFee = 333
         paymentProcessor.processPayments(
-            IERC20PaymentClientBase_v1(address(paymentClient)),
-            abi.encode(333, 1)
+            IERC20PaymentClientBase_v1(address(paymentClient)), executionData
         );
-        console2.log("Fucker who seneeed", address(this));
         // see if failed failedTransfers updates
         assertEq(
             paymentProcessor.failedTransfers(
-                address(paymentClient), recipient, bytes32(0)
+                address(paymentClient), recipient, executionData
             ),
             orders[0].amount
         );
 
         uint failedIntentId = paymentProcessor.failedTransfers(
-            address(paymentClient), recipient, bytes32(0)
+            address(paymentClient), recipient, executionData
         );
-        console2.log("AMOUNT", failedIntentId);
         assertEq(failedIntentId, orders[0].amount);
 
         // Cancel as recipient
         vm.prank(address(paymentClient));
         paymentProcessor.cancelTransfer(
-            address(paymentClient), recipient, bytes32(0), orders[0]
+            address(paymentClient), recipient, executionData, orders[0]
         );
 
         // Verify intentId was cleared
@@ -637,7 +642,7 @@ contract PP_Connext_Crosschain_v1_Test is ModuleTest {
 
         vm.expectRevert(IModule_v1.Module__InvalidAddress.selector);
         paymentProcessor.cancelTransfer(
-            address(paymentClient), testRecipient, pendingIntentId, order
+            address(paymentClient), testRecipient, executionData, order
         );
     }
 

test/modules/paymentProcessor/abstracts/CrossChainBase_v1_Test.t.sol

@@ -58,7 +58,7 @@ contract CrossChainBase_v1_Test is ModuleTest {
     function setUp() public {
         //This function is used to setup the unit test
         //Deploy the SuT
-        address impl = address(new CrossChainBase_v1_Exposed(block.chainid));
+        address impl = address(new CrossChainBase_v1_Exposed());
         crossChainBase = CrossChainBase_v1_Exposed(Clones.clone(impl));
 
         //Setup the module to test

test/modules/paymentProcessor/abstracts/CrosschainBase_v1.t.sol

@@ -41,7 +41,7 @@ contract CrossChainBase_v1_Test is ModuleTest {
     function setUp() public {
         //This function is used to setup the unit test
         //Deploy the SuT
-        address impl = address(new CrossChainBase_v1_Exposed(block.chainid));
+        address impl = address(new CrossChainBase_v1_Exposed());
         crossChainBase = CrossChainBase_v1_Exposed(Clones.clone(impl));
 
         //Setup the module to test

test/utils/mocks/modules/paymentProcessor/CrossChainBase_v1_Exposed.sol

@@ -8,9 +8,29 @@ import {IERC20PaymentClientBase_v1} from
     "@lm/interfaces/IERC20PaymentClientBase_v1.sol";
 
 contract CrossChainBase_v1_Exposed is CrossChainBase_v1 {
-    constructor(uint chainId_) CrossChainBase_v1() {}
     ///// @inheritdoc CrossChainBase_v1
 
+    function _executeBridgeTransfer(
+        IERC20PaymentClientBase_v1.PaymentOrder memory order,
+        bytes memory executionData
+    ) internal pure override returns (bytes memory) {
+        return "";
+    }
+
+    function getBridgeData(uint paymentId)
+        public
+        pure
+        override
+        returns (bytes memory)
+    {
+        return "";
+    }
+
+    function processPayments(IERC20PaymentClientBase_v1 client)
+        external
+        override
+    {}
+
     function exposed_executeBridgeTransfer(
         IERC20PaymentClientBase_v1.PaymentOrder memory order,
         bytes memory executionData

test/utils/mocks/modules/paymentProcessor/PP_Connext_Crosschain_v1_Exposed.sol

@@ -26,7 +26,7 @@ contract PP_Connext_Crosschain_v1_Exposed is PP_Connext_Crosschain_v1 {
     function exposed_setFailedTransfer(
         address client,
         address recipient,
-        bytes32 intentId,
+        bytes memory intentId,
         uint amount
     ) external {
         failedTransfers[client][recipient][intentId] = amount;