@pendle/core-v2 6.3.2-swaphubtest3 → 6.3.2-swaphubtest4

package/build/artifacts/contracts/router/ActionStorageV4.sol/ActionStorageV4.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/66e0858ea21b3c1487f6bd95dbfa6609.json"
+  "buildInfo": "../../../build-info/949599013beec0a4878ddcdc09f27bb0.json"
 }

package/build/artifacts/contracts/router/PendleRouterV4.sol/PendleRouterV4.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/66e0858ea21b3c1487f6bd95dbfa6609.json"
+  "buildInfo": "../../../build-info/949599013beec0a4878ddcdc09f27bb0.json"
 }

package/build/artifacts/contracts/router/Reflector.sol/Reflector.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/66e0858ea21b3c1487f6bd95dbfa6609.json"
+  "buildInfo": "../../../build-info/949599013beec0a4878ddcdc09f27bb0.json"
 }

package/build/artifacts/contracts/router/RouterStorage.sol/RouterStorage.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/66e0858ea21b3c1487f6bd95dbfa6609.json"
+  "buildInfo": "../../../build-info/949599013beec0a4878ddcdc09f27bb0.json"
 }

package/build/artifacts/contracts/router/base/ActionBase.sol/ActionBase.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/66e0858ea21b3c1487f6bd95dbfa6609.json"
+  "buildInfo": "../../../../build-info/949599013beec0a4878ddcdc09f27bb0.json"
 }

package/build/artifacts/contracts/router/base/ActionDelegateBase.sol/ActionDelegateBase.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/66e0858ea21b3c1487f6bd95dbfa6609.json"
+  "buildInfo": "../../../../build-info/949599013beec0a4878ddcdc09f27bb0.json"
 }

package/build/artifacts/contracts/router/base/CallbackHelper.sol/CallbackHelper.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/66e0858ea21b3c1487f6bd95dbfa6609.json"
+  "buildInfo": "../../../../build-info/949599013beec0a4878ddcdc09f27bb0.json"
 }

package/build/artifacts/contracts/router/math/ApproxStateLib.sol/ApproxStateLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/66e0858ea21b3c1487f6bd95dbfa6609.json"
+  "buildInfo": "../../../../build-info/949599013beec0a4878ddcdc09f27bb0.json"
 }

package/build/artifacts/contracts/router/math/MarketApproxEstimateLib.sol/MarketApproxEstimateLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/66e0858ea21b3c1487f6bd95dbfa6609.json"
+  "buildInfo": "../../../../build-info/949599013beec0a4878ddcdc09f27bb0.json"
 }

package/build/artifacts/contracts/router/math/MarketApproxLibOnchain.sol/MarketApproxPtInLibOnchain.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/66e0858ea21b3c1487f6bd95dbfa6609.json"
+  "buildInfo": "../../../../build-info/949599013beec0a4878ddcdc09f27bb0.json"
 }

package/build/artifacts/contracts/router/math/MarketApproxLibOnchain.sol/MarketApproxPtOutLibOnchain.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/66e0858ea21b3c1487f6bd95dbfa6609.json"
+  "buildInfo": "../../../../build-info/949599013beec0a4878ddcdc09f27bb0.json"
 }

package/build/artifacts/contracts/router/math/MarketApproxLibV2.sol/MarketApproxPtInLibV2.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/66e0858ea21b3c1487f6bd95dbfa6609.json"
+  "buildInfo": "../../../../build-info/949599013beec0a4878ddcdc09f27bb0.json"
 }

package/build/artifacts/contracts/router/math/MarketApproxLibV2.sol/MarketApproxPtOutLibV2.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/66e0858ea21b3c1487f6bd95dbfa6609.json"
+  "buildInfo": "../../../../build-info/949599013beec0a4878ddcdc09f27bb0.json"
 }

package/build/artifacts/contracts/router/swap-aggregator/IPSwapAggregator.sol/IPSwapAggregator.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/66e0858ea21b3c1487f6bd95dbfa6609.json"
+  "buildInfo": "../../../../build-info/949599013beec0a4878ddcdc09f27bb0.json"
 }

package/build/artifacts/contracts/router/swap-aggregator/OKXScaleHelper.sol/IOKXDexRouter.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/66e0858ea21b3c1487f6bd95dbfa6609.json"
+  "buildInfo": "../../../../build-info/949599013beec0a4878ddcdc09f27bb0.json"
 }

package/build/artifacts/contracts/router/swap-aggregator/OKXScaleHelper.sol/OKXScaleHelper.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/66e0858ea21b3c1487f6bd95dbfa6609.json"
+  "buildInfo": "../../../../build-info/949599013beec0a4878ddcdc09f27bb0.json"
 }

package/build/artifacts/contracts/router/swap-aggregator/ParaswapScaleHelper.sol/IAugustusV6.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/66e0858ea21b3c1487f6bd95dbfa6609.json"
+  "buildInfo": "../../../../build-info/949599013beec0a4878ddcdc09f27bb0.json"
 }

package/build/artifacts/contracts/router/swap-aggregator/ParaswapScaleHelper.sol/ParaswapScaleHelper.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/66e0858ea21b3c1487f6bd95dbfa6609.json"
+  "buildInfo": "../../../../build-info/949599013beec0a4878ddcdc09f27bb0.json"
 }

package/build/artifacts/contracts/router/swap-aggregator/PendleSwap.sol/IKyberScalingHelper.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/66e0858ea21b3c1487f6bd95dbfa6609.json"
+  "buildInfo": "../../../../build-info/949599013beec0a4878ddcdc09f27bb0.json"
 }

package/build/artifacts/contracts/router/swap-aggregator/PendleSwap.sol/IOdosRouterV2.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/66e0858ea21b3c1487f6bd95dbfa6609.json"
+  "buildInfo": "../../../../build-info/949599013beec0a4878ddcdc09f27bb0.json"
 }

package/build/artifacts/contracts/router/swap-aggregator/PendleSwap.sol/PendleSwap.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/66e0858ea21b3c1487f6bd95dbfa6609.json"
+  "buildInfo": "../../../../build-info/949599013beec0a4878ddcdc09f27bb0.json"
 }

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

@@ -12,39 +12,33 @@ contract DepositBox is IPDepositBox, TokenHelper, Initializable {
     using Address for address;
     using SafeERC20 for IERC20;
 
-    address public immutable HUB;
-    address public immutable TREASURY;
+    address public immutable MANAGER;
     address public OWNER;
     uint32 public BOX_ID;
 
-    constructor(address hub_, address treasury_) {
+    constructor(address manager_) {
         _disableInitializers();
-        HUB = hub_;
-        TREASURY = treasury_;
+        MANAGER = manager_;
     }
 
-    modifier onlyHub() {
-        require(msg.sender == HUB, "DepositBox: caller is not hub");
+    modifier onlyManager() {
+        require(msg.sender == MANAGER, "DepositBox: caller is not manager");
         _;
     }
 
-    function initialize(address owner_, uint32 boxId_) external initializer onlyHub {
+    function initialize(address owner_, uint32 boxId_) external initializer {
         OWNER = owner_;
         BOX_ID = boxId_;
     }
 
-    function payTreasury(address token, uint256 amount) external onlyHub {
-        _transferOut(token, TREASURY, amount);
-    }
-
-    function withdrawTo(address to, address token, uint256 amount) external onlyHub {
+    function withdrawTo(address to, address token, uint256 amount) external onlyManager {
         _transferOut(token, to, amount);
     }
 
     function approveAndCall(ApprovedCall memory call, address nativeRefund)
         external
         payable
-        onlyHub
+        onlyManager
         returns (bytes memory result)
     {
         uint256 nativeAmount = call.token == NATIVE ? call.amount : 0;
@@ -52,9 +46,9 @@ contract DepositBox is IPDepositBox, TokenHelper, Initializable {
 
         uint256 initialNativeBalance = _selfBalance(NATIVE) - nativeAmount - nativeFee;
 
-        _approveForExtRouter(call.token, call.spender, call.amount);
-        result = call.spender.functionCallWithValue(call.data, nativeAmount + nativeFee);
-        _approveForExtRouter(call.token, call.spender, 0);
+        _approveForExtRouter(call.token, call.approveTo, call.amount);
+        result = call.callTo.functionCallWithValue(call.data, nativeAmount + nativeFee);
+        _approveForExtRouter(call.token, call.approveTo, 0);
 
         uint256 finalNativeBalance = _selfBalance(NATIVE);
 

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

@@ -10,12 +10,11 @@ import {
 } from "@layerzerolabs/oft-evm/contracts/interfaces/IOFT.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {ApprovedCall, IPDepositBox} from "../../interfaces/IPDepositBox.sol";
-import {SwapData} from "./swap/IPSwapExecutor.sol";
 import {SwapHubBase} from "./SwapHubBase.sol";
 
 contract PendleCrossChainSwapHub is SwapHubBase {
-    constructor(address beaconProxyCodeContract_, address depositBoxBeacon_)
-        SwapHubBase(beaconProxyCodeContract_, depositBoxBeacon_)
+    constructor(address treasury_, address beaconProxyCodeContract_, address depositBoxBeacon_)
+        SwapHubBase(treasury_, beaconProxyCodeContract_, depositBoxBeacon_)
     {
         _disableInitializers();
     }
@@ -79,7 +78,7 @@ contract PendleCrossChainSwapHub is SwapHubBase {
         _payTreasury(box, ms.tokenSpent, ms.amountFee);
 
         address pt = IOFT(ms.ptAdapter).token();
-        uint256 netPtReceived = _buyPtAndBridge(ms, box, pt, msg.value);
+        uint256 netPtReceived = _buyPtAndBridge(ms, box, pt, msg.value, msg.sender);
         require(netPtReceived >= ms.minPtReceived, InsufficientTokenReceived());
 
         emit BuyCrossChainPt(
@@ -102,7 +101,7 @@ contract PendleCrossChainSwapHub is SwapHubBase {
     }
 
     function _payTreasury(IPDepositBox box, address token, uint256 amount) internal {
-        box.payTreasury(token, amount);
+        box.withdrawTo(TREASURY, token, amount);
     }
 
     function _withdrawToken(WithdrawTokenMessage memory ms, IPDepositBox box) internal {
@@ -110,43 +109,48 @@ contract PendleCrossChainSwapHub is SwapHubBase {
     }
 
     function _bridgeToken(BridgeTokenMessage memory ms, IPDepositBox box, uint256 nativeFee) internal {
-        // forgefmt: disable-next-item
         ApprovedCall memory call = ApprovedCall({
             token: ms.token,
             amount: ms.amountBridge,
-            spender: ms.bridgeExtRouter,
+            approveTo: ms.bridgeApprove,
+            callTo: ms.bridgeExtRouter,
             data: ms.bridgeCalldata
         });
         box.approveAndCall{value: nativeFee}(call, msg.sender);
     }
 
     function _swapToken(SwapTokenMessage memory ms, IPDepositBox box) internal returns (uint256 rawTokenReceived) {
-        SwapData memory swapData = SwapData({
-            tokenIn: ms.tokenSpent,
-            amountIn: ms.amountSpent,
-            tokenOut: ms.tokenReceived,
-            extRouter: ms.swapExtRouter,
-            extCalldata: ms.swapCalldata
+        rawTokenReceived = _swapFromBox({
+            box: box,
+            tokenSpent: ms.tokenSpent,
+            amountSpent: ms.amountSpent,
+            tokenReceived: ms.tokenReceived,
+            swapExtRouter: ms.swapExtRouter,
+            swapApprove: ms.swapApprove,
+            swapCalldata: ms.swapCalldata,
+            receiver: ms.sendToOwner ? ms.owner : address(box)
         });
-
-        address receiver = ms.sendToOwner ? ms.owner : address(box);
-        rawTokenReceived = _swapFromBox(box, ms.swapExecutor, swapData, receiver);
     }
 
-    function _buyPtAndBridge(BuyCrossChainPtMessage memory ms, IPDepositBox box, address pt, uint256 nativeFee)
-        internal
-        returns (uint256 netPtReceived)
-    {
+    function _buyPtAndBridge(
+        BuyCrossChainPtMessage memory ms,
+        IPDepositBox box,
+        address pt,
+        uint256 nativeFee,
+        address nativeRefund
+    ) internal returns (uint256 netPtReceived) {
         require(ms.receiver == _addressToBytes32(ms.owner), InvalidReceiver());
 
-        SwapData memory swapData = SwapData({
-            tokenIn: ms.tokenSpent,
-            amountIn: ms.amountSpent,
-            tokenOut: pt,
-            extRouter: ms.swapExtRouter,
-            extCalldata: ms.swapCalldata
+        uint256 rawPtReceived = _swapFromBox({
+            box: box,
+            tokenSpent: ms.tokenSpent,
+            amountSpent: ms.amountSpent,
+            tokenReceived: pt,
+            swapExtRouter: ms.swapExtRouter,
+            swapApprove: ms.swapApprove,
+            swapCalldata: ms.swapCalldata,
+            receiver: address(box)
         });
-        uint256 rawPtReceived = _swapFromBox(box, ms.swapExecutor, swapData, address(box));
 
         SendParam memory sendParam = SendParam({
             dstEid: ms.dstEid,
@@ -161,15 +165,14 @@ contract PendleCrossChainSwapHub is SwapHubBase {
         ApprovedCall memory call = ApprovedCall({
             token: pt,
             amount: rawPtReceived,
-            spender: ms.ptAdapter,
-            data: abi.encodeCall(IOFT.send, (sendParam, sendFee, msg.sender))
+            approveTo: ms.ptAdapter,
+            callTo: ms.ptAdapter,
+            data: abi.encodeCall(IOFT.send, (sendParam, sendFee, nativeRefund))
         });
         (, OFTReceipt memory oftReceipt) =
-            abi.decode(box.approveAndCall{value: nativeFee}(call, msg.sender), (MessagingReceipt, OFTReceipt));
+            abi.decode(box.approveAndCall{value: nativeFee}(call, nativeRefund), (MessagingReceipt, OFTReceipt));
         netPtReceived = oftReceipt.amountReceivedLD;
     }
 
-    function _addressToBytes32(address addr) internal pure returns (bytes32) {
-        return bytes32(uint256(uint160(addr)));
-    }
+    receive() external payable {}
 }

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

@@ -8,8 +8,7 @@ import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/crypt
 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 {ApprovedCall, IPDepositBox} from "../../interfaces/IPDepositBox.sol";
 import {DepositBox} from "./DepositBox.sol";
 
 abstract contract SwapHubBase is IPCrossChainSwapHub, EIP712Upgradeable, BoringOwnableUpgradeableV2, TokenHelper {
@@ -41,6 +40,7 @@ abstract contract SwapHubBase is IPCrossChainSwapHub, EIP712Upgradeable, BoringO
             "bool pullFromOwner,"
             //
             "address bridgeExtRouter,"
+            "address bridgeApprove,"
             "bytes bridgeCalldata"
         ")"
     );
@@ -61,8 +61,8 @@ abstract contract SwapHubBase is IPCrossChainSwapHub, EIP712Upgradeable, BoringO
             "bool pullFromOwner,"
             "bool sendToOwner,"
             //
-            "address swapExecutor,"
             "address swapExtRouter,"
+            "address swapApprove,"
             "bytes swapCalldata"
         ")"
     );
@@ -84,12 +84,14 @@ abstract contract SwapHubBase is IPCrossChainSwapHub, EIP712Upgradeable, BoringO
             "bytes32 receiver,"
             "bool pullFromOwner,"
             //
-            "address swapExecutor,"
             "address swapExtRouter,"
+            "address swapApprove,"
             "bytes swapCalldata"
         ")"
     );
 
+    address public immutable TREASURY;
+
     /// @dev creation code of OpenZeppelin's BeaconProxy
     address public immutable BEACON_PROXY_CODE_CONTRACT;
     address public immutable DEPOSIT_BOX_BEACON;
@@ -98,7 +100,8 @@ abstract contract SwapHubBase is IPCrossChainSwapHub, EIP712Upgradeable, BoringO
     mapping(address owner => uint256 nonce) public ownerNonce;
     mapping(address executor => bool) public isExecutor;
 
-    constructor(address beaconProxyCodeContract_, address depositBoxBeacon_) {
+    constructor(address treasury_, address beaconProxyCodeContract_, address depositBoxBeacon_) {
+        TREASURY = treasury_;
         BEACON_PROXY_CODE_CONTRACT = beaconProxyCodeContract_;
         DEPOSIT_BOX_BEACON = depositBoxBeacon_;
         DEPOSIT_BOX_CODE_HASH =
@@ -171,6 +174,7 @@ abstract contract SwapHubBase is IPCrossChainSwapHub, EIP712Upgradeable, BoringO
                     message.pullFromOwner,
                     //
                     message.bridgeExtRouter,
+                    message.bridgeApprove,
                     keccak256(message.bridgeCalldata)
                 )
             )
@@ -195,8 +199,8 @@ abstract contract SwapHubBase is IPCrossChainSwapHub, EIP712Upgradeable, BoringO
                     message.pullFromOwner,
                     message.sendToOwner,
                     //
-                    message.swapExecutor,
                     message.swapExtRouter,
+                    message.swapApprove,
                     keccak256(message.swapCalldata)
                 )
             )
@@ -222,8 +226,8 @@ abstract contract SwapHubBase is IPCrossChainSwapHub, EIP712Upgradeable, BoringO
                     message.receiver,
                     message.pullFromOwner,
                     //
-                    message.swapExecutor,
                     message.swapExtRouter,
+                    message.swapApprove,
                     keccak256(message.swapCalldata)
                 )
             )
@@ -233,32 +237,39 @@ abstract contract SwapHubBase is IPCrossChainSwapHub, EIP712Upgradeable, BoringO
     function _verifyOwnerSig(address owner, uint256 expiry, uint256 nonce, bytes32 messageHash, bytes memory signature)
         internal
     {
-        _verifyOwnerSig(owner, expiry, messageHash, signature);
-        _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 _swapFromBox(
+        IPDepositBox box,
+        address tokenSpent,
+        uint256 amountSpent,
+        address tokenReceived,
+        address swapExtRouter,
+        address swapApprove,
+        bytes memory swapCalldata,
+        address receiver
+    ) internal returns (uint256 rawTokenReceived) {
+        // forgefmt: disable-next-item
+        ApprovedCall memory call = ApprovedCall({
+            token: tokenSpent,
+            amount: amountSpent,
+            approveTo: swapApprove,
+            callTo: swapExtRouter,
+            data: swapCalldata
+        });
 
-    function _swapFromBox(IPDepositBox box, address swapExecutor, SwapData memory swapData, address receiver)
-        internal
-        returns (uint256 rawTokenOut)
-    {
-        box.withdrawTo(swapExecutor, swapData.tokenIn, swapData.amountIn);
+        uint256 preBalance = _selfBalance(tokenReceived);
+        box.approveAndCall(call, address(box));
+        rawTokenReceived = _selfBalance(tokenReceived) - preBalance;
+
+        _transferOut(tokenReceived, receiver, rawTokenReceived);
+    }
 
-        uint256 preBalance = _balanceOf(receiver, swapData.tokenOut);
-        IPSwapExecutor(swapExecutor).swap(receiver, swapData);
-        rawTokenOut = _balanceOf(receiver, swapData.tokenOut) - preBalance;
+    function _addressToBytes32(address addr) internal pure returns (bytes32) {
+        return bytes32(uint256(uint160(addr)));
     }
 }

package/contracts/interfaces/IPCrossChainSwapHub.sol

@@ -31,6 +31,7 @@ interface IPCrossChainSwapHub {
         bool pullFromOwner;
         //
         address bridgeExtRouter;
+        address bridgeApprove;
         bytes bridgeCalldata;
     }
 
@@ -48,8 +49,8 @@ interface IPCrossChainSwapHub {
         bool pullFromOwner;
         bool sendToOwner;
         //
-        address swapExecutor;
         address swapExtRouter;
+        address swapApprove;
         bytes swapCalldata;
     }
 
@@ -68,8 +69,8 @@ interface IPCrossChainSwapHub {
         bytes32 receiver;
         bool pullFromOwner;
         //
-        address swapExecutor;
         address swapExtRouter;
+        address swapApprove;
         bytes swapCalldata;
     }
 

package/contracts/interfaces/IPDepositBox.sol

@@ -4,21 +4,18 @@ pragma solidity ^0.8.0;
 struct ApprovedCall {
     address token;
     uint256 amount;
-    address spender;
+    address approveTo;
+    address callTo;
     bytes data;
 }
 
 interface IPDepositBox {
-    function HUB() external view returns (address);
-
-    function TREASURY() external view returns (address);
+    function MANAGER() 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);

package/package.json

@@ -2,7 +2,7 @@
   "name": "@pendle/core-v2",
   "description": "Core smart contracts of Pendle Protocol.",
   "license": "BUSL-1.1",
-  "version": "6.3.2-swaphubtest3",
+  "version": "6.3.2-swaphubtest4",
   "homepage": "https://pendle.finance",
   "keywords": [
     "pendle",