@across-protocol/contracts 0.1.3 → 0.1.4

package/contract-types/ethers/{BridgePool.ts → BridgePool.d.ts}

@@ -1,83 +1,26 @@
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
+
 import {
-  BaseContract,
+  ethers,
+  EventFilter,
+  Signer,
   BigNumber,
   BigNumberish,
-  BytesLike,
-  CallOverrides,
+  PopulatedTransaction,
+  BaseContract,
   ContractTransaction,
   Overrides,
   PayableOverrides,
-  PopulatedTransaction,
-  Signer,
-  utils,
+  CallOverrides,
 } from "ethers";
-import { FunctionFragment, Result, EventFragment } from "@ethersproject/abi";
+import { BytesLike } from "@ethersproject/bytes";
 import { Listener, Provider } from "@ethersproject/providers";
-import { TypedEventFilter, TypedEvent, TypedListener, OnEvent } from "./common";
-
-export type DepositDataStruct = {
-  chainId: BigNumberish;
-  depositId: BigNumberish;
-  l1Recipient: string;
-  l2Sender: string;
-  amount: BigNumberish;
-  slowRelayFeePct: BigNumberish;
-  instantRelayFeePct: BigNumberish;
-  quoteTimestamp: BigNumberish;
-};
-
-export type DepositDataStructOutput = [
-  BigNumber,
-  BigNumber,
-  string,
-  string,
-  BigNumber,
-  BigNumber,
-  BigNumber,
-  number
-] & {
-  chainId: BigNumber;
-  depositId: BigNumber;
-  l1Recipient: string;
-  l2Sender: string;
-  amount: BigNumber;
-  slowRelayFeePct: BigNumber;
-  instantRelayFeePct: BigNumber;
-  quoteTimestamp: number;
-};
-
-export type RelayDataStruct = {
-  relayState: BigNumberish;
-  slowRelayer: string;
-  relayId: BigNumberish;
-  realizedLpFeePct: BigNumberish;
-  priceRequestTime: BigNumberish;
-  proposerBond: BigNumberish;
-  finalFee: BigNumberish;
-};
-
-export type RelayDataStructOutput = [
-  number,
-  string,
-  number,
-  BigNumber,
-  number,
-  BigNumber,
-  BigNumber
-] & {
-  relayState: number;
-  slowRelayer: string;
-  relayId: number;
-  realizedLpFeePct: BigNumber;
-  priceRequestTime: number;
-  proposerBond: BigNumber;
-  finalFee: BigNumber;
-};
-
-export interface BridgePoolInterface extends utils.Interface {
+import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
+import { TypedEventFilter, TypedEvent, TypedListener } from "./commons";
+
+interface BridgePoolInterface extends ethers.utils.Interface {
   functions: {
     "addLiquidity(uint256)": FunctionFragment;
     "allowance(address,address)": FunctionFragment;
@@ -88,12 +31,12 @@ export interface BridgePoolInterface extends utils.Interface {
     "changeAdmin(address)": FunctionFragment;
     "decimals()": FunctionFragment;
     "decreaseAllowance(address,uint256)": FunctionFragment;
-    "disputeRelay((uint256,uint64,address,address,uint256,uint64,uint64,uint32),(uint8,address,uint32,uint64,uint32,uint256,uint256))": FunctionFragment;
+    "disputeRelay(tuple,tuple)": FunctionFragment;
     "exchangeRateCurrent()": FunctionFragment;
     "getAccumulatedFees()": FunctionFragment;
     "getCurrentTime()": FunctionFragment;
     "getLiquidityUtilization(uint256)": FunctionFragment;
-    "getRelayAncillaryData((uint256,uint64,address,address,uint256,uint64,uint64,uint32),(uint8,address,uint32,uint64,uint32,uint256,uint256))": FunctionFragment;
+    "getRelayAncillaryData(tuple,tuple)": FunctionFragment;
     "identifier()": FunctionFragment;
     "increaseAllowance(address,uint256)": FunctionFragment;
     "instantRelays(bytes32)": FunctionFragment;
@@ -111,16 +54,16 @@ export interface BridgePoolInterface extends utils.Interface {
     "optimisticOracleLiveness()": FunctionFragment;
     "pendingReserves()": FunctionFragment;
     "proposerBondPct()": FunctionFragment;
-    "relayAndSpeedUp((uint256,uint64,address,address,uint256,uint64,uint64,uint32),uint64)": FunctionFragment;
-    "relayDeposit((uint256,uint64,address,address,uint256,uint64,uint64,uint32),uint64)": FunctionFragment;
+    "relayAndSpeedUp(tuple,uint64)": FunctionFragment;
+    "relayDeposit(tuple,uint64)": FunctionFragment;
     "relays(bytes32)": FunctionFragment;
     "relaysEnabled()": FunctionFragment;
     "removeLiquidity(uint256,bool)": FunctionFragment;
     "setCurrentTime(uint256)": FunctionFragment;
     "setLpFeeRatePerSecond(uint64)": FunctionFragment;
     "setRelaysEnabled(bool)": FunctionFragment;
-    "settleRelay((uint256,uint64,address,address,uint256,uint64,uint64,uint32),(uint8,address,uint32,uint64,uint32,uint256,uint256))": FunctionFragment;
-    "speedUpRelay((uint256,uint64,address,address,uint256,uint64,uint64,uint32),(uint8,address,uint32,uint64,uint32,uint256,uint256))": FunctionFragment;
+    "settleRelay(tuple,tuple)": FunctionFragment;
+    "speedUpRelay(tuple,tuple)": FunctionFragment;
     "store()": FunctionFragment;
     "symbol()": FunctionFragment;
     "sync()": FunctionFragment;
@@ -160,7 +103,27 @@ export interface BridgePoolInterface extends utils.Interface {
   ): string;
   encodeFunctionData(
     functionFragment: "disputeRelay",
-    values: [DepositDataStruct, RelayDataStruct]
+    values: [
+      {
+        chainId: BigNumberish;
+        depositId: BigNumberish;
+        l1Recipient: string;
+        l2Sender: string;
+        amount: BigNumberish;
+        slowRelayFeePct: BigNumberish;
+        instantRelayFeePct: BigNumberish;
+        quoteTimestamp: BigNumberish;
+      },
+      {
+        relayState: BigNumberish;
+        slowRelayer: string;
+        relayId: BigNumberish;
+        realizedLpFeePct: BigNumberish;
+        priceRequestTime: BigNumberish;
+        proposerBond: BigNumberish;
+        finalFee: BigNumberish;
+      }
+    ]
   ): string;
   encodeFunctionData(
     functionFragment: "exchangeRateCurrent",
@@ -180,7 +143,27 @@ export interface BridgePoolInterface extends utils.Interface {
   ): string;
   encodeFunctionData(
     functionFragment: "getRelayAncillaryData",
-    values: [DepositDataStruct, RelayDataStruct]
+    values: [
+      {
+        chainId: BigNumberish;
+        depositId: BigNumberish;
+        l1Recipient: string;
+        l2Sender: string;
+        amount: BigNumberish;
+        slowRelayFeePct: BigNumberish;
+        instantRelayFeePct: BigNumberish;
+        quoteTimestamp: BigNumberish;
+      },
+      {
+        relayState: BigNumberish;
+        slowRelayer: string;
+        relayId: BigNumberish;
+        realizedLpFeePct: BigNumberish;
+        priceRequestTime: BigNumberish;
+        proposerBond: BigNumberish;
+        finalFee: BigNumberish;
+      }
+    ]
   ): string;
   encodeFunctionData(
     functionFragment: "identifier",
@@ -246,11 +229,35 @@ export interface BridgePoolInterface extends utils.Interface {
   ): string;
   encodeFunctionData(
     functionFragment: "relayAndSpeedUp",
-    values: [DepositDataStruct, BigNumberish]
+    values: [
+      {
+        chainId: BigNumberish;
+        depositId: BigNumberish;
+        l1Recipient: string;
+        l2Sender: string;
+        amount: BigNumberish;
+        slowRelayFeePct: BigNumberish;
+        instantRelayFeePct: BigNumberish;
+        quoteTimestamp: BigNumberish;
+      },
+      BigNumberish
+    ]
   ): string;
   encodeFunctionData(
     functionFragment: "relayDeposit",
-    values: [DepositDataStruct, BigNumberish]
+    values: [
+      {
+        chainId: BigNumberish;
+        depositId: BigNumberish;
+        l1Recipient: string;
+        l2Sender: string;
+        amount: BigNumberish;
+        slowRelayFeePct: BigNumberish;
+        instantRelayFeePct: BigNumberish;
+        quoteTimestamp: BigNumberish;
+      },
+      BigNumberish
+    ]
   ): string;
   encodeFunctionData(functionFragment: "relays", values: [BytesLike]): string;
   encodeFunctionData(
@@ -275,11 +282,51 @@ export interface BridgePoolInterface extends utils.Interface {
   ): string;
   encodeFunctionData(
     functionFragment: "settleRelay",
-    values: [DepositDataStruct, RelayDataStruct]
+    values: [
+      {
+        chainId: BigNumberish;
+        depositId: BigNumberish;
+        l1Recipient: string;
+        l2Sender: string;
+        amount: BigNumberish;
+        slowRelayFeePct: BigNumberish;
+        instantRelayFeePct: BigNumberish;
+        quoteTimestamp: BigNumberish;
+      },
+      {
+        relayState: BigNumberish;
+        slowRelayer: string;
+        relayId: BigNumberish;
+        realizedLpFeePct: BigNumberish;
+        priceRequestTime: BigNumberish;
+        proposerBond: BigNumberish;
+        finalFee: BigNumberish;
+      }
+    ]
   ): string;
   encodeFunctionData(
     functionFragment: "speedUpRelay",
-    values: [DepositDataStruct, RelayDataStruct]
+    values: [
+      {
+        chainId: BigNumberish;
+        depositId: BigNumberish;
+        l1Recipient: string;
+        l2Sender: string;
+        amount: BigNumberish;
+        slowRelayFeePct: BigNumberish;
+        instantRelayFeePct: BigNumberish;
+        quoteTimestamp: BigNumberish;
+      },
+      {
+        relayState: BigNumberish;
+        slowRelayer: string;
+        relayId: BigNumberish;
+        realizedLpFeePct: BigNumberish;
+        priceRequestTime: BigNumberish;
+        proposerBond: BigNumberish;
+        finalFee: BigNumberish;
+      }
+    ]
   ): string;
   encodeFunctionData(functionFragment: "store", values?: undefined): string;
   encodeFunctionData(functionFragment: "symbol", values?: undefined): string;
@@ -514,123 +561,48 @@ export interface BridgePoolInterface extends utils.Interface {
   getEvent(nameOrSignatureOrTopic: "Transfer"): EventFragment;
 }
 
-export type ApprovalEvent = TypedEvent<
-  [string, string, BigNumber],
-  { owner: string; spender: string; value: BigNumber }
->;
-
-export type ApprovalEventFilter = TypedEventFilter<ApprovalEvent>;
-
-export type BridgePoolAdminTransferredEvent = TypedEvent<
-  [string, string],
-  { oldAdmin: string; newAdmin: string }
->;
-
-export type BridgePoolAdminTransferredEventFilter =
-  TypedEventFilter<BridgePoolAdminTransferredEvent>;
-
-export type DepositRelayedEvent = TypedEvent<
-  [string, DepositDataStructOutput, RelayDataStructOutput, string],
-  {
-    depositHash: string;
-    depositData: DepositDataStructOutput;
-    relay: RelayDataStructOutput;
-    relayAncillaryDataHash: string;
-  }
->;
-
-export type DepositRelayedEventFilter = TypedEventFilter<DepositRelayedEvent>;
-
-export type LiquidityAddedEvent = TypedEvent<
-  [BigNumber, BigNumber, string],
-  { amount: BigNumber; lpTokensMinted: BigNumber; liquidityProvider: string }
->;
-
-export type LiquidityAddedEventFilter = TypedEventFilter<LiquidityAddedEvent>;
-
-export type LiquidityRemovedEvent = TypedEvent<
-  [BigNumber, BigNumber, string],
-  { amount: BigNumber; lpTokensBurnt: BigNumber; liquidityProvider: string }
->;
-
-export type LiquidityRemovedEventFilter =
-  TypedEventFilter<LiquidityRemovedEvent>;
-
-export type LpFeeRateSetEvent = TypedEvent<
-  [BigNumber],
-  { newLpFeeRatePerSecond: BigNumber }
->;
-
-export type LpFeeRateSetEventFilter = TypedEventFilter<LpFeeRateSetEvent>;
-
-export type RelayCanceledEvent = TypedEvent<
-  [string, string, string],
-  { depositHash: string; relayHash: string; disputer: string }
->;
-
-export type RelayCanceledEventFilter = TypedEventFilter<RelayCanceledEvent>;
-
-export type RelayDisputedEvent = TypedEvent<
-  [string, string, string],
-  { depositHash: string; relayHash: string; disputer: string }
->;
-
-export type RelayDisputedEventFilter = TypedEventFilter<RelayDisputedEvent>;
-
-export type RelaySettledEvent = TypedEvent<
-  [string, string, RelayDataStructOutput],
-  { depositHash: string; caller: string; relay: RelayDataStructOutput }
->;
-
-export type RelaySettledEventFilter = TypedEventFilter<RelaySettledEvent>;
-
-export type RelaySpedUpEvent = TypedEvent<
-  [string, string, RelayDataStructOutput],
-  { depositHash: string; instantRelayer: string; relay: RelayDataStructOutput }
->;
-
-export type RelaySpedUpEventFilter = TypedEventFilter<RelaySpedUpEvent>;
-
-export type RelaysEnabledSetEvent = TypedEvent<
-  [boolean],
-  { newRelaysEnabled: boolean }
->;
-
-export type RelaysEnabledSetEventFilter =
-  TypedEventFilter<RelaysEnabledSetEvent>;
-
-export type TransferEvent = TypedEvent<
-  [string, string, BigNumber],
-  { from: string; to: string; value: BigNumber }
->;
-
-export type TransferEventFilter = TypedEventFilter<TransferEvent>;
-
-export interface BridgePool extends BaseContract {
+export class BridgePool extends BaseContract {
   connect(signerOrProvider: Signer | Provider | string): this;
   attach(addressOrName: string): this;
   deployed(): Promise<this>;
 
-  interface: BridgePoolInterface;
+  listeners<EventArgsArray extends Array<any>, EventArgsObject>(
+    eventFilter?: TypedEventFilter<EventArgsArray, EventArgsObject>
+  ): Array<TypedListener<EventArgsArray, EventArgsObject>>;
+  off<EventArgsArray extends Array<any>, EventArgsObject>(
+    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
+    listener: TypedListener<EventArgsArray, EventArgsObject>
+  ): this;
+  on<EventArgsArray extends Array<any>, EventArgsObject>(
+    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
+    listener: TypedListener<EventArgsArray, EventArgsObject>
+  ): this;
+  once<EventArgsArray extends Array<any>, EventArgsObject>(
+    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
+    listener: TypedListener<EventArgsArray, EventArgsObject>
+  ): this;
+  removeListener<EventArgsArray extends Array<any>, EventArgsObject>(
+    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
+    listener: TypedListener<EventArgsArray, EventArgsObject>
+  ): this;
+  removeAllListeners<EventArgsArray extends Array<any>, EventArgsObject>(
+    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>
+  ): this;
 
-  queryFilter<TEvent extends TypedEvent>(
-    event: TypedEventFilter<TEvent>,
+  listeners(eventName?: string): Array<Listener>;
+  off(eventName: string, listener: Listener): this;
+  on(eventName: string, listener: Listener): this;
+  once(eventName: string, listener: Listener): this;
+  removeListener(eventName: string, listener: Listener): this;
+  removeAllListeners(eventName?: string): this;
+
+  queryFilter<EventArgsArray extends Array<any>, EventArgsObject>(
+    event: TypedEventFilter<EventArgsArray, EventArgsObject>,
     fromBlockOrBlockhash?: string | number | undefined,
     toBlock?: string | number | undefined
-  ): Promise<Array<TEvent>>;
+  ): Promise<Array<TypedEvent<EventArgsArray & EventArgsObject>>>;
 
-  listeners<TEvent extends TypedEvent>(
-    eventFilter?: TypedEventFilter<TEvent>
-  ): Array<TypedListener<TEvent>>;
-  listeners(eventName?: string): Array<Listener>;
-  removeAllListeners<TEvent extends TypedEvent>(
-    eventFilter: TypedEventFilter<TEvent>
-  ): this;
-  removeAllListeners(eventName?: string): this;
-  off: OnEvent<this>;
-  on: OnEvent<this>;
-  once: OnEvent<this>;
-  removeListener: OnEvent<this>;
+  interface: BridgePoolInterface;
 
   functions: {
     addLiquidity(
@@ -670,8 +642,25 @@ export interface BridgePool extends BaseContract {
     ): Promise<ContractTransaction>;
 
     disputeRelay(
-      depositData: DepositDataStruct,
-      relayData: RelayDataStruct,
+      depositData: {
+        chainId: BigNumberish;
+        depositId: BigNumberish;
+        l1Recipient: string;
+        l2Sender: string;
+        amount: BigNumberish;
+        slowRelayFeePct: BigNumberish;
+        instantRelayFeePct: BigNumberish;
+        quoteTimestamp: BigNumberish;
+      },
+      relayData: {
+        relayState: BigNumberish;
+        slowRelayer: string;
+        relayId: BigNumberish;
+        realizedLpFeePct: BigNumberish;
+        priceRequestTime: BigNumberish;
+        proposerBond: BigNumberish;
+        finalFee: BigNumberish;
+      },
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
@@ -689,8 +678,25 @@ export interface BridgePool extends BaseContract {
     ): Promise<ContractTransaction>;
 
     getRelayAncillaryData(
-      depositData: DepositDataStruct,
-      relayData: RelayDataStruct,
+      depositData: {
+        chainId: BigNumberish;
+        depositId: BigNumberish;
+        l1Recipient: string;
+        l2Sender: string;
+        amount: BigNumberish;
+        slowRelayFeePct: BigNumberish;
+        instantRelayFeePct: BigNumberish;
+        quoteTimestamp: BigNumberish;
+      },
+      relayData: {
+        relayState: BigNumberish;
+        slowRelayer: string;
+        relayId: BigNumberish;
+        realizedLpFeePct: BigNumberish;
+        priceRequestTime: BigNumberish;
+        proposerBond: BigNumberish;
+        finalFee: BigNumberish;
+      },
       overrides?: CallOverrides
     ): Promise<[string]>;
 
@@ -744,13 +750,31 @@ export interface BridgePool extends BaseContract {
     proposerBondPct(overrides?: CallOverrides): Promise<[BigNumber]>;
 
     relayAndSpeedUp(
-      depositData: DepositDataStruct,
+      depositData: {
+        chainId: BigNumberish;
+        depositId: BigNumberish;
+        l1Recipient: string;
+        l2Sender: string;
+        amount: BigNumberish;
+        slowRelayFeePct: BigNumberish;
+        instantRelayFeePct: BigNumberish;
+        quoteTimestamp: BigNumberish;
+      },
       realizedLpFeePct: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     relayDeposit(
-      depositData: DepositDataStruct,
+      depositData: {
+        chainId: BigNumberish;
+        depositId: BigNumberish;
+        l1Recipient: string;
+        l2Sender: string;
+        amount: BigNumberish;
+        slowRelayFeePct: BigNumberish;
+        instantRelayFeePct: BigNumberish;
+        quoteTimestamp: BigNumberish;
+      },
       realizedLpFeePct: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
@@ -781,14 +805,48 @@ export interface BridgePool extends BaseContract {
     ): Promise<ContractTransaction>;
 
     settleRelay(
-      depositData: DepositDataStruct,
-      relayData: RelayDataStruct,
+      depositData: {
+        chainId: BigNumberish;
+        depositId: BigNumberish;
+        l1Recipient: string;
+        l2Sender: string;
+        amount: BigNumberish;
+        slowRelayFeePct: BigNumberish;
+        instantRelayFeePct: BigNumberish;
+        quoteTimestamp: BigNumberish;
+      },
+      relayData: {
+        relayState: BigNumberish;
+        slowRelayer: string;
+        relayId: BigNumberish;
+        realizedLpFeePct: BigNumberish;
+        priceRequestTime: BigNumberish;
+        proposerBond: BigNumberish;
+        finalFee: BigNumberish;
+      },
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     speedUpRelay(
-      depositData: DepositDataStruct,
-      relayData: RelayDataStruct,
+      depositData: {
+        chainId: BigNumberish;
+        depositId: BigNumberish;
+        l1Recipient: string;
+        l2Sender: string;
+        amount: BigNumberish;
+        slowRelayFeePct: BigNumberish;
+        instantRelayFeePct: BigNumberish;
+        quoteTimestamp: BigNumberish;
+      },
+      relayData: {
+        relayState: BigNumberish;
+        slowRelayer: string;
+        relayId: BigNumberish;
+        realizedLpFeePct: BigNumberish;
+        priceRequestTime: BigNumberish;
+        proposerBond: BigNumberish;
+        finalFee: BigNumberish;
+      },
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
@@ -867,8 +925,25 @@ export interface BridgePool extends BaseContract {
   ): Promise<ContractTransaction>;
 
   disputeRelay(
-    depositData: DepositDataStruct,
-    relayData: RelayDataStruct,
+    depositData: {
+      chainId: BigNumberish;
+      depositId: BigNumberish;
+      l1Recipient: string;
+      l2Sender: string;
+      amount: BigNumberish;
+      slowRelayFeePct: BigNumberish;
+      instantRelayFeePct: BigNumberish;
+      quoteTimestamp: BigNumberish;
+    },
+    relayData: {
+      relayState: BigNumberish;
+      slowRelayer: string;
+      relayId: BigNumberish;
+      realizedLpFeePct: BigNumberish;
+      priceRequestTime: BigNumberish;
+      proposerBond: BigNumberish;
+      finalFee: BigNumberish;
+    },
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
@@ -886,8 +961,25 @@ export interface BridgePool extends BaseContract {
   ): Promise<ContractTransaction>;
 
   getRelayAncillaryData(
-    depositData: DepositDataStruct,
-    relayData: RelayDataStruct,
+    depositData: {
+      chainId: BigNumberish;
+      depositId: BigNumberish;
+      l1Recipient: string;
+      l2Sender: string;
+      amount: BigNumberish;
+      slowRelayFeePct: BigNumberish;
+      instantRelayFeePct: BigNumberish;
+      quoteTimestamp: BigNumberish;
+    },
+    relayData: {
+      relayState: BigNumberish;
+      slowRelayer: string;
+      relayId: BigNumberish;
+      realizedLpFeePct: BigNumberish;
+      priceRequestTime: BigNumberish;
+      proposerBond: BigNumberish;
+      finalFee: BigNumberish;
+    },
     overrides?: CallOverrides
   ): Promise<string>;
 
@@ -938,13 +1030,31 @@ export interface BridgePool extends BaseContract {
   proposerBondPct(overrides?: CallOverrides): Promise<BigNumber>;
 
   relayAndSpeedUp(
-    depositData: DepositDataStruct,
+    depositData: {
+      chainId: BigNumberish;
+      depositId: BigNumberish;
+      l1Recipient: string;
+      l2Sender: string;
+      amount: BigNumberish;
+      slowRelayFeePct: BigNumberish;
+      instantRelayFeePct: BigNumberish;
+      quoteTimestamp: BigNumberish;
+    },
     realizedLpFeePct: BigNumberish,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   relayDeposit(
-    depositData: DepositDataStruct,
+    depositData: {
+      chainId: BigNumberish;
+      depositId: BigNumberish;
+      l1Recipient: string;
+      l2Sender: string;
+      amount: BigNumberish;
+      slowRelayFeePct: BigNumberish;
+      instantRelayFeePct: BigNumberish;
+      quoteTimestamp: BigNumberish;
+    },
     realizedLpFeePct: BigNumberish,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
@@ -975,14 +1085,48 @@ export interface BridgePool extends BaseContract {
   ): Promise<ContractTransaction>;
 
   settleRelay(
-    depositData: DepositDataStruct,
-    relayData: RelayDataStruct,
+    depositData: {
+      chainId: BigNumberish;
+      depositId: BigNumberish;
+      l1Recipient: string;
+      l2Sender: string;
+      amount: BigNumberish;
+      slowRelayFeePct: BigNumberish;
+      instantRelayFeePct: BigNumberish;
+      quoteTimestamp: BigNumberish;
+    },
+    relayData: {
+      relayState: BigNumberish;
+      slowRelayer: string;
+      relayId: BigNumberish;
+      realizedLpFeePct: BigNumberish;
+      priceRequestTime: BigNumberish;
+      proposerBond: BigNumberish;
+      finalFee: BigNumberish;
+    },
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   speedUpRelay(
-    depositData: DepositDataStruct,
-    relayData: RelayDataStruct,
+    depositData: {
+      chainId: BigNumberish;
+      depositId: BigNumberish;
+      l1Recipient: string;
+      l2Sender: string;
+      amount: BigNumberish;
+      slowRelayFeePct: BigNumberish;
+      instantRelayFeePct: BigNumberish;
+      quoteTimestamp: BigNumberish;
+    },
+    relayData: {
+      relayState: BigNumberish;
+      slowRelayer: string;
+      relayId: BigNumberish;
+      realizedLpFeePct: BigNumberish;
+      priceRequestTime: BigNumberish;
+      proposerBond: BigNumberish;
+      finalFee: BigNumberish;
+    },
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
@@ -1058,8 +1202,25 @@ export interface BridgePool extends BaseContract {
     ): Promise<boolean>;
 
     disputeRelay(
-      depositData: DepositDataStruct,
-      relayData: RelayDataStruct,
+      depositData: {
+        chainId: BigNumberish;
+        depositId: BigNumberish;
+        l1Recipient: string;
+        l2Sender: string;
+        amount: BigNumberish;
+        slowRelayFeePct: BigNumberish;
+        instantRelayFeePct: BigNumberish;
+        quoteTimestamp: BigNumberish;
+      },
+      relayData: {
+        relayState: BigNumberish;
+        slowRelayer: string;
+        relayId: BigNumberish;
+        realizedLpFeePct: BigNumberish;
+        priceRequestTime: BigNumberish;
+        proposerBond: BigNumberish;
+        finalFee: BigNumberish;
+      },
       overrides?: CallOverrides
     ): Promise<void>;
 
@@ -1080,8 +1241,25 @@ export interface BridgePool extends BaseContract {
     >;
 
     getRelayAncillaryData(
-      depositData: DepositDataStruct,
-      relayData: RelayDataStruct,
+      depositData: {
+        chainId: BigNumberish;
+        depositId: BigNumberish;
+        l1Recipient: string;
+        l2Sender: string;
+        amount: BigNumberish;
+        slowRelayFeePct: BigNumberish;
+        instantRelayFeePct: BigNumberish;
+        quoteTimestamp: BigNumberish;
+      },
+      relayData: {
+        relayState: BigNumberish;
+        slowRelayer: string;
+        relayId: BigNumberish;
+        realizedLpFeePct: BigNumberish;
+        priceRequestTime: BigNumberish;
+        proposerBond: BigNumberish;
+        finalFee: BigNumberish;
+      },
       overrides?: CallOverrides
     ): Promise<string>;
 
@@ -1127,13 +1305,31 @@ export interface BridgePool extends BaseContract {
     proposerBondPct(overrides?: CallOverrides): Promise<BigNumber>;
 
     relayAndSpeedUp(
-      depositData: DepositDataStruct,
+      depositData: {
+        chainId: BigNumberish;
+        depositId: BigNumberish;
+        l1Recipient: string;
+        l2Sender: string;
+        amount: BigNumberish;
+        slowRelayFeePct: BigNumberish;
+        instantRelayFeePct: BigNumberish;
+        quoteTimestamp: BigNumberish;
+      },
       realizedLpFeePct: BigNumberish,
       overrides?: CallOverrides
     ): Promise<void>;
 
     relayDeposit(
-      depositData: DepositDataStruct,
+      depositData: {
+        chainId: BigNumberish;
+        depositId: BigNumberish;
+        l1Recipient: string;
+        l2Sender: string;
+        amount: BigNumberish;
+        slowRelayFeePct: BigNumberish;
+        instantRelayFeePct: BigNumberish;
+        quoteTimestamp: BigNumberish;
+      },
       realizedLpFeePct: BigNumberish,
       overrides?: CallOverrides
     ): Promise<void>;
@@ -1164,14 +1360,48 @@ export interface BridgePool extends BaseContract {
     ): Promise<void>;
 
     settleRelay(
-      depositData: DepositDataStruct,
-      relayData: RelayDataStruct,
+      depositData: {
+        chainId: BigNumberish;
+        depositId: BigNumberish;
+        l1Recipient: string;
+        l2Sender: string;
+        amount: BigNumberish;
+        slowRelayFeePct: BigNumberish;
+        instantRelayFeePct: BigNumberish;
+        quoteTimestamp: BigNumberish;
+      },
+      relayData: {
+        relayState: BigNumberish;
+        slowRelayer: string;
+        relayId: BigNumberish;
+        realizedLpFeePct: BigNumberish;
+        priceRequestTime: BigNumberish;
+        proposerBond: BigNumberish;
+        finalFee: BigNumberish;
+      },
       overrides?: CallOverrides
     ): Promise<void>;
 
     speedUpRelay(
-      depositData: DepositDataStruct,
-      relayData: RelayDataStruct,
+      depositData: {
+        chainId: BigNumberish;
+        depositId: BigNumberish;
+        l1Recipient: string;
+        l2Sender: string;
+        amount: BigNumberish;
+        slowRelayFeePct: BigNumberish;
+        instantRelayFeePct: BigNumberish;
+        quoteTimestamp: BigNumberish;
+      },
+      relayData: {
+        relayState: BigNumberish;
+        slowRelayer: string;
+        relayId: BigNumberish;
+        realizedLpFeePct: BigNumberish;
+        priceRequestTime: BigNumberish;
+        proposerBond: BigNumberish;
+        finalFee: BigNumberish;
+      },
       overrides?: CallOverrides
     ): Promise<void>;
 
@@ -1208,125 +1438,241 @@ export interface BridgePool extends BaseContract {
   };
 
   filters: {
-    "Approval(address,address,uint256)"(
-      owner?: string | null,
-      spender?: string | null,
-      value?: null
-    ): ApprovalEventFilter;
     Approval(
       owner?: string | null,
       spender?: string | null,
       value?: null
-    ): ApprovalEventFilter;
+    ): TypedEventFilter<
+      [string, string, BigNumber],
+      { owner: string; spender: string; value: BigNumber }
+    >;
 
-    "BridgePoolAdminTransferred(address,address)"(
-      oldAdmin?: null,
-      newAdmin?: null
-    ): BridgePoolAdminTransferredEventFilter;
     BridgePoolAdminTransferred(
       oldAdmin?: null,
       newAdmin?: null
-    ): BridgePoolAdminTransferredEventFilter;
+    ): TypedEventFilter<
+      [string, string],
+      { oldAdmin: string; newAdmin: string }
+    >;
 
-    "DepositRelayed(bytes32,tuple,tuple,bytes32)"(
-      depositHash?: BytesLike | null,
-      depositData?: null,
-      relay?: null,
-      relayAncillaryDataHash?: null
-    ): DepositRelayedEventFilter;
     DepositRelayed(
       depositHash?: BytesLike | null,
       depositData?: null,
       relay?: null,
       relayAncillaryDataHash?: null
-    ): DepositRelayedEventFilter;
+    ): TypedEventFilter<
+      [
+        string,
+        [
+          BigNumber,
+          BigNumber,
+          string,
+          string,
+          BigNumber,
+          BigNumber,
+          BigNumber,
+          number
+        ] & {
+          chainId: BigNumber;
+          depositId: BigNumber;
+          l1Recipient: string;
+          l2Sender: string;
+          amount: BigNumber;
+          slowRelayFeePct: BigNumber;
+          instantRelayFeePct: BigNumber;
+          quoteTimestamp: number;
+        },
+        [number, string, number, BigNumber, number, BigNumber, BigNumber] & {
+          relayState: number;
+          slowRelayer: string;
+          relayId: number;
+          realizedLpFeePct: BigNumber;
+          priceRequestTime: number;
+          proposerBond: BigNumber;
+          finalFee: BigNumber;
+        },
+        string
+      ],
+      {
+        depositHash: string;
+        depositData: [
+          BigNumber,
+          BigNumber,
+          string,
+          string,
+          BigNumber,
+          BigNumber,
+          BigNumber,
+          number
+        ] & {
+          chainId: BigNumber;
+          depositId: BigNumber;
+          l1Recipient: string;
+          l2Sender: string;
+          amount: BigNumber;
+          slowRelayFeePct: BigNumber;
+          instantRelayFeePct: BigNumber;
+          quoteTimestamp: number;
+        };
+        relay: [
+          number,
+          string,
+          number,
+          BigNumber,
+          number,
+          BigNumber,
+          BigNumber
+        ] & {
+          relayState: number;
+          slowRelayer: string;
+          relayId: number;
+          realizedLpFeePct: BigNumber;
+          priceRequestTime: number;
+          proposerBond: BigNumber;
+          finalFee: BigNumber;
+        };
+        relayAncillaryDataHash: string;
+      }
+    >;
 
-    "LiquidityAdded(uint256,uint256,address)"(
-      amount?: null,
-      lpTokensMinted?: null,
-      liquidityProvider?: string | null
-    ): LiquidityAddedEventFilter;
     LiquidityAdded(
       amount?: null,
       lpTokensMinted?: null,
       liquidityProvider?: string | null
-    ): LiquidityAddedEventFilter;
+    ): TypedEventFilter<
+      [BigNumber, BigNumber, string],
+      {
+        amount: BigNumber;
+        lpTokensMinted: BigNumber;
+        liquidityProvider: string;
+      }
+    >;
 
-    "LiquidityRemoved(uint256,uint256,address)"(
-      amount?: null,
-      lpTokensBurnt?: null,
-      liquidityProvider?: string | null
-    ): LiquidityRemovedEventFilter;
     LiquidityRemoved(
       amount?: null,
       lpTokensBurnt?: null,
       liquidityProvider?: string | null
-    ): LiquidityRemovedEventFilter;
+    ): TypedEventFilter<
+      [BigNumber, BigNumber, string],
+      { amount: BigNumber; lpTokensBurnt: BigNumber; liquidityProvider: string }
+    >;
 
-    "LpFeeRateSet(uint64)"(
+    LpFeeRateSet(
       newLpFeeRatePerSecond?: null
-    ): LpFeeRateSetEventFilter;
-    LpFeeRateSet(newLpFeeRatePerSecond?: null): LpFeeRateSetEventFilter;
+    ): TypedEventFilter<[BigNumber], { newLpFeeRatePerSecond: BigNumber }>;
 
-    "RelayCanceled(bytes32,bytes32,address)"(
-      depositHash?: BytesLike | null,
-      relayHash?: BytesLike | null,
-      disputer?: string | null
-    ): RelayCanceledEventFilter;
     RelayCanceled(
       depositHash?: BytesLike | null,
       relayHash?: BytesLike | null,
       disputer?: string | null
-    ): RelayCanceledEventFilter;
+    ): TypedEventFilter<
+      [string, string, string],
+      { depositHash: string; relayHash: string; disputer: string }
+    >;
 
-    "RelayDisputed(bytes32,bytes32,address)"(
-      depositHash?: BytesLike | null,
-      relayHash?: BytesLike | null,
-      disputer?: string | null
-    ): RelayDisputedEventFilter;
     RelayDisputed(
       depositHash?: BytesLike | null,
       relayHash?: BytesLike | null,
       disputer?: string | null
-    ): RelayDisputedEventFilter;
+    ): TypedEventFilter<
+      [string, string, string],
+      { depositHash: string; relayHash: string; disputer: string }
+    >;
 
-    "RelaySettled(bytes32,address,tuple)"(
-      depositHash?: BytesLike | null,
-      caller?: string | null,
-      relay?: null
-    ): RelaySettledEventFilter;
     RelaySettled(
       depositHash?: BytesLike | null,
       caller?: string | null,
       relay?: null
-    ): RelaySettledEventFilter;
+    ): TypedEventFilter<
+      [
+        string,
+        string,
+        [number, string, number, BigNumber, number, BigNumber, BigNumber] & {
+          relayState: number;
+          slowRelayer: string;
+          relayId: number;
+          realizedLpFeePct: BigNumber;
+          priceRequestTime: number;
+          proposerBond: BigNumber;
+          finalFee: BigNumber;
+        }
+      ],
+      {
+        depositHash: string;
+        caller: string;
+        relay: [
+          number,
+          string,
+          number,
+          BigNumber,
+          number,
+          BigNumber,
+          BigNumber
+        ] & {
+          relayState: number;
+          slowRelayer: string;
+          relayId: number;
+          realizedLpFeePct: BigNumber;
+          priceRequestTime: number;
+          proposerBond: BigNumber;
+          finalFee: BigNumber;
+        };
+      }
+    >;
 
-    "RelaySpedUp(bytes32,address,tuple)"(
-      depositHash?: BytesLike | null,
-      instantRelayer?: string | null,
-      relay?: null
-    ): RelaySpedUpEventFilter;
     RelaySpedUp(
       depositHash?: BytesLike | null,
       instantRelayer?: string | null,
       relay?: null
-    ): RelaySpedUpEventFilter;
+    ): TypedEventFilter<
+      [
+        string,
+        string,
+        [number, string, number, BigNumber, number, BigNumber, BigNumber] & {
+          relayState: number;
+          slowRelayer: string;
+          relayId: number;
+          realizedLpFeePct: BigNumber;
+          priceRequestTime: number;
+          proposerBond: BigNumber;
+          finalFee: BigNumber;
+        }
+      ],
+      {
+        depositHash: string;
+        instantRelayer: string;
+        relay: [
+          number,
+          string,
+          number,
+          BigNumber,
+          number,
+          BigNumber,
+          BigNumber
+        ] & {
+          relayState: number;
+          slowRelayer: string;
+          relayId: number;
+          realizedLpFeePct: BigNumber;
+          priceRequestTime: number;
+          proposerBond: BigNumber;
+          finalFee: BigNumber;
+        };
+      }
+    >;
 
-    "RelaysEnabledSet(bool)"(
+    RelaysEnabledSet(
       newRelaysEnabled?: null
-    ): RelaysEnabledSetEventFilter;
-    RelaysEnabledSet(newRelaysEnabled?: null): RelaysEnabledSetEventFilter;
+    ): TypedEventFilter<[boolean], { newRelaysEnabled: boolean }>;
 
-    "Transfer(address,address,uint256)"(
-      from?: string | null,
-      to?: string | null,
-      value?: null
-    ): TransferEventFilter;
     Transfer(
       from?: string | null,
       to?: string | null,
       value?: null
-    ): TransferEventFilter;
+    ): TypedEventFilter<
+      [string, string, BigNumber],
+      { from: string; to: string; value: BigNumber }
+    >;
   };
 
   estimateGas: {
@@ -1367,8 +1713,25 @@ export interface BridgePool extends BaseContract {
     ): Promise<BigNumber>;
 
     disputeRelay(
-      depositData: DepositDataStruct,
-      relayData: RelayDataStruct,
+      depositData: {
+        chainId: BigNumberish;
+        depositId: BigNumberish;
+        l1Recipient: string;
+        l2Sender: string;
+        amount: BigNumberish;
+        slowRelayFeePct: BigNumberish;
+        instantRelayFeePct: BigNumberish;
+        quoteTimestamp: BigNumberish;
+      },
+      relayData: {
+        relayState: BigNumberish;
+        slowRelayer: string;
+        relayId: BigNumberish;
+        realizedLpFeePct: BigNumberish;
+        priceRequestTime: BigNumberish;
+        proposerBond: BigNumberish;
+        finalFee: BigNumberish;
+      },
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
@@ -1386,8 +1749,25 @@ export interface BridgePool extends BaseContract {
     ): Promise<BigNumber>;
 
     getRelayAncillaryData(
-      depositData: DepositDataStruct,
-      relayData: RelayDataStruct,
+      depositData: {
+        chainId: BigNumberish;
+        depositId: BigNumberish;
+        l1Recipient: string;
+        l2Sender: string;
+        amount: BigNumberish;
+        slowRelayFeePct: BigNumberish;
+        instantRelayFeePct: BigNumberish;
+        quoteTimestamp: BigNumberish;
+      },
+      relayData: {
+        relayState: BigNumberish;
+        slowRelayer: string;
+        relayId: BigNumberish;
+        realizedLpFeePct: BigNumberish;
+        priceRequestTime: BigNumberish;
+        proposerBond: BigNumberish;
+        finalFee: BigNumberish;
+      },
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
@@ -1441,13 +1821,31 @@ export interface BridgePool extends BaseContract {
     proposerBondPct(overrides?: CallOverrides): Promise<BigNumber>;
 
     relayAndSpeedUp(
-      depositData: DepositDataStruct,
+      depositData: {
+        chainId: BigNumberish;
+        depositId: BigNumberish;
+        l1Recipient: string;
+        l2Sender: string;
+        amount: BigNumberish;
+        slowRelayFeePct: BigNumberish;
+        instantRelayFeePct: BigNumberish;
+        quoteTimestamp: BigNumberish;
+      },
       realizedLpFeePct: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     relayDeposit(
-      depositData: DepositDataStruct,
+      depositData: {
+        chainId: BigNumberish;
+        depositId: BigNumberish;
+        l1Recipient: string;
+        l2Sender: string;
+        amount: BigNumberish;
+        slowRelayFeePct: BigNumberish;
+        instantRelayFeePct: BigNumberish;
+        quoteTimestamp: BigNumberish;
+      },
       realizedLpFeePct: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
@@ -1478,14 +1876,48 @@ export interface BridgePool extends BaseContract {
     ): Promise<BigNumber>;
 
     settleRelay(
-      depositData: DepositDataStruct,
-      relayData: RelayDataStruct,
+      depositData: {
+        chainId: BigNumberish;
+        depositId: BigNumberish;
+        l1Recipient: string;
+        l2Sender: string;
+        amount: BigNumberish;
+        slowRelayFeePct: BigNumberish;
+        instantRelayFeePct: BigNumberish;
+        quoteTimestamp: BigNumberish;
+      },
+      relayData: {
+        relayState: BigNumberish;
+        slowRelayer: string;
+        relayId: BigNumberish;
+        realizedLpFeePct: BigNumberish;
+        priceRequestTime: BigNumberish;
+        proposerBond: BigNumberish;
+        finalFee: BigNumberish;
+      },
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     speedUpRelay(
-      depositData: DepositDataStruct,
-      relayData: RelayDataStruct,
+      depositData: {
+        chainId: BigNumberish;
+        depositId: BigNumberish;
+        l1Recipient: string;
+        l2Sender: string;
+        amount: BigNumberish;
+        slowRelayFeePct: BigNumberish;
+        instantRelayFeePct: BigNumberish;
+        quoteTimestamp: BigNumberish;
+      },
+      relayData: {
+        relayState: BigNumberish;
+        slowRelayer: string;
+        relayId: BigNumberish;
+        realizedLpFeePct: BigNumberish;
+        priceRequestTime: BigNumberish;
+        proposerBond: BigNumberish;
+        finalFee: BigNumberish;
+      },
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
@@ -1568,8 +2000,25 @@ export interface BridgePool extends BaseContract {
     ): Promise<PopulatedTransaction>;
 
     disputeRelay(
-      depositData: DepositDataStruct,
-      relayData: RelayDataStruct,
+      depositData: {
+        chainId: BigNumberish;
+        depositId: BigNumberish;
+        l1Recipient: string;
+        l2Sender: string;
+        amount: BigNumberish;
+        slowRelayFeePct: BigNumberish;
+        instantRelayFeePct: BigNumberish;
+        quoteTimestamp: BigNumberish;
+      },
+      relayData: {
+        relayState: BigNumberish;
+        slowRelayer: string;
+        relayId: BigNumberish;
+        realizedLpFeePct: BigNumberish;
+        priceRequestTime: BigNumberish;
+        proposerBond: BigNumberish;
+        finalFee: BigNumberish;
+      },
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
@@ -1589,8 +2038,25 @@ export interface BridgePool extends BaseContract {
     ): Promise<PopulatedTransaction>;
 
     getRelayAncillaryData(
-      depositData: DepositDataStruct,
-      relayData: RelayDataStruct,
+      depositData: {
+        chainId: BigNumberish;
+        depositId: BigNumberish;
+        l1Recipient: string;
+        l2Sender: string;
+        amount: BigNumberish;
+        slowRelayFeePct: BigNumberish;
+        instantRelayFeePct: BigNumberish;
+        quoteTimestamp: BigNumberish;
+      },
+      relayData: {
+        relayState: BigNumberish;
+        slowRelayer: string;
+        relayId: BigNumberish;
+        realizedLpFeePct: BigNumberish;
+        priceRequestTime: BigNumberish;
+        proposerBond: BigNumberish;
+        finalFee: BigNumberish;
+      },
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
@@ -1648,13 +2114,31 @@ export interface BridgePool extends BaseContract {
     proposerBondPct(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
     relayAndSpeedUp(
-      depositData: DepositDataStruct,
+      depositData: {
+        chainId: BigNumberish;
+        depositId: BigNumberish;
+        l1Recipient: string;
+        l2Sender: string;
+        amount: BigNumberish;
+        slowRelayFeePct: BigNumberish;
+        instantRelayFeePct: BigNumberish;
+        quoteTimestamp: BigNumberish;
+      },
       realizedLpFeePct: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     relayDeposit(
-      depositData: DepositDataStruct,
+      depositData: {
+        chainId: BigNumberish;
+        depositId: BigNumberish;
+        l1Recipient: string;
+        l2Sender: string;
+        amount: BigNumberish;
+        slowRelayFeePct: BigNumberish;
+        instantRelayFeePct: BigNumberish;
+        quoteTimestamp: BigNumberish;
+      },
       realizedLpFeePct: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
@@ -1688,14 +2172,48 @@ export interface BridgePool extends BaseContract {
     ): Promise<PopulatedTransaction>;
 
     settleRelay(
-      depositData: DepositDataStruct,
-      relayData: RelayDataStruct,
+      depositData: {
+        chainId: BigNumberish;
+        depositId: BigNumberish;
+        l1Recipient: string;
+        l2Sender: string;
+        amount: BigNumberish;
+        slowRelayFeePct: BigNumberish;
+        instantRelayFeePct: BigNumberish;
+        quoteTimestamp: BigNumberish;
+      },
+      relayData: {
+        relayState: BigNumberish;
+        slowRelayer: string;
+        relayId: BigNumberish;
+        realizedLpFeePct: BigNumberish;
+        priceRequestTime: BigNumberish;
+        proposerBond: BigNumberish;
+        finalFee: BigNumberish;
+      },
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     speedUpRelay(
-      depositData: DepositDataStruct,
-      relayData: RelayDataStruct,
+      depositData: {
+        chainId: BigNumberish;
+        depositId: BigNumberish;
+        l1Recipient: string;
+        l2Sender: string;
+        amount: BigNumberish;
+        slowRelayFeePct: BigNumberish;
+        instantRelayFeePct: BigNumberish;
+        quoteTimestamp: BigNumberish;
+      },
+      relayData: {
+        relayState: BigNumberish;
+        slowRelayer: string;
+        relayId: BigNumberish;
+        realizedLpFeePct: BigNumberish;
+        priceRequestTime: BigNumberish;
+        proposerBond: BigNumberish;
+        finalFee: BigNumberish;
+      },
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;