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

package/contracts/interfaces/IPCrossChainSwapHub.sol

@@ -2,14 +2,10 @@
 pragma solidity ^0.8.0;
 
 interface IPCrossChainSwapHub {
-    error ExcessiveNativeFee();
     error InsufficientTokenReceived();
-    error InvalidAmountIn();
     error InvalidNonce();
     error InvalidSignature();
-    error InvalidValidator();
-    error IntentExecuted();
-    error IntentHashMismatch();
+    error InvalidReceiver();
     error MessageExpired();
 
     struct WithdrawTokenMessage {
@@ -18,10 +14,9 @@ interface IPCrossChainSwapHub {
         uint256 expiry;
         uint256 nonce;
         //
-        address receiver;
         address token;
-        uint256 withdrawAmount;
-        uint256 feeAmount;
+        uint256 amountWithdraw;
+        uint256 amountFee;
     }
 
     struct BridgeTokenMessage {
@@ -31,8 +26,9 @@ interface IPCrossChainSwapHub {
         uint256 nonce;
         //
         address token;
-        uint256 bridgeAmount;
-        uint256 feeAmount;
+        uint256 amountBridge;
+        uint256 amountFee;
+        bool pullFromOwner;
         //
         address bridgeExtRouter;
         bytes bridgeCalldata;
@@ -46,52 +42,47 @@ interface IPCrossChainSwapHub {
         //
         address tokenSpent;
         uint256 amountSpent;
+        uint256 amountFee;
         address tokenReceived;
         uint256 minReceived;
-        uint256 feeAmount;
+        bool pullFromOwner;
+        bool sendToOwner;
         //
         address swapExecutor;
         address swapExtRouter;
         bytes swapCalldata;
     }
 
-    struct BuyCrossChainPtIntent {
+    struct BuyCrossChainPtMessage {
         address owner;
         uint32 boxId;
-        uint256 salt;
         uint256 expiry;
+        uint256 nonce;
         //
         address tokenSpent;
-        uint256 maxAmountSpent;
-        address pt;
+        uint256 amountSpent;
+        uint256 amountFee;
         address ptAdapter;
         uint256 minPtReceived;
-        uint32 dstLzEid;
+        uint32 dstEid;
         bytes32 receiver;
-    }
-
-    struct ExecuteBuyCrossChainPtMessage {
-        address validator;
-        bytes32 intentHash;
-        uint256 amountSpent;
-        uint256 feeAmount;
+        bool pullFromOwner;
+        //
         address swapExecutor;
         address swapExtRouter;
         bytes swapCalldata;
-        uint256 expiry;
     }
 
-    event WithdrawToken(
-        address indexed owner, uint32 boxId, address receiver, address token, uint256 withdrawAmount, uint256 feeAmount
-    );
+    event WithdrawToken(address indexed owner, uint32 boxId, address token, uint256 amountWithdraw, uint256 amountFee);
 
     event BridgeToken(
         address indexed owner,
         uint32 boxId,
         address bridgeExtRouter,
         address token,
-        uint256 bridgeAmount,
-        uint256 feeAmount
+        uint256 amountBridge,
+        uint256 amountFee,
+        bool pullFromOwner
     );
 
     event SwapToken(
@@ -99,25 +90,27 @@ interface IPCrossChainSwapHub {
         uint32 boxId,
         address tokenSpent,
         uint256 amountSpent,
+        uint256 amountFee,
         address tokenReceived,
-        uint256 netTokenReceived
+        uint256 netTokenReceived,
+        bool pullFromOwner,
+        bool sendToOwner
     );
 
     event BuyCrossChainPt(
         address indexed owner,
         uint32 boxId,
-        bytes32 intentHash,
         address tokenSpent,
         uint256 amountSpent,
-        address pt,
+        uint256 amountFee,
         address ptAdapter,
-        uint256 netPtReceived
+        address pt,
+        uint256 netPtReceived,
+        bool pullFromOwner
     );
 
     event SetExecutor(address indexed executor, bool isExecutor);
 
-    event SetValidator(address indexed validator, bool isValidator);
-
     function BEACON_PROXY_CODE_CONTRACT() external view returns (address);
 
     function DEPOSIT_BOX_BEACON() external view returns (address);
@@ -126,13 +119,12 @@ interface IPCrossChainSwapHub {
 
     function ownerNonce(address owner) external view returns (uint256);
 
-    function isIntentExecuted(bytes32 intentHash) external view returns (bool);
-
     function isExecutor(address executor) external view returns (bool);
 
-    function isValidator(address validator) external view returns (bool);
-
-    function computeDepositBox(address owner, uint32 boxId) external view returns (address box, bytes32 salt);
+    function computeDepositBox(address owner, uint32 boxId)
+        external
+        view
+        returns (address box, bytes32 salt, bool deployed);
 
     function hashTypedData(WithdrawTokenMessage memory message) external view returns (bytes32);
 
@@ -140,9 +132,7 @@ interface IPCrossChainSwapHub {
 
     function hashTypedData(SwapTokenMessage memory message) external view returns (bytes32);
 
-    function hashTypedData(BuyCrossChainPtIntent memory intent) external view returns (bytes32);
-
-    function hashTypedData(ExecuteBuyCrossChainPtMessage memory message) external view returns (bytes32);
+    function hashTypedData(BuyCrossChainPtMessage memory message) external view returns (bytes32);
 
     function withdrawToken(WithdrawTokenMessage memory message, bytes memory signature) external;
 
@@ -150,14 +140,7 @@ interface IPCrossChainSwapHub {
 
     function swapToken(SwapTokenMessage memory message, bytes memory signature) external;
 
-    function buyCrossChainPt(
-        BuyCrossChainPtIntent memory intent,
-        bytes memory intentSig,
-        ExecuteBuyCrossChainPtMessage memory execMsg,
-        bytes memory execSig
-    ) external payable;
+    function buyCrossChainPt(BuyCrossChainPtMessage memory message, bytes memory signature) external payable;
 
     function setExecutor(address executor, bool isExecutor) external;
-
-    function setValidator(address validator, bool isValidator) external;
 }

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-swaphubtest",
+  "version": "6.3.2-swaphubtest3",
   "homepage": "https://pendle.finance",
   "keywords": [
     "pendle",