refactor: optimize refund mappings in RouterPlusAsync [sup 9339] (#659)

Co-authored-by: 0xTimepunk <jldcmartins@gmail.com>

Author: TamaraRingas

.github/workflows/CI.yml

@@ -8,7 +8,7 @@ on:
   push:
     branches: [main, develop, v1.5]
   pull_request:
-    branches: [main, develop, v1.5]
+    branches: [main, develop]
 
 env:
   BSC_RPC_URL: ${{ secrets.BSC_RPC_URL }}

src/interfaces/ISuperformRouterPlusAsync.sol

@@ -59,9 +59,6 @@ interface ISuperformRouterPlusAsync is IBaseSuperformRouterPlus {
     /// @notice thrown when requested refund amount is too high
     error REQUESTED_AMOUNT_TOO_HIGH();
 
-    /// @notice thrown when the refund payload is already approved
-    error REFUND_ALREADY_APPROVED();
-
     //////////////////////////////////////////////////////////////
     //                       EVENTS                             //
     //////////////////////////////////////////////////////////////

src/router-plus/SuperformRouterPlusAsync.sol

@@ -36,8 +36,6 @@ contract SuperformRouterPlusAsync is ISuperformRouterPlusAsync, BaseSuperformRou
     mapping(uint256 routerPlusPayloadId => Refund) public refunds;
     mapping(uint256 routerPlusPayloadId => bool processed) public processedRebalancePayload;
 
-    mapping(uint256 routerPlusPayloadId => bool approvedRefund) public approvedRefund;
-
     //////////////////////////////////////////////////////////////
     //                       MODIFIERS                          //
     //////////////////////////////////////////////////////////////
@@ -448,13 +446,9 @@ contract SuperformRouterPlusAsync is ISuperformRouterPlusAsync, BaseSuperformRou
 
     /// @inheritdoc ISuperformRouterPlusAsync
     function approveRefund(uint256 routerPlusPayloadId_) external onlyCoreStateRegistryRescuer {
-        if (approvedRefund[routerPlusPayloadId_]) revert REFUND_ALREADY_APPROVED();
-
         Refund memory r = refunds[routerPlusPayloadId_];
 
-        if (r.interimToken == address(0)) revert INVALID_REFUND_DATA();
-
-        approvedRefund[routerPlusPayloadId_] = true;
+        if (r.receiver == address(0) && r.interimToken == address(0)) revert INVALID_REFUND_DATA();
 
         /// @dev deleting to prevent re-entrancy
         delete refunds[routerPlusPayloadId_];

test/unit/router-plus/SuperformRouterPlus.t.sol

@@ -2430,6 +2430,8 @@ contract SuperformRouterPlusTest is ProtocolActions {
         uint64 REBALANCE_FROM = ETH;
         uint64 REBALANCE_TO = OP;
 
+        console2.log("Initializing XChain Deposit...");
+
         // Step 1: Initial XCHAIN Deposit
         _xChainDeposit(superformId5ETH, REBALANCE_FROM, 1);
 
@@ -2440,12 +2442,16 @@ contract SuperformRouterPlusTest is ProtocolActions {
 
         vm.startPrank(deployer);
 
+        console2.log("Starting Cross-Chain Rebalance...");
+
         SuperPositions(SUPER_POSITIONS_SOURCE).increaseAllowance(
             ROUTER_PLUS_SOURCE, superformId5ETH, args.sharesToRedeem
         );
         vm.recordLogs();
         SuperformRouterPlus(ROUTER_PLUS_SOURCE).startCrossChainRebalance{ value: 2 ether }(args);
 
+        console2.log("Processing XChain Withdraw (rebalance from)...");
+
         // Step 3: Process XChain Withdraw (rebalance from)
         uint256 balanceOfInterimAssetBefore =
             MockERC20(args.interimAsset).balanceOf(getContract(SOURCE_CHAIN, "SuperformRouterPlusAsync"));
@@ -2464,12 +2470,16 @@ contract SuperformRouterPlusTest is ProtocolActions {
         // Step 4: Complete cross-chain rebalance
         vm.startPrank(deployer);
 
+        console2.log("Completing Cross-Chain Rebalance...");
+
         completeArgs =
             _buildCompleteCrossChainRebalanceArgs(interimAmountOnRouterPlusAsync, superformId4OP, REBALANCE_TO);
         completeArgs.amountReceivedInterimAsset = completeArgs.amountReceivedInterimAsset / 3;
         SuperformRouterPlusAsync(ROUTER_PLUS_ASYNC_SOURCE).completeCrossChainRebalance{ value: 1 ether }(completeArgs);
         vm.stopPrank();
 
+        console2.log("Requesting Refund...");
+
         // Step 5: Request refund
 
         /// @dev testing invalid requester (not receiver)
@@ -2506,12 +2516,6 @@ contract SuperformRouterPlusTest is ProtocolActions {
         SuperformRouterPlusAsync(ROUTER_PLUS_ASYNC_SOURCE).approveRefund(1);
         vm.stopPrank();
 
-        /// @dev testing invalid refund data
-        vm.startPrank(deployer);
-        vm.expectRevert(ISuperformRouterPlusAsync.INVALID_REFUND_DATA.selector);
-        SuperformRouterPlusAsync(ROUTER_PLUS_ASYNC_SOURCE).approveRefund(3);
-        vm.stopPrank();
-
         /// @dev testing valid refund approval
         uint256 balanceBefore = MockERC20(refundToken).balanceOf(deployer);
         uint256 routerBalanceBefore = MockERC20(refundToken).balanceOf(address(ROUTER_PLUS_ASYNC_SOURCE));
@@ -2536,7 +2540,7 @@ contract SuperformRouterPlusTest is ProtocolActions {
 
         /// @dev testing refund already approved
         vm.startPrank(deployer);
-        vm.expectRevert(ISuperformRouterPlusAsync.REFUND_ALREADY_APPROVED.selector);
+        vm.expectRevert();
         SuperformRouterPlusAsync(ROUTER_PLUS_ASYNC_SOURCE).approveRefund(1);
         vm.stopPrank();
     }