@pendle/core-v2 6.3.2-swaphubtest2 → 6.3.3

package/contracts/cross-chain/swap-hub/SwapHubBase.sol

@@ -1,273 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity ^0.8.30;
-
-import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import {Create2} from "@openzeppelin/contracts/utils/Create2.sol";
-import {SignatureChecker} from "@openzeppelin/contracts/utils/cryptography/SignatureChecker.sol";
-import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";
-import {BoringOwnableUpgradeableV2} from "../../core/libraries/BoringOwnableUpgradeableV2.sol";
-import {TokenHelper} from "../../core/libraries/TokenHelper.sol";
-import {IPCrossChainSwapHub} from "../../interfaces/IPCrossChainSwapHub.sol";
-import {IPDepositBox} from "../../interfaces/IPDepositBox.sol";
-import {IPSwapExecutor, SwapData} from "./swap/IPSwapExecutor.sol";
-import {DepositBox} from "./DepositBox.sol";
-
-abstract contract SwapHubBase is IPCrossChainSwapHub, EIP712Upgradeable, BoringOwnableUpgradeableV2, TokenHelper {
-    // forgefmt: disable-next-item
-    bytes32 internal constant WITHDRAW_TOKEN_MESSAGE_TYPEHASH = keccak256(
-        "WithdrawTokenMessage("
-            "address owner,"
-            "uint32 boxId,"
-            "uint256 expiry,"
-            "uint256 nonce,"
-            //
-            "address receiver,"
-            "address token,"
-            "uint256 amountWithdraw,"
-            "uint256 amountFee"
-        ")"
-    );
-
-    // forgefmt: disable-next-item
-    bytes32 internal constant BRIDGE_TOKEN_MESSAGE_TYPEHASH = keccak256(
-        "BridgeTokenMessage("
-            "address owner,"
-            "uint32 boxId,"
-            "uint256 expiry,"
-            "uint256 nonce,"
-            //
-            "address token,"
-            "uint256 amountBridge,"
-            "uint256 amountFee,"
-            //
-            "address bridgeExtRouter,"
-            "bytes bridgeCalldata"
-        ")"
-    );
-
-    // forgefmt: disable-next-item
-    bytes32 internal constant SWAP_TOKEN_MESSAGE_TYPEHASH = keccak256(
-        "SwapTokenMessage("
-            "address owner,"
-            "uint32 boxId,"
-            "uint256 expiry,"
-            "uint256 nonce,"
-            //
-            "address tokenSpent,"
-            "uint256 amountSpent,"
-            "uint256 amountFee,"
-            "address tokenReceived,"
-            "uint256 minReceived,"
-            "address receiver,"
-            //
-            "address swapExecutor,"
-            "address swapExtRouter,"
-            "bytes swapCalldata"
-        ")"
-    );
-
-    // forgefmt: disable-next-item
-    bytes32 internal constant BUY_CROSS_CHAIN_PT_MESSAGE_TYPEHASH = keccak256(
-        "BuyCrossChainPtMessage("
-            "address owner,"
-            "uint32 boxId,"
-            "uint256 expiry,"
-            "uint256 nonce,"
-            //
-            "address tokenSpent,"
-            "uint256 amountSpent,"
-            "uint256 amountFee,"
-            "address ptAdapter,"
-            "uint256 minPtReceived,"
-            "uint32 dstEid,"
-            "bytes32 receiver,"
-            //
-            "address swapExecutor,"
-            "address swapExtRouter,"
-            "bytes swapCalldata"
-        ")"
-    );
-
-    /// @dev creation code of OpenZeppelin's BeaconProxy
-    address public immutable BEACON_PROXY_CODE_CONTRACT;
-    address public immutable DEPOSIT_BOX_BEACON;
-    bytes32 public immutable DEPOSIT_BOX_CODE_HASH;
-
-    mapping(address owner => uint256 nonce) public ownerNonce;
-    mapping(bytes32 actionStatus => ActionStatus) public actionStatus;
-    mapping(address executor => bool) public isExecutor;
-
-    constructor(address beaconProxyCodeContract_, address depositBoxBeacon_) {
-        BEACON_PROXY_CODE_CONTRACT = beaconProxyCodeContract_;
-        DEPOSIT_BOX_BEACON = depositBoxBeacon_;
-        DEPOSIT_BOX_CODE_HASH =
-            keccak256(abi.encodePacked(beaconProxyCodeContract_.code, abi.encode(depositBoxBeacon_, "")));
-    }
-
-    modifier onlyExecutor() {
-        require(isExecutor[msg.sender], "SwapHub: caller is not executor");
-        _;
-    }
-
-    function setExecutor(address executor, bool isExecutor_) external onlyOwner {
-        isExecutor[executor] = isExecutor_;
-        emit SetExecutor(executor, isExecutor_);
-    }
-
-    function computeDepositBox(address owner, uint32 boxId) public view returns (address box, bytes32 salt) {
-        salt = keccak256(abi.encode(owner, boxId));
-        box = Create2.computeAddress(salt, DEPOSIT_BOX_CODE_HASH);
-    }
-
-    function _checkAndDeployBox(address owner, uint32 boxId) internal returns (IPDepositBox) {
-        (address box, bytes32 salt) = computeDepositBox(owner, boxId);
-        if (box.code.length > 0) {
-            return IPDepositBox(box);
-        }
-
-        bytes memory bytecode = abi.encodePacked(BEACON_PROXY_CODE_CONTRACT.code, abi.encode(DEPOSIT_BOX_BEACON, ""));
-        assert(Create2.deploy(0, salt, bytecode) == box);
-        DepositBox(payable(box)).initialize(owner, boxId);
-        return IPDepositBox(box);
-    }
-
-    function hashTypedData(WithdrawTokenMessage memory message) public view returns (bytes32) {
-        return _hashTypedDataV4(
-            keccak256(
-                abi.encode(
-                    WITHDRAW_TOKEN_MESSAGE_TYPEHASH,
-                    message.owner,
-                    message.boxId,
-                    message.expiry,
-                    message.nonce,
-                    //
-                    message.receiver,
-                    message.token,
-                    message.amountWithdraw,
-                    message.amountFee
-                )
-            )
-        );
-    }
-
-    function hashTypedData(BridgeTokenMessage memory message) public view returns (bytes32) {
-        return _hashTypedDataV4(
-            keccak256(
-                abi.encode(
-                    BRIDGE_TOKEN_MESSAGE_TYPEHASH,
-                    message.owner,
-                    message.boxId,
-                    message.expiry,
-                    message.nonce,
-                    //
-                    message.token,
-                    message.amountBridge,
-                    message.amountFee,
-                    //
-                    message.bridgeExtRouter,
-                    keccak256(message.bridgeCalldata)
-                )
-            )
-        );
-    }
-
-    function hashTypedData(SwapTokenMessage memory message) public view returns (bytes32) {
-        return _hashTypedDataV4(
-            keccak256(
-                abi.encode(
-                    SWAP_TOKEN_MESSAGE_TYPEHASH,
-                    message.owner,
-                    message.boxId,
-                    message.expiry,
-                    message.nonce,
-                    //
-                    message.tokenSpent,
-                    message.amountSpent,
-                    message.amountFee,
-                    message.tokenReceived,
-                    message.minReceived,
-                    message.receiver,
-                    //
-                    message.swapExecutor,
-                    message.swapExtRouter,
-                    keccak256(message.swapCalldata)
-                )
-            )
-        );
-    }
-
-    function hashTypedData(BuyCrossChainPtMessage memory message) public view returns (bytes32) {
-        return _hashTypedDataV4(
-            keccak256(
-                abi.encode(
-                    BUY_CROSS_CHAIN_PT_MESSAGE_TYPEHASH,
-                    message.owner,
-                    message.boxId,
-                    message.expiry,
-                    message.nonce,
-                    //
-                    message.tokenSpent,
-                    message.amountSpent,
-                    message.amountFee,
-                    message.ptAdapter,
-                    message.minPtReceived,
-                    message.dstEid,
-                    message.receiver,
-                    //
-                    message.swapExecutor,
-                    message.swapExtRouter,
-                    keccak256(message.swapCalldata)
-                )
-            )
-        );
-    }
-
-    function _verifyOwnerSig(
-        address owner,
-        uint256 expiry,
-        uint256 nonce,
-        bytes32 messageHash,
-        bytes memory signature,
-        bool verifyNonce
-    ) internal {
-        _verifyOwnerSig(owner, expiry, messageHash, signature);
-        if (verifyNonce) _verifyAndIncreaseNonce(owner, nonce);
-    }
-
-    function _verifyOwnerSig(address owner, uint256 expiry, bytes32 messageHash, bytes memory signature) internal view {
-        require(SignatureChecker.isValidSignatureNow(owner, messageHash, signature), InvalidSignature());
-        require(expiry > block.timestamp, MessageExpired());
-    }
-
-    function _verifyAndIncreaseNonce(address owner, uint256 nonce) internal {
-        require(ownerNonce[owner] < nonce, InvalidNonce());
-        ownerNonce[owner] = nonce;
-    }
-
-    function _balanceOf(address addr, address token) internal view returns (uint256) {
-        return (token == NATIVE) ? addr.balance : IERC20(token).balanceOf(addr);
-    }
-
-    function _markSucceededAndTakeFee(bytes32 actionHash, IPDepositBox box, address token, uint256 amount) internal {
-        require(actionStatus[actionHash] == ActionStatus.NOT_EXECUTED, ActionExecuted());
-        actionStatus[actionHash] = ActionStatus.SUCCEEDED;
-        box.payTreasury(token, amount);
-    }
-
-    function _markFailedAndTakeFee(bytes32 actionHash, IPDepositBox box, address token, uint256 amount) internal {
-        require(actionStatus[actionHash] == ActionStatus.NOT_EXECUTED, ActionExecuted());
-        actionStatus[actionHash] = ActionStatus.FAILED;
-        box.payTreasury(token, amount);
-    }
-
-    function _swapFromBox(IPDepositBox box, address swapExecutor, SwapData memory swapData, address receiver)
-        internal
-        returns (uint256 rawTokenOut)
-    {
-        box.withdrawTo(swapExecutor, swapData.tokenIn, swapData.amountIn);
-
-        uint256 preBalance = _balanceOf(receiver, swapData.tokenOut);
-        IPSwapExecutor(swapExecutor).swap(receiver, swapData);
-        rawTokenOut = _balanceOf(receiver, swapData.tokenOut) - preBalance;
-    }
-}

package/contracts/cross-chain/swap-hub/swap/IPSwapExecutor.sol

@@ -1,14 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity ^0.8.0;
-
-struct SwapData {
-    address tokenIn;
-    uint256 amountIn;
-    address tokenOut;
-    address extRouter;
-    bytes extCalldata;
-}
-
-interface IPSwapExecutor {
-    function swap(address receiver, SwapData memory swapData) external payable;
-}

package/contracts/cross-chain/swap-hub/swap/SwapExecutor.sol

@@ -1,33 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity ^0.8.30;
-
-import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import {Address} from "@openzeppelin/contracts/utils/Address.sol";
-import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
-import {TokenHelper} from "../../../core/libraries/TokenHelper.sol";
-import {IPSwapExecutor, SwapData} from "./IPSwapExecutor.sol";
-
-contract SwapExecutor is IPSwapExecutor, TokenHelper {
-    using Address for address;
-    using SafeERC20 for IERC20;
-
-    function swap(address receiver, SwapData memory $) external payable {
-        _approveForExtRouter($.tokenIn, $.extRouter);
-        $.extRouter.functionCallWithValue($.extCalldata, $.tokenIn == NATIVE ? $.amountIn : 0);
-        _transferOut($.tokenOut, receiver, _selfBalance($.tokenOut));
-    }
-
-    function _approveForExtRouter(address token, address extRouter) internal {
-        if (token == NATIVE) return;
-
-        _safeApproveInfV2(IERC20(token), extRouter);
-    }
-
-    function _safeApproveInfV2(IERC20 token, address spender) internal {
-        if (token.allowance(address(this), spender) < type(uint256).max) {
-            token.forceApprove(spender, type(uint256).max);
-        }
-    }
-
-    receive() external payable {}
-}

package/contracts/interfaces/IPCrossChainSwapHub.sol

@@ -1,168 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-interface IPCrossChainSwapHub {
-    error ActionExecuted();
-    error InsufficientTokenReceived();
-    error InvalidNonce();
-    error InvalidSignature();
-    error MessageExpired();
-
-    enum ActionStatus {
-        NOT_EXECUTED,
-        SUCCEEDED,
-        FAILED
-    }
-
-    struct WithdrawTokenMessage {
-        address owner;
-        uint32 boxId;
-        uint256 expiry;
-        uint256 nonce;
-        //
-        address receiver;
-        address token;
-        uint256 amountWithdraw;
-        uint256 amountFee;
-    }
-
-    struct BridgeTokenMessage {
-        address owner;
-        uint32 boxId;
-        uint256 expiry;
-        uint256 nonce;
-        //
-        address token;
-        uint256 amountBridge;
-        uint256 amountFee;
-        //
-        address bridgeExtRouter;
-        bytes bridgeCalldata;
-    }
-
-    struct SwapTokenMessage {
-        address owner;
-        uint32 boxId;
-        uint256 expiry;
-        uint256 nonce;
-        //
-        address tokenSpent;
-        uint256 amountSpent;
-        uint256 amountFee;
-        address tokenReceived;
-        uint256 minReceived;
-        address receiver;
-        //
-        address swapExecutor;
-        address swapExtRouter;
-        bytes swapCalldata;
-    }
-
-    struct BuyCrossChainPtMessage {
-        address owner;
-        uint32 boxId;
-        uint256 expiry;
-        uint256 nonce;
-        //
-        address tokenSpent;
-        uint256 amountSpent;
-        uint256 amountFee;
-        address ptAdapter;
-        uint256 minPtReceived;
-        uint32 dstEid;
-        bytes32 receiver;
-        //
-        address swapExecutor;
-        address swapExtRouter;
-        bytes swapCalldata;
-    }
-
-    event WithdrawToken(
-        address indexed owner,
-        uint32 boxId,
-        bytes32 actionHash,
-        address receiver,
-        address token,
-        uint256 amountWithdraw,
-        uint256 amountFee
-    );
-
-    event BridgeToken(
-        address indexed owner,
-        uint32 boxId,
-        bytes32 actionHash,
-        address bridgeExtRouter,
-        address token,
-        uint256 amountBridge,
-        uint256 amountFee
-    );
-
-    event SwapToken(
-        address indexed owner,
-        uint32 boxId,
-        bytes32 actionHash,
-        address tokenSpent,
-        uint256 amountSpent,
-        uint256 amountFee,
-        address tokenReceived,
-        uint256 netTokenReceived
-    );
-
-    event BuyCrossChainPt(
-        address indexed owner,
-        uint32 boxId,
-        bytes32 actionHash,
-        address tokenSpent,
-        uint256 amountSpent,
-        uint256 amountFee,
-        address ptAdapter,
-        address pt,
-        uint256 netPtReceived
-    );
-
-    event ClaimFeeForFailedAction(
-        address indexed owner, uint32 boxId, bytes32 actionHash, address token, uint256 amount
-    );
-
-    event SetExecutor(address indexed executor, bool isExecutor);
-
-    function BEACON_PROXY_CODE_CONTRACT() external view returns (address);
-
-    function DEPOSIT_BOX_BEACON() external view returns (address);
-
-    function DEPOSIT_BOX_CODE_HASH() external view returns (bytes32);
-
-    function ownerNonce(address owner) external view returns (uint256);
-
-    function actionStatus(bytes32 actionHash) external view returns (ActionStatus);
-
-    function isExecutor(address executor) external view returns (bool);
-
-    function computeDepositBox(address owner, uint32 boxId) external view returns (address box, bytes32 salt);
-
-    function hashTypedData(WithdrawTokenMessage memory message) external view returns (bytes32);
-
-    function hashTypedData(BridgeTokenMessage memory message) external view returns (bytes32);
-
-    function hashTypedData(SwapTokenMessage memory message) external view returns (bytes32);
-
-    function hashTypedData(BuyCrossChainPtMessage memory message) external view returns (bytes32);
-
-    function withdrawToken(WithdrawTokenMessage memory message, bytes memory signature) external;
-
-    function bridgeToken(BridgeTokenMessage memory message, bytes memory signature) external payable;
-
-    function swapToken(SwapTokenMessage memory message, bytes memory signature) external;
-
-    function buyCrossChainPt(BuyCrossChainPtMessage memory message, bytes memory signature) external payable;
-
-    function claimFee(WithdrawTokenMessage memory message, bytes memory signature) external;
-
-    function claimFee(BridgeTokenMessage memory message, bytes memory signature) external;
-
-    function claimFee(SwapTokenMessage memory message, bytes memory signature) external;
-
-    function claimFee(BuyCrossChainPtMessage memory message, bytes memory signature) external;
-
-    function setExecutor(address executor, bool isExecutor) external;
-}

package/contracts/interfaces/IPDepositBox.sol

@@ -1,25 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-struct ApprovedCall {
-    address token;
-    uint256 amount;
-    address spender;
-    bytes data;
-}
-
-interface IPDepositBox {
-    function HUB() external view returns (address);
-
-    function TREASURY() external view returns (address);
-
-    function OWNER() external view returns (address);
-
-    function BOX_ID() external view returns (uint32);
-
-    function payTreasury(address token, uint256 amount) external;
-
-    function withdrawTo(address to, address token, uint256 amount) external;
-
-    function approveAndCall(ApprovedCall memory call, address nativeRefund) external payable returns (bytes memory);
-}