@across-protocol/sdk 3.1.36 → 3.2.0

package/dist/types/clients/mocks/MockHubPoolClient.d.ts

@@ -1,7 +1,7 @@
 import winston from "winston";
-import { Contract, Event } from "ethers";
+import { Contract } from "ethers";
 import { BigNumber } from "../../utils";
-import { L1Token, PendingRootBundle, RealizedLpFee } from "../../interfaces";
+import { L1Token, Log, PendingRootBundle, RealizedLpFee } from "../../interfaces";
 import { AcrossConfigStoreClient as ConfigStoreClient } from "../AcrossConfigStoreClient";
 import { HubPoolClient, HubPoolUpdate, LpFeeRequest } from "../HubPoolClient";
 import { EventOverrides } from "./MockEvents";
@@ -30,8 +30,8 @@ export declare class MockHubPoolClient extends HubPoolClient {
     setTokenInfoToReturn(tokenInfo: L1Token): void;
     _update(eventNames: string[]): Promise<HubPoolUpdate>;
     readonly eventSignatures: Record<string, string>;
-    setPoolRebalanceRoute(destinationChainId: number, l1Token: string, destinationToken: string, overrides?: EventOverrides): Event;
-    proposeRootBundle(challengePeriodEndTimestamp: number, poolRebalanceLeafCount: number, bundleEvaluationBlockNumbers: BigNumber[], poolRebalanceRoot?: string, relayerRefundRoot?: string, slowRelayRoot?: string, proposer?: string, overrides?: EventOverrides): Event;
-    executeRootBundle(groupIndex: BigNumber, leafId: number, chainId: BigNumber, l1Tokens: string[], bundleLpFees: BigNumber[], netSendAmounts: BigNumber[], runningBalances: BigNumber[], caller?: string, overrides?: EventOverrides): Event;
+    setPoolRebalanceRoute(destinationChainId: number, l1Token: string, destinationToken: string, overrides?: EventOverrides): Log;
+    proposeRootBundle(challengePeriodEndTimestamp: number, poolRebalanceLeafCount: number, bundleEvaluationBlockNumbers: BigNumber[], poolRebalanceRoot?: string, relayerRefundRoot?: string, slowRelayRoot?: string, proposer?: string, overrides?: EventOverrides): Log;
+    executeRootBundle(groupIndex: BigNumber, leafId: number, chainId: BigNumber, l1Tokens: string[], bundleLpFees: BigNumber[], netSendAmounts: BigNumber[], runningBalances: BigNumber[], caller?: string, overrides?: EventOverrides): Log;
 }
 //# sourceMappingURL=MockHubPoolClient.d.ts.map

package/dist/types/clients/mocks/MockHubPoolClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MockHubPoolClient.d.ts","sourceRoot":"","sources":["../../../../src/clients/mocks/MockHubPoolClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"MockHubPoolClient.d.ts","sourceRoot":"","sources":["../../../../src/clients/mocks/MockHubPoolClient.ts"],"names":[],"mappings":"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"}

package/dist/types/clients/mocks/MockSpokePoolClient.d.ts

@@ -1,28 +1,19 @@
-import { Contract, Event, providers } from "ethers";
+import { Contract } from "ethers";
 import winston from "winston";
-import { DepositWithBlock, V3FundsDepositedEvent, RealizedLpFee, RelayerRefundExecutionWithBlock, SlowFillRequestWithBlock, FillWithBlock, SlowFillLeaf, SpeedUp } from "../../interfaces";
-import { BigNumber } from "../../utils";
+import { Log, DepositWithBlock, RelayerRefundExecutionWithBlock, SlowFillRequestWithBlock, FillWithBlock, SlowFillLeaf, SpeedUp } from "../../interfaces";
 import { SpokePoolClient, SpokePoolUpdate } from "../SpokePoolClient";
 import { HubPoolClient } from "../HubPoolClient";
 import { EventManager, EventOverrides } from "./MockEvents";
 import { AcrossConfigStoreClient } from "../AcrossConfigStoreClient";
-type Block = providers.Block;
 export declare class MockSpokePoolClient extends SpokePoolClient {
     eventManager: EventManager;
-    private realizedLpFeePct;
-    private realizedLpFeePctOverride;
     private destinationTokenForChainOverride;
     depositIdAtBlock: number[];
     numberOfDeposits: number;
-    blocks: Record<number, Block>;
     constructor(logger: winston.Logger, spokePool: Contract, chainId: number, deploymentBlock: number, opts?: {
         hubPoolClient: HubPoolClient | null;
     });
-    setDefaultRealizedLpFeePct(fee: BigNumber): void;
     setConfigStoreClient(configStore?: AcrossConfigStoreClient): void;
-    clearDefaultRealizedLpFeePct(): void;
-    computeRealizedLpFeePct(depositEvent: V3FundsDepositedEvent): Promise<RealizedLpFee>;
-    batchComputeRealizedLpFeePct(depositEvents: V3FundsDepositedEvent[]): Promise<RealizedLpFee[]>;
     setDestinationTokenForChain(chainId: number, token: string): void;
     getDestinationTokenForDeposit(deposit: DepositWithBlock): string;
     setLatestBlockNumber(blockNumber: number): void;
@@ -30,13 +21,12 @@ export declare class MockSpokePoolClient extends SpokePoolClient {
     _getDepositIdAtBlock(blockTag: number): Promise<number>;
     _update(eventsToQuery: string[]): Promise<SpokePoolUpdate>;
     readonly eventSignatures: Record<string, string>;
-    depositV3(deposit: DepositWithBlock): Event;
-    fillV3Relay(fill: FillWithBlock): Event;
-    speedUpV3Deposit(speedUp: SpeedUp): Event;
-    requestV3SlowFill(request: SlowFillRequestWithBlock): Event;
-    executeV3SlowRelayLeaf(leaf: SlowFillLeaf): Event;
-    executeRelayerRefundLeaf(refund: RelayerRefundExecutionWithBlock): Event;
-    setEnableRoute(originToken: string, destinationChainId: number, enabled: boolean, overrides?: EventOverrides): Event;
+    depositV3(deposit: DepositWithBlock): Log;
+    fillV3Relay(fill: FillWithBlock): Log;
+    speedUpV3Deposit(speedUp: SpeedUp): Log;
+    requestV3SlowFill(request: SlowFillRequestWithBlock): Log;
+    executeV3SlowRelayLeaf(leaf: SlowFillLeaf): Log;
+    executeRelayerRefundLeaf(refund: RelayerRefundExecutionWithBlock): Log;
+    setEnableRoute(originToken: string, destinationChainId: number, enabled: boolean, overrides?: EventOverrides): Log;
 }
-export {};
 //# sourceMappingURL=MockSpokePoolClient.d.ts.map

package/dist/types/clients/mocks/MockSpokePoolClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MockSpokePoolClient.d.ts","sourceRoot":"","sources":["../../../../src/clients/mocks/MockSpokePoolClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEpD,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,EACL,gBAAgB,EAEhB,qBAAqB,EACrB,aAAa,EACb,+BAA+B,EAC/B,wBAAwB,EAExB,aAAa,EACb,YAAY,EACZ,OAAO,EACR,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAsE,MAAM,aAAa,CAAC;AAC5G,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,cAAc,EAAmB,MAAM,cAAc,CAAC;AAC7E,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAErE,KAAK,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC;AAI7B,qBAAa,mBAAoB,SAAQ,eAAe;IAC/C,YAAY,EAAE,YAAY,CAAC;IAClC,OAAO,CAAC,gBAAgB,CAAqB;IAC7C,OAAO,CAAC,wBAAwB,CAAS;IACzC,OAAO,CAAC,gCAAgC,CAA8B;IAE/D,gBAAgB,EAAE,MAAM,EAAE,CAAM;IAChC,gBAAgB,SAAK;IACrB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAM;gBAGxC,MAAM,EAAE,OAAO,CAAC,MAAM,EACtB,SAAS,EAAE,QAAQ,EACnB,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,MAAM,EACvB,IAAI,GAAE;QAAE,aAAa,EAAE,aAAa,GAAG,IAAI,CAAA;KAA4B;IAOzE,0BAA0B,CAAC,GAAG,EAAE,SAAS,GAAG,IAAI;IAKhD,oBAAoB,CAAC,WAAW,CAAC,EAAE,uBAAuB,GAAG,IAAI;IAIjE,4BAA4B,IAAI,IAAI;IAI9B,uBAAuB,CAAC,YAAY,EAAE,qBAAqB;IAQ3D,4BAA4B,CAAC,aAAa,EAAE,qBAAqB,EAAE,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IASpG,2BAA2B,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAIjE,6BAA6B,CAAC,OAAO,EAAE,gBAAgB,GAAG,MAAM;IAIhE,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAI/C,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,IAAI;IAc1C,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIjD,OAAO,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC;IAsChE,SAAgB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAIrD;IAEF,SAAS,CAAC,OAAO,EAAE,gBAAgB,GAAG,KAAK;IA8C3C,WAAW,CAAC,IAAI,EAAE,aAAa,GAAG,KAAK;IAkDvC,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,KAAK;IAazC,iBAAiB,CAAC,OAAO,EAAE,wBAAwB,GAAG,KAAK;IAmB3D,sBAAsB,CAAC,IAAI,EAAE,YAAY,GAAG,KAAK;IAiBjD,wBAAwB,CAAC,MAAM,EAAE,+BAA+B,GAAG,KAAK;IA2BxE,cAAc,CACZ,WAAW,EAAE,MAAM,EACnB,kBAAkB,EAAE,MAAM,EAC1B,OAAO,EAAE,OAAO,EAChB,SAAS,GAAE,cAAmB,GAC7B,KAAK;CAcT"}
+{"version":3,"file":"MockSpokePoolClient.d.ts","sourceRoot":"","sources":["../../../../src/clients/mocks/MockSpokePoolClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,EACL,GAAG,EACH,gBAAgB,EAEhB,+BAA+B,EAC/B,wBAAwB,EAExB,aAAa,EACb,YAAY,EACZ,OAAO,EACR,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,cAAc,EAAmB,MAAM,cAAc,CAAC;AAC7E,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAIrE,qBAAa,mBAAoB,SAAQ,eAAe;IAC/C,YAAY,EAAE,YAAY,CAAC;IAClC,OAAO,CAAC,gCAAgC,CAA8B;IAE/D,gBAAgB,EAAE,MAAM,EAAE,CAAM;IAChC,gBAAgB,SAAK;gBAG1B,MAAM,EAAE,OAAO,CAAC,MAAM,EACtB,SAAS,EAAE,QAAQ,EACnB,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,MAAM,EACvB,IAAI,GAAE;QAAE,aAAa,EAAE,aAAa,GAAG,IAAI,CAAA;KAA4B;IAOzE,oBAAoB,CAAC,WAAW,CAAC,EAAE,uBAAuB,GAAG,IAAI;IAIjE,2BAA2B,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAIjE,6BAA6B,CAAC,OAAO,EAAE,gBAAgB,GAAG,MAAM;IAIhE,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAI/C,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,IAAI;IAc1C,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIvD,OAAO,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC;IAqC1D,SAAgB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAIrD;IAEF,SAAS,CAAC,OAAO,EAAE,gBAAgB,GAAG,GAAG;IA8CzC,WAAW,CAAC,IAAI,EAAE,aAAa,GAAG,GAAG;IAkDrC,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,GAAG;IAavC,iBAAiB,CAAC,OAAO,EAAE,wBAAwB,GAAG,GAAG;IAmBzD,sBAAsB,CAAC,IAAI,EAAE,YAAY,GAAG,GAAG;IAiB/C,wBAAwB,CAAC,MAAM,EAAE,+BAA+B,GAAG,GAAG;IA2BtE,cAAc,CACZ,WAAW,EAAE,MAAM,EACnB,kBAAkB,EAAE,MAAM,EAC1B,OAAO,EAAE,OAAO,EAChB,SAAS,GAAE,cAAmB,GAC7B,GAAG;CAcP"}

package/dist/types/contracts/utils.d.ts

@@ -1,4 +1,4 @@
-import { Event } from "ethers";
+import { Event } from "@ethersproject/contracts";
 import { BigNumberish } from "../utils";
 /**
  * @dev Originally imported from @uma/sdk.

package/dist/types/contracts/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/contracts/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC/B,OAAO,EAAa,YAAY,EAAa,MAAM,UAAU,CAAC;AAE9D;;;;GAIG;AAEH,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAClC,KAAK,EACL,QAAQ,GAAG,gBAAgB,GAAG,UAAU,GAAG,gBAAgB,GAAG,uBAAuB,CACtF,CAAC;AAGF,MAAM,MAAM,QAAQ,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC;AAEjD;;GAEG;AACH,wBAAgB,QAAQ,CAAC,QAAQ,GAAE,QAAa;iBAC1B,MAAM;cAcT,MAAM,UAAU,YAAY;cAI5B,MAAM,UAAU,YAAY;cAI5B,MAAM;;cAbN,MAAM,UAAU,MAAM;cAJtB,MAAM;sBAsBE,MAAM;EAMhC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/contracts/utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAa,YAAY,EAAa,MAAM,UAAU,CAAC;AAE9D;;;;GAIG;AAEH,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAClC,KAAK,EACL,QAAQ,GAAG,gBAAgB,GAAG,UAAU,GAAG,gBAAgB,GAAG,uBAAuB,CACtF,CAAC;AAGF,MAAM,MAAM,QAAQ,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC;AAEjD;;GAEG;AACH,wBAAgB,QAAQ,CAAC,QAAQ,GAAE,QAAa;iBAC1B,MAAM;cAcT,MAAM,UAAU,YAAY;cAI5B,MAAM,UAAU,YAAY;cAI5B,MAAM;;cAbN,MAAM,UAAU,MAAM;cAJtB,MAAM;sBAsBE,MAAM;EAMhC"}

package/dist/types/interfaces/Common.d.ts

@@ -1,4 +1,11 @@
+import { Log as _Log } from "@ethersproject/abstract-provider";
 import { BigNumber } from "../utils";
+export type Log = _Log & {
+    event: string;
+    args: {
+        [key: string]: any;
+    };
+};
 export interface SortableEvent {
     blockNumber: number;
     transactionIndex: number;

package/dist/types/interfaces/Common.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Common.d.ts","sourceRoot":"","sources":["../../../src/interfaces/Common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,iBAAiB;IAChC,CAAC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;CACrC"}
+{"version":3,"file":"Common.d.ts","sourceRoot":"","sources":["../../../src/interfaces/Common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,IAAI,IAAI,EAAE,MAAM,kCAAkC,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,MAAM,MAAM,GAAG,GAAG,IAAI,GAAG;IACvB,KAAK,EAAE,MAAM,CAAC;IAEd,IAAI,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;CAC9B,CAAC;AAEF,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,iBAAiB;IAChC,CAAC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;CACrC"}

package/dist/types/utils/EventUtils.d.ts

@@ -1,13 +1,16 @@
 import { Result } from "@ethersproject/abi";
-import { SortableEvent } from "../interfaces";
 import { Contract, Event, EventFilter } from "ethers";
-export declare function spreadEvent(args?: Result): any;
+import { Log, SortableEvent } from "../interfaces";
+export declare function spreadEvent(args: Result | Record<string, unknown>): {
+    [key: string]: any;
+};
 export interface EventSearchConfig {
     fromBlock: number;
     toBlock: number;
     maxBlockLookBack?: number;
 }
-export declare function paginatedEventQuery(contract: Contract, filter: EventFilter, searchConfig: EventSearchConfig, retryCount?: number): Promise<Event[]>;
+export declare const eventToLog: (event: Event) => Log;
+export declare function paginatedEventQuery(contract: Contract, filter: EventFilter, searchConfig: EventSearchConfig, retryCount?: number): Promise<Log[]>;
 /**
  * @dev Warning: this is a specialized function!! Its functionality is not obvious.
  * This function attempts to return block ranges to repeat ranges as much as possible. To do so, it may include blocks that
@@ -23,7 +26,7 @@ export declare function paginatedEventQuery(contract: Contract, filter: EventFil
  * are ordered from smallest to largest.
  */
 export declare function getPaginatedBlockRanges({ fromBlock, toBlock, maxBlockLookBack, }: EventSearchConfig): [number, number][];
-export declare function spreadEventWithBlockNumber(event: Event): SortableEvent;
+export declare function spreadEventWithBlockNumber(event: Log): SortableEvent;
 export declare function sortEventsAscending<T extends SortableEvent>(events: T[]): T[];
 export declare function sortEventsAscendingInPlace<T extends SortableEvent>(events: T[]): T[];
 export declare function sortEventsDescending<T extends SortableEvent>(events: T[]): T[];

package/dist/types/utils/EventUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EventUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/EventUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAMtD,wBAAgB,WAAW,CAAC,IAAI,GAAE,MAAqB,GAAG,GAAG,CAoD5D;AAED,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,WAAW,EACnB,YAAY,EAAE,iBAAiB,EAC/B,UAAU,SAAI,GACb,OAAO,CAAC,KAAK,EAAE,CAAC,CA8BlB;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,uBAAuB,CAAC,EACtC,SAAS,EACT,OAAO,EACP,gBAAgB,GACjB,EAAE,iBAAiB,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAuCxC;AAED,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,KAAK,GAAG,aAAa,CAQtE;AAGD,wBAAgB,mBAAmB,CAAC,CAAC,SAAS,aAAa,EAAE,MAAM,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,CAE7E;AAID,wBAAgB,0BAA0B,CAAC,CAAC,SAAS,aAAa,EAAE,MAAM,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,CAUpF;AAGD,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,aAAa,EAAE,MAAM,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,CAE9E;AAID,wBAAgB,2BAA2B,CAAC,CAAC,SAAS,aAAa,EAAE,MAAM,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,CAUrF;AAGD,wBAAgB,YAAY,CAAC,CAAC,SAAS,aAAa,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,OAAO,CAQ3E;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,EAAE,CAEtE"}
+{"version":3,"file":"EventUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/EventUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AACtD,OAAO,EAAE,GAAG,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAOnD,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,CAoD1F;AAED,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,eAAO,MAAM,UAAU,UAAW,KAAK,KAAG,GAA0E,CAAC;AAErH,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,WAAW,EACnB,YAAY,EAAE,iBAAiB,EAC/B,UAAU,SAAI,GACb,OAAO,CAAC,GAAG,EAAE,CAAC,CAgChB;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,uBAAuB,CAAC,EACtC,SAAS,EACT,OAAO,EACP,gBAAgB,GACjB,EAAE,iBAAiB,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAuCxC;AAED,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,GAAG,GAAG,aAAa,CAQpE;AAGD,wBAAgB,mBAAmB,CAAC,CAAC,SAAS,aAAa,EAAE,MAAM,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,CAE7E;AAID,wBAAgB,0BAA0B,CAAC,CAAC,SAAS,aAAa,EAAE,MAAM,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,CAUpF;AAGD,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,aAAa,EAAE,MAAM,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,CAE9E;AAID,wBAAgB,2BAA2B,CAAC,CAAC,SAAS,aAAa,EAAE,MAAM,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,CAUrF;AAGD,wBAAgB,YAAY,CAAC,CAAC,SAAS,aAAa,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,OAAO,CAQ3E;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,EAAE,CAEtE"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@across-protocol/sdk",
   "author": "UMA Team",
-  "version": "3.1.36",
+  "version": "3.2.0",
   "license": "AGPL-3.0",
   "homepage": "https://docs.across.to/reference/sdk",
   "files": [
@@ -12,8 +12,9 @@
     "node": ">=16.18.0"
   },
   "scripts": {
-    "start": "nodemon -e ts,tsx,json,js,jsx --watch ./src --ignore ./dist --exec 'yarn build'",
+    "start": "yarn typechain && nodemon -e ts,tsx,json,js,jsx --watch ./src --ignore ./dist --exec 'yarn dev'",
     "build": "yarn run clean && yarn typechain && yarn run build:cjs & yarn run build:esm & yarn run build:types; wait",
+    "dev": "yarn run build:cjs & yarn run build:esm & yarn run build:types; wait",
     "build:cjs": "tsc --project tsconfig.build.json --module commonjs --outDir ./dist/cjs --removeComments --verbatimModuleSyntax false && echo > ./dist/cjs/package.json '{\"type\":\"commonjs\"}'",
     "build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir ./dist/esm && echo > ./dist/esm/package.json '{\"type\":\"module\",\"sideEffects\":false}'",
     "build:types": "tsc --project tsconfig.build.json --module esnext --declarationDir ./dist/types --emitDeclarationOnly --declaration --declarationMap",

package/src/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.ts

@@ -1,6 +1,6 @@
 import { utils, across } from "@uma/sdk";
 import assert from "assert";
-import { Contract, Event } from "ethers";
+import { Contract } from "ethers";
 import winston from "winston";
 import { isError } from "../../typeguards";
 import {
@@ -14,7 +14,6 @@ import {
   paginatedEventQuery,
   sortEventsAscendingInPlace,
   sortEventsDescending,
-  spreadEvent,
   spreadEventWithBlockNumber,
   toBN,
   utf8ToHex,
@@ -25,8 +24,10 @@ import {
   DisabledChainsUpdate,
   GlobalConfigUpdate,
   LiteChainsIdListUpdate,
+  Log,
   ParsedTokenConfig,
   RouteRateModelUpdate,
+  SortableEvent,
   SpokePoolTargetBalance,
   SpokeTargetBalanceUpdate,
   TokenConfig,
@@ -41,8 +42,8 @@ type ConfigStoreUpdateSuccess = {
   chainId: number;
   searchEndBlock: number;
   events: {
-    updatedTokenConfigEvents: Event[];
-    updatedGlobalConfigEvents: Event[];
+    updatedTokenConfigEvents: Log[];
+    updatedGlobalConfigEvents: Log[];
     globalConfigUpdateTimes: number[];
   };
 };
@@ -430,12 +431,10 @@ export class AcrossConfigStoreClient extends BaseAbstractClient {
 
     // Save new Global config updates.
     for (let i = 0; i < updatedGlobalConfigEvents.length; i++) {
-      const event = updatedGlobalConfigEvents[i];
-      const args = {
-        blockNumber: event.blockNumber,
-        transactionIndex: event.transactionIndex,
-        logIndex: event.logIndex,
-        ...spreadEvent(event.args),
+      const args = spreadEventWithBlockNumber(updatedGlobalConfigEvents[i]) as SortableEvent & {
+        key: string;
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        value: any;
       };
 
       if (args.key === utf8ToHex(GLOBAL_CONFIG_STORE_KEYS.MAX_RELAYER_REPAYMENT_LEAF_SIZE)) {

package/src/clients/HubPoolClient.ts

@@ -1,5 +1,5 @@
 import assert from "assert";
-import { Contract, Event, EventFilter } from "ethers";
+import { Contract, EventFilter } from "ethers";
 import _ from "lodash";
 import winston from "winston";
 import { DEFAULT_CACHING_SAFE_LAG, DEFAULT_CACHING_TTL } from "../constants";
@@ -13,6 +13,7 @@ import {
   DisputedRootBundle,
   ExecutedRootBundle,
   L1Token,
+  Log,
   LpToken,
   PendingRootBundle,
   ProposedRootBundle,
@@ -38,7 +39,6 @@ import {
   paginatedEventQuery,
   shouldCache,
   sortEventsDescending,
-  spreadEvent,
   spreadEventWithBlockNumber,
   toBN,
   getTokenInfo,
@@ -52,7 +52,7 @@ type HubPoolUpdateSuccess = {
   success: true;
   currentTime: number;
   pendingRootBundleProposal: PendingRootBundle;
-  events: Record<string, Event[]>;
+  events: Record<string, Log[]>;
   searchEndBlock: number;
 };
 type HubPoolUpdateFailure = {
@@ -291,11 +291,33 @@ export class HubPoolClient extends BaseAbstractClient {
     return getL1TokenInfo(tokenAddress, chain);
   }
 
-  getBlockNumber(timestamp: number): Promise<number | undefined> {
+  /**
+   * Resolve a given timestamp to a block number on the HubPool chain.
+   * @param timestamp A single timestamp to be resolved to a block number on the HubPool chain.
+   * @returns The block number corresponding to the supplied timestamp.
+   */
+  getBlockNumber(timestamp: number): Promise<number> {
     const hints = { lowBlock: this.deploymentBlock };
     return getCachedBlockForTimestamp(this.chainId, timestamp, this.blockFinder, this.cachingMechanism, hints);
   }
 
+  /**
+   * For an array of timestamps, resolve each unique timestamp to a block number on the HubPool chain.
+   * @dev Inputs are filtered for uniqueness and sorted to improve BlockFinder efficiency.
+   * @dev Querying block numbers sequentially also improves BlockFinder efficiency.
+   * @param timestamps Array of timestamps to be resolved to a block number on the HubPool chain.
+   * @returns A mapping of quoteTimestamp -> HubPool block number.
+   */
+  async getBlockNumbers(timestamps: number[]): Promise<{ [quoteTimestamp: number]: number }> {
+    const sortedTimestamps = dedupArray(timestamps).sort((x, y) => x - y);
+    const blockNumbers: { [quoteTimestamp: number]: number } = {};
+    for (const timestamp of sortedTimestamps) {
+      blockNumbers[timestamp] = await this.getBlockNumber(timestamp);
+    }
+
+    return blockNumbers;
+  }
+
   async getCurrentPoolUtilization(l1Token: string): Promise<BigNumber> {
     const blockNumber = this.latestBlockSearched ?? (await this.hubPool.provider.getBlockNumber());
     return await this.getUtilization(l1Token, blockNumber, bnZero, getCurrentTime(), 0);
@@ -400,15 +422,6 @@ export class HubPoolClient extends BaseAbstractClient {
       }
     };
 
-    // Helper to resolve a quoteTimestamp to a HubPool block number.
-    const resolveTimestampsToBlocks = async (quoteTimestamp: number): Promise<[number, number]> => {
-      const quoteBlock = await this.getBlockNumber(quoteTimestamp);
-      if (!isDefined(quoteBlock)) {
-        throw new Error(`Could not find block for timestamp ${quoteTimestamp}`);
-      }
-      return [quoteTimestamp, quoteBlock];
-    };
-
     // Helper to resolve existing HubPool token utilisation for an array of unique block numbers.
     // Produces a mapping of blockNumber -> utilization for a specific token.
     const resolveUtilization = async (hubPoolToken: string): Promise<Record<number, BigNumber>> => {
@@ -462,14 +475,12 @@ export class HubPoolClient extends BaseAbstractClient {
      */
     const timeToCache = this.configOverride.timeToCache ?? DEFAULT_CACHING_SAFE_LAG;
 
-    // Identify the unique hubPoolToken & quoteTimestamp mappings. This is used to optimise subsequent HubPool queries.
-    deposits.forEach((deposit) => resolveUniqueQuoteTimestamps(deposit));
-
     // Filter all deposits for unique quoteTimestamps, to be resolved to a blockNumber in parallel.
     const quoteTimestamps = dedupArray(deposits.map(({ quoteTimestamp }) => quoteTimestamp));
-    quoteBlocks = Object.fromEntries(
-      await mapAsync(quoteTimestamps, (quoteTimestamp) => resolveTimestampsToBlocks(quoteTimestamp))
-    );
+    quoteBlocks = await this.getBlockNumbers(quoteTimestamps);
+
+    // Identify the unique hubPoolToken & quoteTimestamp mappings. This is used to optimise subsequent HubPool queries.
+    deposits.forEach((deposit) => resolveUniqueQuoteTimestamps(deposit));
 
     // For each token / quoteBlock pair, resolve the utilisation for each quoted block.
     // This can be reused for each deposit with the same HubPool token and quoteTimestamp pair.
@@ -890,11 +901,10 @@ export class HubPoolClient extends BaseAbstractClient {
     // only run iff a new token has been enabled. Will only append iff the info is not there already.
     // Filter out any duplicate addresses. This might happen due to enabling, disabling and re-enabling a token.
     if (eventsToQuery.includes("L1TokenEnabledForLiquidityProvision")) {
-      const uniqueL1Tokens = [
-        ...Array.from(
-          new Set(events["L1TokenEnabledForLiquidityProvision"].map((event) => spreadEvent(event.args).l1Token))
-        ),
-      ];
+      const uniqueL1Tokens = dedupArray(
+        events["L1TokenEnabledForLiquidityProvision"].map((event) => String(event.args["l1Token"]))
+      );
+
       const [tokenInfo, lpTokenInfo] = await Promise.all([
         Promise.all(uniqueL1Tokens.map((l1Token: string) => fetchTokenInfo(l1Token, this.hubPool.provider))),
         Promise.all(

package/src/clients/SpokePoolClient.ts

@@ -1,4 +1,4 @@
-import { Contract, Event, EventFilter } from "ethers";
+import { Contract, EventFilter } from "ethers";
 import winston from "winston";
 import {
   AnyObject,
@@ -20,7 +20,6 @@ import {
   spreadEventWithBlockNumber,
 } from "../utils/EventUtils";
 import { validateFillForDeposit } from "../utils/FlowUtils";
-
 import { ZERO_ADDRESS } from "../constants";
 import {
   Deposit,
@@ -28,15 +27,13 @@ import {
   Fill,
   FillStatus,
   FillWithBlock,
-  FilledV3RelayEvent,
-  RealizedLpFee,
+  Log,
   RelayData,
   RelayerRefundExecutionWithBlock,
   RootBundleRelayWithBlock,
   SlowFillRequestWithBlock,
   SpeedUpWithBlock,
   TokensBridged,
-  V3FundsDepositedEvent,
 } from "../interfaces";
 import { SpokePool } from "../typechain";
 import { getNetworkName } from "../utils/NetworkUtils";
@@ -51,7 +48,7 @@ type SpokePoolUpdateSuccess = {
   oldestTime: number;
   firstDepositId: number;
   latestDepositId: number;
-  events: Event[][];
+  events: Log[][];
   searchEndBlock: number;
 };
 type SpokePoolUpdateFailure = {
@@ -511,7 +508,7 @@ export class SpokePoolClient extends BaseAbstractClient {
     }
 
     // Sort all events to ensure they are stored in a consistent order.
-    events.forEach((events: Event[]) => sortEventsAscendingInPlace(events));
+    events.forEach((events: Log[]) => sortEventsAscendingInPlace(events));
 
     return {
       success: true,
@@ -550,24 +547,34 @@ export class SpokePoolClient extends BaseAbstractClient {
     }
 
     if (eventsToQuery.includes("V3FundsDeposited")) {
-      const depositEvents = [
-        ...((queryResults[eventsToQuery.indexOf("V3FundsDeposited")] ?? []) as V3FundsDepositedEvent[]),
-      ];
+      const depositEvents = queryResults[eventsToQuery.indexOf("V3FundsDeposited")] ?? [];
       if (depositEvents.length > 0) {
         this.log("debug", `Using ${depositEvents.length} newly queried deposit events for chain ${this.chainId}`, {
           earliestEvent: depositEvents[0].blockNumber,
         });
       }
 
-      const dataForQuoteTime = await this.batchComputeRealizedLpFeePct(depositEvents);
-      for (const [index, event] of Array.from(depositEvents.entries())) {
-        const rawDeposit = spreadEventWithBlockNumber(event);
+      // For each deposit, resolve its quoteTimestamp to a block number on the HubPool.
+      // Don't bother filtering for uniqueness; the HubPoolClient handles this efficienctly.
+      const quoteBlockNumbers = await this.getBlockNumbers(
+        depositEvents.map(({ args }) => Number(args["quoteTimestamp"]))
+      );
+      for (const event of depositEvents) {
+        const quoteBlockNumber = quoteBlockNumbers[Number(event.args["quoteTimestamp"])];
 
         // Derive and append the common properties that are not part of the onchain event.
-        const { quoteBlock: quoteBlockNumber } = dataForQuoteTime[index];
-        const deposit = { ...(rawDeposit as DepositWithBlock), originChainId: this.chainId, quoteBlockNumber };
+        const deposit = {
+          ...spreadEventWithBlockNumber(event),
+          quoteBlockNumber,
+          originChainId: this.chainId,
+          // The following properties are placeholders to be updated immediately.
+          fromLiteChain: true,
+          toLiteChain: true,
+        } as DepositWithBlock;
+
         deposit.fromLiteChain = this.isOriginLiteChain(deposit);
         deposit.toLiteChain = this.isDestinationLiteChain(deposit);
+
         if (deposit.outputToken === ZERO_ADDRESS) {
           deposit.outputToken = this.getDestinationTokenForDeposit(deposit);
         }
@@ -586,16 +593,12 @@ export class SpokePoolClient extends BaseAbstractClient {
       }
     }
 
-    // TODO: When validating fills with deposits for the purposes of UBA flows, do we need to consider
-    // speed ups as well? For example, do we need to also consider that the speed up is before the fill
-    // timestamp to be applied for the fill? My brain hurts.
     // Update deposits with speed up requests from depositor.
     if (eventsToQuery.includes("RequestedSpeedUpV3Deposit")) {
-      const speedUpEvents = [...(queryResults[eventsToQuery.indexOf("RequestedSpeedUpV3Deposit")] ?? [])];
+      const speedUpEvents = queryResults[eventsToQuery.indexOf("RequestedSpeedUpV3Deposit")] ?? [];
 
       for (const event of speedUpEvents) {
-        const rawEvent = spreadEventWithBlockNumber(event);
-        const speedUp = { ...rawEvent, originChainId: this.chainId } as SpeedUpWithBlock;
+        const speedUp = { ...spreadEventWithBlockNumber(event), originChainId: this.chainId } as SpeedUpWithBlock;
         assign(this.speedUps, [speedUp.depositor, speedUp.depositId], [speedUp]);
 
         // Find deposit hash matching this speed up event and update the deposit data associated with the hash,
@@ -614,10 +617,11 @@ export class SpokePoolClient extends BaseAbstractClient {
     if (eventsToQuery.includes("RequestedV3SlowFill")) {
       const slowFillRequests = queryResults[eventsToQuery.indexOf("RequestedV3SlowFill")];
       for (const event of slowFillRequests) {
-        const slowFillRequest: SlowFillRequestWithBlock = {
-          ...(spreadEventWithBlockNumber(event) as SlowFillRequestWithBlock),
+        const slowFillRequest = {
+          ...spreadEventWithBlockNumber(event),
           destinationChainId: this.chainId,
-        };
+        } as SlowFillRequestWithBlock;
+
         const relayDataHash = getRelayDataHash(slowFillRequest, this.chainId);
         if (this.slowFillRequests[relayDataHash] !== undefined) {
           continue;
@@ -627,7 +631,7 @@ export class SpokePoolClient extends BaseAbstractClient {
     }
 
     if (eventsToQuery.includes("FilledV3Relay")) {
-      const fillEvents = [...((queryResults[eventsToQuery.indexOf("FilledV3Relay")] ?? []) as FilledV3RelayEvent[])];
+      const fillEvents = queryResults[eventsToQuery.indexOf("FilledV3Relay")] ?? [];
 
       if (fillEvents.length > 0) {
         this.log("debug", `Using ${fillEvents.length} newly queried fill events for chain ${this.chainId}`, {
@@ -639,9 +643,9 @@ export class SpokePoolClient extends BaseAbstractClient {
       // test that the types are complete. A broader change in strategy for safely unpacking events will be introduced.
       for (const event of fillEvents) {
         const fill = {
-          ...(spreadEventWithBlockNumber(event) as FillWithBlock),
+          ...spreadEventWithBlockNumber(event),
           destinationChainId: this.chainId,
-        };
+        } as FillWithBlock;
 
         assign(this.fills, [fill.originChainId], [fill]);
         assign(this.depositHashesToFills, [this.getDepositHash(fill)], [fill]);
@@ -719,46 +723,24 @@ export class SpokePoolClient extends BaseAbstractClient {
   }
 
   /**
-   * Computes the realized LP fee percentage for a given deposit.
-   * @param depositEvent The deposit event to compute the realized LP fee percentage for.
-   * @returns The realized LP fee percentage.
+   * Resolve a given timestamp to a block number on the HubPool chain via the HubPoolClient.
+   * @param timestamp A single timestamp to be resolved via the HubPoolClient.
+   * @returns The block number on the HubPool chain corresponding to the supplied timestamp.
    */
-  protected async computeRealizedLpFeePct(depositEvent: V3FundsDepositedEvent): Promise<RealizedLpFee> {
-    const [lpFee] = await this.batchComputeRealizedLpFeePct([depositEvent]);
-    return lpFee;
+  protected getBlockNumber(timestamp: number): Promise<number> {
+    return this.hubPoolClient?.getBlockNumber(timestamp) ?? Promise.resolve(MAX_BIG_INT.toNumber());
   }
 
   /**
-   * Computes the realized LP fee percentage for a batch of deposits.
-   * @dev Computing in batch opens up for efficiencies, e.g. in quoteTimestamp -> blockNumber resolution.
-   * @param depositEvents The array of deposit events to compute the realized LP fee percentage for.
-   * @returns The array of realized LP fee percentages and associated HubPool block numbers.
+   * For an array of timestamps, resolve each timestamp to a block number on the HubPool chain via the HubPoolClient.
+   * @param timestamps Array of timestamps to be resolved to a block number via the HubPoolClient.
+   * @returns A mapping of quoteTimestamp -> HubPool block number.
    */
-  protected async batchComputeRealizedLpFeePct(depositEvents: V3FundsDepositedEvent[]): Promise<RealizedLpFee[]> {
-    // If no hub pool client, we're using this for testing. Set quote block very high so that if it's ever
-    // used to look up a configuration for a block, it will always match with the latest configuration.
-    if (this.hubPoolClient === null) {
-      const realizedLpFeePct = bnZero;
-      const quoteBlock = MAX_BIG_INT.toNumber();
-      return depositEvents.map(() => {
-        return { realizedLpFeePct, quoteBlock };
-      });
-    }
-
-    const deposits = depositEvents.map(({ args }) => {
-      // For v3 deposits, leave payment chain ID undefined so we don't compute lp fee since we don't have the
-      // payment chain ID until we match this deposit with a fill.
-      const { inputToken, inputAmount, quoteTimestamp } = args;
-      return {
-        inputToken,
-        inputAmount,
-        originChainId: this.chainId,
-        paymentChainId: undefined,
-        quoteTimestamp,
-      };
-    });
-
-    return deposits.length > 0 ? await this.hubPoolClient.batchComputeRealizedLpFeePct(deposits) : [];
+  protected getBlockNumbers(timestamps: number[]): Promise<{ [quoteTimestamp: number]: number }> {
+    return (
+      this.hubPoolClient?.getBlockNumbers(timestamps) ??
+      Promise.resolve(Object.fromEntries(timestamps.map((timestamp) => [timestamp, MAX_BIG_INT.toNumber()])))
+    );
   }
 
   /**
@@ -829,7 +811,7 @@ export class SpokePoolClient extends BaseAbstractClient {
     );
     const tStop = Date.now();
 
-    const event = (query as V3FundsDepositedEvent[]).find((deposit) => deposit.args.depositId === depositId);
+    const event = query.find(({ args }) => args["depositId"] === depositId);
     if (event === undefined) {
       const srcChain = getNetworkName(this.chainId);
       const dstChain = getNetworkName(destinationChainId);
@@ -838,19 +820,18 @@ export class SpokePoolClient extends BaseAbstractClient {
           ` between ${srcChain} blocks [${searchBounds.low}, ${searchBounds.high}]`
       );
     }
-    const partialDeposit = spreadEventWithBlockNumber(event) as DepositWithBlock;
-    const { quoteBlock: quoteBlockNumber } = await this.computeRealizedLpFeePct(event);
 
-    // Append destination token and realized lp fee to deposit.
-    const deposit: DepositWithBlock = {
-      ...partialDeposit,
+    const deposit = {
+      ...spreadEventWithBlockNumber(event),
       originChainId: this.chainId,
-      quoteBlockNumber,
-      outputToken:
-        partialDeposit.outputToken === ZERO_ADDRESS
-          ? this.getDestinationTokenForDeposit({ ...partialDeposit, originChainId: this.chainId })
-          : partialDeposit.outputToken,
-    };
+      quoteBlockNumber: await this.getBlockNumber(Number(event.args["quoteTimestamp"])),
+      fromLiteChain: true, // To be updated immediately afterwards.
+      toLiteChain: true, // To be updated immediately afterwards.
+    } as DepositWithBlock;
+
+    if (deposit.outputToken === ZERO_ADDRESS) {
+      deposit.outputToken = this.getDestinationTokenForDeposit(deposit);
+    }
     deposit.fromLiteChain = this.isOriginLiteChain(deposit);
     deposit.toLiteChain = this.isDestinationLiteChain(deposit);