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

package/dist/esm/clients/mocks/MockSpokePoolClient.js

@@ -3,7 +3,7 @@ import assert from "assert";
 import { random } from "lodash";
 import { ZERO_ADDRESS } from "../../constants";
 import { FillType, } 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 } from "../SpokePoolClient";
 import { getEventManager } from "./MockEvents";
 // This class replaces internal SpokePoolClient functionality, enabling
@@ -85,36 +85,44 @@ var MockSpokePoolClient = /** @class */ (function (_super) {
             searchEndBlock: this.eventSearchConfig.toBlock || latestBlockSearched,
         });
     };
+    MockSpokePoolClient.prototype.deposit = function (deposit) {
+        return this._deposit("FundsDeposited", deposit);
+    };
     MockSpokePoolClient.prototype.depositV3 = function (deposit) {
-        var _a, _b, _c, _d, _e, _f, _g;
-        var event = "V3FundsDeposited";
+        return this._deposit("V3FundsDeposited", deposit);
+    };
+    MockSpokePoolClient.prototype._deposit = function (event, deposit) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         var blockNumber = deposit.blockNumber, transactionIndex = deposit.transactionIndex;
-        var depositId = deposit.depositId, depositor = deposit.depositor, destinationChainId = deposit.destinationChainId, inputToken = deposit.inputToken, inputAmount = deposit.inputAmount, outputToken = deposit.outputToken, outputAmount = deposit.outputAmount;
+        var depositId = deposit.depositId, destinationChainId = deposit.destinationChainId, inputAmount = deposit.inputAmount, outputAmount = deposit.outputAmount;
         depositId !== null && depositId !== void 0 ? depositId : (depositId = this.numberOfDeposits);
         this.numberOfDeposits = depositId.add(bnOne);
         destinationChainId !== null && destinationChainId !== void 0 ? destinationChainId : (destinationChainId = random(1, 42161, false));
-        depositor !== null && depositor !== void 0 ? depositor : (depositor = randomAddress());
-        inputToken !== null && inputToken !== void 0 ? inputToken : (inputToken = randomAddress());
-        outputToken !== null && outputToken !== void 0 ? outputToken : (outputToken = inputToken);
+        var addressModifier = event === "FundsDeposited" ? toBytes32 : toAddress;
+        var depositor = addressModifier((_a = deposit.depositor) !== null && _a !== void 0 ? _a : randomAddress());
+        var recipient = addressModifier((_b = deposit.recipient) !== null && _b !== void 0 ? _b : depositor);
+        var inputToken = addressModifier((_c = deposit.inputToken) !== null && _c !== void 0 ? _c : randomAddress());
+        var outputToken = addressModifier((_d = deposit.outputToken) !== null && _d !== void 0 ? _d : inputToken);
+        var exclusiveRelayer = addressModifier((_e = deposit.exclusiveRelayer) !== null && _e !== void 0 ? _e : ZERO_ADDRESS);
         inputAmount !== null && inputAmount !== void 0 ? inputAmount : (inputAmount = toBNWei(random(1, 1000, false)));
         outputAmount !== null && outputAmount !== void 0 ? outputAmount : (outputAmount = inputAmount.mul(toBN("0.95")));
-        var message = (_a = deposit["message"]) !== null && _a !== void 0 ? _a : "0x";
+        var message = (_f = deposit["message"]) !== null && _f !== void 0 ? _f : "0x";
         var topics = [destinationChainId, depositId, depositor];
-        var quoteTimestamp = (_b = deposit.quoteTimestamp) !== null && _b !== void 0 ? _b : getCurrentTime();
+        var quoteTimestamp = (_g = deposit.quoteTimestamp) !== null && _g !== void 0 ? _g : getCurrentTime();
         var args = {
             depositId: depositId,
-            originChainId: (_c = deposit.originChainId) !== null && _c !== void 0 ? _c : this.chainId,
+            originChainId: (_h = deposit.originChainId) !== null && _h !== void 0 ? _h : this.chainId,
             destinationChainId: destinationChainId,
             depositor: depositor,
-            recipient: (_d = deposit.recipient) !== null && _d !== void 0 ? _d : depositor,
+            recipient: recipient,
             inputToken: inputToken,
             inputAmount: inputAmount,
             outputToken: outputToken,
             outputAmount: outputAmount,
             quoteTimestamp: quoteTimestamp,
-            fillDeadline: (_e = deposit.fillDeadline) !== null && _e !== void 0 ? _e : quoteTimestamp + 3600,
-            exclusiveRelayer: (_f = deposit.exclusiveRelayer) !== null && _f !== void 0 ? _f : ZERO_ADDRESS,
-            exclusivityDeadline: (_g = deposit.exclusivityDeadline) !== null && _g !== void 0 ? _g : quoteTimestamp + 600,
+            fillDeadline: (_j = deposit.fillDeadline) !== null && _j !== void 0 ? _j : quoteTimestamp + 3600,
+            exclusiveRelayer: exclusiveRelayer,
+            exclusivityDeadline: (_k = deposit.exclusivityDeadline) !== null && _k !== void 0 ? _k : quoteTimestamp + 600,
             message: message,
         };
         return this.eventManager.generateEvent({
@@ -127,42 +135,60 @@ var MockSpokePoolClient = /** @class */ (function (_super) {
         });
     };
     MockSpokePoolClient.prototype.fillV3Relay = function (fill) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
-        var event = "FilledV3Relay";
+        return this._fillRelay("FilledV3Relay", fill);
+    };
+    MockSpokePoolClient.prototype.fillRelay = function (fill) {
+        return this._fillRelay("FilledRelay", fill);
+    };
+    MockSpokePoolClient.prototype._fillRelay = function (event, fill) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1;
         var blockNumber = fill.blockNumber, transactionIndex = fill.transactionIndex;
-        var originChainId = fill.originChainId, depositId = fill.depositId, inputToken = fill.inputToken, inputAmount = fill.inputAmount, outputAmount = fill.outputAmount, fillDeadline = fill.fillDeadline, relayer = fill.relayer;
+        var originChainId = fill.originChainId, depositId = fill.depositId, inputAmount = fill.inputAmount, outputAmount = fill.outputAmount, fillDeadline = fill.fillDeadline;
         originChainId !== null && originChainId !== void 0 ? originChainId : (originChainId = random(1, 42161, false));
         depositId !== null && depositId !== void 0 ? depositId : (depositId = BigNumber.from(random(1, 100000, false)));
-        inputToken !== null && inputToken !== void 0 ? inputToken : (inputToken = randomAddress());
         inputAmount !== null && inputAmount !== void 0 ? inputAmount : (inputAmount = toBNWei(random(1, 1000, false)));
         outputAmount !== null && outputAmount !== void 0 ? outputAmount : (outputAmount = inputAmount);
         fillDeadline !== null && fillDeadline !== void 0 ? fillDeadline : (fillDeadline = getCurrentTime() + 60);
-        relayer !== null && relayer !== void 0 ? relayer : (relayer = randomAddress());
-        var topics = [originChainId, depositId, relayer];
-        var recipient = (_a = fill.recipient) !== null && _a !== void 0 ? _a : randomAddress();
-        var message = (_b = fill["message"]) !== null && _b !== void 0 ? _b : "0x";
-        var args = {
+        var addressModifier = event === "FilledRelay" ? toBytes32 : toAddress;
+        var depositor = addressModifier((_a = fill.depositor) !== null && _a !== void 0 ? _a : randomAddress());
+        var recipient = addressModifier((_b = fill.recipient) !== null && _b !== void 0 ? _b : depositor);
+        var inputToken = addressModifier((_c = fill.inputToken) !== null && _c !== void 0 ? _c : randomAddress());
+        var outputToken = addressModifier((_d = fill.outputToken) !== null && _d !== void 0 ? _d : ZERO_ADDRESS);
+        var exclusiveRelayer = addressModifier((_e = fill.exclusiveRelayer) !== null && _e !== void 0 ? _e : ZERO_ADDRESS);
+        var relayer = addressModifier((_f = fill.relayer) !== null && _f !== void 0 ? _f : randomAddress());
+        var topics = [originChainId, depositId, relayer]; // @todo verify
+        var message = (_g = fill["message"]) !== null && _g !== void 0 ? _g : "0x";
+        var updatedMessage = (_j = (_h = fill.relayExecutionInfo) === null || _h === void 0 ? void 0 : _h.updatedMessage) !== null && _j !== void 0 ? _j : message;
+        var relayExecutionInfo = {
+            updatedRecipient: (_l = (_k = fill.relayExecutionInfo) === null || _k === void 0 ? void 0 : _k.updatedRecipient) !== null && _l !== void 0 ? _l : recipient,
+            updatedOutputAmount: (_o = (_m = fill.relayExecutionInfo) === null || _m === void 0 ? void 0 : _m.updatedOutputAmount) !== null && _o !== void 0 ? _o : outputAmount,
+            fillType: (_q = (_p = fill.relayExecutionInfo) === null || _p === void 0 ? void 0 : _p.fillType) !== null && _q !== void 0 ? _q : FillType.FastFill,
+        };
+        var _args = {
             inputToken: inputToken,
-            outputToken: (_c = fill.outputToken) !== null && _c !== void 0 ? _c : ZERO_ADDRESS,
+            outputToken: outputToken,
             inputAmount: fill.inputAmount,
             outputAmount: fill.outputAmount,
-            repaymentChainId: (_d = fill.repaymentChainId) !== null && _d !== void 0 ? _d : this.chainId,
+            repaymentChainId: (_r = fill.repaymentChainId) !== null && _r !== void 0 ? _r : this.chainId,
             originChainId: originChainId,
             depositId: depositId,
             fillDeadline: fillDeadline,
-            exclusivityDeadline: (_e = fill.exclusivityDeadline) !== null && _e !== void 0 ? _e : fillDeadline,
-            exclusiveRelayer: (_f = fill.exclusiveRelayer) !== null && _f !== void 0 ? _f : ZERO_ADDRESS,
+            exclusivityDeadline: (_s = fill.exclusivityDeadline) !== null && _s !== void 0 ? _s : fillDeadline,
+            exclusiveRelayer: exclusiveRelayer,
             relayer: relayer,
-            depositor: (_g = fill.depositor) !== null && _g !== void 0 ? _g : randomAddress(),
+            depositor: depositor,
             recipient: recipient,
             message: message,
             relayExecutionInfo: {
-                updatedRecipient: (_j = (_h = fill.relayExecutionInfo) === null || _h === void 0 ? void 0 : _h.updatedRecipient) !== null && _j !== void 0 ? _j : recipient,
-                updatedMessage: (_l = (_k = fill.relayExecutionInfo) === null || _k === void 0 ? void 0 : _k.updatedMessage) !== null && _l !== void 0 ? _l : message,
-                updatedOutputAmount: (_o = (_m = fill.relayExecutionInfo) === null || _m === void 0 ? void 0 : _m.updatedOutputAmount) !== null && _o !== void 0 ? _o : outputAmount,
-                fillType: (_q = (_p = fill.relayExecutionInfo) === null || _p === void 0 ? void 0 : _p.fillType) !== null && _q !== void 0 ? _q : FillType.FastFill,
+                updatedRecipient: (_u = (_t = fill.relayExecutionInfo) === null || _t === void 0 ? void 0 : _t.updatedRecipient) !== null && _u !== void 0 ? _u : recipient,
+                updatedMessage: updatedMessage,
+                updatedMessageHash: getMessageHash(updatedMessage),
+                updatedOutputAmount: (_w = (_v = fill.relayExecutionInfo) === null || _v === void 0 ? void 0 : _v.updatedOutputAmount) !== null && _w !== void 0 ? _w : outputAmount,
+                fillType: (_y = (_x = fill.relayExecutionInfo) === null || _x === void 0 ? void 0 : _x.fillType) !== null && _y !== void 0 ? _y : FillType.FastFill,
             },
         };
+        var args = event === "FilledRelay"
+            ? __assign(__assign({}, _args), { messageHash: getMessageHash(message), relayExecutionInfo: __assign(__assign({}, relayExecutionInfo), { updatedMessageHash: (_z = fill.relayExecutionInfo.updatedMessageHash) !== null && _z !== void 0 ? _z : getMessageHash(fill.message) }) }) : __assign(__assign({}, _args), { message: message, relayExecutionInfo: __assign(__assign({}, relayExecutionInfo), { updatedMessage: (_1 = (_0 = fill.relayExecutionInfo) === null || _0 === void 0 ? void 0 : _0.updatedMessage) !== null && _1 !== void 0 ? _1 : message }) });
         return this.eventManager.generateEvent({
             event: event,
             address: this.spokePool.address,
@@ -173,14 +199,21 @@ var MockSpokePoolClient = /** @class */ (function (_super) {
         });
     };
     MockSpokePoolClient.prototype.speedUpV3Deposit = function (speedUp) {
-        var event = "RequestedSpeedUpV3Deposit";
-        var topics = [speedUp.depositId, speedUp.depositor];
+        return this._speedUpDeposit("RequestedSpeedUpV3Deposit", speedUp);
+    };
+    MockSpokePoolClient.prototype.speedUpDeposit = function (speedUp) {
+        return this._speedUpDeposit("RequestedSpeedUpDeposit", speedUp);
+    };
+    MockSpokePoolClient.prototype._speedUpDeposit = function (event, speedUp) {
+        var addressModifier = event === "RequestedSpeedUpDeposit" ? toBytes32 : toAddress;
+        var depositor = addressModifier(speedUp.depositor);
+        var topics = [speedUp.depositId, depositor];
         var args = __assign({}, speedUp);
         return this.eventManager.generateEvent({
             event: event,
             address: this.spokePool.address,
             topics: topics.map(function (topic) { return topic.toString(); }),
-            args: args,
+            args: __assign(__assign({}, args), { depositor: depositor, updatedRecipient: addressModifier(speedUp.updatedRecipient) }),
         });
     };
     MockSpokePoolClient.prototype.setTokensBridged = function (tokensBridged) {
@@ -195,15 +228,23 @@ var MockSpokePoolClient = /** @class */ (function (_super) {
         });
     };
     MockSpokePoolClient.prototype.requestV3SlowFill = function (request) {
-        var event = "RequestedV3SlowFill";
+        return this._requestSlowFill("RequestedV3SlowFill", request);
+    };
+    MockSpokePoolClient.prototype.requestSlowFill = function (request) {
+        return this._requestSlowFill("RequestedSlowFill", request);
+    };
+    MockSpokePoolClient.prototype._requestSlowFill = function (event, request) {
+        var _a, _b, _c, _d, _e;
         var originChainId = request.originChainId, depositId = request.depositId;
         var topics = [originChainId, depositId];
         var args = __assign({}, request);
+        var addressModifier = event === "RequestedSlowFill" ? toBytes32 : toAddress;
+        var depositor = addressModifier((_a = args.depositor) !== null && _a !== void 0 ? _a : randomAddress());
         return this.eventManager.generateEvent({
             event: event,
             address: this.spokePool.address,
             topics: topics.map(function (topic) { return topic.toString(); }),
-            args: args,
+            args: __assign(__assign({}, args), { depositor: depositor, recipient: addressModifier((_b = args.recipient) !== null && _b !== void 0 ? _b : depositor), inputToken: addressModifier((_c = args.inputToken) !== null && _c !== void 0 ? _c : randomAddress()), outputToken: addressModifier((_d = args.outputToken) !== null && _d !== void 0 ? _d : ZERO_ADDRESS), exclusiveRelayer: addressModifier((_e = args.exclusiveRelayer) !== null && _e !== void 0 ? _e : ZERO_ADDRESS) }),
             blockNumber: request.blockNumber,
             transactionIndex: request.transactionIndex,
         });
@@ -215,6 +256,7 @@ var MockSpokePoolClient = /** @class */ (function (_super) {
                 updatedRecipient: leaf.relayData.recipient,
                 updatedOutputAmount: leaf.updatedOutputAmount,
                 updatedMessage: leaf.relayData.message,
+                updatedMessageHash: getMessageHash(leaf.relayData.message),
                 fillType: FillType.SlowFill,
             } });
         return this.fillV3Relay(fill);

package/dist/esm/clients/mocks/MockSpokePoolClient.js.map

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

package/dist/esm/constants.d.ts

@@ -10,7 +10,7 @@ export declare const HUBPOOL_CHAIN_ID = 1;
 export declare const TRANSFER_THRESHOLD_MAX_CONFIG_STORE_VERSION = 1;
 export declare const PRE_FILL_MIN_CONFIG_STORE_VERSION = 5;
 export declare const ARWEAVE_TAG_APP_NAME = "across-protocol";
-export declare const ARWEAVE_TAG_APP_VERSION = 3;
+export declare const ARWEAVE_TAG_APP_VERSION = 4;
 /**
  * A default list of chain Ids that the protocol supports. This is outlined
  * in the UMIP (https://github.com/UMAprotocol/UMIPs/pull/590) and is used
@@ -26,6 +26,7 @@ export declare const DEFAULT_SIMULATED_RELAYER_ADDRESS = "0x07aE8551Be970cB1cCa1
 export declare const DEFAULT_SIMULATED_RELAYER_ADDRESS_TEST = "0x9A8f92a830A5cB89a3816e3D267CB7791c16b04D";
 export declare const DEFAULT_ARWEAVE_STORAGE_ADDRESS = "Z6hjBM8FHu90lYWB8o5jR1dfX92FlV2WBaND9xgp8Lg";
 export declare const EMPTY_MESSAGE = "0x";
+export declare const UNDEFINED_MESSAGE_HASH = "";
 export declare const BRIDGED_USDC_SYMBOLS: string[];
 export declare const CUSTOM_GAS_TOKENS: {
     [x: number]: string;

package/dist/esm/constants.js

@@ -19,7 +19,11 @@ export var PRE_FILL_MIN_CONFIG_STORE_VERSION = 5;
 // A hardcoded identifier used, by default, to tag all Arweave records.
 export var ARWEAVE_TAG_APP_NAME = "across-protocol";
 // A hardcoded version number used, by default, to tag all Arweave records.
-export var ARWEAVE_TAG_APP_VERSION = 3;
+// Version 3:
+// - Changed depositId number -> string (uint32 -> uint256).
+// Version 4:
+// - Dropped message field from Fill event data.
+export var ARWEAVE_TAG_APP_VERSION = 4;
 /**
  * A default list of chain Ids that the protocol supports. This is outlined
  * in the UMIP (https://github.com/UMAprotocol/UMIPs/pull/590) and is used
@@ -35,6 +39,7 @@ export var DEFAULT_SIMULATED_RELAYER_ADDRESS = "0x07aE8551Be970cB1cCa11Dd7a11F47
 export var DEFAULT_SIMULATED_RELAYER_ADDRESS_TEST = "0x9A8f92a830A5cB89a3816e3D267CB7791c16b04D"; // Görli, ...
 export var DEFAULT_ARWEAVE_STORAGE_ADDRESS = "Z6hjBM8FHu90lYWB8o5jR1dfX92FlV2WBaND9xgp8Lg";
 export var EMPTY_MESSAGE = "0x";
+export var UNDEFINED_MESSAGE_HASH = "";
 export var BRIDGED_USDC_SYMBOLS = [
     TOKEN_SYMBOLS_MAP["USDC.e"].symbol,
     TOKEN_SYMBOLS_MAP.USDbC.symbol,

package/dist/esm/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,IAAI,eAAe,EAAE,MAAM,QAAQ,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAE1E,OAAO,EACL,WAAW,EACX,SAAS,EACT,iBAAiB,EACjB,eAAe,EACf,iBAAiB,EACjB,iBAAiB,GAClB,MAAM,4BAA4B,CAAC;AAEpC,MAAM,CAAS,IAAa,YAAY,GAA2B,eAAe,YAA1C,EAAY,UAAU,GAAK,eAAe,SAApB,CAAqB;AAEnF,kDAAkD;AAClD,MAAM,CAAC,IAAM,kBAAkB,GAAG,+BAA+B,CAAC;AAElE,kGAAkG;AAClG,YAAY;AACZ,MAAM,CAAC,IAAM,mBAAmB,GAAG,YAAY,CAAC;AAEhD,MAAM,CAAC,IAAM,gBAAgB,GAAG,QAAQ,CAAC,CAAC,wBAAwB;AAElE;;GAEG;AACH,MAAM,CAAC,IAAM,gBAAgB,GAAG,CAAC,CAAC;AAElC,4EAA4E;AAC5E,MAAM,CAAC,IAAM,2CAA2C,GAAG,CAAC,CAAC;AAE7D,MAAM,CAAC,IAAM,iCAAiC,GAAG,CAAC,CAAC;AAEnD,uEAAuE;AACvE,MAAM,CAAC,IAAM,oBAAoB,GAAG,iBAAiB,CAAC;AAEtD,2EAA2E;AAC3E,MAAM,CAAC,IAAM,uBAAuB,GAAG,CAAC,CAAC;AAEzC;;;;;;;GAOG;AACH,MAAM,CAAC,IAAM,iCAAiC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;AAE1E,MAAM,CAAC,IAAM,mBAAmB,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU;AACnE,MAAM,CAAC,IAAM,wBAAwB,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,SAAS;AAE1D,MAAM,CAAC,IAAM,iCAAiC,GAAG,4CAA4C,CAAC;AAC9F,MAAM,CAAC,IAAM,sCAAsC,GAAG,4CAA4C,CAAC,CAAC,aAAa;AAEjH,MAAM,CAAC,IAAM,+BAA+B,GAAG,6CAA6C,CAAC;AAE7F,MAAM,CAAC,IAAM,aAAa,GAAG,IAAI,CAAC;AAElC,MAAM,CAAC,IAAM,oBAAoB,GAAG;IAClC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,MAAM;IAClC,iBAAiB,CAAC,KAAK,CAAC,MAAM;IAC9B,iBAAiB,CAAC,KAAK,CAAC,MAAM;CAC/B,CAAC;AAEF,MAAM,CAAC,IAAM,iBAAiB;IAC5B,GAAC,SAAS,CAAC,OAAO,IAAG,OAAO;IAC5B,GAAC,SAAS,CAAC,YAAY,IAAG,OAAO;IACjC,GAAC,SAAS,CAAC,UAAU,IAAG,OAAO;IAC/B,4DAA4D;IAC5D,kDAAkD;IAClD,GAAC,SAAS,CAAC,YAAY,IAAG,KAAK;OAChC,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,IAAI,eAAe,EAAE,MAAM,QAAQ,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAE1E,OAAO,EACL,WAAW,EACX,SAAS,EACT,iBAAiB,EACjB,eAAe,EACf,iBAAiB,EACjB,iBAAiB,GAClB,MAAM,4BAA4B,CAAC;AAEpC,MAAM,CAAS,IAAa,YAAY,GAA2B,eAAe,YAA1C,EAAY,UAAU,GAAK,eAAe,SAApB,CAAqB;AAEnF,kDAAkD;AAClD,MAAM,CAAC,IAAM,kBAAkB,GAAG,+BAA+B,CAAC;AAElE,kGAAkG;AAClG,YAAY;AACZ,MAAM,CAAC,IAAM,mBAAmB,GAAG,YAAY,CAAC;AAEhD,MAAM,CAAC,IAAM,gBAAgB,GAAG,QAAQ,CAAC,CAAC,wBAAwB;AAElE;;GAEG;AACH,MAAM,CAAC,IAAM,gBAAgB,GAAG,CAAC,CAAC;AAElC,4EAA4E;AAC5E,MAAM,CAAC,IAAM,2CAA2C,GAAG,CAAC,CAAC;AAE7D,MAAM,CAAC,IAAM,iCAAiC,GAAG,CAAC,CAAC;AAEnD,uEAAuE;AACvE,MAAM,CAAC,IAAM,oBAAoB,GAAG,iBAAiB,CAAC;AAEtD,2EAA2E;AAC3E,aAAa;AACb,4DAA4D;AAC5D,aAAa;AACb,gDAAgD;AAChD,MAAM,CAAC,IAAM,uBAAuB,GAAG,CAAC,CAAC;AAEzC;;;;;;;GAOG;AACH,MAAM,CAAC,IAAM,iCAAiC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;AAE1E,MAAM,CAAC,IAAM,mBAAmB,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU;AACnE,MAAM,CAAC,IAAM,wBAAwB,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,SAAS;AAE1D,MAAM,CAAC,IAAM,iCAAiC,GAAG,4CAA4C,CAAC;AAC9F,MAAM,CAAC,IAAM,sCAAsC,GAAG,4CAA4C,CAAC,CAAC,aAAa;AAEjH,MAAM,CAAC,IAAM,+BAA+B,GAAG,6CAA6C,CAAC;AAE7F,MAAM,CAAC,IAAM,aAAa,GAAG,IAAI,CAAC;AAClC,MAAM,CAAC,IAAM,sBAAsB,GAAG,EAAE,CAAC;AAEzC,MAAM,CAAC,IAAM,oBAAoB,GAAG;IAClC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,MAAM;IAClC,iBAAiB,CAAC,KAAK,CAAC,MAAM;IAC9B,iBAAiB,CAAC,KAAK,CAAC,MAAM;CAC/B,CAAC;AAEF,MAAM,CAAC,IAAM,iBAAiB;IAC5B,GAAC,SAAS,CAAC,OAAO,IAAG,OAAO;IAC5B,GAAC,SAAS,CAAC,YAAY,IAAG,OAAO;IACjC,GAAC,SAAS,CAAC,UAAU,IAAG,OAAO;IAC/B,4DAA4D;IAC5D,kDAAkD;IAClD,GAAC,SAAS,CAAC,YAAY,IAAG,KAAK;OAChC,CAAC"}

package/dist/esm/interfaces/SpokePool.d.ts

@@ -45,10 +45,12 @@ export declare 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/dist/esm/package.json

@@ -0,0 +1 @@
+{"type":"module","sideEffects":false}

package/dist/esm/utils/AddressUtils.d.ts

@@ -8,5 +8,6 @@ import { providers } from "ethers";
 export declare function isContractDeployedToAddress(address: string, provider: providers.Provider): Promise<boolean>;
 export declare function compareAddresses(addressA: string, addressB: string): 1 | -1 | 0;
 export declare function compareAddressesSimple(addressA?: string, addressB?: string): boolean;
+export declare function toBytes32(address: string): string;
 export declare function toAddress(hexString: string): string;
 export declare function isValidEvmAddress(address: string): boolean;

package/dist/esm/utils/AddressUtils.js

@@ -47,10 +47,13 @@ export function compareAddressesSimple(addressA, addressB) {
     }
     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) {
+    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) {
     // rawAddress is the address which is not properly checksummed.
     var rawAddress = utils.hexZeroPad(utils.hexStripZeros(hexString), 20);

package/dist/esm/utils/AddressUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"AddressUtils.js","sourceRoot":"","sources":["../../../src/utils/AddressUtils.ts"],"names":[],"mappings":";AAAA,OAAO,EAAa,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C;;;;;GAKG;AACH,MAAM,UAAgB,2BAA2B,CAAC,OAAe,EAAE,QAA4B;;;;;;oBAC7F,sDAAsD;oBACtD,IAAI,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;wBACzC,sBAAO,KAAK,EAAC;qBACd;oBAEY,qBAAM,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAA;;oBAAtC,IAAI,GAAG,SAA+B;oBAC5C,qEAAqE;oBACrE,sBAAO,IAAI,KAAK,IAAI,EAAC;;;;CACtB;AAED,MAAM,UAAU,gBAAgB,CAAC,QAAgB,EAAE,QAAgB;IACjE,kHAAkH;IAClH,kCAAkC;IAClC,IAAM,UAAU,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC5C,IAAM,UAAU,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC5C,IAAI,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,EAAE;QAC7B,OAAO,CAAC,CAAC;KACV;SAAM,IAAI,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,EAAE;QACpC,OAAO,CAAC,CAAC,CAAC;KACX;SAAM;QACL,OAAO,CAAC,CAAC;KACV;AACH,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,QAAiB,EAAE,QAAiB;IACzE,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,SAAS,EAAE;QACpD,OAAO,KAAK,CAAC;KACd;IACD,OAAO,QAAQ,CAAC,WAAW,EAAE,KAAK,QAAQ,CAAC,WAAW,EAAE,CAAC;AAC3D,CAAC;AAED,0EAA0E;AAC1E,uFAAuF;AACvF,sBAAsB;AACtB,0FAA0F;AAC1F,MAAM,UAAU,SAAS,CAAC,SAAiB;IACzC,+DAA+D;IAC/D,IAAM,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;IACxE,OAAO,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;AACtC,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,OAAe;IAC/C,IAAI,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;QAC5B,OAAO,IAAI,CAAC;KACb;IACD,kIAAkI;IAClI,wDAAwD;IACxD,mHAAmH;IACnH,wHAAwH;IACxH,IAAI;QACF,IAAM,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QACtE,OAAO,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;KACtD;IAAC,OAAO,EAAE,EAAE;QACX,OAAO,KAAK,CAAC;KACd;AACH,CAAC"}
+{"version":3,"file":"AddressUtils.js","sourceRoot":"","sources":["../../../src/utils/AddressUtils.ts"],"names":[],"mappings":";AAAA,OAAO,EAAa,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C;;;;;GAKG;AACH,MAAM,UAAgB,2BAA2B,CAAC,OAAe,EAAE,QAA4B;;;;;;oBAC7F,sDAAsD;oBACtD,IAAI,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;wBACzC,sBAAO,KAAK,EAAC;qBACd;oBAEY,qBAAM,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAA;;oBAAtC,IAAI,GAAG,SAA+B;oBAC5C,qEAAqE;oBACrE,sBAAO,IAAI,KAAK,IAAI,EAAC;;;;CACtB;AAED,MAAM,UAAU,gBAAgB,CAAC,QAAgB,EAAE,QAAgB;IACjE,kHAAkH;IAClH,kCAAkC;IAClC,IAAM,UAAU,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC5C,IAAM,UAAU,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC5C,IAAI,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,EAAE;QAC7B,OAAO,CAAC,CAAC;KACV;SAAM,IAAI,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,EAAE;QACpC,OAAO,CAAC,CAAC,CAAC;KACX;SAAM;QACL,OAAO,CAAC,CAAC;KACV;AACH,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,QAAiB,EAAE,QAAiB;IACzE,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,SAAS,EAAE;QACpD,OAAO,KAAK,CAAC;KACd;IACD,OAAO,QAAQ,CAAC,WAAW,EAAE,KAAK,QAAQ,CAAC,WAAW,EAAE,CAAC;AAC3D,CAAC;AAED,wGAAwG;AACxG,uDAAuD;AACvD,wEAAwE;AACxE,MAAM,UAAU,SAAS,CAAC,OAAe;IACvC,OAAO,KAAK,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;AACrD,CAAC;AAED,6HAA6H;AAC7H,MAAM,UAAU,SAAS,CAAC,SAAiB;IACzC,+DAA+D;IAC/D,IAAM,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;IACxE,OAAO,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;AACtC,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,OAAe;IAC/C,IAAI,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;QAC5B,OAAO,IAAI,CAAC;KACb;IACD,kIAAkI;IAClI,wDAAwD;IACxD,mHAAmH;IACnH,wHAAwH;IACxH,IAAI;QACF,IAAM,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QACtE,OAAO,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;KACtD;IAAC,OAAO,EAAE,EAAE;QACX,OAAO,KAAK,CAAC;KACd;AACH,CAAC"}

package/dist/esm/utils/CachingUtils.js

@@ -2,7 +2,7 @@ import { __awaiter, __generator } from "tslib";
 import { DEFAULT_CACHING_SAFE_LAG, DEFAULT_CACHING_TTL } from "../constants";
 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";
 export function shouldCache(eventTimestamp, latestTime, cachingMaxAge) {
@@ -60,7 +60,7 @@ export function setDepositInCache(deposit, currentChainTime, cache, expirySecond
  * @returns The key for caching the event.
  */
 export function getDepositKey(bridgeEvent) {
-    var relayHash = getRelayHashFromEvent(bridgeEvent);
+    var relayHash = getRelayEventKey(bridgeEvent);
     return "deposit_".concat(bridgeEvent.originChainId, "_").concat(bridgeEvent.depositId.toString(), "_").concat(relayHash);
 }
 //# sourceMappingURL=CachingUtils.js.map

package/dist/esm/utils/CachingUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"CachingUtils.js","sourceRoot":"","sources":["../../../src/utils/CachingUtils.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAE7E,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,eAAe,EAAE,0BAA0B,EAAE,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,MAAM,UAAU,WAAW,CAAC,cAAsB,EAAE,UAAkB,EAAE,aAAqB;IAC3F,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,MAAM,KAAK,EAAE,EAAE,mCAAmC,CAAC,CAAC;IACrF,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,MAAM,KAAK,EAAE,EAAE,mCAAmC,CAAC,CAAC;IACjF,OAAO,UAAU,GAAG,cAAc,IAAI,aAAa,CAAC;AACtD,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAgB,iBAAiB,CAAC,GAAW,EAAE,KAAgC;;;;;wBAChE,qBAAM,KAAK,CAAC,GAAG,CAAS,GAAG,CAAC,EAAA;;oBAAzC,UAAU,GAAG,SAA4B;oBAC/C,sBAAO,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,eAAe,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,EAAC;;;;CAChH;AAED,MAAM,UAAgB,iBAAiB,CACrC,OAAgB,EAChB,gBAAwB,EACxB,KAAgC,EAChC,aAAmC,EACnC,WAAsC;IADtC,8BAAA,EAAA,mCAAmC;IACnC,4BAAA,EAAA,sCAAsC;;;;;;oBAEhC,oBAAoB,GAAG,cAAc,EAAE,CAAC;oBAC9C,6FAA6F;oBAC7F,mEAAmE;oBACnE,IAAI,OAAO,CAAC,cAAc,GAAG,oBAAoB,IAAI,gBAAgB,GAAG,oBAAoB,EAAE;wBAC5F,sBAAO;qBACR;yBAIG,WAAW,CAAC,OAAO,CAAC,cAAc,EAAE,gBAAgB,EAAE,WAAW,CAAC,EAAlE,wBAAkE;oBACpE,qBAAM,KAAK,CAAC,GAAG,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC,EAAA;;oBAA/E,SAA+E,CAAC;;;;;;CAEnF;AAED;;;;;GAKG;AACH,MAAM,UAAU,aAAa,CAAC,WAA6C;IACzE,IAAM,SAAS,GAAG,qBAAqB,CAAC,WAAW,CAAC,CAAC;IACrD,OAAO,kBAAW,WAAW,CAAC,aAAa,cAAI,WAAW,CAAC,SAAS,CAAC,QAAQ,EAAE,cAAI,SAAS,CAAE,CAAC;AACjG,CAAC"}
+{"version":3,"file":"CachingUtils.js","sourceRoot":"","sources":["../../../src/utils/CachingUtils.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAE7E,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,eAAe,EAAE,0BAA0B,EAAE,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,MAAM,UAAU,WAAW,CAAC,cAAsB,EAAE,UAAkB,EAAE,aAAqB;IAC3F,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,MAAM,KAAK,EAAE,EAAE,mCAAmC,CAAC,CAAC;IACrF,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,MAAM,KAAK,EAAE,EAAE,mCAAmC,CAAC,CAAC;IACjF,OAAO,UAAU,GAAG,cAAc,IAAI,aAAa,CAAC;AACtD,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAgB,iBAAiB,CAAC,GAAW,EAAE,KAAgC;;;;;wBAChE,qBAAM,KAAK,CAAC,GAAG,CAAS,GAAG,CAAC,EAAA;;oBAAzC,UAAU,GAAG,SAA4B;oBAC/C,sBAAO,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,eAAe,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,EAAC;;;;CAChH;AAED,MAAM,UAAgB,iBAAiB,CACrC,OAAgB,EAChB,gBAAwB,EACxB,KAAgC,EAChC,aAAmC,EACnC,WAAsC;IADtC,8BAAA,EAAA,mCAAmC;IACnC,4BAAA,EAAA,sCAAsC;;;;;;oBAEhC,oBAAoB,GAAG,cAAc,EAAE,CAAC;oBAC9C,6FAA6F;oBAC7F,mEAAmE;oBACnE,IAAI,OAAO,CAAC,cAAc,GAAG,oBAAoB,IAAI,gBAAgB,GAAG,oBAAoB,EAAE;wBAC5F,sBAAO;qBACR;yBAIG,WAAW,CAAC,OAAO,CAAC,cAAc,EAAE,gBAAgB,EAAE,WAAW,CAAC,EAAlE,wBAAkE;oBACpE,qBAAM,KAAK,CAAC,GAAG,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC,EAAA;;oBAA/E,SAA+E,CAAC;;;;;;CAEnF;AAED;;;;;GAKG;AACH,MAAM,UAAU,aAAa,CAAC,WAA6C;IACzE,IAAM,SAAS,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAC;IAChD,OAAO,kBAAW,WAAW,CAAC,aAAa,cAAI,WAAW,CAAC,SAAS,CAAC,QAAQ,EAAE,cAAI,SAAS,CAAE,CAAC;AACjG,CAAC"}

package/dist/esm/utils/DepositUtils.d.ts

@@ -36,7 +36,7 @@ export declare function queryHistoricalDepositForFill(spokePoolClient: SpokePool
  * @returns True if deposit's input amount is 0 and message is empty.
  */
 export declare function isZeroValueDeposit(deposit: Pick<Deposit, "inputAmount" | "message">): boolean;
-export declare function isZeroValueFillOrSlowFillRequest(e: Pick<Fill | SlowFillRequest, "inputAmount" | "message">): boolean;
+export declare function isZeroValueFillOrSlowFillRequest(e: Pick<Fill | SlowFillRequest, "inputAmount" | "messageHash">): boolean;
 /**
  * Determines if a message is empty or not.
  * @param message The message to check.

package/dist/esm/utils/DepositUtils.js

@@ -2,9 +2,10 @@ import { __awaiter, __generator } from "tslib";
 import assert from "assert";
 import { DEFAULT_CACHING_TTL, EMPTY_MESSAGE, ZERO_BYTES } from "../constants";
 import { getNetworkName } from "./NetworkUtils";
+import { bnZero } from "./BigNumberUtils";
 import { getDepositInCache, getDepositKey, setDepositInCache } from "./CachingUtils";
 import { validateFillForDeposit } from "./FlowUtils";
-import { isUnsafeDepositId } from "./SpokeUtils";
+import { getMessageHash, isUnsafeDepositId } from "./SpokeUtils";
 import { getCurrentTime } from "./TimeUtils";
 import { isDefined } from "./TypeGuards";
 import { isDepositFormedCorrectly } from "./ValidatorUtils";
@@ -31,10 +32,11 @@ export var InvalidFill;
  * @throws If the spoke pool client has not been updated.
  */
 export function queryHistoricalDepositForFill(spokePoolClient, fill, cache) {
+    var _a;
     return __awaiter(this, void 0, void 0, function () {
         var depositId, lowId, highId, originChain, deposit_1, match_1, deposit, cachedDeposit, match;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
                     if (isUnsafeDepositId(fill.depositId)) {
                         return [2 /*return*/, {
@@ -84,7 +86,7 @@ export function queryHistoricalDepositForFill(spokePoolClient, fill, cache) {
                     if (!cache) return [3 /*break*/, 2];
                     return [4 /*yield*/, getDepositInCache(getDepositKey(fill), cache)];
                 case 1:
-                    cachedDeposit = _a.sent();
+                    cachedDeposit = _b.sent();
                     // We only want to warn and remove the cached deposit if it
                     //    A: exists
                     //    B: is not formed correctly
@@ -100,20 +102,21 @@ export function queryHistoricalDepositForFill(spokePoolClient, fill, cache) {
                         // is formed correctly, we will cache it below.
                         cachedDeposit = undefined;
                     }
-                    _a.label = 2;
+                    _b.label = 2;
                 case 2:
                     if (!isDefined(cachedDeposit)) return [3 /*break*/, 3];
                     deposit = cachedDeposit;
                     return [3 /*break*/, 6];
                 case 3: return [4 /*yield*/, spokePoolClient.findDeposit(fill.depositId, fill.destinationChainId)];
                 case 4:
-                    deposit = _a.sent();
+                    deposit = _b.sent();
                     if (!cache) return [3 /*break*/, 6];
                     return [4 /*yield*/, setDepositInCache(deposit, getCurrentTime(), cache, DEFAULT_CACHING_TTL)];
                 case 5:
-                    _a.sent();
-                    _a.label = 6;
+                    _b.sent();
+                    _b.label = 6;
                 case 6:
+                    (_a = deposit.messageHash) !== null && _a !== void 0 ? _a : (deposit.messageHash = getMessageHash(deposit.message));
                     match = validateFillForDeposit(fill, deposit);
                     if (match.valid) {
                         return [2 /*return*/, { found: true, deposit: deposit }];
@@ -139,7 +142,7 @@ export function isZeroValueDeposit(deposit) {
     return deposit.inputAmount.eq(0) && isMessageEmpty(deposit.message);
 }
 export function isZeroValueFillOrSlowFillRequest(e) {
-    return e.inputAmount.eq(0) && isFillOrSlowFillRequestMessageEmpty(e.message);
+    return e.inputAmount.eq(bnZero) && e.messageHash === ZERO_BYTES;
 }
 /**
  * Determines if a message is empty or not.

package/dist/esm/utils/DepositUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"DepositUtils.js","sourceRoot":"","sources":["../../../src/utils/DepositUtils.ts"],"names":[],"mappings":";AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE9E,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACrF,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAE5D,4FAA4F;AAC5F,gGAAgG;AAChG,yDAAyD;AAEzD,MAAM,CAAN,IAAY,WAKX;AALD,WAAY,WAAW;IACrB,qEAAoB,CAAA;IACpB,uEAAiB,CAAA;IACjB,6DAAY,CAAA;IACZ,2EAAmB,CAAA;AACrB,CAAC,EALW,WAAW,KAAX,WAAW,QAKtB;AAMD;;;;;;;;;;;GAWG;AACH,MAAM,UAAgB,6BAA6B,CACjD,eAAgC,EAChC,IAA4B,EAC5B,KAAiC;;;;;;oBAEjC,IAAI,iBAAiB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;wBACrC,sBAAO;gCACL,KAAK,EAAE,KAAK;gCACZ,IAAI,EAAE,WAAW,CAAC,mBAAmB;gCACrC,MAAM,EAAE,yEAAkE,IAAI,CAAC,SAAS,MAAG;6BAC5F,EAAC;qBACH;oBACD,IAAI,IAAI,CAAC,aAAa,KAAK,eAAe,CAAC,OAAO,EAAE;wBAClD,MAAM,IAAI,KAAK,CAAC,kCAA2B,IAAI,CAAC,aAAa,iBAAO,eAAe,CAAC,OAAO,MAAG,CAAC,CAAC;qBACjG;oBAED,kHAAkH;oBAClH,iEAAiE;oBACjE,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE;wBAC9B,MAAM,IAAI,KAAK,CAAC,qEAAqE,CAAC,CAAC;qBACxF;oBAEO,SAAS,GAAK,IAAI,UAAT,CAAU;oBACO,KAAK,GAAwC,eAAe,2BAAvD,EAA6B,MAAM,GAAK,eAAe,0BAApB,CAAqB;oBAC/F,IAAI,SAAS,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE;wBAC/C,sBAAO;gCACL,KAAK,EAAE,KAAK;gCACZ,IAAI,EAAE,WAAW,CAAC,gBAAgB;gCAClC,MAAM,EAAE,qBAAc,SAAS,CAAC,QAAQ,EAAE,8CAAoC,KAAK,cAAI,MAAM,OAAI;6BAClG,EAAC;qBACH;oBAED,CAA6B,KAAK,GAAqC,eAAe,yBAApD,EAA0B,MAAM,GAAK,eAAe,uBAApB,CAAqB,CAAC;oBACxF,IAAI,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;wBAC3C,WAAW,GAAG,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;wBACjD,YAAU,eAAe,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;wBACtD,IAAI,SAAS,CAAC,SAAO,CAAC,EAAE;4BAChB,UAAQ,sBAAsB,CAAC,IAAI,EAAE,SAAO,CAAC,CAAC;4BACpD,IAAI,OAAK,CAAC,KAAK,EAAE;gCACf,sBAAO,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,WAAA,EAAE,EAAC;6BACjC;4BAED,sBAAO;oCACL,KAAK,EAAE,KAAK;oCACZ,IAAI,EAAE,WAAW,CAAC,YAAY;oCAC9B,MAAM,EAAE,mBAAY,WAAW,yBAAe,SAAS,CAAC,QAAQ,EAAE,0BAAgB,OAAK,CAAC,MAAM,OAAI;iCACnG,EAAC;yBACH;wBAED,sBAAO;gCACL,KAAK,EAAE,KAAK;gCACZ,IAAI,EAAE,WAAW,CAAC,iBAAiB;gCACnC,MAAM,EAAE,UAAG,WAAW,yBAAe,SAAS,CAAC,QAAQ,EAAE,gDAA6C;6BACvG,EAAC;qBACH;yBAGG,KAAK,EAAL,wBAAK;oBACS,qBAAM,iBAAiB,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,EAAA;;oBAAnE,aAAa,GAAG,SAAmD,CAAC;oBACpE,2DAA2D;oBAC3D,eAAe;oBACf,gCAAgC;oBAChC,IAAI,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,wBAAwB,CAAC,aAAa,CAAC,EAAE;wBACxE,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC;4BAC1B,EAAE,EAAE,kDAAkD;4BACtD,OAAO,EAAE,8DAA8D;4BACvE,IAAI,MAAA;4BACJ,aAAa,eAAA;yBACd,CAAC,CAAC;wBACH,iEAAiE;wBACjE,mEAAmE;wBACnE,+CAA+C;wBAC/C,aAAa,GAAG,SAAS,CAAC;qBAC3B;;;yBAGC,SAAS,CAAC,aAAa,CAAC,EAAxB,wBAAwB;oBAC1B,OAAO,GAAG,aAAiC,CAAC;;wBAElC,qBAAM,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,kBAAkB,CAAC,EAAA;;oBAApF,OAAO,GAAG,SAA0E,CAAC;yBACjF,KAAK,EAAL,wBAAK;oBACP,qBAAM,iBAAiB,CAAC,OAAO,EAAE,cAAc,EAAE,EAAE,KAAK,EAAE,mBAAmB,CAAC,EAAA;;oBAA9E,SAA8E,CAAC;;;oBAI7E,KAAK,GAAG,sBAAsB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;oBACpD,IAAI,KAAK,CAAC,KAAK,EAAE;wBACf,sBAAO,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,SAAA,EAAE,EAAC;qBACjC;oBAED,sBAAO;4BACL,KAAK,EAAE,KAAK;4BACZ,IAAI,EAAE,WAAW,CAAC,YAAY;4BAC9B,MAAM,EAAE,KAAK,CAAC,MAAM;yBACrB,EAAC;;;;CACH;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,kBAAkB,CAAC,OAAiD;IAClF,OAAO,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;AACtE,CAAC;AAED,MAAM,UAAU,gCAAgC,CAAC,CAA0D;IACzG,OAAO,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,mCAAmC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;AAC/E,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,cAAc,CAAC,OAAuB;IAAvB,wBAAA,EAAA,uBAAuB;IACpD,OAAO,OAAO,KAAK,EAAE,IAAI,OAAO,KAAK,IAAI,CAAC;AAC5C,CAAC;AAED,MAAM,UAAU,mCAAmC,CAAC,OAAe;IACjE,OAAO,cAAc,CAAC,OAAO,CAAC,IAAI,OAAO,KAAK,UAAU,CAAC;AAC3D,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAAC,OAAgB;IAC9C,OAAO,SAAS,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,SAAS,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;AACvF,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,qBAAqB,CAAC,OAAgB;IACpD,IAAM,OAAO,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC;IACpF,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,iEAAiE;IAC7F,OAAO,OAAO,CAAC;AACjB,CAAC"}
+{"version":3,"file":"DepositUtils.js","sourceRoot":"","sources":["../../../src/utils/DepositUtils.ts"],"names":[],"mappings":"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"}

package/dist/esm/utils/FlowUtils.d.ts

@@ -1,8 +1,9 @@
 import { Deposit, RelayData } from "../interfaces";
-export declare const RELAYDATA_KEYS: readonly ["depositId", "originChainId", "destinationChainId", "depositor", "recipient", "inputToken", "inputAmount", "outputToken", "outputAmount", "fillDeadline", "exclusivityDeadline", "exclusiveRelayer", "message"];
-export declare function validateFillForDeposit(relayData: RelayData & {
+export declare const RELAYDATA_KEYS: readonly ["depositId", "originChainId", "destinationChainId", "depositor", "recipient", "inputToken", "inputAmount", "outputToken", "outputAmount", "fillDeadline", "exclusivityDeadline", "exclusiveRelayer", "messageHash"];
+export declare function validateFillForDeposit(relayData: Omit<RelayData, "message"> & {
+    messageHash: string;
     destinationChainId: number;
-}, deposit?: Deposit): {
+}, deposit?: Omit<Deposit, "quoteTimestamp" | "fromLiteChain" | "toLiteChain">): {
     valid: true;
 } | {
     valid: false;

package/dist/esm/utils/FlowUtils.js

@@ -1,4 +1,5 @@
 import { isDefined } from "../utils";
+import { UNDEFINED_MESSAGE_HASH } from "../constants";
 export var RELAYDATA_KEYS = [
     "depositId",
     "originChainId",
@@ -12,7 +13,7 @@ export var RELAYDATA_KEYS = [
     "fillDeadline",
     "exclusivityDeadline",
     "exclusiveRelayer",
-    "message",
+    "messageHash",
 ];
 // Ensure that each deposit element is included with the same value in the fill. This includes all elements defined
 // by the depositor as well as destinationToken, which are pulled from other clients.
@@ -24,6 +25,10 @@ export function validateFillForDeposit(relayData, deposit) {
     // TODO: if we turn on "strict" in the tsconfig, the elements of FILL_DEPOSIT_COMPARISON_KEYS will be automatically
     // validated against the fields in Fill and Deposit, generating an error if there is a discrepency.
     var invalidKey = RELAYDATA_KEYS.find(function (key) { return relayData[key].toString() !== deposit[key].toString(); });
+    // There should be no paths for `messageHash` to be unset, but mask it off anyway.
+    if (!isDefined(invalidKey) && [relayData.messageHash, deposit.messageHash].includes(UNDEFINED_MESSAGE_HASH)) {
+        invalidKey = "messageHash";
+    }
     return isDefined(invalidKey)
         ? { valid: false, reason: "".concat(invalidKey, " mismatch (").concat(relayData[invalidKey], " != ").concat(deposit[invalidKey], ")") }
         : { valid: true };

package/dist/esm/utils/FlowUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"FlowUtils.js","sourceRoot":"","sources":["../../../src/utils/FlowUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAGrC,MAAM,CAAC,IAAM,cAAc,GAAG;IAC5B,WAAW;IACX,eAAe;IACf,oBAAoB;IACpB,WAAW;IACX,WAAW;IACX,YAAY;IACZ,aAAa;IACb,aAAa;IACb,cAAc;IACd,cAAc;IACd,qBAAqB;IACrB,kBAAkB;IAClB,SAAS;CACD,CAAC;AAEX,mHAAmH;AACnH,qFAAqF;AACrF,MAAM,UAAU,sBAAsB,CACpC,SAAqD,EACrD,OAAiB;IAEjB,IAAI,OAAO,KAAK,SAAS,EAAE;QACzB,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,sBAAsB,EAAE,CAAC;KACzD;IAED,oFAAoF;IACpF,mHAAmH;IACnH,mGAAmG;IACnG,IAAM,UAAU,GAAG,cAAc,CAAC,IAAI,CAAC,UAAC,GAAG,IAAK,OAAA,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAArD,CAAqD,CAAC,CAAC;IAEvG,OAAO,SAAS,CAAC,UAAU,CAAC;QAC1B,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,UAAG,UAAU,wBAAc,SAAS,CAAC,UAAU,CAAC,iBAAO,OAAO,CAAC,UAAU,CAAC,MAAG,EAAE;QACzG,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AACtB,CAAC"}
+{"version":3,"file":"FlowUtils.js","sourceRoot":"","sources":["../../../src/utils/FlowUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAEtD,MAAM,CAAC,IAAM,cAAc,GAAG;IAC5B,WAAW;IACX,eAAe;IACf,oBAAoB;IACpB,WAAW;IACX,WAAW;IACX,YAAY;IACZ,aAAa;IACb,aAAa;IACb,cAAc;IACd,cAAc;IACd,qBAAqB;IACrB,kBAAkB;IAClB,aAAa;CACL,CAAC;AAEX,mHAAmH;AACnH,qFAAqF;AACrF,MAAM,UAAU,sBAAsB,CACpC,SAA2F,EAC3F,OAA2E;IAE3E,IAAI,OAAO,KAAK,SAAS,EAAE;QACzB,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,sBAAsB,EAAE,CAAC;KACzD;IAED,oFAAoF;IACpF,mHAAmH;IACnH,mGAAmG;IACnG,IAAI,UAAU,GAAG,cAAc,CAAC,IAAI,CAAC,UAAC,GAAG,IAAK,OAAA,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAArD,CAAqD,CAAC,CAAC;IAErG,kFAAkF;IAClF,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,sBAAsB,CAAC,EAAE;QAC3G,UAAU,GAAG,aAAa,CAAC;KAC5B;IAED,OAAO,SAAS,CAAC,UAAU,CAAC;QAC1B,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,UAAG,UAAU,wBAAc,SAAS,CAAC,UAAU,CAAC,iBAAO,OAAO,CAAC,UAAU,CAAC,MAAG,EAAE;QACzG,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AACtB,CAAC"}

package/dist/esm/utils/SpokeUtils.d.ts

@@ -1,5 +1,5 @@
 import { Contract, PopulatedTransaction, providers } from "ethers";
-import { Deposit, Fill, FillStatus, FillWithBlock, RelayData, SlowFillRequest } from "../interfaces";
+import { Deposit, FillStatus, FillWithBlock, RelayData } from "../interfaces";
 import { SpokePoolClient } from "../clients";
 import { BigNumber } from "./BigNumberUtils";
 type BlockTag = providers.BlockTag;
@@ -17,7 +17,8 @@ export declare function populateV3Relay(spokePool: Contract, deposit: Omit<Depos
  * is required to compute a complete RelayData hash.
  * note: This function should _not_ be used to query the SpokePool.fillStatuses mapping.
  */
-export declare function getRelayEventKey(data: RelayData & {
+export declare function getRelayEventKey(data: Omit<RelayData, "message"> & {
+    messageHash: string;
     destinationChainId: number;
 }): string;
 /**
@@ -52,7 +53,9 @@ export declare function getDepositIdAtBlock(contract: Contract, blockTag: number
  * @returns The corresponding RelayData hash.
  */
 export declare function getRelayDataHash(relayData: RelayData, destinationChainId: number): string;
-export declare function getRelayHashFromEvent(e: Deposit | Fill | SlowFillRequest): string;
+export declare function getRelayHashFromEvent(e: RelayData & {
+    destinationChainId: number;
+}): string;
 export declare function isUnsafeDepositId(depositId: BigNumber): boolean;
 /**
  * Find the amount filled for a deposit at a particular block.

package/dist/esm/utils/SpokeUtils.js

@@ -61,7 +61,7 @@ export function getRelayEventKey(data) {
         data.depositId,
         data.fillDeadline,
         data.exclusivityDeadline,
-        data.message,
+        data.messageHash,
     ]
         .map(String)
         .join("-");
@@ -444,7 +444,7 @@ export function findFillEvent(spokePool, relayData, lowBlockNumber, highBlockNum
                     _c.label = 6;
                 case 6:
                     destinationChainId = _a;
-                    fill = __assign(__assign({}, spreadEventWithBlockNumber(event)), { destinationChainId: destinationChainId });
+                    fill = __assign(__assign({}, spreadEventWithBlockNumber(event)), { destinationChainId: destinationChainId, messageHash: getMessageHash(event.args.message) });
                     return [2 /*return*/, fill];
             }
         });