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

package/typechain-types/SwapHubBase.ts

@@ -30,8 +30,9 @@ export declare namespace IPCrossChainSwapHub {
     expiry: BigNumberish;
     nonce: BigNumberish;
     token: string;
-    bridgeAmount: BigNumberish;
-    feeAmount: BigNumberish;
+    amountBridge: BigNumberish;
+    amountFee: BigNumberish;
+    pullFromOwner: boolean;
     bridgeExtRouter: string;
     bridgeCalldata: BytesLike;
   };
@@ -44,6 +45,7 @@ export declare namespace IPCrossChainSwapHub {
     string,
     BigNumber,
     BigNumber,
+    boolean,
     string,
     string
   ] & {
@@ -52,81 +54,63 @@ export declare namespace IPCrossChainSwapHub {
     expiry: BigNumber;
     nonce: BigNumber;
     token: string;
-    bridgeAmount: BigNumber;
-    feeAmount: BigNumber;
+    amountBridge: BigNumber;
+    amountFee: BigNumber;
+    pullFromOwner: boolean;
     bridgeExtRouter: string;
     bridgeCalldata: string;
   };
 
-  export type BuyCrossChainPtIntentStruct = {
+  export type BuyCrossChainPtMessageStruct = {
     owner: string;
     boxId: BigNumberish;
-    salt: BigNumberish;
     expiry: BigNumberish;
+    nonce: BigNumberish;
     tokenSpent: string;
-    maxAmountSpent: BigNumberish;
-    pt: string;
+    amountSpent: BigNumberish;
+    amountFee: BigNumberish;
     ptAdapter: string;
     minPtReceived: BigNumberish;
-    dstLzEid: BigNumberish;
+    dstEid: BigNumberish;
     receiver: BytesLike;
+    pullFromOwner: boolean;
+    swapExecutor: string;
+    swapExtRouter: string;
+    swapCalldata: BytesLike;
   };
 
-  export type BuyCrossChainPtIntentStructOutput = [
+  export type BuyCrossChainPtMessageStructOutput = [
     string,
     number,
     BigNumber,
     BigNumber,
     string,
     BigNumber,
-    string,
+    BigNumber,
     string,
     BigNumber,
     number,
+    string,
+    boolean,
+    string,
+    string,
     string
   ] & {
     owner: string;
     boxId: number;
-    salt: BigNumber;
     expiry: BigNumber;
+    nonce: BigNumber;
     tokenSpent: string;
-    maxAmountSpent: BigNumber;
-    pt: string;
+    amountSpent: BigNumber;
+    amountFee: BigNumber;
     ptAdapter: string;
     minPtReceived: BigNumber;
-    dstLzEid: number;
+    dstEid: number;
     receiver: string;
-  };
-
-  export type ExecuteBuyCrossChainPtMessageStruct = {
-    validator: string;
-    intentHash: BytesLike;
-    amountSpent: BigNumberish;
-    feeAmount: BigNumberish;
-    swapExecutor: string;
-    swapExtRouter: string;
-    swapCalldata: BytesLike;
-    expiry: BigNumberish;
-  };
-
-  export type ExecuteBuyCrossChainPtMessageStructOutput = [
-    string,
-    string,
-    BigNumber,
-    BigNumber,
-    string,
-    string,
-    string,
-    BigNumber
-  ] & {
-    validator: string;
-    intentHash: string;
-    amountSpent: BigNumber;
-    feeAmount: BigNumber;
+    pullFromOwner: boolean;
     swapExecutor: string;
     swapExtRouter: string;
     swapCalldata: string;
-    expiry: BigNumber;
   };
 
   export type SwapTokenMessageStruct = {
@@ -136,9 +120,11 @@ export declare namespace IPCrossChainSwapHub {
     nonce: BigNumberish;
     tokenSpent: string;
     amountSpent: BigNumberish;
+    amountFee: BigNumberish;
     tokenReceived: string;
     minReceived: BigNumberish;
-    feeAmount: BigNumberish;
+    pullFromOwner: boolean;
+    sendToOwner: boolean;
     swapExecutor: string;
     swapExtRouter: string;
     swapCalldata: BytesLike;
@@ -151,9 +137,11 @@ export declare namespace IPCrossChainSwapHub {
     BigNumber,
     string,
     BigNumber,
-    string,
     BigNumber,
+    string,
     BigNumber,
+    boolean,
+    boolean,
     string,
     string,
     string
@@ -164,9 +152,11 @@ export declare namespace IPCrossChainSwapHub {
     nonce: BigNumber;
     tokenSpent: string;
     amountSpent: BigNumber;
+    amountFee: BigNumber;
     tokenReceived: string;
     minReceived: BigNumber;
-    feeAmount: BigNumber;
+    pullFromOwner: boolean;
+    sendToOwner: boolean;
     swapExecutor: string;
     swapExtRouter: string;
     swapCalldata: string;
@@ -177,10 +167,9 @@ export declare namespace IPCrossChainSwapHub {
     boxId: BigNumberish;
     expiry: BigNumberish;
     nonce: BigNumberish;
-    receiver: string;
     token: string;
-    withdrawAmount: BigNumberish;
-    feeAmount: BigNumberish;
+    amountWithdraw: BigNumberish;
+    amountFee: BigNumberish;
   };
 
   export type WithdrawTokenMessageStructOutput = [
@@ -189,7 +178,6 @@ export declare namespace IPCrossChainSwapHub {
     BigNumber,
     BigNumber,
     string,
-    string,
     BigNumber,
     BigNumber
   ] & {
@@ -197,10 +185,9 @@ export declare namespace IPCrossChainSwapHub {
     boxId: number;
     expiry: BigNumber;
     nonce: BigNumber;
-    receiver: string;
     token: string;
-    withdrawAmount: BigNumber;
-    feeAmount: BigNumber;
+    amountWithdraw: BigNumber;
+    amountFee: BigNumber;
   };
 }
 
@@ -210,23 +197,20 @@ export interface SwapHubBaseInterface extends utils.Interface {
     "BEACON_PROXY_CODE_CONTRACT()": FunctionFragment;
     "DEPOSIT_BOX_BEACON()": FunctionFragment;
     "DEPOSIT_BOX_CODE_HASH()": FunctionFragment;
-    "bridgeToken((address,uint32,uint256,uint256,address,uint256,uint256,address,bytes),bytes)": FunctionFragment;
-    "buyCrossChainPt((address,uint32,uint256,uint256,address,uint256,address,address,uint256,uint32,bytes32),bytes,(address,bytes32,uint256,uint256,address,address,bytes,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,address,uint256,uint256,address,address,bytes))": FunctionFragment;
+    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,bool,bool,address,address,bytes))": FunctionFragment;
     "isExecutor(address)": FunctionFragment;
-    "isIntentExecuted(bytes32)": FunctionFragment;
-    "isValidator(address)": FunctionFragment;
     "owner()": FunctionFragment;
     "ownerNonce(address)": FunctionFragment;
     "pendingOwner()": FunctionFragment;
     "setExecutor(address,bool)": FunctionFragment;
-    "setValidator(address,bool)": FunctionFragment;
-    "swapToken((address,uint32,uint256,uint256,address,uint256,address,uint256,uint256,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(
@@ -247,12 +231,7 @@ export interface SwapHubBaseInterface extends utils.Interface {
   ): string;
   encodeFunctionData(
     functionFragment: "buyCrossChainPt",
-    values: [
-      IPCrossChainSwapHub.BuyCrossChainPtIntentStruct,
-      BytesLike,
-      IPCrossChainSwapHub.ExecuteBuyCrossChainPtMessageStruct,
-      BytesLike
-    ]
+    values: [IPCrossChainSwapHub.BuyCrossChainPtMessageStruct, BytesLike]
   ): string;
   encodeFunctionData(
     functionFragment: "claimOwnership",
@@ -271,11 +250,6 @@ export interface SwapHubBaseInterface extends utils.Interface {
     values: [IPCrossChainSwapHub.SwapTokenMessageStruct]
   ): string;
   encodeFunctionData(functionFragment: "isExecutor", values: [string]): string;
-  encodeFunctionData(
-    functionFragment: "isIntentExecuted",
-    values: [BytesLike]
-  ): string;
-  encodeFunctionData(functionFragment: "isValidator", values: [string]): string;
   encodeFunctionData(functionFragment: "owner", values?: undefined): string;
   encodeFunctionData(functionFragment: "ownerNonce", values: [string]): string;
   encodeFunctionData(
@@ -286,10 +260,6 @@ export interface SwapHubBaseInterface extends utils.Interface {
     functionFragment: "setExecutor",
     values: [string, boolean]
   ): string;
-  encodeFunctionData(
-    functionFragment: "setValidator",
-    values: [string, boolean]
-  ): string;
   encodeFunctionData(
     functionFragment: "swapToken",
     values: [IPCrossChainSwapHub.SwapTokenMessageStruct, BytesLike]
@@ -340,14 +310,6 @@ export interface SwapHubBaseInterface extends utils.Interface {
     data: BytesLike
   ): Result;
   decodeFunctionResult(functionFragment: "isExecutor", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "isIntentExecuted",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "isValidator",
-    data: BytesLike
-  ): Result;
   decodeFunctionResult(functionFragment: "owner", data: BytesLike): Result;
   decodeFunctionResult(functionFragment: "ownerNonce", data: BytesLike): Result;
   decodeFunctionResult(
@@ -358,10 +320,6 @@ export interface SwapHubBaseInterface extends utils.Interface {
     functionFragment: "setExecutor",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(
-    functionFragment: "setValidator",
-    data: BytesLike
-  ): Result;
   decodeFunctionResult(functionFragment: "swapToken", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "transferOwnership",
@@ -373,15 +331,14 @@ export interface SwapHubBaseInterface extends utils.Interface {
   ): Result;
 
   events: {
-    "BridgeToken(address,uint32,address,address,uint256,uint256)": EventFragment;
-    "BuyCrossChainPt(address,uint32,bytes32,address,uint256,address,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;
-    "SetValidator(address,bool)": EventFragment;
-    "SwapToken(address,uint32,address,uint256,address,uint256)": EventFragment;
-    "WithdrawToken(address,uint32,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;
@@ -390,36 +347,47 @@ export interface SwapHubBaseInterface extends utils.Interface {
   getEvent(nameOrSignatureOrTopic: "Initialized"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "OwnershipTransferred"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "SetExecutor"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "SetValidator"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "SwapToken"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "WithdrawToken"): EventFragment;
 }
 
 export type BridgeTokenEvent = TypedEvent<
-  [string, number, string, string, BigNumber, BigNumber],
+  [string, number, string, string, BigNumber, BigNumber, boolean],
   {
     owner: string;
     boxId: number;
     bridgeExtRouter: string;
     token: string;
-    bridgeAmount: BigNumber;
-    feeAmount: BigNumber;
+    amountBridge: BigNumber;
+    amountFee: BigNumber;
+    pullFromOwner: boolean;
   }
 >;
 
 export type BridgeTokenEventFilter = TypedEventFilter<BridgeTokenEvent>;
 
 export type BuyCrossChainPtEvent = TypedEvent<
-  [string, number, string, string, BigNumber, string, string, BigNumber],
+  [
+    string,
+    number,
+    string,
+    BigNumber,
+    BigNumber,
+    string,
+    string,
+    BigNumber,
+    boolean
+  ],
   {
     owner: string;
     boxId: number;
-    intentHash: string;
     tokenSpent: string;
     amountSpent: BigNumber;
-    pt: string;
+    amountFee: BigNumber;
     ptAdapter: string;
+    pt: string;
     netPtReceived: BigNumber;
+    pullFromOwner: boolean;
   }
 >;
 
@@ -449,36 +417,41 @@ export type SetExecutorEvent = TypedEvent<
 
 export type SetExecutorEventFilter = TypedEventFilter<SetExecutorEvent>;
 
-export type SetValidatorEvent = TypedEvent<
-  [string, boolean],
-  { validator: string; isValidator: boolean }
->;
-
-export type SetValidatorEventFilter = TypedEventFilter<SetValidatorEvent>;
-
 export type SwapTokenEvent = TypedEvent<
-  [string, number, string, BigNumber, string, BigNumber],
+  [
+    string,
+    number,
+    string,
+    BigNumber,
+    BigNumber,
+    string,
+    BigNumber,
+    boolean,
+    boolean
+  ],
   {
     owner: string;
     boxId: number;
     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, BigNumber, BigNumber],
+  [string, number, string, BigNumber, BigNumber],
   {
     owner: string;
     boxId: number;
-    receiver: string;
     token: string;
-    withdrawAmount: BigNumber;
-    feeAmount: BigNumber;
+    amountWithdraw: BigNumber;
+    amountFee: BigNumber;
   }
 >;
 
@@ -525,10 +498,8 @@ export interface SwapHubBase extends BaseContract {
     ): Promise<ContractTransaction>;
 
     buyCrossChainPt(
-      intent: IPCrossChainSwapHub.BuyCrossChainPtIntentStruct,
-      intentSig: BytesLike,
-      execMsg: IPCrossChainSwapHub.ExecuteBuyCrossChainPtMessageStruct,
-      execSig: BytesLike,
+      message: IPCrossChainSwapHub.BuyCrossChainPtMessageStruct,
+      signature: BytesLike,
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
@@ -540,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
@@ -556,43 +533,28 @@ export interface SwapHubBase extends BaseContract {
       }
     >;
 
-    "hashTypedData((address,uint32,uint256,uint256,address,uint256,address,uint256,uint256,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,bytes32,uint256,uint256,address,address,bytes,uint256))"(
-      message: IPCrossChainSwapHub.ExecuteBuyCrossChainPtMessageStruct,
+    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256))"(
+      message: IPCrossChainSwapHub.WithdrawTokenMessageStruct,
       overrides?: CallOverrides
     ): Promise<[string]>;
 
-    "hashTypedData((address,uint32,uint256,uint256,address,uint256,address,address,uint256,uint32,bytes32))"(
-      intent: IPCrossChainSwapHub.BuyCrossChainPtIntentStruct,
+    "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,uint256,uint256,address,bytes))"(
+    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,bool,address,bytes))"(
       message: IPCrossChainSwapHub.BridgeTokenMessageStruct,
       overrides?: CallOverrides
     ): Promise<[string]>;
 
-    "hashTypedData((address,uint32,uint256,uint256,address,address,uint256,uint256))"(
-      message: IPCrossChainSwapHub.WithdrawTokenMessageStruct,
-      overrides?: CallOverrides
-    ): Promise<[string]>;
-
     isExecutor(executor: string, overrides?: CallOverrides): Promise<[boolean]>;
 
-    isIntentExecuted(
-      intentHash: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<[boolean]>;
-
-    isValidator(
-      validator: string,
-      overrides?: CallOverrides
-    ): Promise<[boolean]>;
-
     owner(overrides?: CallOverrides): Promise<[string]>;
 
     ownerNonce(
@@ -608,12 +570,6 @@ export interface SwapHubBase extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    setValidator(
-      validator: string,
-      isValidator_: boolean,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
     swapToken(
       message: IPCrossChainSwapHub.SwapTokenMessageStruct,
       signature: BytesLike,
@@ -647,10 +603,8 @@ export interface SwapHubBase extends BaseContract {
   ): Promise<ContractTransaction>;
 
   buyCrossChainPt(
-    intent: IPCrossChainSwapHub.BuyCrossChainPtIntentStruct,
-    intentSig: BytesLike,
-    execMsg: IPCrossChainSwapHub.ExecuteBuyCrossChainPtMessageStruct,
-    execSig: BytesLike,
+    message: IPCrossChainSwapHub.BuyCrossChainPtMessageStruct,
+    signature: BytesLike,
     overrides?: PayableOverrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
@@ -662,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
@@ -678,40 +634,28 @@ export interface SwapHubBase extends BaseContract {
     }
   >;
 
-  "hashTypedData((address,uint32,uint256,uint256,address,uint256,address,uint256,uint256,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,bytes32,uint256,uint256,address,address,bytes,uint256))"(
-    message: IPCrossChainSwapHub.ExecuteBuyCrossChainPtMessageStruct,
+  "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256))"(
+    message: IPCrossChainSwapHub.WithdrawTokenMessageStruct,
     overrides?: CallOverrides
   ): Promise<string>;
 
-  "hashTypedData((address,uint32,uint256,uint256,address,uint256,address,address,uint256,uint32,bytes32))"(
-    intent: IPCrossChainSwapHub.BuyCrossChainPtIntentStruct,
+  "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,uint256,uint256,address,bytes))"(
+  "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,bool,address,bytes))"(
     message: IPCrossChainSwapHub.BridgeTokenMessageStruct,
     overrides?: CallOverrides
   ): Promise<string>;
 
-  "hashTypedData((address,uint32,uint256,uint256,address,address,uint256,uint256))"(
-    message: IPCrossChainSwapHub.WithdrawTokenMessageStruct,
-    overrides?: CallOverrides
-  ): Promise<string>;
-
   isExecutor(executor: string, overrides?: CallOverrides): Promise<boolean>;
 
-  isIntentExecuted(
-    intentHash: BytesLike,
-    overrides?: CallOverrides
-  ): Promise<boolean>;
-
-  isValidator(validator: string, overrides?: CallOverrides): Promise<boolean>;
-
   owner(overrides?: CallOverrides): Promise<string>;
 
   ownerNonce(owner: string, overrides?: CallOverrides): Promise<BigNumber>;
@@ -724,12 +668,6 @@ export interface SwapHubBase extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  setValidator(
-    validator: string,
-    isValidator_: boolean,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
   swapToken(
     message: IPCrossChainSwapHub.SwapTokenMessageStruct,
     signature: BytesLike,
@@ -763,10 +701,8 @@ export interface SwapHubBase extends BaseContract {
     ): Promise<void>;
 
     buyCrossChainPt(
-      intent: IPCrossChainSwapHub.BuyCrossChainPtIntentStruct,
-      intentSig: BytesLike,
-      execMsg: IPCrossChainSwapHub.ExecuteBuyCrossChainPtMessageStruct,
-      execSig: BytesLike,
+      message: IPCrossChainSwapHub.BuyCrossChainPtMessageStruct,
+      signature: BytesLike,
       overrides?: CallOverrides
     ): Promise<void>;
 
@@ -776,7 +712,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
@@ -792,40 +734,28 @@ export interface SwapHubBase extends BaseContract {
       }
     >;
 
-    "hashTypedData((address,uint32,uint256,uint256,address,uint256,address,uint256,uint256,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,bytes32,uint256,uint256,address,address,bytes,uint256))"(
-      message: IPCrossChainSwapHub.ExecuteBuyCrossChainPtMessageStruct,
+    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256))"(
+      message: IPCrossChainSwapHub.WithdrawTokenMessageStruct,
       overrides?: CallOverrides
     ): Promise<string>;
 
-    "hashTypedData((address,uint32,uint256,uint256,address,uint256,address,address,uint256,uint32,bytes32))"(
-      intent: IPCrossChainSwapHub.BuyCrossChainPtIntentStruct,
+    "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,uint256,uint256,address,bytes))"(
+    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,bool,address,bytes))"(
       message: IPCrossChainSwapHub.BridgeTokenMessageStruct,
       overrides?: CallOverrides
     ): Promise<string>;
 
-    "hashTypedData((address,uint32,uint256,uint256,address,address,uint256,uint256))"(
-      message: IPCrossChainSwapHub.WithdrawTokenMessageStruct,
-      overrides?: CallOverrides
-    ): Promise<string>;
-
     isExecutor(executor: string, overrides?: CallOverrides): Promise<boolean>;
 
-    isIntentExecuted(
-      intentHash: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<boolean>;
-
-    isValidator(validator: string, overrides?: CallOverrides): Promise<boolean>;
-
     owner(overrides?: CallOverrides): Promise<string>;
 
     ownerNonce(owner: string, overrides?: CallOverrides): Promise<BigNumber>;
@@ -838,12 +768,6 @@ export interface SwapHubBase extends BaseContract {
       overrides?: CallOverrides
     ): Promise<void>;
 
-    setValidator(
-      validator: string,
-      isValidator_: boolean,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
     swapToken(
       message: IPCrossChainSwapHub.SwapTokenMessageStruct,
       signature: BytesLike,
@@ -865,42 +789,46 @@ export interface SwapHubBase extends BaseContract {
   };
 
   filters: {
-    "BridgeToken(address,uint32,address,address,uint256,uint256)"(
+    "BridgeToken(address,uint32,address,address,uint256,uint256,bool)"(
       owner?: string | null,
       boxId?: null,
       bridgeExtRouter?: null,
       token?: null,
-      bridgeAmount?: null,
-      feeAmount?: null
+      amountBridge?: null,
+      amountFee?: null,
+      pullFromOwner?: null
     ): BridgeTokenEventFilter;
     BridgeToken(
       owner?: string | null,
       boxId?: null,
       bridgeExtRouter?: null,
       token?: null,
-      bridgeAmount?: null,
-      feeAmount?: null
+      amountBridge?: null,
+      amountFee?: null,
+      pullFromOwner?: null
     ): BridgeTokenEventFilter;
 
-    "BuyCrossChainPt(address,uint32,bytes32,address,uint256,address,address,uint256)"(
+    "BuyCrossChainPt(address,uint32,address,uint256,uint256,address,address,uint256,bool)"(
       owner?: string | null,
       boxId?: null,
-      intentHash?: null,
       tokenSpent?: null,
       amountSpent?: null,
-      pt?: null,
+      amountFee?: null,
       ptAdapter?: null,
-      netPtReceived?: null
+      pt?: null,
+      netPtReceived?: null,
+      pullFromOwner?: null
     ): BuyCrossChainPtEventFilter;
     BuyCrossChainPt(
       owner?: string | null,
       boxId?: null,
-      intentHash?: null,
       tokenSpent?: null,
       amountSpent?: null,
-      pt?: null,
+      amountFee?: null,
       ptAdapter?: null,
-      netPtReceived?: null
+      pt?: null,
+      netPtReceived?: null,
+      pullFromOwner?: null
     ): BuyCrossChainPtEventFilter;
 
     "EIP712DomainChanged()"(): EIP712DomainChangedEventFilter;
@@ -927,47 +855,42 @@ export interface SwapHubBase extends BaseContract {
       isExecutor?: null
     ): SetExecutorEventFilter;
 
-    "SetValidator(address,bool)"(
-      validator?: string | null,
-      isValidator?: null
-    ): SetValidatorEventFilter;
-    SetValidator(
-      validator?: string | null,
-      isValidator?: null
-    ): SetValidatorEventFilter;
-
-    "SwapToken(address,uint32,address,uint256,address,uint256)"(
+    "SwapToken(address,uint32,address,uint256,uint256,address,uint256,bool,bool)"(
       owner?: string | null,
       boxId?: null,
       tokenSpent?: null,
       amountSpent?: null,
+      amountFee?: null,
       tokenReceived?: null,
-      netTokenReceived?: null
+      netTokenReceived?: null,
+      pullFromOwner?: null,
+      sendToOwner?: null
     ): SwapTokenEventFilter;
     SwapToken(
       owner?: string | null,
       boxId?: null,
       tokenSpent?: null,
       amountSpent?: null,
+      amountFee?: null,
       tokenReceived?: null,
-      netTokenReceived?: null
+      netTokenReceived?: null,
+      pullFromOwner?: null,
+      sendToOwner?: null
     ): SwapTokenEventFilter;
 
-    "WithdrawToken(address,uint32,address,address,uint256,uint256)"(
+    "WithdrawToken(address,uint32,address,uint256,uint256)"(
       owner?: string | null,
       boxId?: null,
-      receiver?: null,
       token?: null,
-      withdrawAmount?: null,
-      feeAmount?: null
+      amountWithdraw?: null,
+      amountFee?: null
     ): WithdrawTokenEventFilter;
     WithdrawToken(
       owner?: string | null,
       boxId?: null,
-      receiver?: null,
       token?: null,
-      withdrawAmount?: null,
-      feeAmount?: null
+      amountWithdraw?: null,
+      amountFee?: null
     ): WithdrawTokenEventFilter;
   };
 
@@ -985,10 +908,8 @@ export interface SwapHubBase extends BaseContract {
     ): Promise<BigNumber>;
 
     buyCrossChainPt(
-      intent: IPCrossChainSwapHub.BuyCrossChainPtIntentStruct,
-      intentSig: BytesLike,
-      execMsg: IPCrossChainSwapHub.ExecuteBuyCrossChainPtMessageStruct,
-      execSig: BytesLike,
+      message: IPCrossChainSwapHub.BuyCrossChainPtMessageStruct,
+      signature: BytesLike,
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
@@ -1004,43 +925,28 @@ export interface SwapHubBase extends BaseContract {
 
     eip712Domain(overrides?: CallOverrides): Promise<BigNumber>;
 
-    "hashTypedData((address,uint32,uint256,uint256,address,uint256,address,uint256,uint256,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,bytes32,uint256,uint256,address,address,bytes,uint256))"(
-      message: IPCrossChainSwapHub.ExecuteBuyCrossChainPtMessageStruct,
+    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256))"(
+      message: IPCrossChainSwapHub.WithdrawTokenMessageStruct,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    "hashTypedData((address,uint32,uint256,uint256,address,uint256,address,address,uint256,uint32,bytes32))"(
-      intent: IPCrossChainSwapHub.BuyCrossChainPtIntentStruct,
+    "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,uint256,uint256,address,bytes))"(
+    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,bool,address,bytes))"(
       message: IPCrossChainSwapHub.BridgeTokenMessageStruct,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    "hashTypedData((address,uint32,uint256,uint256,address,address,uint256,uint256))"(
-      message: IPCrossChainSwapHub.WithdrawTokenMessageStruct,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
     isExecutor(executor: string, overrides?: CallOverrides): Promise<BigNumber>;
 
-    isIntentExecuted(
-      intentHash: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    isValidator(
-      validator: string,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
     owner(overrides?: CallOverrides): Promise<BigNumber>;
 
     ownerNonce(owner: string, overrides?: CallOverrides): Promise<BigNumber>;
@@ -1053,12 +959,6 @@ export interface SwapHubBase extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    setValidator(
-      validator: string,
-      isValidator_: boolean,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
     swapToken(
       message: IPCrossChainSwapHub.SwapTokenMessageStruct,
       signature: BytesLike,
@@ -1099,10 +999,8 @@ export interface SwapHubBase extends BaseContract {
     ): Promise<PopulatedTransaction>;
 
     buyCrossChainPt(
-      intent: IPCrossChainSwapHub.BuyCrossChainPtIntentStruct,
-      intentSig: BytesLike,
-      execMsg: IPCrossChainSwapHub.ExecuteBuyCrossChainPtMessageStruct,
-      execSig: BytesLike,
+      message: IPCrossChainSwapHub.BuyCrossChainPtMessageStruct,
+      signature: BytesLike,
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
@@ -1118,46 +1016,31 @@ export interface SwapHubBase extends BaseContract {
 
     eip712Domain(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
-    "hashTypedData((address,uint32,uint256,uint256,address,uint256,address,uint256,uint256,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,bytes32,uint256,uint256,address,address,bytes,uint256))"(
-      message: IPCrossChainSwapHub.ExecuteBuyCrossChainPtMessageStruct,
+    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256))"(
+      message: IPCrossChainSwapHub.WithdrawTokenMessageStruct,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
-    "hashTypedData((address,uint32,uint256,uint256,address,uint256,address,address,uint256,uint32,bytes32))"(
-      intent: IPCrossChainSwapHub.BuyCrossChainPtIntentStruct,
+    "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,uint256,uint256,address,bytes))"(
+    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,bool,address,bytes))"(
       message: IPCrossChainSwapHub.BridgeTokenMessageStruct,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
-    "hashTypedData((address,uint32,uint256,uint256,address,address,uint256,uint256))"(
-      message: IPCrossChainSwapHub.WithdrawTokenMessageStruct,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
     isExecutor(
       executor: string,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
-    isIntentExecuted(
-      intentHash: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    isValidator(
-      validator: string,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
     owner(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
     ownerNonce(
@@ -1173,12 +1056,6 @@ export interface SwapHubBase extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    setValidator(
-      validator: string,
-      isValidator_: boolean,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
     swapToken(
       message: IPCrossChainSwapHub.SwapTokenMessageStruct,
       signature: BytesLike,