superform-xyz · 0xTimepunk · Oct 25, 2024 · Oct 16, 2024 · Oct 16, 2024 · Oct 16, 2024
diff --git a/script/forge-scripts/safe/lib/DelegatePrank.sol b/script/forge-scripts/safe/lib/DelegatePrank.sol
@@ -20,27 +20,28 @@ import "forge-std/console.sol";
 
 */
 contract DelegatePrank is CommonBase {
-  Delegator delegator = makeDelegator();
-  function makeDelegator() internal returns (Delegator) {
-    return new Delegator();
-  }
-
-  function delegatePrank(address from, address to, bytes memory cd) public returns (bool success, bytes memory ret) {
-    bytes memory code = from.code;
-    vm.etch(from,address(delegator).code);
-    (success, ret) = from.call(abi.encodeCall(delegator.etchCodeAndDelegateCall,(to,cd,code)));
-  }
+    Delegator delegator = makeDelegator();
+
+    function makeDelegator() internal returns (Delegator) {
+        return new Delegator();
+    }
+
+    function delegatePrank(address from, address to, bytes memory cd) public returns (bool success, bytes memory ret) {
+        bytes memory code = from.code;
+        vm.etch(from, address(delegator).code);
+        (success, ret) = from.call(abi.encodeCall(delegator.etchCodeAndDelegateCall, (to, cd, code)));
+    }
 }
 
 contract Delegator is CommonBase {
-  function etchCodeAndDelegateCall(address dest, bytes memory cd, bytes calldata code) external payable virtual {
-    vm.etch(address(this),code);
-    assembly ("memory-safe") {
-      let result := delegatecall(gas(), dest, add(cd,32), mload(cd), 0, 0)
-      returndatacopy(0, 0, returndatasize())
-      switch result
-      case 0 { revert(0, returndatasize()) }
-      default { return(0, returndatasize()) }
+    function etchCodeAndDelegateCall(address dest, bytes memory cd, bytes calldata code) external payable virtual {
+        vm.etch(address(this), code);
+        assembly ("memory-safe") {
+            let result := delegatecall(gas(), dest, add(cd, 32), mload(cd), 0, 0)
+            returndatacopy(0, 0, returndatasize())
+            switch result
+            case 0 { revert(0, returndatasize()) }
+            default { return(0, returndatasize()) }
+        }
     }
-  }
 }
diff --git a/src/BaseForm.sol b/src/BaseForm.sol
@@ -16,7 +16,6 @@ import { IERC165 } from "openzeppelin-contracts/contracts/utils/introspection/IE
 /// @dev Abstract contract to be inherited by different Form implementations
 /// @author Zeropoint Labs
 abstract contract BaseForm is IBaseForm, Initializable, ERC165 {
-
     using DataLib for uint256;
 
     //////////////////////////////////////////////////////////////
@@ -254,7 +253,7 @@ abstract contract BaseForm is IBaseForm, Initializable, ERC165 {
     }
 
     /// @dev Checks if the Form implementation has the appropriate interface support
-    /// @param interfaceId_ is the interfaceId to check  
+    /// @param interfaceId_ is the interfaceId to check
     function supportsInterface(bytes4 interfaceId_) public view virtual override(ERC165, IERC165) returns (bool) {
         return interfaceId_ == type(IBaseForm).interfaceId || super.supportsInterface(interfaceId_);
     }

diff --git a/src/crosschain-data/extensions/AsyncStateRegistry.sol b/src/crosschain-data/extensions/AsyncStateRegistry.sol
@@ -361,9 +361,7 @@ contract AsyncStateRegistry is BaseStateRegistry, IAsyncStateRegistry {
     }
 
     /// @inheritdoc IAsyncStateRegistry
-    function getSyncWithdrawTxDataPayload(
-        uint256 payloadId_
-    )
+    function getSyncWithdrawTxDataPayload(uint256 payloadId_)
         external
         view
         returns (SyncWithdrawTxDataPayload memory syncWithdrawTxDataPayload_)

diff --git a/src/crosschain-data/utils/QuorumManager.sol b/src/crosschain-data/utils/QuorumManager.sol
@@ -8,7 +8,6 @@ import { Error } from "src/libraries/Error.sol";
 /// @dev Quorum thresholds using in sending proofs from chain to chain
 /// @author ZeroPoint Labs
 abstract contract QuorumManager is IQuorumManager {
-
     //////////////////////////////////////////////////////////////
     //                     STATE VARIABLES                      //
     //////////////////////////////////////////////////////////////

diff --git a/src/crosschain-liquidity/debridge/libraries/DeBridgeError.sol b/src/crosschain-liquidity/debridge/libraries/DeBridgeError.sol
@@ -35,4 +35,4 @@ library DeBridgeError {
 
     /// @dev if the swap router is invalid
     error INVALID_SWAP_ROUTER();
-}
+}
diff --git a/src/crosschain-liquidity/socket/SocketOneInchValidator.sol b/src/crosschain-liquidity/socket/SocketOneInchValidator.sol
@@ -9,7 +9,6 @@ import { ISocketOneInchImpl } from "src/vendor/socket/ISocketOneInchImpl.sol";
 /// @dev Asserts Socket same-chain txData is valid
 /// @author Zeropoint Labs
 contract SocketOneInchValidator is BridgeValidator {
-
     //////////////////////////////////////////////////////////////
     //                      CONSTRUCTOR                         //
     //////////////////////////////////////////////////////////////

diff --git a/src/forms/ERC4626FormImplementation.sol b/src/forms/ERC4626FormImplementation.sol
@@ -16,7 +16,6 @@ import { IERC4626 } from "openzeppelin-contracts/contracts/interfaces/IERC4626.s
 /// @dev Has common ERC4626 internal functions that can be re-used by implementations
 /// @author Zeropoint Labs
 abstract contract ERC4626FormImplementation is BaseForm, LiquidityHandler {
-
     using SafeERC20 for IERC20;
     using SafeERC20 for IERC4626;
     using DataLib for uint256;
@@ -229,7 +228,7 @@ abstract contract ERC4626FormImplementation is BaseForm, LiquidityHandler {
         /// superform data
         if (
             vars.assetDifference * ENTIRE_SLIPPAGE
-            < singleVaultData_.amount * (ENTIRE_SLIPPAGE - singleVaultData_.maxSlippage)
+                < singleVaultData_.amount * (ENTIRE_SLIPPAGE - singleVaultData_.maxSlippage)
         ) {
             revert Error.DIRECT_DEPOSIT_SWAP_FAILED();
         }
@@ -271,7 +270,6 @@ abstract contract ERC4626FormImplementation is BaseForm, LiquidityHandler {
     }
 
     function _processDirectWithdraw(InitSingleVaultData memory singleVaultData_) internal returns (uint256 assets) {
-
         DirectWithdrawLocalVars memory vars;
 
         /// @dev if there is no txData, on withdraws the receiver is receiverAddress, otherwise it

diff --git a/src/forms/interfaces/IERC4626Form.sol b/src/forms/interfaces/IERC4626Form.sol
@@ -7,7 +7,6 @@ import { IERC20 } from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol"
 /// @dev Interface for ERC4626Form
 /// @author Zeropoint Labs
 interface IERC4626Form is IERC20 {
-
     //////////////////////////////////////////////////////////////
     //              EXTERNAL VIEW FUNCTIONS                     //
     //////////////////////////////////////////////////////////////

diff --git a/src/interfaces/IAsyncStateRegistry.sol b/src/interfaces/IAsyncStateRegistry.sol
@@ -101,9 +101,7 @@ interface IAsyncStateRegistry {
     /// @notice retrieves the sync withdraw txData payload for a given payload ID
     /// @param payloadId_ The ID of the payload
     /// @return syncWithdrawTxDataPayload_ for the specified payload ID
-    function getSyncWithdrawTxDataPayload(
-        uint256 payloadId_
-    )
+    function getSyncWithdrawTxDataPayload(uint256 payloadId_)
         external
         view
         returns (SyncWithdrawTxDataPayload memory syncWithdrawTxDataPayload_);

diff --git a/src/interfaces/IBaseForm.sol b/src/interfaces/IBaseForm.sol
@@ -9,7 +9,6 @@ import { IERC4626 } from "openzeppelin-contracts/contracts/interfaces/IERC4626.s
 /// @dev Interface for BaseForm
 /// @author ZeroPoint Labs
 interface IBaseForm is IERC165 {
-
     //////////////////////////////////////////////////////////////
     //                          EVENTS                           //
     //////////////////////////////////////////////////////////////

diff --git a/src/interfaces/IBaseRouter.sol b/src/interfaces/IBaseRouter.sol
@@ -7,7 +7,6 @@ import "src/types/DataTypes.sol";
 /// @dev Interface for abstract BaseRouter
 /// @author Zeropoint Labs
 interface IBaseRouter {
-
     //////////////////////////////////////////////////////////////
     //              EXTERNAL WRITE FUNCTIONS                    //
     //////////////////////////////////////////////////////////////

diff --git a/src/interfaces/IBroadcastAmbImplementation.sol b/src/interfaces/IBroadcastAmbImplementation.sol
@@ -5,7 +5,6 @@ pragma solidity ^0.8.23;
 /// @dev Interface for AMBs used in Broadcasting
 /// @author ZeroPoint Labs
 interface IBroadcastAmbImplementation {
-
     //////////////////////////////////////////////////////////////
     //                          EVENTS                          //
     //////////////////////////////////////////////////////////////

diff --git a/src/interfaces/ICoreStateRegistry.sol b/src/interfaces/ICoreStateRegistry.sol
@@ -5,7 +5,6 @@ pragma solidity ^0.8.23;
 /// @dev Interface for CoreStateRegistry
 /// @author ZeroPoint Labs
 interface ICoreStateRegistry {
-
     //////////////////////////////////////////////////////////////
     //                           STRUCTS                        //
     //////////////////////////////////////////////////////////////
@@ -34,10 +33,7 @@ interface ICoreStateRegistry {
 
     /// @dev is emitted when a rescue is proposed for failed deposits in a payload
     event RescueProposed(
-        uint256 indexed payloadId,
-        uint256[] superformIds,
-        uint256[] proposedAmount,
-        uint256 proposedTime
+        uint256 indexed payloadId, uint256[] superformIds, uint256[] proposedAmount, uint256 proposedTime
     );
 
     /// @dev is emitted when an user disputed his refund amounts
@@ -64,7 +60,11 @@ interface ICoreStateRegistry {
     /// @param finalAmount_ is the final amount of tokens received
     /// @param amount_ is the indicated amount of tokens to be received
     /// @param maxSlippage_ is the amount of acceptable slippage for the transaction
-    function validateSlippage(uint256 finalAmount_, uint256 amount_, uint256 maxSlippage_)
+    function validateSlippage(
+        uint256 finalAmount_,
+        uint256 amount_,
+        uint256 maxSlippage_
+    )
         external
         view
         returns (bool);

diff --git a/src/interfaces/IDstSwapper.sol b/src/interfaces/IDstSwapper.sol
@@ -5,7 +5,6 @@ pragma solidity ^0.8.23;
 /// @dev Interface for DstSwapper
 /// @author Zeropoint Labs
 interface IDstSwapper {
-
     //////////////////////////////////////////////////////////////
     //                           STRUCTS                         //
     //////////////////////////////////////////////////////////////

diff --git a/src/interfaces/IEmergencyQueue.sol b/src/interfaces/IEmergencyQueue.sol
@@ -7,7 +7,6 @@ import { InitSingleVaultData } from "src/types/DataTypes.sol";
 /// @dev Interface for EmergencyQueue
 /// @author ZeroPoint Labs
 interface IEmergencyQueue {
-
     //////////////////////////////////////////////////////////////
     //                          EVENTS                          //
     //////////////////////////////////////////////////////////////

diff --git a/src/interfaces/IPayMaster.sol b/src/interfaces/IPayMaster.sol
@@ -7,7 +7,6 @@ import { LiqRequest } from "src/types/DataTypes.sol";
 /// @dev Interface for PayMaster
 /// @author ZeroPoint Labs
 interface IPayMaster {
-
     //////////////////////////////////////////////////////////////
     //                          EVENTS                          //
     //////////////////////////////////////////////////////////////

diff --git a/src/interfaces/IQuorumManager.sol b/src/interfaces/IQuorumManager.sol
@@ -5,7 +5,6 @@ pragma solidity ^0.8.23;
 /// @dev Interface for QuorumManager
 /// @author ZeroPoint Labs
 interface IQuorumManager {
-
     //////////////////////////////////////////////////////////////
     //                          EVENTS                           //
     //////////////////////////////////////////////////////////////

diff --git a/src/interfaces/ISuperPositions.sol b/src/interfaces/ISuperPositions.sol
@@ -8,7 +8,6 @@ import { AMBMessage } from "../types/DataTypes.sol";
 /// @dev Interface for SuperPositions
 /// @author Zeropoint Labs
 interface ISuperPositions is IERC1155A {
-
     //////////////////////////////////////////////////////////////
     //                          STRUCTS                         //
     //////////////////////////////////////////////////////////////
@@ -17,7 +16,7 @@ interface ISuperPositions is IERC1155A {
         uint256 txInfo;
         address receiverAddressSP;
     }
-    
+
     //////////////////////////////////////////////////////////////
     //                          EVENTS                          //
     //////////////////////////////////////////////////////////////

diff --git a/src/interfaces/ISuperRBAC.sol b/src/interfaces/ISuperRBAC.sol
@@ -7,7 +7,6 @@ import { IAccessControl } from "openzeppelin-contracts/contracts/access/IAccessC
 /// @dev Interface for SuperRBAC
 /// @author Zeropoint Labs
 interface ISuperRBAC is IAccessControl {
-
     //////////////////////////////////////////////////////////////
     //                           STRUCTS                         //
     //////////////////////////////////////////////////////////////

diff --git a/src/interfaces/ISuperformFactory.sol b/src/interfaces/ISuperformFactory.sol
@@ -5,7 +5,6 @@ pragma solidity ^0.8.23;
 /// @dev Interface for SuperformFactory
 /// @author ZeroPoint Labs
 interface ISuperformFactory {
-
     //////////////////////////////////////////////////////////////
     //                         CONSTANTS                        //
     //////////////////////////////////////////////////////////////

diff --git a/src/interfaces/ISuperformRouterPlusAsync.sol b/src/interfaces/ISuperformRouterPlusAsync.sol
@@ -18,6 +18,9 @@ interface ISuperformRouterPlusAsync is IBaseSuperformRouterPlus {
     /// @notice thrown if the caller is not router plus
     error NOT_ROUTER_PLUS();
 
+    /// @notice thrown if the caller is not core state registry rescuer
+    error NOT_CORE_STATE_REGISTRY_RESCUER();
+
     /// @notice thrown if the rebalance to update is invalid
     error COMPLETE_REBALANCE_INVALID_TX_DATA_UPDATE();
 
@@ -44,17 +47,17 @@ interface ISuperformRouterPlusAsync is IBaseSuperformRouterPlus {
     /// @notice thrown to avoid processing the same rebalance payload twice
     error REBALANCE_ALREADY_PROCESSED();
 
-    /// @notice thrown when the refund proposer is invalid
-    error INVALID_PROPOSER();
+    /// @notice thrown when the refund requester is not the payload receiver
+    error INVALID_REQUESTER();
 
     /// @notice thrown when the refund payload is invalid
     error INVALID_REFUND_DATA();
 
-    /// @notice thrown when refund is already proposed
-    error REFUND_ALREADY_PROPOSED();
+    /// @notice thrown when requestedrefund amount exceeds received amount
+    error REFUND_AMOUNT_EXCEEDS_EXPECTED_AMOUNT();
 
-    /// @notice thrown if the refund is still in dispute phase
-    error IN_DISPUTE_PHASE();
+    /// @notice thrown when the refund payload is already approved
+    error REFUND_ALREADY_APPROVED();
 
     //////////////////////////////////////////////////////////////
     //                       EVENTS                             //
@@ -168,16 +171,12 @@ interface ISuperformRouterPlusAsync is IBaseSuperformRouterPlus {
         payable
         returns (bool rebalanceSuccessful);
 
-    /// @notice allows the receiver / disputer to protect against malicious processors
-    /// @param finalPayloadId_ is the unique identifier of the refund
-    function disputeRefund(uint256 finalPayloadId_) external;
-
-    /// @notice allows the rescuer to propose a new refund amount after a successful dispute
-    /// @param finalPayloadId_ is the unique identifier of the refund
-    /// @param refundAmount_ is the new refund amount proposed
-    function proposeRefund(uint256 finalPayloadId_, uint256 refundAmount_) external;
+    /// @notice allows the user to request a refund for the rebalance
+    /// @param requestedAmount_ the amount to be refunded
+    function requestRefund(uint256 requestedAmount_, uint256 routerplusPayloadId_) external;
 
-    /// @notice allows the user to claim their refund post the dispute period
-    /// @param finalPayloadId_ is the unique identifier of the refund
-    function finalizeRefund(uint256 finalPayloadId_) external;
+    /// @dev only callable by core state registry rescuer
+    /// @notice approves a refund for the rebalance and sends funds to the receiver
+    /// @param routerplusPayloadId_ the router plus payload id
+    function approveRefund(uint256 routerplusPayloadId_) external;
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,4 +35,4 @@ library DeBridgeError { @@
         /// @dev if the swap router is invalid
         error INVALID_SWAP_ROUTER();
-    }
+    }