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

package/typechain-types/SwapHubBase.ts

@@ -25,14 +25,15 @@ import type {
 
 export declare namespace IPCrossChainSwapHub {
   export type BridgeTokenMessageStruct = {
-    owner: string;
-    boxId: BigNumberish;
+    proposer: string;
     expiry: BigNumberish;
+    requestId: BigNumberish;
     nonce: BigNumberish;
+    owner: string;
+    boxId: BigNumberish;
     token: string;
     amountBridge: BigNumberish;
     amountFee: BigNumberish;
-    pullFromOwner: boolean;
     bridgeExtRouter: string;
     bridgeApprove: string;
     bridgeCalldata: BytesLike;
@@ -40,94 +41,43 @@ export declare namespace IPCrossChainSwapHub {
 
   export type BridgeTokenMessageStructOutput = [
     string,
-    number,
     BigNumber,
     BigNumber,
+    BigNumber,
+    string,
+    number,
     string,
     BigNumber,
     BigNumber,
-    boolean,
     string,
     string,
     string
   ] & {
-    owner: string;
-    boxId: number;
+    proposer: string;
     expiry: BigNumber;
+    requestId: BigNumber;
     nonce: BigNumber;
+    owner: string;
+    boxId: number;
     token: string;
     amountBridge: BigNumber;
     amountFee: BigNumber;
-    pullFromOwner: boolean;
     bridgeExtRouter: string;
     bridgeApprove: string;
     bridgeCalldata: string;
   };
 
-  export type BuyCrossChainPtMessageStruct = {
-    owner: string;
-    boxId: BigNumberish;
+  export type SwapTokenMessageStruct = {
+    proposer: string;
     expiry: BigNumberish;
+    requestId: BigNumberish;
     nonce: BigNumberish;
-    tokenSpent: string;
-    amountSpent: BigNumberish;
-    amountFee: BigNumberish;
-    ptAdapter: string;
-    minPtReceived: BigNumberish;
-    dstEid: BigNumberish;
-    receiver: BytesLike;
-    pullFromOwner: boolean;
-    swapExtRouter: string;
-    swapApprove: string;
-    swapCalldata: BytesLike;
-  };
-
-  export type BuyCrossChainPtMessageStructOutput = [
-    string,
-    number,
-    BigNumber,
-    BigNumber,
-    string,
-    BigNumber,
-    BigNumber,
-    string,
-    BigNumber,
-    number,
-    string,
-    boolean,
-    string,
-    string,
-    string
-  ] & {
-    owner: string;
-    boxId: number;
-    expiry: BigNumber;
-    nonce: BigNumber;
-    tokenSpent: string;
-    amountSpent: BigNumber;
-    amountFee: BigNumber;
-    ptAdapter: string;
-    minPtReceived: BigNumber;
-    dstEid: number;
-    receiver: string;
-    pullFromOwner: boolean;
-    swapExtRouter: string;
-    swapApprove: string;
-    swapCalldata: string;
-  };
-
-  export type SwapTokenMessageStruct = {
     owner: string;
     boxId: BigNumberish;
-    expiry: BigNumberish;
-    nonce: BigNumberish;
     tokenSpent: string;
     amountSpent: BigNumberish;
-    amountFee: BigNumberish;
     tokenReceived: string;
     minReceived: BigNumberish;
-    pullFromOwner: boolean;
-    sendToOwner: boolean;
     swapExtRouter: string;
     swapApprove: string;
     swapCalldata: BytesLike;
@@ -135,41 +85,41 @@ export declare namespace IPCrossChainSwapHub {
 
   export type SwapTokenMessageStructOutput = [
     string,
-    number,
     BigNumber,
     BigNumber,
-    string,
     BigNumber,
+    string,
+    number,
+    string,
     BigNumber,
     string,
     BigNumber,
-    boolean,
-    boolean,
     string,
     string,
     string
   ] & {
-    owner: string;
-    boxId: number;
+    proposer: string;
     expiry: BigNumber;
+    requestId: BigNumber;
     nonce: BigNumber;
+    owner: string;
+    boxId: number;
     tokenSpent: string;
     amountSpent: BigNumber;
-    amountFee: BigNumber;
     tokenReceived: string;
     minReceived: BigNumber;
-    pullFromOwner: boolean;
-    sendToOwner: boolean;
     swapExtRouter: string;
     swapApprove: string;
     swapCalldata: string;
   };
 
   export type WithdrawTokenMessageStruct = {
-    owner: string;
-    boxId: BigNumberish;
+    proposer: string;
     expiry: BigNumberish;
+    requestId: BigNumberish;
     nonce: BigNumberish;
+    owner: string;
+    boxId: BigNumberish;
     token: string;
     amountWithdraw: BigNumberish;
     amountFee: BigNumberish;
@@ -177,17 +127,21 @@ export declare namespace IPCrossChainSwapHub {
 
   export type WithdrawTokenMessageStructOutput = [
     string,
-    number,
     BigNumber,
     BigNumber,
+    BigNumber,
+    string,
+    number,
     string,
     BigNumber,
     BigNumber
   ] & {
-    owner: string;
-    boxId: number;
+    proposer: string;
     expiry: BigNumber;
+    requestId: BigNumber;
     nonce: BigNumber;
+    owner: string;
+    boxId: number;
     token: string;
     amountWithdraw: BigNumber;
     amountFee: BigNumber;
@@ -197,36 +151,26 @@ export declare namespace IPCrossChainSwapHub {
 export interface SwapHubBaseInterface extends utils.Interface {
   contractName: "SwapHubBase";
   functions: {
-    "BEACON_PROXY_CODE_CONTRACT()": FunctionFragment;
-    "DEPOSIT_BOX_BEACON()": FunctionFragment;
-    "DEPOSIT_BOX_CODE_HASH()": FunctionFragment;
+    "DEPOSIT_BOX_FACTORY()": FunctionFragment;
     "TREASURY()": FunctionFragment;
-    "bridgeToken((address,uint32,uint256,uint256,address,uint256,uint256,bool,address,address,bytes),bytes)": FunctionFragment;
-    "buyCrossChainPt((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,uint32,bytes32,bool,address,address,bytes),bytes)": FunctionFragment;
+    "bridgeToken((address,uint256,uint256,uint256,address,uint32,address,uint256,uint256,address,address,bytes),bytes)": FunctionFragment;
     "claimOwnership()": FunctionFragment;
-    "computeDepositBox(address,uint32)": FunctionFragment;
     "eip712Domain()": FunctionFragment;
-    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,bool,bool,address,address,bytes))": FunctionFragment;
+    "hashTypedData((address,uint256,uint256,uint256,address,uint32,address,uint256,uint256,address,address,bytes))": FunctionFragment;
     "isExecutor(address)": FunctionFragment;
+    "isProposer(address)": FunctionFragment;
     "owner()": FunctionFragment;
-    "ownerNonce(address)": FunctionFragment;
     "pendingOwner()": FunctionFragment;
+    "requestNonce(uint256)": FunctionFragment;
     "setExecutor(address,bool)": FunctionFragment;
-    "swapToken((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,bool,bool,address,address,bytes),bytes)": FunctionFragment;
+    "setProposer(address,bool)": FunctionFragment;
+    "swapToken((address,uint256,uint256,uint256,address,uint32,address,uint256,address,uint256,address,address,bytes),bytes)": FunctionFragment;
     "transferOwnership(address,bool,bool)": FunctionFragment;
-    "withdrawToken((address,uint32,uint256,uint256,address,uint256,uint256),bytes)": FunctionFragment;
+    "withdrawToken((address,uint256,uint256,uint256,address,uint32,address,uint256,uint256),bytes)": FunctionFragment;
   };
 
   encodeFunctionData(
-    functionFragment: "BEACON_PROXY_CODE_CONTRACT",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "DEPOSIT_BOX_BEACON",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "DEPOSIT_BOX_CODE_HASH",
+    functionFragment: "DEPOSIT_BOX_FACTORY",
     values?: undefined
   ): string;
   encodeFunctionData(functionFragment: "TREASURY", values?: undefined): string;
@@ -234,37 +178,37 @@ export interface SwapHubBaseInterface extends utils.Interface {
     functionFragment: "bridgeToken",
     values: [IPCrossChainSwapHub.BridgeTokenMessageStruct, BytesLike]
   ): string;
-  encodeFunctionData(
-    functionFragment: "buyCrossChainPt",
-    values: [IPCrossChainSwapHub.BuyCrossChainPtMessageStruct, BytesLike]
-  ): string;
   encodeFunctionData(
     functionFragment: "claimOwnership",
     values?: undefined
   ): string;
-  encodeFunctionData(
-    functionFragment: "computeDepositBox",
-    values: [string, BigNumberish]
-  ): string;
   encodeFunctionData(
     functionFragment: "eip712Domain",
     values?: undefined
   ): string;
   encodeFunctionData(
     functionFragment: "hashTypedData",
-    values: [IPCrossChainSwapHub.SwapTokenMessageStruct]
+    values: [IPCrossChainSwapHub.BridgeTokenMessageStruct]
   ): string;
   encodeFunctionData(functionFragment: "isExecutor", values: [string]): string;
+  encodeFunctionData(functionFragment: "isProposer", values: [string]): string;
   encodeFunctionData(functionFragment: "owner", values?: undefined): string;
-  encodeFunctionData(functionFragment: "ownerNonce", values: [string]): string;
   encodeFunctionData(
     functionFragment: "pendingOwner",
     values?: undefined
   ): string;
+  encodeFunctionData(
+    functionFragment: "requestNonce",
+    values: [BigNumberish]
+  ): string;
   encodeFunctionData(
     functionFragment: "setExecutor",
     values: [string, boolean]
   ): string;
+  encodeFunctionData(
+    functionFragment: "setProposer",
+    values: [string, boolean]
+  ): string;
   encodeFunctionData(
     functionFragment: "swapToken",
     values: [IPCrossChainSwapHub.SwapTokenMessageStruct, BytesLike]
@@ -279,15 +223,7 @@ export interface SwapHubBaseInterface extends utils.Interface {
   ): string;
 
   decodeFunctionResult(
-    functionFragment: "BEACON_PROXY_CODE_CONTRACT",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "DEPOSIT_BOX_BEACON",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "DEPOSIT_BOX_CODE_HASH",
+    functionFragment: "DEPOSIT_BOX_FACTORY",
     data: BytesLike
   ): Result;
   decodeFunctionResult(functionFragment: "TREASURY", data: BytesLike): Result;
@@ -295,18 +231,10 @@ export interface SwapHubBaseInterface extends utils.Interface {
     functionFragment: "bridgeToken",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(
-    functionFragment: "buyCrossChainPt",
-    data: BytesLike
-  ): Result;
   decodeFunctionResult(
     functionFragment: "claimOwnership",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(
-    functionFragment: "computeDepositBox",
-    data: BytesLike
-  ): Result;
   decodeFunctionResult(
     functionFragment: "eip712Domain",
     data: BytesLike
@@ -316,16 +244,24 @@ export interface SwapHubBaseInterface extends utils.Interface {
     data: BytesLike
   ): Result;
   decodeFunctionResult(functionFragment: "isExecutor", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "isProposer", data: BytesLike): Result;
   decodeFunctionResult(functionFragment: "owner", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "ownerNonce", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "pendingOwner",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "requestNonce",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(
     functionFragment: "setExecutor",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "setProposer",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(functionFragment: "swapToken", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "transferOwnership",
@@ -337,68 +273,42 @@ export interface SwapHubBaseInterface extends utils.Interface {
   ): Result;
 
   events: {
-    "BridgeToken(address,uint32,address,address,uint256,uint256,bool)": EventFragment;
-    "BuyCrossChainPt(address,uint32,address,uint256,uint256,address,address,uint256,bool)": EventFragment;
+    "BridgeToken(uint256,uint256,address,uint32,address,address,uint256,uint256)": EventFragment;
     "EIP712DomainChanged()": EventFragment;
     "Initialized(uint8)": EventFragment;
     "OwnershipTransferred(address,address)": EventFragment;
     "SetExecutor(address,bool)": EventFragment;
-    "SwapToken(address,uint32,address,uint256,uint256,address,uint256,bool,bool)": EventFragment;
-    "WithdrawToken(address,uint32,address,uint256,uint256)": EventFragment;
+    "SetProposer(address,bool)": EventFragment;
+    "SwapToken(uint256,uint256,address,uint32,address,uint256,address,uint256)": EventFragment;
+    "WithdrawToken(uint256,uint256,address,uint32,address,uint256,uint256)": EventFragment;
   };
 
   getEvent(nameOrSignatureOrTopic: "BridgeToken"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "BuyCrossChainPt"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "EIP712DomainChanged"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "Initialized"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "OwnershipTransferred"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "SetExecutor"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "SetProposer"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "SwapToken"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "WithdrawToken"): EventFragment;
 }
 
 export type BridgeTokenEvent = TypedEvent<
-  [string, number, string, string, BigNumber, BigNumber, boolean],
+  [BigNumber, BigNumber, string, number, string, string, BigNumber, BigNumber],
   {
+    requestId: BigNumber;
+    nonce: BigNumber;
     owner: string;
     boxId: number;
     bridgeExtRouter: string;
     token: string;
     amountBridge: BigNumber;
     amountFee: BigNumber;
-    pullFromOwner: boolean;
   }
 >;
 
 export type BridgeTokenEventFilter = TypedEventFilter<BridgeTokenEvent>;
 
-export type BuyCrossChainPtEvent = TypedEvent<
-  [
-    string,
-    number,
-    string,
-    BigNumber,
-    BigNumber,
-    string,
-    string,
-    BigNumber,
-    boolean
-  ],
-  {
-    owner: string;
-    boxId: number;
-    tokenSpent: string;
-    amountSpent: BigNumber;
-    amountFee: BigNumber;
-    ptAdapter: string;
-    pt: string;
-    netPtReceived: BigNumber;
-    pullFromOwner: boolean;
-  }
->;
-
-export type BuyCrossChainPtEventFilter = TypedEventFilter<BuyCrossChainPtEvent>;
-
 export type EIP712DomainChangedEvent = TypedEvent<[], {}>;
 
 export type EIP712DomainChangedEventFilter =
@@ -423,36 +333,34 @@ export type SetExecutorEvent = TypedEvent<
 
 export type SetExecutorEventFilter = TypedEventFilter<SetExecutorEvent>;
 
+export type SetProposerEvent = TypedEvent<
+  [string, boolean],
+  { proposer: string; isProposer: boolean }
+>;
+
+export type SetProposerEventFilter = TypedEventFilter<SetProposerEvent>;
+
 export type SwapTokenEvent = TypedEvent<
-  [
-    string,
-    number,
-    string,
-    BigNumber,
-    BigNumber,
-    string,
-    BigNumber,
-    boolean,
-    boolean
-  ],
+  [BigNumber, BigNumber, string, number, string, BigNumber, string, BigNumber],
   {
+    requestId: BigNumber;
+    nonce: BigNumber;
     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, BigNumber, BigNumber],
+  [BigNumber, BigNumber, string, number, string, BigNumber, BigNumber],
   {
+    requestId: BigNumber;
+    nonce: BigNumber;
     owner: string;
     boxId: number;
     token: string;
@@ -491,11 +399,7 @@ export interface SwapHubBase extends BaseContract {
   removeListener: OnEvent<this>;
 
   functions: {
-    BEACON_PROXY_CODE_CONTRACT(overrides?: CallOverrides): Promise<[string]>;
-
-    DEPOSIT_BOX_BEACON(overrides?: CallOverrides): Promise<[string]>;
-
-    DEPOSIT_BOX_CODE_HASH(overrides?: CallOverrides): Promise<[string]>;
+    DEPOSIT_BOX_FACTORY(overrides?: CallOverrides): Promise<[string]>;
 
     TREASURY(overrides?: CallOverrides): Promise<[string]>;
 
@@ -505,28 +409,10 @@ export interface SwapHubBase extends BaseContract {
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    buyCrossChainPt(
-      message: IPCrossChainSwapHub.BuyCrossChainPtMessageStruct,
-      signature: BytesLike,
-      overrides?: PayableOverrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
     claimOwnership(
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    computeDepositBox(
-      owner: string,
-      boxId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<
-      [string, string, boolean] & {
-        box: string;
-        salt: string;
-        deployed: boolean;
-      }
-    >;
-
     eip712Domain(
       overrides?: CallOverrides
     ): Promise<
@@ -541,43 +427,46 @@ export interface SwapHubBase extends BaseContract {
       }
     >;
 
-    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,bool,bool,address,address,bytes))"(
-      message: IPCrossChainSwapHub.SwapTokenMessageStruct,
+    "hashTypedData((address,uint256,uint256,uint256,address,uint32,address,uint256,uint256,address,address,bytes))"(
+      ms: IPCrossChainSwapHub.BridgeTokenMessageStruct,
       overrides?: CallOverrides
     ): Promise<[string]>;
 
-    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256))"(
-      message: IPCrossChainSwapHub.WithdrawTokenMessageStruct,
+    "hashTypedData((address,uint256,uint256,uint256,address,uint32,address,uint256,address,uint256,address,address,bytes))"(
+      ms: IPCrossChainSwapHub.SwapTokenMessageStruct,
       overrides?: CallOverrides
     ): Promise<[string]>;
 
-    "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,bool,address,address,bytes))"(
-      message: IPCrossChainSwapHub.BridgeTokenMessageStruct,
+    "hashTypedData((address,uint256,uint256,uint256,address,uint32,address,uint256,uint256))"(
+      ms: IPCrossChainSwapHub.WithdrawTokenMessageStruct,
       overrides?: CallOverrides
     ): Promise<[string]>;
 
     isExecutor(executor: string, overrides?: CallOverrides): Promise<[boolean]>;
 
+    isProposer(proposer: string, overrides?: CallOverrides): Promise<[boolean]>;
+
     owner(overrides?: CallOverrides): Promise<[string]>;
 
-    ownerNonce(
-      owner: string,
+    pendingOwner(overrides?: CallOverrides): Promise<[string]>;
+
+    requestNonce(
+      requestId: BigNumberish,
       overrides?: CallOverrides
     ): Promise<[BigNumber] & { nonce: BigNumber }>;
 
-    pendingOwner(overrides?: CallOverrides): Promise<[string]>;
-
     setExecutor(
       executor: string,
       isExecutor_: boolean,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
+    setProposer(
+      proposer: string,
+      isProposer_: boolean,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
     swapToken(
       message: IPCrossChainSwapHub.SwapTokenMessageStruct,
       signature: BytesLike,
@@ -598,11 +487,7 @@ export interface SwapHubBase extends BaseContract {
     ): Promise<ContractTransaction>;
   };
 
-  BEACON_PROXY_CODE_CONTRACT(overrides?: CallOverrides): Promise<string>;
-
-  DEPOSIT_BOX_BEACON(overrides?: CallOverrides): Promise<string>;
-
-  DEPOSIT_BOX_CODE_HASH(overrides?: CallOverrides): Promise<string>;
+  DEPOSIT_BOX_FACTORY(overrides?: CallOverrides): Promise<string>;
 
   TREASURY(overrides?: CallOverrides): Promise<string>;
 
@@ -612,24 +497,10 @@ export interface SwapHubBase extends BaseContract {
     overrides?: PayableOverrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  buyCrossChainPt(
-    message: IPCrossChainSwapHub.BuyCrossChainPtMessageStruct,
-    signature: BytesLike,
-    overrides?: PayableOverrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
   claimOwnership(
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  computeDepositBox(
-    owner: string,
-    boxId: BigNumberish,
-    overrides?: CallOverrides
-  ): Promise<
-    [string, string, boolean] & { box: string; salt: string; deployed: boolean }
-  >;
-
   eip712Domain(
     overrides?: CallOverrides
   ): Promise<
@@ -644,40 +515,46 @@ export interface SwapHubBase extends BaseContract {
     }
   >;
 
-  "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,bool,bool,address,address,bytes))"(
-    message: IPCrossChainSwapHub.SwapTokenMessageStruct,
+  "hashTypedData((address,uint256,uint256,uint256,address,uint32,address,uint256,uint256,address,address,bytes))"(
+    ms: IPCrossChainSwapHub.BridgeTokenMessageStruct,
     overrides?: CallOverrides
   ): Promise<string>;
 
-  "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256))"(
-    message: IPCrossChainSwapHub.WithdrawTokenMessageStruct,
+  "hashTypedData((address,uint256,uint256,uint256,address,uint32,address,uint256,address,uint256,address,address,bytes))"(
+    ms: IPCrossChainSwapHub.SwapTokenMessageStruct,
     overrides?: CallOverrides
   ): Promise<string>;
 
-  "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,bool,address,address,bytes))"(
-    message: IPCrossChainSwapHub.BridgeTokenMessageStruct,
+  "hashTypedData((address,uint256,uint256,uint256,address,uint32,address,uint256,uint256))"(
+    ms: IPCrossChainSwapHub.WithdrawTokenMessageStruct,
     overrides?: CallOverrides
   ): Promise<string>;
 
   isExecutor(executor: string, overrides?: CallOverrides): Promise<boolean>;
 
-  owner(overrides?: CallOverrides): Promise<string>;
+  isProposer(proposer: string, overrides?: CallOverrides): Promise<boolean>;
 
-  ownerNonce(owner: string, overrides?: CallOverrides): Promise<BigNumber>;
+  owner(overrides?: CallOverrides): Promise<string>;
 
   pendingOwner(overrides?: CallOverrides): Promise<string>;
 
+  requestNonce(
+    requestId: BigNumberish,
+    overrides?: CallOverrides
+  ): Promise<BigNumber>;
+
   setExecutor(
     executor: string,
     isExecutor_: boolean,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
+  setProposer(
+    proposer: string,
+    isProposer_: boolean,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
   swapToken(
     message: IPCrossChainSwapHub.SwapTokenMessageStruct,
     signature: BytesLike,
@@ -698,11 +575,7 @@ export interface SwapHubBase extends BaseContract {
   ): Promise<ContractTransaction>;
 
   callStatic: {
-    BEACON_PROXY_CODE_CONTRACT(overrides?: CallOverrides): Promise<string>;
-
-    DEPOSIT_BOX_BEACON(overrides?: CallOverrides): Promise<string>;
-
-    DEPOSIT_BOX_CODE_HASH(overrides?: CallOverrides): Promise<string>;
+    DEPOSIT_BOX_FACTORY(overrides?: CallOverrides): Promise<string>;
 
     TREASURY(overrides?: CallOverrides): Promise<string>;
 
@@ -712,26 +585,8 @@ export interface SwapHubBase extends BaseContract {
       overrides?: CallOverrides
     ): Promise<void>;
 
-    buyCrossChainPt(
-      message: IPCrossChainSwapHub.BuyCrossChainPtMessageStruct,
-      signature: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
     claimOwnership(overrides?: CallOverrides): Promise<void>;
 
-    computeDepositBox(
-      owner: string,
-      boxId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<
-      [string, string, boolean] & {
-        box: string;
-        salt: string;
-        deployed: boolean;
-      }
-    >;
-
     eip712Domain(
       overrides?: CallOverrides
     ): Promise<
@@ -746,40 +601,46 @@ export interface SwapHubBase extends BaseContract {
       }
     >;
 
-    "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))"(
-      message: IPCrossChainSwapHub.WithdrawTokenMessageStruct,
+    "hashTypedData((address,uint256,uint256,uint256,address,uint32,address,uint256,uint256,address,address,bytes))"(
+      ms: IPCrossChainSwapHub.BridgeTokenMessageStruct,
       overrides?: CallOverrides
     ): Promise<string>;
 
-    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,uint32,bytes32,bool,address,address,bytes))"(
-      message: IPCrossChainSwapHub.BuyCrossChainPtMessageStruct,
+    "hashTypedData((address,uint256,uint256,uint256,address,uint32,address,uint256,address,uint256,address,address,bytes))"(
+      ms: IPCrossChainSwapHub.SwapTokenMessageStruct,
       overrides?: CallOverrides
     ): Promise<string>;
 
-    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,bool,address,address,bytes))"(
-      message: IPCrossChainSwapHub.BridgeTokenMessageStruct,
+    "hashTypedData((address,uint256,uint256,uint256,address,uint32,address,uint256,uint256))"(
+      ms: IPCrossChainSwapHub.WithdrawTokenMessageStruct,
       overrides?: CallOverrides
     ): Promise<string>;
 
     isExecutor(executor: string, overrides?: CallOverrides): Promise<boolean>;
 
-    owner(overrides?: CallOverrides): Promise<string>;
+    isProposer(proposer: string, overrides?: CallOverrides): Promise<boolean>;
 
-    ownerNonce(owner: string, overrides?: CallOverrides): Promise<BigNumber>;
+    owner(overrides?: CallOverrides): Promise<string>;
 
     pendingOwner(overrides?: CallOverrides): Promise<string>;
 
+    requestNonce(
+      requestId: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
     setExecutor(
       executor: string,
       isExecutor_: boolean,
       overrides?: CallOverrides
     ): Promise<void>;
 
+    setProposer(
+      proposer: string,
+      isProposer_: boolean,
+      overrides?: CallOverrides
+    ): Promise<void>;
+
     swapToken(
       message: IPCrossChainSwapHub.SwapTokenMessageStruct,
       signature: BytesLike,
@@ -801,48 +662,27 @@ export interface SwapHubBase extends BaseContract {
   };
 
   filters: {
-    "BridgeToken(address,uint32,address,address,uint256,uint256,bool)"(
-      owner?: string | null,
+    "BridgeToken(uint256,uint256,address,uint32,address,address,uint256,uint256)"(
+      requestId?: null,
+      nonce?: null,
+      owner?: null,
       boxId?: null,
       bridgeExtRouter?: null,
       token?: null,
       amountBridge?: null,
-      amountFee?: null,
-      pullFromOwner?: null
+      amountFee?: null
     ): BridgeTokenEventFilter;
     BridgeToken(
-      owner?: string | null,
+      requestId?: null,
+      nonce?: null,
+      owner?: null,
       boxId?: null,
       bridgeExtRouter?: null,
       token?: null,
       amountBridge?: null,
-      amountFee?: null,
-      pullFromOwner?: null
+      amountFee?: null
     ): BridgeTokenEventFilter;
 
-    "BuyCrossChainPt(address,uint32,address,uint256,uint256,address,address,uint256,bool)"(
-      owner?: string | null,
-      boxId?: null,
-      tokenSpent?: null,
-      amountSpent?: null,
-      amountFee?: null,
-      ptAdapter?: null,
-      pt?: null,
-      netPtReceived?: null,
-      pullFromOwner?: null
-    ): BuyCrossChainPtEventFilter;
-    BuyCrossChainPt(
-      owner?: string | null,
-      boxId?: null,
-      tokenSpent?: null,
-      amountSpent?: null,
-      amountFee?: null,
-      ptAdapter?: null,
-      pt?: null,
-      netPtReceived?: null,
-      pullFromOwner?: null
-    ): BuyCrossChainPtEventFilter;
-
     "EIP712DomainChanged()"(): EIP712DomainChangedEventFilter;
     EIP712DomainChanged(): EIP712DomainChangedEventFilter;
 
@@ -867,38 +707,49 @@ export interface SwapHubBase extends BaseContract {
       isExecutor?: null
     ): SetExecutorEventFilter;
 
-    "SwapToken(address,uint32,address,uint256,uint256,address,uint256,bool,bool)"(
-      owner?: string | null,
+    "SetProposer(address,bool)"(
+      proposer?: string | null,
+      isProposer?: null
+    ): SetProposerEventFilter;
+    SetProposer(
+      proposer?: string | null,
+      isProposer?: null
+    ): SetProposerEventFilter;
+
+    "SwapToken(uint256,uint256,address,uint32,address,uint256,address,uint256)"(
+      requestId?: null,
+      nonce?: null,
+      owner?: null,
       boxId?: null,
       tokenSpent?: null,
       amountSpent?: null,
-      amountFee?: null,
       tokenReceived?: null,
-      netTokenReceived?: null,
-      pullFromOwner?: null,
-      sendToOwner?: null
+      netTokenReceived?: null
     ): SwapTokenEventFilter;
     SwapToken(
-      owner?: string | null,
+      requestId?: null,
+      nonce?: null,
+      owner?: null,
       boxId?: null,
       tokenSpent?: null,
       amountSpent?: null,
-      amountFee?: null,
       tokenReceived?: null,
-      netTokenReceived?: null,
-      pullFromOwner?: null,
-      sendToOwner?: null
+      netTokenReceived?: null
     ): SwapTokenEventFilter;
 
-    "WithdrawToken(address,uint32,address,uint256,uint256)"(
-      owner?: string | null,
+    "WithdrawToken(uint256,uint256,address,uint32,address,uint256,uint256)"(
+      requestId?: null,
+      nonce?: null,
+      owner?: null,
       boxId?: null,
       token?: null,
       amountWithdraw?: null,
       amountFee?: null
     ): WithdrawTokenEventFilter;
     WithdrawToken(
-      owner?: string | null,
+      requestId?: null,
+      nonce?: null,
+      owner?: null,
       boxId?: null,
       token?: null,
       amountWithdraw?: null,
@@ -907,11 +758,7 @@ export interface SwapHubBase extends BaseContract {
   };
 
   estimateGas: {
-    BEACON_PROXY_CODE_CONTRACT(overrides?: CallOverrides): Promise<BigNumber>;
-
-    DEPOSIT_BOX_BEACON(overrides?: CallOverrides): Promise<BigNumber>;
-
-    DEPOSIT_BOX_CODE_HASH(overrides?: CallOverrides): Promise<BigNumber>;
+    DEPOSIT_BOX_FACTORY(overrides?: CallOverrides): Promise<BigNumber>;
 
     TREASURY(overrides?: CallOverrides): Promise<BigNumber>;
 
@@ -921,58 +768,52 @@ export interface SwapHubBase extends BaseContract {
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    buyCrossChainPt(
-      message: IPCrossChainSwapHub.BuyCrossChainPtMessageStruct,
-      signature: BytesLike,
-      overrides?: PayableOverrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
     claimOwnership(
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    computeDepositBox(
-      owner: string,
-      boxId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
     eip712Domain(overrides?: CallOverrides): Promise<BigNumber>;
 
-    "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))"(
-      message: IPCrossChainSwapHub.WithdrawTokenMessageStruct,
+    "hashTypedData((address,uint256,uint256,uint256,address,uint32,address,uint256,uint256,address,address,bytes))"(
+      ms: IPCrossChainSwapHub.BridgeTokenMessageStruct,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,uint32,bytes32,bool,address,address,bytes))"(
-      message: IPCrossChainSwapHub.BuyCrossChainPtMessageStruct,
+    "hashTypedData((address,uint256,uint256,uint256,address,uint32,address,uint256,address,uint256,address,address,bytes))"(
+      ms: IPCrossChainSwapHub.SwapTokenMessageStruct,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,bool,address,address,bytes))"(
-      message: IPCrossChainSwapHub.BridgeTokenMessageStruct,
+    "hashTypedData((address,uint256,uint256,uint256,address,uint32,address,uint256,uint256))"(
+      ms: IPCrossChainSwapHub.WithdrawTokenMessageStruct,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
     isExecutor(executor: string, overrides?: CallOverrides): Promise<BigNumber>;
 
-    owner(overrides?: CallOverrides): Promise<BigNumber>;
+    isProposer(proposer: string, overrides?: CallOverrides): Promise<BigNumber>;
 
-    ownerNonce(owner: string, overrides?: CallOverrides): Promise<BigNumber>;
+    owner(overrides?: CallOverrides): Promise<BigNumber>;
 
     pendingOwner(overrides?: CallOverrides): Promise<BigNumber>;
 
+    requestNonce(
+      requestId: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
     setExecutor(
       executor: string,
       isExecutor_: boolean,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
+    setProposer(
+      proposer: string,
+      isProposer_: boolean,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
     swapToken(
       message: IPCrossChainSwapHub.SwapTokenMessageStruct,
       signature: BytesLike,
@@ -994,15 +835,7 @@ export interface SwapHubBase extends BaseContract {
   };
 
   populateTransaction: {
-    BEACON_PROXY_CODE_CONTRACT(
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    DEPOSIT_BOX_BEACON(
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    DEPOSIT_BOX_CODE_HASH(
+    DEPOSIT_BOX_FACTORY(
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
@@ -1014,64 +847,58 @@ export interface SwapHubBase extends BaseContract {
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    buyCrossChainPt(
-      message: IPCrossChainSwapHub.BuyCrossChainPtMessageStruct,
-      signature: BytesLike,
-      overrides?: PayableOverrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
     claimOwnership(
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    computeDepositBox(
-      owner: string,
-      boxId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
     eip712Domain(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
-    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,bool,bool,address,address,bytes))"(
-      message: IPCrossChainSwapHub.SwapTokenMessageStruct,
+    "hashTypedData((address,uint256,uint256,uint256,address,uint32,address,uint256,uint256,address,address,bytes))"(
+      ms: IPCrossChainSwapHub.BridgeTokenMessageStruct,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
-    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256))"(
-      message: IPCrossChainSwapHub.WithdrawTokenMessageStruct,
+    "hashTypedData((address,uint256,uint256,uint256,address,uint32,address,uint256,address,uint256,address,address,bytes))"(
+      ms: IPCrossChainSwapHub.SwapTokenMessageStruct,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
-    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,address,uint256,uint32,bytes32,bool,address,address,bytes))"(
-      message: IPCrossChainSwapHub.BuyCrossChainPtMessageStruct,
+    "hashTypedData((address,uint256,uint256,uint256,address,uint32,address,uint256,uint256))"(
+      ms: IPCrossChainSwapHub.WithdrawTokenMessageStruct,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
-    "hashTypedData((address,uint32,uint256,uint256,address,uint256,uint256,bool,address,address,bytes))"(
-      message: IPCrossChainSwapHub.BridgeTokenMessageStruct,
+    isExecutor(
+      executor: string,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
-    isExecutor(
-      executor: string,
+    isProposer(
+      proposer: string,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
     owner(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
-    ownerNonce(
-      owner: string,
+    pendingOwner(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
+    requestNonce(
+      requestId: BigNumberish,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
-    pendingOwner(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
     setExecutor(
       executor: string,
       isExecutor_: boolean,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
+    setProposer(
+      proposer: string,
+      isProposer_: boolean,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
     swapToken(
       message: IPCrossChainSwapHub.SwapTokenMessageStruct,
       signature: BytesLike,