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

package/build/artifacts/contracts/cross-chain/swap-hub/SwapHubBase.sol/SwapHubBase.json

@@ -5,17 +5,17 @@
   "abi": [
     {
       "inputs": [],
-      "name": "ActionExecuted",
+      "name": "InsufficientTokenReceived",
       "type": "error"
     },
     {
       "inputs": [],
-      "name": "InsufficientTokenReceived",
+      "name": "InvalidNonce",
       "type": "error"
     },
     {
       "inputs": [],
-      "name": "InvalidNonce",
+      "name": "InvalidReceiver",
       "type": "error"
     },
     {
@@ -43,12 +43,6 @@
           "name": "boxId",
           "type": "uint32"
         },
-        {
-          "indexed": false,
-          "internalType": "bytes32",
-          "name": "actionHash",
-          "type": "bytes32"
-        },
         {
           "indexed": false,
           "internalType": "address",
@@ -72,6 +66,12 @@
           "internalType": "uint256",
           "name": "amountFee",
           "type": "uint256"
+        },
+        {
+          "indexed": false,
+          "internalType": "bool",
+          "name": "pullFromOwner",
+          "type": "bool"
         }
       ],
       "name": "BridgeToken",
@@ -92,12 +92,6 @@
           "name": "boxId",
           "type": "uint32"
         },
-        {
-          "indexed": false,
-          "internalType": "bytes32",
-          "name": "actionHash",
-          "type": "bytes32"
-        },
         {
           "indexed": false,
           "internalType": "address",
@@ -133,46 +127,15 @@
           "internalType": "uint256",
           "name": "netPtReceived",
           "type": "uint256"
-        }
-      ],
-      "name": "BuyCrossChainPt",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "internalType": "address",
-          "name": "owner",
-          "type": "address"
         },
         {
           "indexed": false,
-          "internalType": "uint32",
-          "name": "boxId",
-          "type": "uint32"
-        },
-        {
-          "indexed": false,
-          "internalType": "bytes32",
-          "name": "actionHash",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "internalType": "address",
-          "name": "token",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "internalType": "uint256",
-          "name": "amount",
-          "type": "uint256"
+          "internalType": "bool",
+          "name": "pullFromOwner",
+          "type": "bool"
         }
       ],
-      "name": "ClaimFeeForFailedAction",
+      "name": "BuyCrossChainPt",
       "type": "event"
     },
     {
@@ -247,12 +210,6 @@
           "name": "boxId",
           "type": "uint32"
         },
-        {
-          "indexed": false,
-          "internalType": "bytes32",
-          "name": "actionHash",
-          "type": "bytes32"
-        },
         {
           "indexed": false,
           "internalType": "address",
@@ -282,6 +239,18 @@
           "internalType": "uint256",
           "name": "netTokenReceived",
           "type": "uint256"
+        },
+        {
+          "indexed": false,
+          "internalType": "bool",
+          "name": "pullFromOwner",
+          "type": "bool"
+        },
+        {
+          "indexed": false,
+          "internalType": "bool",
+          "name": "sendToOwner",
+          "type": "bool"
         }
       ],
       "name": "SwapToken",
@@ -302,18 +271,6 @@
           "name": "boxId",
           "type": "uint32"
         },
-        {
-          "indexed": false,
-          "internalType": "bytes32",
-          "name": "actionHash",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "internalType": "address",
-          "name": "receiver",
-          "type": "address"
-        },
         {
           "indexed": false,
           "internalType": "address",
@@ -376,19 +333,13 @@
       "type": "function"
     },
     {
-      "inputs": [
-        {
-          "internalType": "bytes32",
-          "name": "actionStatus",
-          "type": "bytes32"
-        }
-      ],
-      "name": "actionStatus",
+      "inputs": [],
+      "name": "TREASURY",
       "outputs": [
         {
-          "internalType": "enum IPCrossChainSwapHub.ActionStatus",
+          "internalType": "address",
           "name": "",
-          "type": "uint8"
+          "type": "address"
         }
       ],
       "stateMutability": "view",
@@ -434,223 +385,18 @@
               "type": "uint256"
             },
             {
-              "internalType": "address",
-              "name": "bridgeExtRouter",
-              "type": "address"
-            },
-            {
-              "internalType": "bytes",
-              "name": "bridgeCalldata",
-              "type": "bytes"
-            }
-          ],
-          "internalType": "struct IPCrossChainSwapHub.BridgeTokenMessage",
-          "name": "message",
-          "type": "tuple"
-        },
-        {
-          "internalType": "bytes",
-          "name": "signature",
-          "type": "bytes"
-        }
-      ],
-      "name": "bridgeToken",
-      "outputs": [],
-      "stateMutability": "payable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "components": [
-            {
-              "internalType": "address",
-              "name": "owner",
-              "type": "address"
-            },
-            {
-              "internalType": "uint32",
-              "name": "boxId",
-              "type": "uint32"
-            },
-            {
-              "internalType": "uint256",
-              "name": "expiry",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "nonce",
-              "type": "uint256"
-            },
-            {
-              "internalType": "address",
-              "name": "tokenSpent",
-              "type": "address"
-            },
-            {
-              "internalType": "uint256",
-              "name": "amountSpent",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "amountFee",
-              "type": "uint256"
-            },
-            {
-              "internalType": "address",
-              "name": "ptAdapter",
-              "type": "address"
-            },
-            {
-              "internalType": "uint256",
-              "name": "minPtReceived",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint32",
-              "name": "dstEid",
-              "type": "uint32"
-            },
-            {
-              "internalType": "bytes32",
-              "name": "receiver",
-              "type": "bytes32"
-            },
-            {
-              "internalType": "address",
-              "name": "swapExecutor",
-              "type": "address"
-            },
-            {
-              "internalType": "address",
-              "name": "swapExtRouter",
-              "type": "address"
-            },
-            {
-              "internalType": "bytes",
-              "name": "swapCalldata",
-              "type": "bytes"
-            }
-          ],
-          "internalType": "struct IPCrossChainSwapHub.BuyCrossChainPtMessage",
-          "name": "message",
-          "type": "tuple"
-        },
-        {
-          "internalType": "bytes",
-          "name": "signature",
-          "type": "bytes"
-        }
-      ],
-      "name": "buyCrossChainPt",
-      "outputs": [],
-      "stateMutability": "payable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "components": [
-            {
-              "internalType": "address",
-              "name": "owner",
-              "type": "address"
-            },
-            {
-              "internalType": "uint32",
-              "name": "boxId",
-              "type": "uint32"
-            },
-            {
-              "internalType": "uint256",
-              "name": "expiry",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "nonce",
-              "type": "uint256"
-            },
-            {
-              "internalType": "address",
-              "name": "receiver",
-              "type": "address"
+              "internalType": "bool",
+              "name": "pullFromOwner",
+              "type": "bool"
             },
             {
               "internalType": "address",
-              "name": "token",
-              "type": "address"
-            },
-            {
-              "internalType": "uint256",
-              "name": "amountWithdraw",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "amountFee",
-              "type": "uint256"
-            }
-          ],
-          "internalType": "struct IPCrossChainSwapHub.WithdrawTokenMessage",
-          "name": "message",
-          "type": "tuple"
-        },
-        {
-          "internalType": "bytes",
-          "name": "signature",
-          "type": "bytes"
-        }
-      ],
-      "name": "claimFee",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "components": [
-            {
-              "internalType": "address",
-              "name": "owner",
-              "type": "address"
-            },
-            {
-              "internalType": "uint32",
-              "name": "boxId",
-              "type": "uint32"
-            },
-            {
-              "internalType": "uint256",
-              "name": "expiry",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "nonce",
-              "type": "uint256"
-            },
-            {
-              "internalType": "address",
-              "name": "token",
+              "name": "bridgeExtRouter",
               "type": "address"
             },
-            {
-              "internalType": "uint256",
-              "name": "amountBridge",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "amountFee",
-              "type": "uint256"
-            },
             {
               "internalType": "address",
-              "name": "bridgeExtRouter",
+              "name": "bridgeApprove",
               "type": "address"
             },
             {
@@ -669,9 +415,9 @@
           "type": "bytes"
         }
       ],
-      "name": "claimFee",
+      "name": "bridgeToken",
       "outputs": [],
-      "stateMutability": "nonpayable",
+      "stateMutability": "payable",
       "type": "function"
     },
     {
@@ -734,98 +480,18 @@
               "type": "bytes32"
             },
             {
-              "internalType": "address",
-              "name": "swapExecutor",
-              "type": "address"
+              "internalType": "bool",
+              "name": "pullFromOwner",
+              "type": "bool"
             },
             {
               "internalType": "address",
               "name": "swapExtRouter",
               "type": "address"
             },
-            {
-              "internalType": "bytes",
-              "name": "swapCalldata",
-              "type": "bytes"
-            }
-          ],
-          "internalType": "struct IPCrossChainSwapHub.BuyCrossChainPtMessage",
-          "name": "message",
-          "type": "tuple"
-        },
-        {
-          "internalType": "bytes",
-          "name": "signature",
-          "type": "bytes"
-        }
-      ],
-      "name": "claimFee",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "components": [
-            {
-              "internalType": "address",
-              "name": "owner",
-              "type": "address"
-            },
-            {
-              "internalType": "uint32",
-              "name": "boxId",
-              "type": "uint32"
-            },
-            {
-              "internalType": "uint256",
-              "name": "expiry",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "nonce",
-              "type": "uint256"
-            },
-            {
-              "internalType": "address",
-              "name": "tokenSpent",
-              "type": "address"
-            },
-            {
-              "internalType": "uint256",
-              "name": "amountSpent",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "amountFee",
-              "type": "uint256"
-            },
-            {
-              "internalType": "address",
-              "name": "tokenReceived",
-              "type": "address"
-            },
-            {
-              "internalType": "uint256",
-              "name": "minReceived",
-              "type": "uint256"
-            },
-            {
-              "internalType": "address",
-              "name": "receiver",
-              "type": "address"
-            },
-            {
-              "internalType": "address",
-              "name": "swapExecutor",
-              "type": "address"
-            },
             {
               "internalType": "address",
-              "name": "swapExtRouter",
+              "name": "swapApprove",
               "type": "address"
             },
             {
@@ -834,7 +500,7 @@
               "type": "bytes"
             }
           ],
-          "internalType": "struct IPCrossChainSwapHub.SwapTokenMessage",
+          "internalType": "struct IPCrossChainSwapHub.BuyCrossChainPtMessage",
           "name": "message",
           "type": "tuple"
         },
@@ -844,9 +510,9 @@
           "type": "bytes"
         }
       ],
-      "name": "claimFee",
+      "name": "buyCrossChainPt",
       "outputs": [],
-      "stateMutability": "nonpayable",
+      "stateMutability": "payable",
       "type": "function"
     },
     {
@@ -880,6 +546,11 @@
           "internalType": "bytes32",
           "name": "salt",
           "type": "bytes32"
+        },
+        {
+          "internalType": "bool",
+          "name": "deployed",
+          "type": "bool"
         }
       ],
       "stateMutability": "view",
@@ -978,18 +649,23 @@
               "type": "uint256"
             },
             {
-              "internalType": "address",
-              "name": "receiver",
-              "type": "address"
+              "internalType": "bool",
+              "name": "pullFromOwner",
+              "type": "bool"
+            },
+            {
+              "internalType": "bool",
+              "name": "sendToOwner",
+              "type": "bool"
             },
             {
               "internalType": "address",
-              "name": "swapExecutor",
+              "name": "swapExtRouter",
               "type": "address"
             },
             {
               "internalType": "address",
-              "name": "swapExtRouter",
+              "name": "swapApprove",
               "type": "address"
             },
             {
@@ -1040,56 +716,21 @@
             },
             {
               "internalType": "address",
-              "name": "tokenSpent",
+              "name": "token",
               "type": "address"
             },
             {
               "internalType": "uint256",
-              "name": "amountSpent",
+              "name": "amountWithdraw",
               "type": "uint256"
             },
             {
               "internalType": "uint256",
               "name": "amountFee",
               "type": "uint256"
-            },
-            {
-              "internalType": "address",
-              "name": "ptAdapter",
-              "type": "address"
-            },
-            {
-              "internalType": "uint256",
-              "name": "minPtReceived",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint32",
-              "name": "dstEid",
-              "type": "uint32"
-            },
-            {
-              "internalType": "bytes32",
-              "name": "receiver",
-              "type": "bytes32"
-            },
-            {
-              "internalType": "address",
-              "name": "swapExecutor",
-              "type": "address"
-            },
-            {
-              "internalType": "address",
-              "name": "swapExtRouter",
-              "type": "address"
-            },
-            {
-              "internalType": "bytes",
-              "name": "swapCalldata",
-              "type": "bytes"
             }
           ],
-          "internalType": "struct IPCrossChainSwapHub.BuyCrossChainPtMessage",
+          "internalType": "struct IPCrossChainSwapHub.WithdrawTokenMessage",
           "name": "message",
           "type": "tuple"
         }
@@ -1131,12 +772,12 @@
             },
             {
               "internalType": "address",
-              "name": "token",
+              "name": "tokenSpent",
               "type": "address"
             },
             {
               "internalType": "uint256",
-              "name": "amountBridge",
+              "name": "amountSpent",
               "type": "uint256"
             },
             {
@@ -1146,16 +787,46 @@
             },
             {
               "internalType": "address",
-              "name": "bridgeExtRouter",
+              "name": "ptAdapter",
+              "type": "address"
+            },
+            {
+              "internalType": "uint256",
+              "name": "minPtReceived",
+              "type": "uint256"
+            },
+            {
+              "internalType": "uint32",
+              "name": "dstEid",
+              "type": "uint32"
+            },
+            {
+              "internalType": "bytes32",
+              "name": "receiver",
+              "type": "bytes32"
+            },
+            {
+              "internalType": "bool",
+              "name": "pullFromOwner",
+              "type": "bool"
+            },
+            {
+              "internalType": "address",
+              "name": "swapExtRouter",
+              "type": "address"
+            },
+            {
+              "internalType": "address",
+              "name": "swapApprove",
               "type": "address"
             },
             {
               "internalType": "bytes",
-              "name": "bridgeCalldata",
+              "name": "swapCalldata",
               "type": "bytes"
             }
           ],
-          "internalType": "struct IPCrossChainSwapHub.BridgeTokenMessage",
+          "internalType": "struct IPCrossChainSwapHub.BuyCrossChainPtMessage",
           "name": "message",
           "type": "tuple"
         }
@@ -1195,11 +866,6 @@
               "name": "nonce",
               "type": "uint256"
             },
-            {
-              "internalType": "address",
-              "name": "receiver",
-              "type": "address"
-            },
             {
               "internalType": "address",
               "name": "token",
@@ -1207,16 +873,36 @@
             },
             {
               "internalType": "uint256",
-              "name": "amountWithdraw",
+              "name": "amountBridge",
               "type": "uint256"
             },
             {
               "internalType": "uint256",
               "name": "amountFee",
               "type": "uint256"
+            },
+            {
+              "internalType": "bool",
+              "name": "pullFromOwner",
+              "type": "bool"
+            },
+            {
+              "internalType": "address",
+              "name": "bridgeExtRouter",
+              "type": "address"
+            },
+            {
+              "internalType": "address",
+              "name": "bridgeApprove",
+              "type": "address"
+            },
+            {
+              "internalType": "bytes",
+              "name": "bridgeCalldata",
+              "type": "bytes"
             }
           ],
-          "internalType": "struct IPCrossChainSwapHub.WithdrawTokenMessage",
+          "internalType": "struct IPCrossChainSwapHub.BridgeTokenMessage",
           "name": "message",
           "type": "tuple"
         }
@@ -1364,18 +1050,23 @@
               "type": "uint256"
             },
             {
-              "internalType": "address",
-              "name": "receiver",
-              "type": "address"
+              "internalType": "bool",
+              "name": "pullFromOwner",
+              "type": "bool"
+            },
+            {
+              "internalType": "bool",
+              "name": "sendToOwner",
+              "type": "bool"
             },
             {
               "internalType": "address",
-              "name": "swapExecutor",
+              "name": "swapExtRouter",
               "type": "address"
             },
             {
               "internalType": "address",
-              "name": "swapExtRouter",
+              "name": "swapApprove",
               "type": "address"
             },
             {
@@ -1446,11 +1137,6 @@
               "name": "nonce",
               "type": "uint256"
             },
-            {
-              "internalType": "address",
-              "name": "receiver",
-              "type": "address"
-            },
             {
               "internalType": "address",
               "name": "token",