@across-protocol/sdk 4.0.3-beta.0 → 4.0.3

package/src/clients/BundleDataClient/BundleDataClient.ts

@@ -45,6 +45,7 @@ import {
 import winston from "winston";
 import {
   _buildPoolRebalanceRoot,
+  BundleData,
   BundleDataSS,
   getEndBlockBuffers,
   getRefundInformationFromFill,
@@ -53,12 +54,11 @@ import {
   isChainDisabled,
   PoolRebalanceRoot,
   prettyPrintV3SpokePoolEvents,
-  UNDEFINED_MESSAGE_HASH,
   V3DepositWithBlock,
   V3FillWithBlock,
   verifyFillRepayment,
 } from "./utils";
-import { PRE_FILL_MIN_CONFIG_STORE_VERSION } from "../../constants";
+import { PRE_FILL_MIN_CONFIG_STORE_VERSION, UNDEFINED_MESSAGE_HASH } from "../../constants";
 
 // max(uint256) - 1
 export const INFINITE_FILL_DEADLINE = bnUint32Max;
@@ -209,6 +209,33 @@ export class BundleDataClient {
     return `bundles-${BundleDataClient.getArweaveClientKey(blockRangesForChains)}`;
   }
 
+  // Post-populate any missing message hashes.
+  // @todo This can be removed once the legacy types hurdle is cleared (earliest 7 days post migration).
+  backfillMessageHashes(data: Pick<BundleData, "bundleDepositsV3" | "bundleFillsV3">): void {
+    Object.values(data.bundleDepositsV3).forEach((x) =>
+      Object.values(x).forEach((deposits) =>
+        deposits.forEach((deposit) => {
+          if (deposit.messageHash === UNDEFINED_MESSAGE_HASH) {
+            deposit.messageHash = getMessageHash(deposit.message);
+          }
+        })
+      )
+    );
+
+    Object.values(data.bundleFillsV3).forEach((x) =>
+      Object.values(x).forEach(({ fills }) =>
+        fills.forEach((fill) => {
+          if (fill.messageHash === UNDEFINED_MESSAGE_HASH) {
+            fill.messageHash = getMessageHash(fill.message);
+          }
+          if (fill.relayExecutionInfo.updatedMessageHash === UNDEFINED_MESSAGE_HASH) {
+            fill.relayExecutionInfo.updatedMessageHash = getMessageHash(fill.relayExecutionInfo.updatedMessage);
+          }
+        })
+      )
+    );
+  }
+
   private async loadPersistedDataFromArweave(
     blockRangesForChains: number[][]
   ): Promise<LoadDataReturnValue | undefined> {
@@ -241,17 +268,7 @@ export class BundleDataClient {
 
     const data = persistedData[0].data;
 
-    // Post-populate any missing message hashes.
-    // @todo This can be removed once the legacy types hurdle is cleared (earliest 7 days post migration).
-    Object.values(data.bundleDepositsV3).forEach((x) =>
-      Object.values(x).forEach((deposits) =>
-        deposits.forEach((deposit) => {
-          if (deposit.messageHash === UNDEFINED_MESSAGE_HASH) {
-            deposit.messageHash = getMessageHash(deposit.message);
-          }
-        })
-      )
-    );
+    this.backfillMessageHashes(data);
 
     const bundleData = {
       bundleFillsV3: convertTypedStringRecordIntoNumericRecord(data.bundleFillsV3),

package/src/clients/BundleDataClient/utils/FillUtils.ts

@@ -53,7 +53,7 @@ export function getRepaymentChainId(fill: Fill, matchedDeposit: Deposit): number
   return matchedDeposit.fromLiteChain ? matchedDeposit.originChainId : fill.repaymentChainId;
 }
 
-export function willOverwriteRepaymentChain(
+export function forceDestinationRepayment(
   repaymentChainId: number,
   matchedDeposit: Deposit & { quoteBlockNumber: number },
   hubPoolClient: HubPoolClient
@@ -96,7 +96,7 @@ export async function verifyFillRepayment(
 
   // If repayment chain doesn't have a Pool Rebalance Route for the input token, then change the repayment
   // chain to the destination chain.
-  if (!isSlowFill(fill) && willOverwriteRepaymentChain(repaymentChainId, matchedDeposit, hubPoolClient)) {
+  if (forceDestinationRepayment(repaymentChainId, matchedDeposit, hubPoolClient)) {
     repaymentChainId = fill.destinationChainId;
   }
 

package/src/clients/BundleDataClient/utils/SuperstructUtils.ts

@@ -1,4 +1,5 @@
 import {
+  Infer,
   object,
   number,
   optional,
@@ -13,10 +14,9 @@ import {
   union,
   type,
 } from "superstruct";
+import { UNDEFINED_MESSAGE_HASH } from "../../../constants";
 import { BigNumber } from "../../../utils";
 
-export const UNDEFINED_MESSAGE_HASH = "";
-
 const PositiveIntegerStringSS = pattern(string(), /\d+/);
 const Web3AddressSS = pattern(string(), /^0x[a-fA-F0-9]{40}$/);
 
@@ -86,16 +86,17 @@ const V3RelayExecutionEventInfoSS = object({
   fillType: FillTypeSS,
   updatedRecipient: string(),
   updatedMessage: string(),
+  updatedMessageHash: defaulted(string(), UNDEFINED_MESSAGE_HASH),
 });
 
 const V3FillSS = {
   ...V3RelayDataSS,
+  messageHash: defaulted(string(), UNDEFINED_MESSAGE_HASH),
   destinationChainId: number(),
   relayer: string(),
   repaymentChainId: number(),
   relayExecutionInfo: V3RelayExecutionEventInfoSS,
   quoteTimestamp: number(),
-  messageHash: optional(string()),
 };
 
 const V3FillWithBlockSS = {
@@ -135,3 +136,5 @@ export const BundleDataSS = type({
   bundleSlowFillsV3: nestedV3DepositRecordWithLpFeePctSS,
   bundleFillsV3: nestedV3BundleFillsSS,
 });
+
+export type BundleData = Infer<typeof BundleDataSS>;

package/src/clients/SpokePoolClient.ts

@@ -17,6 +17,7 @@ import {
   isUnsafeDepositId,
   isSlowFill,
   isValidEvmAddress,
+  isZeroAddress,
 } from "../utils";
 import {
   paginatedEventQuery,
@@ -46,7 +47,7 @@ import { getBlockRangeForDepositId, getDepositIdAtBlock, relayFillStatus } from
 import { BaseAbstractClient, isUpdateFailureReason, UpdateFailureReason } from "./BaseAbstractClient";
 import { HubPoolClient } from "./HubPoolClient";
 import { AcrossConfigStoreClient } from "./AcrossConfigStoreClient";
-import { getRepaymentChainId, overwriteRepaymentChain, willOverwriteRepaymentChain } from "./BundleDataClient/utils/FillUtils";
+import { getRepaymentChainId, forceDestinationRepayment } from "./BundleDataClient/utils/FillUtils";
 
 type SpokePoolUpdateSuccess = {
   success: true;
@@ -310,7 +311,8 @@ export class SpokePoolClient extends BaseAbstractClient {
    * @returns The corresponding SlowFIllRequest event if found, otherwise undefined.
    */
   public getSlowFillRequest(relayData: RelayData): SlowFillRequestWithBlock | undefined {
-    const hash = getRelayEventKey({ ...relayData, destinationChainId: this.chainId });
+    const messageHash = getMessageHash(relayData.message);
+    const hash = getRelayEventKey({ ...relayData, messageHash, destinationChainId: this.chainId });
     return this.slowFillRequests[hash];
   }
 
@@ -400,7 +402,7 @@ export class SpokePoolClient extends BaseAbstractClient {
             this.hubPoolClient &&
             !isSlowFill(fill) &&
             (!isValidEvmAddress(fill.relayer) ||
-              willOverwriteRepaymentChain(
+              forceDestinationRepayment(
                 repaymentChainId,
                 { ...deposit, quoteBlockNumber: this.hubPoolClient!.latestBlockSearched },
                 this.hubPoolClient
@@ -609,12 +611,17 @@ export class SpokePoolClient extends BaseAbstractClient {
       }
     }
 
-    if (eventsToQuery.includes("V3FundsDeposited")) {
-      const depositEvents = queryResults[eventsToQuery.indexOf("V3FundsDeposited")] ?? [];
+    // Performs the indexing of a deposit-like spoke pool event.
+    const queryDepositEvents = async (eventName: string) => {
+      const depositEvents = queryResults[eventsToQuery.indexOf(eventName)] ?? [];
       if (depositEvents.length > 0) {
-        this.log("debug", `Using ${depositEvents.length} newly queried deposit events for chain ${this.chainId}`, {
-          earliestEvent: depositEvents[0].blockNumber,
-        });
+        this.log(
+          "debug",
+          `Using ${depositEvents.length} newly queried ${eventName} deposit events for chain ${this.chainId}`,
+          {
+            earliestEvent: depositEvents[0].blockNumber,
+          }
+        );
       }
 
       // For each deposit, resolve its quoteTimestamp to a block number on the HubPool.
@@ -628,7 +635,7 @@ export class SpokePoolClient extends BaseAbstractClient {
         // Derive and append the common properties that are not part of the onchain event.
         const deposit = {
           ...spreadEventWithBlockNumber(event),
-          messageHash: getMessageHash(event.args["message"]),
+          messageHash: getMessageHash(event.args.message),
           quoteBlockNumber,
           originChainId: this.chainId,
           // The following properties are placeholders to be updated immediately.
@@ -639,7 +646,7 @@ export class SpokePoolClient extends BaseAbstractClient {
         deposit.fromLiteChain = this.isOriginLiteChain(deposit);
         deposit.toLiteChain = this.isDestinationLiteChain(deposit);
 
-        if (deposit.outputToken === ZERO_ADDRESS) {
+        if (isZeroAddress(deposit.outputToken)) {
           deposit.outputToken = this.getDestinationTokenForDeposit(deposit);
         }
 
@@ -656,11 +663,17 @@ export class SpokePoolClient extends BaseAbstractClient {
           this.latestDepositIdQueried = deposit.depositId;
         }
       }
+    };
+
+    for (const event of ["V3FundsDeposited", "FundsDeposited"]) {
+      if (eventsToQuery.includes(event)) {
+        await queryDepositEvents(event);
+      }
     }
 
-    // Update deposits with speed up requests from depositor.
-    if (eventsToQuery.includes("RequestedSpeedUpV3Deposit")) {
-      const speedUpEvents = queryResults[eventsToQuery.indexOf("RequestedSpeedUpV3Deposit")] ?? [];
+    // Performs indexing of a "speed up deposit"-like event.
+    const querySpeedUpDepositEvents = (eventName: string) => {
+      const speedUpEvents = queryResults[eventsToQuery.indexOf(eventName)] ?? [];
 
       for (const event of speedUpEvents) {
         const speedUp = { ...spreadEventWithBlockNumber(event), originChainId: this.chainId } as SpeedUpWithBlock;
@@ -677,27 +690,45 @@ export class SpokePoolClient extends BaseAbstractClient {
           this.depositHashes[eventKey] = this.appendMaxSpeedUpSignatureToDeposit(deposit);
         }
       }
-    }
+    };
 
-    if (eventsToQuery.includes("RequestedV3SlowFill")) {
-      const slowFillRequests = queryResults[eventsToQuery.indexOf("RequestedV3SlowFill")];
+    // Update deposits with speed up requests from depositor.
+    ["RequestedSpeedUpV3Deposit", "RequestedSpeedUpDeposit"].forEach((event) => {
+      if (eventsToQuery.includes(event)) {
+        querySpeedUpDepositEvents(event);
+      }
+    });
+
+    // Performs indexing of "requested slow fill"-like events.
+    const queryRequestedSlowFillEvents = (eventName: string) => {
+      const slowFillRequests = queryResults[eventsToQuery.indexOf(eventName)];
       for (const event of slowFillRequests) {
         const slowFillRequest = {
           ...spreadEventWithBlockNumber(event),
-          messageHash: getMessageHash(event.args["message"]),
           destinationChainId: this.chainId,
         } as SlowFillRequestWithBlock;
 
+        if (eventName === "RequestedV3SlowFill") {
+          slowFillRequest.messageHash = getMessageHash(slowFillRequest.message);
+        }
+
         const depositHash = getRelayEventKey({ ...slowFillRequest, destinationChainId: this.chainId });
         this.slowFillRequests[depositHash] ??= slowFillRequest;
       }
-    }
+    };
 
-    if (eventsToQuery.includes("FilledV3Relay")) {
-      const fillEvents = queryResults[eventsToQuery.indexOf("FilledV3Relay")] ?? [];
+    ["RequestedV3SlowFill", "RequestedSlowFill"].forEach((event) => {
+      if (eventsToQuery.includes(event)) {
+        queryRequestedSlowFillEvents(event);
+      }
+    });
+
+    // Performs indexing of filled relay-like events.
+    const queryFilledRelayEvents = (eventName: string) => {
+      const fillEvents = queryResults[eventsToQuery.indexOf(eventName)] ?? [];
 
       if (fillEvents.length > 0) {
-        this.log("debug", `Using ${fillEvents.length} newly queried fill events for chain ${this.chainId}`, {
+        this.log("debug", `Using ${fillEvents.length} newly queried ${eventName} events for chain ${this.chainId}`, {
           earliestEvent: fillEvents[0].blockNumber,
         });
       }
@@ -707,13 +738,26 @@ export class SpokePoolClient extends BaseAbstractClient {
       for (const event of fillEvents) {
         const fill = {
           ...spreadEventWithBlockNumber(event),
+          messageHash: getMessageHash(event.args["message"]),
           destinationChainId: this.chainId,
         } as FillWithBlock;
 
+        if (eventName === "FilledV3Relay") {
+          fill.messageHash = getMessageHash(event.args.message);
+          fill.relayExecutionInfo.updatedMessageHash = getMessageHash(event.args.relayExecutionInfo.updatedMessage);
+        }
+
         assign(this.fills, [fill.originChainId], [fill]);
         assign(this.depositHashesToFills, [getRelayEventKey(fill)], [fill]);
       }
-    }
+    };
+
+    // Update observed fills with ingested event data.
+    ["FilledV3Relay", "FilledRelay"].forEach((event) => {
+      if (eventsToQuery.includes(event)) {
+        queryFilledRelayEvents(event);
+      }
+    });
 
     if (eventsToQuery.includes("EnabledDepositRoute")) {
       const enableDepositsEvents = queryResults[eventsToQuery.indexOf("EnabledDepositRoute")];
@@ -893,7 +937,7 @@ export class SpokePoolClient extends BaseAbstractClient {
       toLiteChain: true, // To be updated immediately afterwards.
     } as DepositWithBlock;
 
-    if (deposit.outputToken === ZERO_ADDRESS) {
+    if (isZeroAddress(deposit.outputToken)) {
       deposit.outputToken = this.getDestinationTokenForDeposit(deposit);
     }
     deposit.fromLiteChain = this.isOriginLiteChain(deposit);

package/src/clients/mocks/MockSpokePoolClient.ts

@@ -12,12 +12,23 @@ import {
   SlowFillRequest,
   SortableEvent,
   Fill,
-  FillWithBlock,
   SlowFillLeaf,
   SpeedUp,
   TokensBridged,
 } from "../../interfaces";
-import { toBN, toBNWei, getCurrentTime, randomAddress, BigNumber, bnZero, bnOne, bnMax } from "../../utils";
+import {
+  toBN,
+  toBNWei,
+  getCurrentTime,
+  getMessageHash,
+  randomAddress,
+  BigNumber,
+  bnZero,
+  bnMax,
+  bnOne,
+  toAddress,
+  toBytes32,
+} from "../../utils";
 import { SpokePoolClient, SpokePoolUpdate } from "../SpokePoolClient";
 import { HubPoolClient } from "../HubPoolClient";
 import { EventManager, EventOverrides, getEventManager } from "./MockEvents";
@@ -119,18 +130,28 @@ export class MockSpokePoolClient extends SpokePoolClient {
     EnabledDepositRoute: "address,uint256,bool",
   };
 
+  deposit(deposit: Omit<Deposit, "messageHash"> & Partial<SortableEvent>): Log {
+    return this._deposit("FundsDeposited", deposit);
+  }
+
   depositV3(deposit: Omit<Deposit, "messageHash"> & Partial<SortableEvent>): Log {
-    const event = "V3FundsDeposited";
+    return this._deposit("V3FundsDeposited", deposit);
+  }
 
+  protected _deposit(event: string, deposit: Omit<Deposit, "messageHash"> & Partial<SortableEvent>): Log {
     const { blockNumber, transactionIndex } = deposit;
-    let { depositId, depositor, destinationChainId, inputToken, inputAmount, outputToken, outputAmount } = deposit;
+    let { depositId, destinationChainId, inputAmount, outputAmount } = deposit;
     depositId ??= this.numberOfDeposits;
     this.numberOfDeposits = depositId.add(bnOne);
 
     destinationChainId ??= random(1, 42161, false);
-    depositor ??= randomAddress();
-    inputToken ??= randomAddress();
-    outputToken ??= inputToken;
+    const addressModifier = event === "FundsDeposited" ? toBytes32 : toAddress;
+    const depositor = addressModifier(deposit.depositor ?? randomAddress());
+    const recipient = addressModifier(deposit.recipient ?? depositor);
+    const inputToken = addressModifier(deposit.inputToken ?? randomAddress());
+    const outputToken = addressModifier(deposit.outputToken ?? inputToken);
+    const exclusiveRelayer = addressModifier(deposit.exclusiveRelayer ?? ZERO_ADDRESS);
+
     inputAmount ??= toBNWei(random(1, 1000, false));
     outputAmount ??= inputAmount.mul(toBN("0.95"));
 
@@ -142,14 +163,14 @@ export class MockSpokePoolClient extends SpokePoolClient {
       originChainId: deposit.originChainId ?? this.chainId,
       destinationChainId,
       depositor,
-      recipient: deposit.recipient ?? depositor,
+      recipient,
       inputToken,
       inputAmount,
       outputToken,
       outputAmount,
       quoteTimestamp,
       fillDeadline: deposit.fillDeadline ?? quoteTimestamp + 3600,
-      exclusiveRelayer: deposit.exclusiveRelayer ?? ZERO_ADDRESS,
+      exclusiveRelayer,
       exclusivityDeadline: deposit.exclusivityDeadline ?? quoteTimestamp + 600,
       message,
     };
@@ -164,26 +185,47 @@ export class MockSpokePoolClient extends SpokePoolClient {
     });
   }
 
-  fillV3Relay(fill: Omit<Fill, "messageHash"> & Partial<SortableEvent>): Log {
-    const event = "FilledV3Relay";
+  fillV3Relay(fill: Omit<Fill, "messageHash"> & { message: string } & Partial<SortableEvent>): Log {
+    return this._fillRelay("FilledV3Relay", fill);
+  }
 
+  fillRelay(fill: Omit<Fill, "messageHash"> & { message: string } & Partial<SortableEvent>): Log {
+    return this._fillRelay("FilledRelay", fill);
+  }
+
+  protected _fillRelay(
+    event: string,
+    fill: Omit<Fill, "messageHash"> & { message: string } & Partial<SortableEvent>
+  ): Log {
     const { blockNumber, transactionIndex } = fill;
-    let { originChainId, depositId, inputToken, inputAmount, outputAmount, fillDeadline, relayer } = fill;
+    let { originChainId, depositId, inputAmount, outputAmount, fillDeadline } = fill;
     originChainId ??= random(1, 42161, false);
     depositId ??= BigNumber.from(random(1, 100_000, false));
-    inputToken ??= randomAddress();
     inputAmount ??= toBNWei(random(1, 1000, false));
     outputAmount ??= inputAmount;
     fillDeadline ??= getCurrentTime() + 60;
-    relayer ??= randomAddress();
 
-    const topics = [originChainId, depositId, relayer];
-    const recipient = fill.recipient ?? randomAddress();
+    const addressModifier = event === "FilledRelay" ? toBytes32 : toAddress;
+    const depositor = addressModifier(fill.depositor ?? randomAddress());
+    const recipient = addressModifier(fill.recipient ?? depositor);
+    const inputToken = addressModifier(fill.inputToken ?? randomAddress());
+    const outputToken = addressModifier(fill.outputToken ?? ZERO_ADDRESS);
+    const exclusiveRelayer = addressModifier(fill.exclusiveRelayer ?? ZERO_ADDRESS);
+    const relayer = addressModifier(fill.relayer ?? randomAddress());
+
+    const topics = [originChainId, depositId, relayer]; // @todo verify
     const message = fill["message"] ?? "0x";
+    const updatedMessage = fill.relayExecutionInfo?.updatedMessage ?? message;
 
-    const args = {
+    const relayExecutionInfo = {
+      updatedRecipient: fill.relayExecutionInfo?.updatedRecipient ?? recipient,
+      updatedOutputAmount: fill.relayExecutionInfo?.updatedOutputAmount ?? outputAmount,
+      fillType: fill.relayExecutionInfo?.fillType ?? FillType.FastFill,
+    };
+
+    const _args = {
       inputToken,
-      outputToken: fill.outputToken ?? ZERO_ADDRESS, // resolved via HubPoolClient.
+      outputToken,
       inputAmount: fill.inputAmount,
       outputAmount: fill.outputAmount,
       repaymentChainId: fill.repaymentChainId ?? this.chainId,
@@ -191,19 +233,40 @@ export class MockSpokePoolClient extends SpokePoolClient {
       depositId,
       fillDeadline,
       exclusivityDeadline: fill.exclusivityDeadline ?? fillDeadline,
-      exclusiveRelayer: fill.exclusiveRelayer ?? ZERO_ADDRESS,
+      exclusiveRelayer,
       relayer,
-      depositor: fill.depositor ?? randomAddress(),
+      depositor,
       recipient,
       message,
       relayExecutionInfo: {
         updatedRecipient: fill.relayExecutionInfo?.updatedRecipient ?? recipient,
-        updatedMessage: fill.relayExecutionInfo?.updatedMessage ?? message,
+        updatedMessage,
+        updatedMessageHash: getMessageHash(updatedMessage),
         updatedOutputAmount: fill.relayExecutionInfo?.updatedOutputAmount ?? outputAmount,
         fillType: fill.relayExecutionInfo?.fillType ?? FillType.FastFill,
       },
     };
 
+    const args =
+      event === "FilledRelay"
+        ? {
+            ..._args,
+            messageHash: getMessageHash(message),
+            relayExecutionInfo: {
+              ...relayExecutionInfo,
+              updatedMessageHash: fill.relayExecutionInfo.updatedMessageHash ?? getMessageHash(fill.message),
+            },
+          }
+        : {
+            // FilledV3Relay
+            ..._args,
+            message,
+            relayExecutionInfo: {
+              ...relayExecutionInfo,
+              updatedMessage: fill.relayExecutionInfo?.updatedMessage ?? message,
+            },
+          };
+
     return this.eventManager.generateEvent({
       event,
       address: this.spokePool.address,
@@ -215,15 +278,28 @@ export class MockSpokePoolClient extends SpokePoolClient {
   }
 
   speedUpV3Deposit(speedUp: SpeedUp): Log {
-    const event = "RequestedSpeedUpV3Deposit";
-    const topics = [speedUp.depositId, speedUp.depositor];
+    return this._speedUpDeposit("RequestedSpeedUpV3Deposit", speedUp);
+  }
+
+  speedUpDeposit(speedUp: SpeedUp): Log {
+    return this._speedUpDeposit("RequestedSpeedUpDeposit", speedUp);
+  }
+
+  protected _speedUpDeposit(event: string, speedUp: SpeedUp): Log {
+    const addressModifier = event === "RequestedSpeedUpDeposit" ? toBytes32 : toAddress;
+    const depositor = addressModifier(speedUp.depositor);
+    const topics = [speedUp.depositId, depositor];
     const args = { ...speedUp };
 
     return this.eventManager.generateEvent({
       event,
       address: this.spokePool.address,
       topics: topics.map((topic) => topic.toString()),
-      args,
+      args: {
+        ...args,
+        depositor,
+        updatedRecipient: addressModifier(speedUp.updatedRecipient),
+      },
     });
   }
 
@@ -241,17 +317,36 @@ export class MockSpokePoolClient extends SpokePoolClient {
   }
 
   requestV3SlowFill(request: Omit<SlowFillRequest, "messageHash"> & Partial<SortableEvent>): Log {
-    const event = "RequestedV3SlowFill";
+    return this._requestSlowFill("RequestedV3SlowFill", request);
+  }
+
+  requestSlowFill(request: Omit<SlowFillRequest, "messageHash"> & Partial<SortableEvent>): Log {
+    return this._requestSlowFill("RequestedSlowFill", request);
+  }
 
+  protected _requestSlowFill(
+    event: string,
+    request: Omit<SlowFillRequest, "messageHash"> & Partial<SortableEvent>
+  ): Log {
     const { originChainId, depositId } = request;
     const topics = [originChainId, depositId];
     const args = { ...request };
 
+    const addressModifier = event === "RequestedSlowFill" ? toBytes32 : toAddress;
+    const depositor = addressModifier(args.depositor ?? randomAddress());
+
     return this.eventManager.generateEvent({
       event,
       address: this.spokePool.address,
       topics: topics.map((topic) => topic.toString()),
-      args,
+      args: {
+        ...args,
+        depositor,
+        recipient: addressModifier(args.recipient ?? depositor),
+        inputToken: addressModifier(args.inputToken ?? randomAddress()),
+        outputToken: addressModifier(args.outputToken ?? ZERO_ADDRESS),
+        exclusiveRelayer: addressModifier(args.exclusiveRelayer ?? ZERO_ADDRESS),
+      },
       blockNumber: request.blockNumber,
       transactionIndex: request.transactionIndex,
     });
@@ -259,8 +354,8 @@ export class MockSpokePoolClient extends SpokePoolClient {
 
   // This is a simple wrapper around fillV3Relay().
   // rootBundleId and proof are discarded here - we have no interest in verifying that.
-  executeV3SlowRelayLeaf(leaf: SlowFillLeaf): Log {
-    const fill: Fill = {
+  executeV3SlowRelayLeaf(leaf: Omit<SlowFillLeaf, "messageHash">): Log {
+    const fill = {
       ...leaf.relayData,
       destinationChainId: this.chainId,
       relayer: ZERO_ADDRESS,
@@ -269,11 +364,12 @@ export class MockSpokePoolClient extends SpokePoolClient {
         updatedRecipient: leaf.relayData.recipient,
         updatedOutputAmount: leaf.updatedOutputAmount,
         updatedMessage: leaf.relayData.message,
+        updatedMessageHash: getMessageHash(leaf.relayData.message),
         fillType: FillType.SlowFill,
       },
     };
 
-    return this.fillV3Relay(fill as FillWithBlock);
+    return this.fillV3Relay(fill);
   }
 
   executeRelayerRefundLeaf(refund: RelayerRefundExecution & Partial<SortableEvent>): Log {

package/src/constants.ts

@@ -35,7 +35,11 @@ export const PRE_FILL_MIN_CONFIG_STORE_VERSION = 5;
 export const ARWEAVE_TAG_APP_NAME = "across-protocol";
 
 // A hardcoded version number used, by default, to tag all Arweave records.
-export const ARWEAVE_TAG_APP_VERSION = 3;
+// Version 3:
+// - Changed depositId number -> string (uint32 -> uint256).
+// Version 4:
+// - Dropped message field from Fill event data.
+export const ARWEAVE_TAG_APP_VERSION = 4;
 
 /**
  * A default list of chain Ids that the protocol supports. This is outlined
@@ -56,6 +60,7 @@ export const DEFAULT_SIMULATED_RELAYER_ADDRESS_TEST = "0x9A8f92a830A5cB89a3816e3
 export const DEFAULT_ARWEAVE_STORAGE_ADDRESS = "Z6hjBM8FHu90lYWB8o5jR1dfX92FlV2WBaND9xgp8Lg";
 
 export const EMPTY_MESSAGE = "0x";
+export const UNDEFINED_MESSAGE_HASH = "";
 
 export const BRIDGED_USDC_SYMBOLS = [
   TOKEN_SYMBOLS_MAP["USDC.e"].symbol,

package/src/interfaces/SpokePool.ts

@@ -52,11 +52,13 @@ export enum FillType {
 export interface RelayExecutionEventInfo {
   updatedRecipient: string;
   updatedOutputAmount: BigNumber;
-  updatedMessage: string;
+  updatedMessage?: string;
+  updatedMessageHash: string;
   fillType: FillType;
 }
 
-export interface Fill extends RelayData {
+export interface Fill extends Omit<RelayData, "message"> {
+  messageHash: string;
   destinationChainId: number;
   relayer: string;
   repaymentChainId: number;

package/src/utils/AddressUtils.ts

@@ -39,10 +39,14 @@ export function compareAddressesSimple(addressA?: string, addressB?: string): bo
   return addressA.toLowerCase() === addressB.toLowerCase();
 }
 
-// Converts an input (assumed to be) bytes32 string into a bytes20 string.
-// If the input is not a bytes32 but is less than type(uint160).max, then this function
-// will still succeed.
-// Throws an error if the string as an unsigned integer is greater than type(uint160).max.
+// Converts an input hex data string into a bytes32 string. Note that the output bytes will be lowercase
+// so that it naturally matches with ethers event data.
+// Throws an error if the input string is already greater than 32 bytes.
+export function toBytes32(address: string): string {
+  return utils.hexZeroPad(address, 32).toLowerCase();
+}
+
+// Checks if the input string can be coerced into a bytes20 evm address. Returns true if it is possible, and false otherwise.
 export function toAddress(hexString: string): string {
   // rawAddress is the address which is not properly checksummed.
   const rawAddress = utils.hexZeroPad(utils.hexStripZeros(hexString), 20);

package/src/utils/CachingUtils.ts

@@ -2,7 +2,7 @@ import { DEFAULT_CACHING_SAFE_LAG, DEFAULT_CACHING_TTL } from "../constants";
 import { CachingMechanismInterface, Deposit, Fill, SlowFillRequest } from "../interfaces";
 import { assert } from "./LogUtils";
 import { composeRevivers, objectWithBigNumberReviver } from "./ReviverUtils";
-import { getRelayHashFromEvent } from "./SpokeUtils";
+import { getRelayEventKey } from "./SpokeUtils";
 import { getCurrentTime } from "./TimeUtils";
 import { isDefined } from "./TypeGuards";
 
@@ -51,6 +51,6 @@ export async function setDepositInCache(
  * @returns The key for caching the event.
  */
 export function getDepositKey(bridgeEvent: Deposit | Fill | SlowFillRequest): string {
-  const relayHash = getRelayHashFromEvent(bridgeEvent);
+  const relayHash = getRelayEventKey(bridgeEvent);
   return `deposit_${bridgeEvent.originChainId}_${bridgeEvent.depositId.toString()}_${relayHash}`;
 }