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

package/contracts/interfaces/IPCrossChainSwapHub.sol

@@ -2,16 +2,18 @@
 pragma solidity ^0.8.0;
 
 interface IPCrossChainSwapHub {
-    error ExcessiveNativeFee();
+    error ActionExecuted();
     error InsufficientTokenReceived();
-    error InvalidAmountIn();
     error InvalidNonce();
     error InvalidSignature();
-    error InvalidValidator();
-    error IntentExecuted();
-    error IntentHashMismatch();
     error MessageExpired();
 
+    enum ActionStatus {
+        NOT_EXECUTED,
+        SUCCEEDED,
+        FAILED
+    }
+
     struct WithdrawTokenMessage {
         address owner;
         uint32 boxId;
@@ -20,8 +22,8 @@ interface IPCrossChainSwapHub {
         //
         address receiver;
         address token;
-        uint256 withdrawAmount;
-        uint256 feeAmount;
+        uint256 amountWithdraw;
+        uint256 amountFee;
     }
 
     struct BridgeTokenMessage {
@@ -31,8 +33,8 @@ interface IPCrossChainSwapHub {
         uint256 nonce;
         //
         address token;
-        uint256 bridgeAmount;
-        uint256 feeAmount;
+        uint256 amountBridge;
+        uint256 amountFee;
         //
         address bridgeExtRouter;
         bytes bridgeCalldata;
@@ -46,59 +48,62 @@ interface IPCrossChainSwapHub {
         //
         address tokenSpent;
         uint256 amountSpent;
+        uint256 amountFee;
         address tokenReceived;
         uint256 minReceived;
-        uint256 feeAmount;
+        address receiver;
         //
         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;
+        //
         address swapExecutor;
         address swapExtRouter;
         bytes swapCalldata;
-        uint256 expiry;
     }
 
     event WithdrawToken(
-        address indexed owner, uint32 boxId, address receiver, address token, uint256 withdrawAmount, uint256 feeAmount
+        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 bridgeAmount,
-        uint256 feeAmount
+        uint256 amountBridge,
+        uint256 amountFee
     );
 
     event SwapToken(
         address indexed owner,
         uint32 boxId,
+        bytes32 actionHash,
         address tokenSpent,
         uint256 amountSpent,
+        uint256 amountFee,
         address tokenReceived,
         uint256 netTokenReceived
     );
@@ -106,17 +111,20 @@ interface IPCrossChainSwapHub {
     event BuyCrossChainPt(
         address indexed owner,
         uint32 boxId,
-        bytes32 intentHash,
+        bytes32 actionHash,
         address tokenSpent,
         uint256 amountSpent,
-        address pt,
+        uint256 amountFee,
         address ptAdapter,
+        address pt,
         uint256 netPtReceived
     );
 
-    event SetExecutor(address indexed executor, bool isExecutor);
+    event ClaimFeeForFailedAction(
+        address indexed owner, uint32 boxId, bytes32 actionHash, address token, uint256 amount
+    );
 
-    event SetValidator(address indexed validator, bool isValidator);
+    event SetExecutor(address indexed executor, bool isExecutor);
 
     function BEACON_PROXY_CODE_CONTRACT() external view returns (address);
 
@@ -126,12 +134,10 @@ interface IPCrossChainSwapHub {
 
     function ownerNonce(address owner) external view returns (uint256);
 
-    function isIntentExecuted(bytes32 intentHash) external view returns (bool);
+    function actionStatus(bytes32 actionHash) external view returns (ActionStatus);
 
     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 hashTypedData(WithdrawTokenMessage memory message) external view returns (bytes32);
@@ -140,9 +146,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 +154,15 @@ 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 claimFee(WithdrawTokenMessage memory message, bytes memory signature) external;
+
+    function claimFee(BridgeTokenMessage memory message, bytes memory signature) external;
 
-    function setValidator(address validator, bool isValidator) 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/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-swaphubtest2",
   "homepage": "https://pendle.finance",
   "keywords": [
     "pendle",