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

package/typechain-types/SwapHubBase.ts

@@ -32,6 +32,7 @@ export declare namespace IPCrossChainSwapHub {
     token: string;
     amountBridge: BigNumberish;
     amountFee: BigNumberish;
+    pullFromOwner: boolean;
     bridgeExtRouter: string;
     bridgeCalldata: BytesLike;
   };
@@ -44,6 +45,7 @@ export declare namespace IPCrossChainSwapHub {
     string,
     BigNumber,
     BigNumber,
+    boolean,
     string,
     string
   ] & {
@@ -54,6 +56,7 @@ export declare namespace IPCrossChainSwapHub {
     token: string;
     amountBridge: BigNumber;
     amountFee: BigNumber;
+    pullFromOwner: boolean;
     bridgeExtRouter: string;
     bridgeCalldata: string;
   };
@@ -70,6 +73,7 @@ export declare namespace IPCrossChainSwapHub {
     minPtReceived: BigNumberish;
     dstEid: BigNumberish;
     receiver: BytesLike;
+    pullFromOwner: boolean;
     swapExecutor: string;
     swapExtRouter: string;
     swapCalldata: BytesLike;
@@ -87,6 +91,7 @@ export declare namespace IPCrossChainSwapHub {
     BigNumber,
     number,
     string,
+    boolean,
     string,
     string,
     string
@@ -102,42 +107,12 @@ export declare namespace IPCrossChainSwapHub {
     minPtReceived: BigNumber;
     dstEid: number;
     receiver: string;
+    pullFromOwner: boolean;
     swapExecutor: string;
     swapExtRouter: string;
     swapCalldata: string;
   };
 
-  export type WithdrawTokenMessageStruct = {
-    owner: string;
-    boxId: BigNumberish;
-    expiry: BigNumberish;
-    nonce: BigNumberish;
-    receiver: string;
-    token: string;
-    amountWithdraw: BigNumberish;
-    amountFee: BigNumberish;
-  };
-
-  export type WithdrawTokenMessageStructOutput = [
-    string,
-    number,
-    BigNumber,
-    BigNumber,
-    string,
-    string,
-    BigNumber,
-    BigNumber
-  ] & {
-    owner: string;
-    boxId: number;
-    expiry: BigNumber;
-    nonce: BigNumber;
-    receiver: string;
-    token: string;
-    amountWithdraw: BigNumber;
-    amountFee: BigNumber;
-  };
-
   export type SwapTokenMessageStruct = {
     owner: string;
     boxId: BigNumberish;
@@ -148,7 +123,8 @@ export declare namespace IPCrossChainSwapHub {
     amountFee: BigNumberish;
     tokenReceived: string;
     minReceived: BigNumberish;
-    receiver: string;
+    pullFromOwner: boolean;
+    sendToOwner: boolean;
     swapExecutor: string;
     swapExtRouter: string;
     swapCalldata: BytesLike;
@@ -164,7 +140,8 @@ export declare namespace IPCrossChainSwapHub {
     BigNumber,
     string,
     BigNumber,
-    string,
+    boolean,
+    boolean,
     string,
     string,
     string
@@ -178,11 +155,40 @@ export declare namespace IPCrossChainSwapHub {
     amountFee: BigNumber;
     tokenReceived: string;
     minReceived: BigNumber;
-    receiver: string;
+    pullFromOwner: boolean;
+    sendToOwner: boolean;
     swapExecutor: string;
     swapExtRouter: string;
     swapCalldata: string;
   };
+
+  export type WithdrawTokenMessageStruct = {
+    owner: string;
+    boxId: BigNumberish;
+    expiry: BigNumberish;
+    nonce: BigNumberish;
+    token: string;
+    amountWithdraw: BigNumberish;
+    amountFee: BigNumberish;
+  };
+
+  export type WithdrawTokenMessageStructOutput = [
+    string,
+    number,
+    BigNumber,
+    BigNumber,
+    string,
+    BigNumber,
+    BigNumber
+  ] & {
+    owner: string;
+    boxId: number;
+    expiry: BigNumber;
+    nonce: BigNumber;
+    token: string;
+    amountWithdraw: BigNumber;
+    amountFee: BigNumber;
+  };
 }
 
 export interface SwapHubBaseInterface extends utils.Interface {
@@ -191,22 +197,20 @@ export interface SwapHubBaseInterface extends utils.Interface {
     "BEACON_PROXY_CODE_CONTRACT()": FunctionFragment;
     "DEPOSIT_BOX_BEACON()": FunctionFragment;
     "DEPOSIT_BOX_CODE_HASH()": FunctionFragment;
-    "actionStatus(bytes32)": FunctionFragment;
-    "bridgeToken((address,uint32,uint256,uint256,address,uint256,uint256,address,bytes),bytes)": FunctionFragment;
-    "buyCrossChainPt((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,uint32,bytes32,address,address,bytes),bytes)": FunctionFragment;
-    "claimFee((address,uint32,uint256,uint256,address,address,uint256,uint256),bytes)": FunctionFragment;
+    "bridgeToken((address,uint32,uint256,uint256,address,uint256,uint256,bool,address,bytes),bytes)": FunctionFragment;
+    "buyCrossChainPt((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,uint32,bytes32,bool,address,address,bytes),bytes)": FunctionFragment;
     "claimOwnership()": FunctionFragment;
     "computeDepositBox(address,uint32)": FunctionFragment;
     "eip712Domain()": FunctionFragment;
-    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,address,address,address,bytes))": FunctionFragment;
+    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,bool,bool,address,address,bytes))": FunctionFragment;
     "isExecutor(address)": FunctionFragment;
     "owner()": FunctionFragment;
     "ownerNonce(address)": FunctionFragment;
     "pendingOwner()": FunctionFragment;
     "setExecutor(address,bool)": FunctionFragment;
-    "swapToken((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,address,address,address,bytes),bytes)": FunctionFragment;
+    "swapToken((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,bool,bool,address,address,bytes),bytes)": FunctionFragment;
     "transferOwnership(address,bool,bool)": FunctionFragment;
-    "withdrawToken((address,uint32,uint256,uint256,address,address,uint256,uint256),bytes)": FunctionFragment;
+    "withdrawToken((address,uint32,uint256,uint256,address,uint256,uint256),bytes)": FunctionFragment;
   };
 
   encodeFunctionData(
@@ -221,10 +225,6 @@ export interface SwapHubBaseInterface extends utils.Interface {
     functionFragment: "DEPOSIT_BOX_CODE_HASH",
     values?: undefined
   ): string;
-  encodeFunctionData(
-    functionFragment: "actionStatus",
-    values: [BytesLike]
-  ): string;
   encodeFunctionData(
     functionFragment: "bridgeToken",
     values: [IPCrossChainSwapHub.BridgeTokenMessageStruct, BytesLike]
@@ -233,10 +233,6 @@ export interface SwapHubBaseInterface extends utils.Interface {
     functionFragment: "buyCrossChainPt",
     values: [IPCrossChainSwapHub.BuyCrossChainPtMessageStruct, BytesLike]
   ): string;
-  encodeFunctionData(
-    functionFragment: "claimFee",
-    values: [IPCrossChainSwapHub.WithdrawTokenMessageStruct, BytesLike]
-  ): string;
   encodeFunctionData(
     functionFragment: "claimOwnership",
     values?: undefined
@@ -289,10 +285,6 @@ export interface SwapHubBaseInterface extends utils.Interface {
     functionFragment: "DEPOSIT_BOX_CODE_HASH",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(
-    functionFragment: "actionStatus",
-    data: BytesLike
-  ): Result;
   decodeFunctionResult(
     functionFragment: "bridgeToken",
     data: BytesLike
@@ -301,7 +293,6 @@ export interface SwapHubBaseInterface extends utils.Interface {
     functionFragment: "buyCrossChainPt",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(functionFragment: "claimFee", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "claimOwnership",
     data: BytesLike
@@ -340,20 +331,18 @@ export interface SwapHubBaseInterface extends utils.Interface {
   ): Result;
 
   events: {
-    "BridgeToken(address,uint32,bytes32,address,address,uint256,uint256)": EventFragment;
-    "BuyCrossChainPt(address,uint32,bytes32,address,uint256,uint256,address,address,uint256)": EventFragment;
-    "ClaimFeeForFailedAction(address,uint32,bytes32,address,uint256)": EventFragment;
+    "BridgeToken(address,uint32,address,address,uint256,uint256,bool)": EventFragment;
+    "BuyCrossChainPt(address,uint32,address,uint256,uint256,address,address,uint256,bool)": EventFragment;
     "EIP712DomainChanged()": EventFragment;
     "Initialized(uint8)": EventFragment;
     "OwnershipTransferred(address,address)": EventFragment;
     "SetExecutor(address,bool)": EventFragment;
-    "SwapToken(address,uint32,bytes32,address,uint256,uint256,address,uint256)": EventFragment;
-    "WithdrawToken(address,uint32,bytes32,address,address,uint256,uint256)": EventFragment;
+    "SwapToken(address,uint32,address,uint256,uint256,address,uint256,bool,bool)": EventFragment;
+    "WithdrawToken(address,uint32,address,uint256,uint256)": EventFragment;
   };
 
   getEvent(nameOrSignatureOrTopic: "BridgeToken"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "BuyCrossChainPt"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "ClaimFeeForFailedAction"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "EIP712DomainChanged"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "Initialized"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "OwnershipTransferred"): EventFragment;
@@ -363,15 +352,15 @@ export interface SwapHubBaseInterface extends utils.Interface {
 }
 
 export type BridgeTokenEvent = TypedEvent<
-  [string, number, string, string, string, BigNumber, BigNumber],
+  [string, number, string, string, BigNumber, BigNumber, boolean],
   {
     owner: string;
     boxId: number;
-    actionHash: string;
     bridgeExtRouter: string;
     token: string;
     amountBridge: BigNumber;
     amountFee: BigNumber;
+    pullFromOwner: boolean;
   }
 >;
 
@@ -382,42 +371,28 @@ export type BuyCrossChainPtEvent = TypedEvent<
     string,
     number,
     string,
-    string,
     BigNumber,
     BigNumber,
     string,
     string,
-    BigNumber
+    BigNumber,
+    boolean
   ],
   {
     owner: string;
     boxId: number;
-    actionHash: string;
     tokenSpent: string;
     amountSpent: BigNumber;
     amountFee: BigNumber;
     ptAdapter: string;
     pt: string;
     netPtReceived: BigNumber;
+    pullFromOwner: boolean;
   }
 >;
 
 export type BuyCrossChainPtEventFilter = TypedEventFilter<BuyCrossChainPtEvent>;
 
-export type ClaimFeeForFailedActionEvent = TypedEvent<
-  [string, number, string, string, BigNumber],
-  {
-    owner: string;
-    boxId: number;
-    actionHash: string;
-    token: string;
-    amount: BigNumber;
-  }
->;
-
-export type ClaimFeeForFailedActionEventFilter =
-  TypedEventFilter<ClaimFeeForFailedActionEvent>;
-
 export type EIP712DomainChangedEvent = TypedEvent<[], {}>;
 
 export type EIP712DomainChangedEventFilter =
@@ -443,28 +418,37 @@ export type SetExecutorEvent = TypedEvent<
 export type SetExecutorEventFilter = TypedEventFilter<SetExecutorEvent>;
 
 export type SwapTokenEvent = TypedEvent<
-  [string, number, string, string, BigNumber, BigNumber, string, BigNumber],
+  [
+    string,
+    number,
+    string,
+    BigNumber,
+    BigNumber,
+    string,
+    BigNumber,
+    boolean,
+    boolean
+  ],
   {
     owner: string;
     boxId: number;
-    actionHash: string;
     tokenSpent: string;
     amountSpent: BigNumber;
     amountFee: BigNumber;
     tokenReceived: string;
     netTokenReceived: BigNumber;
+    pullFromOwner: boolean;
+    sendToOwner: boolean;
   }
 >;
 
 export type SwapTokenEventFilter = TypedEventFilter<SwapTokenEvent>;
 
 export type WithdrawTokenEvent = TypedEvent<
-  [string, number, string, string, string, BigNumber, BigNumber],
+  [string, number, string, BigNumber, BigNumber],
   {
     owner: string;
     boxId: number;
-    actionHash: string;
-    receiver: string;
     token: string;
     amountWithdraw: BigNumber;
     amountFee: BigNumber;
@@ -507,11 +491,6 @@ export interface SwapHubBase extends BaseContract {
 
     DEPOSIT_BOX_CODE_HASH(overrides?: CallOverrides): Promise<[string]>;
 
-    actionStatus(
-      actionStatus: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<[number]>;
-
     bridgeToken(
       message: IPCrossChainSwapHub.BridgeTokenMessageStruct,
       signature: BytesLike,
@@ -524,30 +503,6 @@ export interface SwapHubBase extends BaseContract {
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    "claimFee((address,uint32,uint256,uint256,address,address,uint256,uint256),bytes)"(
-      message: IPCrossChainSwapHub.WithdrawTokenMessageStruct,
-      signature: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    "claimFee((address,uint32,uint256,uint256,address,uint256,uint256,address,bytes),bytes)"(
-      message: IPCrossChainSwapHub.BridgeTokenMessageStruct,
-      signature: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    "claimFee((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,uint32,bytes32,address,address,bytes),bytes)"(
-      message: IPCrossChainSwapHub.BuyCrossChainPtMessageStruct,
-      signature: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    "claimFee((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,address,address,address,bytes),bytes)"(
-      message: IPCrossChainSwapHub.SwapTokenMessageStruct,
-      signature: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
     claimOwnership(
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
@@ -556,7 +511,13 @@ export interface SwapHubBase extends BaseContract {
       owner: string,
       boxId: BigNumberish,
       overrides?: CallOverrides
-    ): Promise<[string, string] & { box: string; salt: string }>;
+    ): Promise<
+      [string, string, boolean] & {
+        box: string;
+        salt: string;
+        deployed: boolean;
+      }
+    >;
 
     eip712Domain(
       overrides?: CallOverrides
@@ -572,23 +533,23 @@ export interface SwapHubBase extends BaseContract {
       }
     >;
 
-    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,address,address,address,bytes))"(
+    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,bool,bool,address,address,bytes))"(
       message: IPCrossChainSwapHub.SwapTokenMessageStruct,
       overrides?: CallOverrides
     ): Promise<[string]>;
 
-    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,uint32,bytes32,address,address,bytes))"(
-      message: IPCrossChainSwapHub.BuyCrossChainPtMessageStruct,
+    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256))"(
+      message: IPCrossChainSwapHub.WithdrawTokenMessageStruct,
       overrides?: CallOverrides
     ): Promise<[string]>;
 
-    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,address,bytes))"(
-      message: IPCrossChainSwapHub.BridgeTokenMessageStruct,
+    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,uint32,bytes32,bool,address,address,bytes))"(
+      message: IPCrossChainSwapHub.BuyCrossChainPtMessageStruct,
       overrides?: CallOverrides
     ): Promise<[string]>;
 
-    "hashTypedData((address,uint32,uint256,uint256,address,address,uint256,uint256))"(
-      message: IPCrossChainSwapHub.WithdrawTokenMessageStruct,
+    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,bool,address,bytes))"(
+      message: IPCrossChainSwapHub.BridgeTokenMessageStruct,
       overrides?: CallOverrides
     ): Promise<[string]>;
 
@@ -635,11 +596,6 @@ export interface SwapHubBase extends BaseContract {
 
   DEPOSIT_BOX_CODE_HASH(overrides?: CallOverrides): Promise<string>;
 
-  actionStatus(
-    actionStatus: BytesLike,
-    overrides?: CallOverrides
-  ): Promise<number>;
-
   bridgeToken(
     message: IPCrossChainSwapHub.BridgeTokenMessageStruct,
     signature: BytesLike,
@@ -652,30 +608,6 @@ export interface SwapHubBase extends BaseContract {
     overrides?: PayableOverrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  "claimFee((address,uint32,uint256,uint256,address,address,uint256,uint256),bytes)"(
-    message: IPCrossChainSwapHub.WithdrawTokenMessageStruct,
-    signature: BytesLike,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  "claimFee((address,uint32,uint256,uint256,address,uint256,uint256,address,bytes),bytes)"(
-    message: IPCrossChainSwapHub.BridgeTokenMessageStruct,
-    signature: BytesLike,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  "claimFee((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,uint32,bytes32,address,address,bytes),bytes)"(
-    message: IPCrossChainSwapHub.BuyCrossChainPtMessageStruct,
-    signature: BytesLike,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  "claimFee((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,address,address,address,bytes),bytes)"(
-    message: IPCrossChainSwapHub.SwapTokenMessageStruct,
-    signature: BytesLike,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
   claimOwnership(
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
@@ -684,7 +616,9 @@ export interface SwapHubBase extends BaseContract {
     owner: string,
     boxId: BigNumberish,
     overrides?: CallOverrides
-  ): Promise<[string, string] & { box: string; salt: string }>;
+  ): Promise<
+    [string, string, boolean] & { box: string; salt: string; deployed: boolean }
+  >;
 
   eip712Domain(
     overrides?: CallOverrides
@@ -700,23 +634,23 @@ export interface SwapHubBase extends BaseContract {
     }
   >;
 
-  "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,address,address,address,bytes))"(
+  "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,bool,bool,address,address,bytes))"(
     message: IPCrossChainSwapHub.SwapTokenMessageStruct,
     overrides?: CallOverrides
   ): Promise<string>;
 
-  "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,uint32,bytes32,address,address,bytes))"(
-    message: IPCrossChainSwapHub.BuyCrossChainPtMessageStruct,
+  "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256))"(
+    message: IPCrossChainSwapHub.WithdrawTokenMessageStruct,
     overrides?: CallOverrides
   ): Promise<string>;
 
-  "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,address,bytes))"(
-    message: IPCrossChainSwapHub.BridgeTokenMessageStruct,
+  "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,uint32,bytes32,bool,address,address,bytes))"(
+    message: IPCrossChainSwapHub.BuyCrossChainPtMessageStruct,
     overrides?: CallOverrides
   ): Promise<string>;
 
-  "hashTypedData((address,uint32,uint256,uint256,address,address,uint256,uint256))"(
-    message: IPCrossChainSwapHub.WithdrawTokenMessageStruct,
+  "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,bool,address,bytes))"(
+    message: IPCrossChainSwapHub.BridgeTokenMessageStruct,
     overrides?: CallOverrides
   ): Promise<string>;
 
@@ -760,11 +694,6 @@ export interface SwapHubBase extends BaseContract {
 
     DEPOSIT_BOX_CODE_HASH(overrides?: CallOverrides): Promise<string>;
 
-    actionStatus(
-      actionStatus: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<number>;
-
     bridgeToken(
       message: IPCrossChainSwapHub.BridgeTokenMessageStruct,
       signature: BytesLike,
@@ -777,37 +706,19 @@ export interface SwapHubBase extends BaseContract {
       overrides?: CallOverrides
     ): Promise<void>;
 
-    "claimFee((address,uint32,uint256,uint256,address,address,uint256,uint256),bytes)"(
-      message: IPCrossChainSwapHub.WithdrawTokenMessageStruct,
-      signature: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    "claimFee((address,uint32,uint256,uint256,address,uint256,uint256,address,bytes),bytes)"(
-      message: IPCrossChainSwapHub.BridgeTokenMessageStruct,
-      signature: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    "claimFee((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,uint32,bytes32,address,address,bytes),bytes)"(
-      message: IPCrossChainSwapHub.BuyCrossChainPtMessageStruct,
-      signature: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    "claimFee((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,address,address,address,bytes),bytes)"(
-      message: IPCrossChainSwapHub.SwapTokenMessageStruct,
-      signature: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
     claimOwnership(overrides?: CallOverrides): Promise<void>;
 
     computeDepositBox(
       owner: string,
       boxId: BigNumberish,
       overrides?: CallOverrides
-    ): Promise<[string, string] & { box: string; salt: string }>;
+    ): Promise<
+      [string, string, boolean] & {
+        box: string;
+        salt: string;
+        deployed: boolean;
+      }
+    >;
 
     eip712Domain(
       overrides?: CallOverrides
@@ -823,23 +734,23 @@ export interface SwapHubBase extends BaseContract {
       }
     >;
 
-    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,address,address,address,bytes))"(
+    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,bool,bool,address,address,bytes))"(
       message: IPCrossChainSwapHub.SwapTokenMessageStruct,
       overrides?: CallOverrides
     ): Promise<string>;
 
-    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,uint32,bytes32,address,address,bytes))"(
-      message: IPCrossChainSwapHub.BuyCrossChainPtMessageStruct,
+    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256))"(
+      message: IPCrossChainSwapHub.WithdrawTokenMessageStruct,
       overrides?: CallOverrides
     ): Promise<string>;
 
-    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,address,bytes))"(
-      message: IPCrossChainSwapHub.BridgeTokenMessageStruct,
+    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,uint32,bytes32,bool,address,address,bytes))"(
+      message: IPCrossChainSwapHub.BuyCrossChainPtMessageStruct,
       overrides?: CallOverrides
     ): Promise<string>;
 
-    "hashTypedData((address,uint32,uint256,uint256,address,address,uint256,uint256))"(
-      message: IPCrossChainSwapHub.WithdrawTokenMessageStruct,
+    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,bool,address,bytes))"(
+      message: IPCrossChainSwapHub.BridgeTokenMessageStruct,
       overrides?: CallOverrides
     ): Promise<string>;
 
@@ -878,63 +789,48 @@ export interface SwapHubBase extends BaseContract {
   };
 
   filters: {
-    "BridgeToken(address,uint32,bytes32,address,address,uint256,uint256)"(
+    "BridgeToken(address,uint32,address,address,uint256,uint256,bool)"(
       owner?: string | null,
       boxId?: null,
-      actionHash?: null,
       bridgeExtRouter?: null,
       token?: null,
       amountBridge?: null,
-      amountFee?: null
+      amountFee?: null,
+      pullFromOwner?: null
     ): BridgeTokenEventFilter;
     BridgeToken(
       owner?: string | null,
       boxId?: null,
-      actionHash?: null,
       bridgeExtRouter?: null,
       token?: null,
       amountBridge?: null,
-      amountFee?: null
+      amountFee?: null,
+      pullFromOwner?: null
     ): BridgeTokenEventFilter;
 
-    "BuyCrossChainPt(address,uint32,bytes32,address,uint256,uint256,address,address,uint256)"(
+    "BuyCrossChainPt(address,uint32,address,uint256,uint256,address,address,uint256,bool)"(
       owner?: string | null,
       boxId?: null,
-      actionHash?: null,
       tokenSpent?: null,
       amountSpent?: null,
       amountFee?: null,
       ptAdapter?: null,
       pt?: null,
-      netPtReceived?: null
+      netPtReceived?: null,
+      pullFromOwner?: null
     ): BuyCrossChainPtEventFilter;
     BuyCrossChainPt(
       owner?: string | null,
       boxId?: null,
-      actionHash?: null,
       tokenSpent?: null,
       amountSpent?: null,
       amountFee?: null,
       ptAdapter?: null,
       pt?: null,
-      netPtReceived?: null
+      netPtReceived?: null,
+      pullFromOwner?: null
     ): BuyCrossChainPtEventFilter;
 
-    "ClaimFeeForFailedAction(address,uint32,bytes32,address,uint256)"(
-      owner?: string | null,
-      boxId?: null,
-      actionHash?: null,
-      token?: null,
-      amount?: null
-    ): ClaimFeeForFailedActionEventFilter;
-    ClaimFeeForFailedAction(
-      owner?: string | null,
-      boxId?: null,
-      actionHash?: null,
-      token?: null,
-      amount?: null
-    ): ClaimFeeForFailedActionEventFilter;
-
     "EIP712DomainChanged()"(): EIP712DomainChangedEventFilter;
     EIP712DomainChanged(): EIP712DomainChangedEventFilter;
 
@@ -959,32 +855,32 @@ export interface SwapHubBase extends BaseContract {
       isExecutor?: null
     ): SetExecutorEventFilter;
 
-    "SwapToken(address,uint32,bytes32,address,uint256,uint256,address,uint256)"(
+    "SwapToken(address,uint32,address,uint256,uint256,address,uint256,bool,bool)"(
       owner?: string | null,
       boxId?: null,
-      actionHash?: null,
       tokenSpent?: null,
       amountSpent?: null,
       amountFee?: null,
       tokenReceived?: null,
-      netTokenReceived?: null
+      netTokenReceived?: null,
+      pullFromOwner?: null,
+      sendToOwner?: null
     ): SwapTokenEventFilter;
     SwapToken(
       owner?: string | null,
       boxId?: null,
-      actionHash?: null,
       tokenSpent?: null,
       amountSpent?: null,
       amountFee?: null,
       tokenReceived?: null,
-      netTokenReceived?: null
+      netTokenReceived?: null,
+      pullFromOwner?: null,
+      sendToOwner?: null
     ): SwapTokenEventFilter;
 
-    "WithdrawToken(address,uint32,bytes32,address,address,uint256,uint256)"(
+    "WithdrawToken(address,uint32,address,uint256,uint256)"(
       owner?: string | null,
       boxId?: null,
-      actionHash?: null,
-      receiver?: null,
       token?: null,
       amountWithdraw?: null,
       amountFee?: null
@@ -992,8 +888,6 @@ export interface SwapHubBase extends BaseContract {
     WithdrawToken(
       owner?: string | null,
       boxId?: null,
-      actionHash?: null,
-      receiver?: null,
       token?: null,
       amountWithdraw?: null,
       amountFee?: null
@@ -1007,11 +901,6 @@ export interface SwapHubBase extends BaseContract {
 
     DEPOSIT_BOX_CODE_HASH(overrides?: CallOverrides): Promise<BigNumber>;
 
-    actionStatus(
-      actionStatus: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
     bridgeToken(
       message: IPCrossChainSwapHub.BridgeTokenMessageStruct,
       signature: BytesLike,
@@ -1024,30 +913,6 @@ export interface SwapHubBase extends BaseContract {
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    "claimFee((address,uint32,uint256,uint256,address,address,uint256,uint256),bytes)"(
-      message: IPCrossChainSwapHub.WithdrawTokenMessageStruct,
-      signature: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    "claimFee((address,uint32,uint256,uint256,address,uint256,uint256,address,bytes),bytes)"(
-      message: IPCrossChainSwapHub.BridgeTokenMessageStruct,
-      signature: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    "claimFee((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,uint32,bytes32,address,address,bytes),bytes)"(
-      message: IPCrossChainSwapHub.BuyCrossChainPtMessageStruct,
-      signature: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    "claimFee((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,address,address,address,bytes),bytes)"(
-      message: IPCrossChainSwapHub.SwapTokenMessageStruct,
-      signature: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
     claimOwnership(
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
@@ -1060,23 +925,23 @@ export interface SwapHubBase extends BaseContract {
 
     eip712Domain(overrides?: CallOverrides): Promise<BigNumber>;
 
-    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,address,address,address,bytes))"(
+    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,bool,bool,address,address,bytes))"(
       message: IPCrossChainSwapHub.SwapTokenMessageStruct,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,uint32,bytes32,address,address,bytes))"(
-      message: IPCrossChainSwapHub.BuyCrossChainPtMessageStruct,
+    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256))"(
+      message: IPCrossChainSwapHub.WithdrawTokenMessageStruct,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,address,bytes))"(
-      message: IPCrossChainSwapHub.BridgeTokenMessageStruct,
+    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,uint32,bytes32,bool,address,address,bytes))"(
+      message: IPCrossChainSwapHub.BuyCrossChainPtMessageStruct,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    "hashTypedData((address,uint32,uint256,uint256,address,address,uint256,uint256))"(
-      message: IPCrossChainSwapHub.WithdrawTokenMessageStruct,
+    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,bool,address,bytes))"(
+      message: IPCrossChainSwapHub.BridgeTokenMessageStruct,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
@@ -1127,11 +992,6 @@ export interface SwapHubBase extends BaseContract {
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
-    actionStatus(
-      actionStatus: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
     bridgeToken(
       message: IPCrossChainSwapHub.BridgeTokenMessageStruct,
       signature: BytesLike,
@@ -1144,30 +1004,6 @@ export interface SwapHubBase extends BaseContract {
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    "claimFee((address,uint32,uint256,uint256,address,address,uint256,uint256),bytes)"(
-      message: IPCrossChainSwapHub.WithdrawTokenMessageStruct,
-      signature: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    "claimFee((address,uint32,uint256,uint256,address,uint256,uint256,address,bytes),bytes)"(
-      message: IPCrossChainSwapHub.BridgeTokenMessageStruct,
-      signature: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    "claimFee((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,uint32,bytes32,address,address,bytes),bytes)"(
-      message: IPCrossChainSwapHub.BuyCrossChainPtMessageStruct,
-      signature: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    "claimFee((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,address,address,address,bytes),bytes)"(
-      message: IPCrossChainSwapHub.SwapTokenMessageStruct,
-      signature: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
     claimOwnership(
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
@@ -1180,23 +1016,23 @@ export interface SwapHubBase extends BaseContract {
 
     eip712Domain(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
-    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,address,address,address,bytes))"(
+    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,bool,bool,address,address,bytes))"(
       message: IPCrossChainSwapHub.SwapTokenMessageStruct,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
-    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,uint32,bytes32,address,address,bytes))"(
-      message: IPCrossChainSwapHub.BuyCrossChainPtMessageStruct,
+    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256))"(
+      message: IPCrossChainSwapHub.WithdrawTokenMessageStruct,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
-    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,address,bytes))"(
-      message: IPCrossChainSwapHub.BridgeTokenMessageStruct,
+    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,uint32,bytes32,bool,address,address,bytes))"(
+      message: IPCrossChainSwapHub.BuyCrossChainPtMessageStruct,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
-    "hashTypedData((address,uint32,uint256,uint256,address,address,uint256,uint256))"(
-      message: IPCrossChainSwapHub.WithdrawTokenMessageStruct,
+    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,bool,address,bytes))"(
+      message: IPCrossChainSwapHub.BridgeTokenMessageStruct,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;