@across-protocol/sdk 4.2.9-alpha.1 → 4.2.9-alpha.2

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

@@ -1,9 +1,9 @@
 import { __assign, __extends } from "tslib";
 import assert from "assert";
 import { random } from "lodash";
-import { EMPTY_MESSAGE, ZERO_ADDRESS } from "../../constants";
+import { EMPTY_MESSAGE, ZERO_ADDRESS, ZERO_BYTES } from "../../constants";
 import { FillType, } from "../../interfaces";
-import { toBN, toBNWei, getCurrentTime, getMessageHash, randomAddress, BigNumber, bnZero, bnOne, toAddress, toBytes32, spreadEventWithBlockNumber, } from "../../utils";
+import { toBN, toBNWei, getCurrentTime, getMessageHash, randomAddress, BigNumber, bnZero, bnOne, toBytes32, spreadEventWithBlockNumber, toAddressType, isDefined, } from "../../utils";
 import { EVMSpokePoolClient } from "../SpokePoolClient";
 import { getEventManager } from "./MockEvents";
 // This class replaces internal SpokePoolClient functionality, enabling
@@ -32,8 +32,10 @@ var MockSpokePoolClient = /** @class */ (function (_super) {
         this.destinationTokenForChainOverride[chainId] = token;
     };
     MockSpokePoolClient.prototype.getDestinationTokenForDeposit = function (deposit) {
-        var _a;
-        return (_a = this.destinationTokenForChainOverride[deposit.originChainId]) !== null && _a !== void 0 ? _a : _super.prototype.getDestinationTokenForDeposit.call(this, deposit);
+        var override = this.destinationTokenForChainOverride[deposit.originChainId];
+        return isDefined(override)
+            ? toAddressType(override, deposit.destinationChainId)
+            : _super.prototype.getDestinationTokenForDeposit.call(this, deposit);
     };
     MockSpokePoolClient.prototype.setLatestBlockNumber = function (blockNumber) {
         this.latestHeightSearched = blockNumber;
@@ -85,30 +87,26 @@ var MockSpokePoolClient = /** @class */ (function (_super) {
     MockSpokePoolClient.prototype.deposit = function (deposit) {
         return this._deposit("FundsDeposited", deposit);
     };
-    MockSpokePoolClient.prototype.depositV3 = function (deposit) {
-        return this._deposit("V3FundsDeposited", deposit);
-    };
     MockSpokePoolClient.prototype._deposit = function (event, deposit) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
         var blockNumber = deposit.blockNumber, txnIndex = deposit.txnIndex;
         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));
-        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);
+        var depositor = (_b = (_a = deposit.depositor) === null || _a === void 0 ? void 0 : _a.toBytes32()) !== null && _b !== void 0 ? _b : toBytes32(randomAddress());
+        var recipient = (_d = (_c = deposit.recipient) === null || _c === void 0 ? void 0 : _c.toBytes32()) !== null && _d !== void 0 ? _d : toBytes32(depositor);
+        var inputToken = (_f = (_e = deposit.inputToken) === null || _e === void 0 ? void 0 : _e.toBytes32()) !== null && _f !== void 0 ? _f : toBytes32(randomAddress());
+        var outputToken = (_h = (_g = deposit.outputToken) === null || _g === void 0 ? void 0 : _g.toBytes32()) !== null && _h !== void 0 ? _h : inputToken;
+        var exclusiveRelayer = (_k = (_j = deposit.exclusiveRelayer) === null || _j === void 0 ? void 0 : _j.toBytes32()) !== null && _k !== void 0 ? _k : toBytes32(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 = (_f = deposit["message"]) !== null && _f !== void 0 ? _f : "0x";
+        var message = (_l = deposit.message) !== null && _l !== void 0 ? _l : "0x";
         var topics = [destinationChainId, depositId, depositor];
-        var quoteTimestamp = (_g = deposit.quoteTimestamp) !== null && _g !== void 0 ? _g : getCurrentTime();
+        var quoteTimestamp = (_m = deposit.quoteTimestamp) !== null && _m !== void 0 ? _m : getCurrentTime();
         var args = {
             depositId: depositId,
-            originChainId: (_h = deposit.originChainId) !== null && _h !== void 0 ? _h : this.chainId,
+            originChainId: (_o = deposit.originChainId) !== null && _o !== void 0 ? _o : this.chainId,
             destinationChainId: destinationChainId,
             depositor: depositor,
             recipient: recipient,
@@ -117,9 +115,9 @@ var MockSpokePoolClient = /** @class */ (function (_super) {
             outputToken: outputToken,
             outputAmount: outputAmount,
             quoteTimestamp: quoteTimestamp,
-            fillDeadline: (_j = deposit.fillDeadline) !== null && _j !== void 0 ? _j : quoteTimestamp + 3600,
+            fillDeadline: (_p = deposit.fillDeadline) !== null && _p !== void 0 ? _p : quoteTimestamp + 3600,
             exclusiveRelayer: exclusiveRelayer,
-            exclusivityDeadline: (_k = deposit.exclusivityDeadline) !== null && _k !== void 0 ? _k : quoteTimestamp + 600,
+            exclusivityDeadline: (_q = deposit.exclusivityDeadline) !== null && _q !== void 0 ? _q : quoteTimestamp + 600,
             message: message,
         };
         return this.eventManager.generateEvent({
@@ -131,14 +129,11 @@ var MockSpokePoolClient = /** @class */ (function (_super) {
             transactionIndex: txnIndex,
         });
     };
-    MockSpokePoolClient.prototype.fillV3Relay = function (fill) {
-        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;
+        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, _2;
         var blockNumber = fill.blockNumber, txnIndex = fill.txnIndex;
         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));
@@ -146,43 +141,42 @@ var MockSpokePoolClient = /** @class */ (function (_super) {
         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);
-        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 : EMPTY_MESSAGE;
-        var updatedMessage = (_j = (_h = fill.relayExecutionInfo) === null || _h === void 0 ? void 0 : _h.updatedMessage) !== null && _j !== void 0 ? _j : message;
+        var depositor = (_b = (_a = fill.depositor) === null || _a === void 0 ? void 0 : _a.toBytes32()) !== null && _b !== void 0 ? _b : toBytes32(randomAddress());
+        var recipient = (_d = (_c = fill.recipient) === null || _c === void 0 ? void 0 : _c.toBytes32()) !== null && _d !== void 0 ? _d : toBytes32(depositor);
+        var inputToken = (_f = (_e = fill.inputToken) === null || _e === void 0 ? void 0 : _e.toBytes32()) !== null && _f !== void 0 ? _f : toBytes32(randomAddress());
+        var outputToken = (_h = (_g = fill.outputToken) === null || _g === void 0 ? void 0 : _g.toBytes32()) !== null && _h !== void 0 ? _h : toBytes32(ZERO_ADDRESS);
+        var exclusiveRelayer = (_k = (_j = fill.exclusiveRelayer) === null || _j === void 0 ? void 0 : _j.toBytes32()) !== null && _k !== void 0 ? _k : toBytes32(ZERO_ADDRESS);
+        var relayer = (_m = (_l = fill.relayer) === null || _l === void 0 ? void 0 : _l.toBytes32()) !== null && _m !== void 0 ? _m : toBytes32(randomAddress());
+        var topics = [originChainId, depositId, relayer];
+        var message = (_o = fill.message) !== null && _o !== void 0 ? _o : EMPTY_MESSAGE;
+        var updatedMessage = (_q = (_p = fill.relayExecutionInfo) === null || _p === void 0 ? void 0 : _p.updatedMessage) !== null && _q !== void 0 ? _q : message;
+        var updatedRecipient = (_s = (_r = fill.relayExecutionInfo) === null || _r === void 0 ? void 0 : _r.updatedRecipient.toBytes32()) !== null && _s !== void 0 ? _s : recipient;
         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,
+            updatedRecipient: updatedRecipient,
+            updatedOutputAmount: (_u = (_t = fill.relayExecutionInfo) === null || _t === void 0 ? void 0 : _t.updatedOutputAmount) !== null && _u !== void 0 ? _u : outputAmount,
+            fillType: (_w = (_v = fill.relayExecutionInfo) === null || _v === void 0 ? void 0 : _v.fillType) !== null && _w !== void 0 ? _w : FillType.FastFill,
         };
         var _args = {
             inputToken: inputToken,
             outputToken: outputToken,
             inputAmount: fill.inputAmount,
             outputAmount: fill.outputAmount,
-            repaymentChainId: (_r = fill.repaymentChainId) !== null && _r !== void 0 ? _r : this.chainId,
+            repaymentChainId: (_x = fill.repaymentChainId) !== null && _x !== void 0 ? _x : this.chainId,
             originChainId: originChainId,
             depositId: depositId,
             fillDeadline: fillDeadline,
-            exclusivityDeadline: (_s = fill.exclusivityDeadline) !== null && _s !== void 0 ? _s : fillDeadline,
+            exclusivityDeadline: (_y = fill.exclusivityDeadline) !== null && _y !== void 0 ? _y : fillDeadline,
             exclusiveRelayer: exclusiveRelayer,
             relayer: relayer,
             depositor: depositor,
             recipient: recipient,
             relayExecutionInfo: {
-                updatedRecipient: (_u = (_t = fill.relayExecutionInfo) === null || _t === void 0 ? void 0 : _t.updatedRecipient) !== null && _u !== void 0 ? _u : recipient,
-                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,
+                updatedRecipient: updatedRecipient,
+                updatedOutputAmount: (_0 = (_z = fill.relayExecutionInfo) === null || _z === void 0 ? void 0 : _z.updatedOutputAmount) !== null && _0 !== void 0 ? _0 : outputAmount,
+                fillType: (_2 = (_1 = fill.relayExecutionInfo) === null || _1 === void 0 ? void 0 : _1.fillType) !== null && _2 !== void 0 ? _2 : FillType.FastFill,
             },
         };
-        var args = event === "FilledRelay"
-            ? __assign(__assign({}, _args), { messageHash: getMessageHash(message), relayExecutionInfo: __assign(__assign({}, relayExecutionInfo), { updatedMessageHash: getMessageHash(updatedMessage) }) }) : __assign(__assign({}, _args), { message: message, relayExecutionInfo: __assign(__assign({}, relayExecutionInfo), { updatedMessage: updatedMessage }) });
+        var args = __assign(__assign({}, _args), { messageHash: getMessageHash(message), relayExecutionInfo: __assign(__assign({}, relayExecutionInfo), { updatedMessageHash: getMessageHash(updatedMessage) }) });
         return this.eventManager.generateEvent({
             event: event,
             address: this.spokePool.address,
@@ -192,22 +186,18 @@ var MockSpokePoolClient = /** @class */ (function (_super) {
             transactionIndex: txnIndex,
         });
     };
-    MockSpokePoolClient.prototype.speedUpV3Deposit = function (speedUp) {
-        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 depositor = speedUp.depositor.toBytes32();
         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: __assign(__assign({}, args), { depositor: depositor, updatedRecipient: addressModifier(speedUp.updatedRecipient) }),
+            args: __assign(__assign({}, args), { depositor: depositor, updatedRecipient: speedUp.updatedRecipient.toBytes32() }),
         });
     };
     MockSpokePoolClient.prototype.setTokensBridged = function (tokensBridged) {
@@ -221,39 +211,35 @@ var MockSpokePoolClient = /** @class */ (function (_super) {
             args: args,
         });
     };
-    MockSpokePoolClient.prototype.requestV3SlowFill = function (request) {
-        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 _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         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());
+        var depositor = (_a = args.depositor.toBytes32()) !== null && _a !== void 0 ? _a : toBytes32(randomAddress());
         return this.eventManager.generateEvent({
             event: event,
             address: this.spokePool.address,
             topics: topics.map(function (topic) { return topic.toString(); }),
-            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) }),
+            args: __assign(__assign({}, args), { destinationChainId: this.chainId, depositor: depositor, recipient: (_c = (_b = args.recipient) === null || _b === void 0 ? void 0 : _b.toBytes32()) !== null && _c !== void 0 ? _c : depositor, inputToken: (_e = (_d = args.inputToken) === null || _d === void 0 ? void 0 : _d.toBytes32()) !== null && _e !== void 0 ? _e : toBytes32(randomAddress()), outputToken: (_g = (_f = args.outputToken) === null || _f === void 0 ? void 0 : _f.toBytes32()) !== null && _g !== void 0 ? _g : toBytes32(ZERO_ADDRESS), exclusiveRelayer: (_j = (_h = args.exclusiveRelayer) === null || _h === void 0 ? void 0 : _h.toBytes32()) !== null && _j !== void 0 ? _j : toBytes32(ZERO_ADDRESS), messageHash: (_k = args.messageHash) !== null && _k !== void 0 ? _k : ZERO_BYTES }),
             blockNumber: request.blockNumber,
             transactionIndex: request.txnIndex,
         });
     };
-    // This is a simple wrapper around fillV3Relay().
+    // This is a simple wrapper around fillRelay().
     // rootBundleId and proof are discarded here - we have no interest in verifying that.
-    MockSpokePoolClient.prototype.executeV3SlowRelayLeaf = function (leaf) {
-        var fill = __assign(__assign({}, leaf.relayData), { destinationChainId: this.chainId, relayer: ZERO_ADDRESS, repaymentChainId: 0, relayExecutionInfo: {
+    MockSpokePoolClient.prototype.executeSlowRelayLeaf = function (leaf) {
+        var fill = __assign(__assign({}, leaf.relayData), { destinationChainId: this.chainId, relayer: toAddressType(ZERO_ADDRESS), repaymentChainId: 0, relayExecutionInfo: {
                 updatedRecipient: leaf.relayData.recipient,
                 updatedOutputAmount: leaf.updatedOutputAmount,
                 updatedMessage: leaf.relayData.message,
                 updatedMessageHash: getMessageHash(leaf.relayData.message),
                 fillType: FillType.SlowFill,
             } });
-        return this.fillV3Relay(fill);
+        return this.fillRelay(fill);
     };
     MockSpokePoolClient.prototype.executeRelayerRefundLeaf = function (refund) {
         var _a;

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":";AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC1E,OAAO,EAIL,QAAQ,GAQT,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,IAAI,EACJ,OAAO,EACP,cAAc,EACd,cAAc,EACd,aAAa,EACb,SAAS,EACT,MAAM,EACN,KAAK,EACL,SAAS,EACT,0BAA0B,EAE1B,aAAa,EACb,SAAS,GACV,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,kBAAkB,EAAmB,MAAM,oBAAoB,CAAC;AAEzE,OAAO,EAAgC,eAAe,EAAE,MAAM,cAAc,CAAC;AAG7E,uEAAuE;AACvE,uEAAuE;AACvE;IAAyC,uCAAkB;IAOzD,6BACE,MAAsB,EACtB,SAAmB,EACnB,OAAe,EACf,eAAuB,EACvB,IAAuE;QAAvE,qBAAA,EAAA,SAAkD,aAAa,EAAE,IAAI,EAAE;QALzE,YAOE,kBAAM,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,aAAa,EAAE,OAAO,EAAE,eAAe,CAAC,SAGvE;QAfO,sCAAgC,GAA2B,EAAE,CAAC;QACtE,sFAAsF;QAC/E,sBAAgB,GAAgB,EAAE,CAAC;QACnC,sBAAgB,GAAG,MAAM,CAAC;QAmFjC,6FAA6F;QAC7E,qBAAe,GAA2B;YACxD,mBAAmB,EAAE,sBAAsB;SAC5C,CAAC;QA5EA,KAAI,CAAC,oBAAoB,GAAG,eAAe,CAAC;QAC5C,KAAI,CAAC,YAAY,GAAG,eAAe,CAAC,OAAO,EAAE,KAAI,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;;IACtF,CAAC;IAED,kDAAoB,GAApB,UAAqB,WAAqC;QACxD,IAAI,CAAC,iBAAiB,GAAG,WAAW,CAAC;IACvC,CAAC;IAED,yDAA2B,GAA3B,UAA4B,OAAe,EAAE,KAAa;QACxD,IAAI,CAAC,gCAAgC,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC;IACzD,CAAC;IAED,2DAA6B,GAA7B,UAA8B,OAAyB;QACrD,IAAM,QAAQ,GAAG,IAAI,CAAC,gCAAgC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAC9E,OAAO,SAAS,CAAC,QAAQ,CAAC;YACxB,CAAC,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,kBAAkB,CAAC;YACrD,CAAC,CAAC,iBAAM,6BAA6B,YAAC,OAAO,CAAC,CAAC;IACnD,CAAC;IAED,kDAAoB,GAApB,UAAqB,WAAmB;QACtC,IAAI,CAAC,oBAAoB,GAAG,WAAW,CAAC;IAC1C,CAAC;IAED,2CAAa,GAAb,UAAc,WAAwB;QACpC,IAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC;QAC3B,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;YAC5B,OAAO;SACR;QACD,IAAI,aAAa,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QACnC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC3C,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,aAAa,CAAC,EAAE;gBACpC,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;aACzE;YACD,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;YAC1C,aAAa,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;SAChC;IACH,CAAC;IAED,kDAAoB,GAApB,UAAqB,QAAgB;QACnC,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC1D,CAAC;IAED,qCAAO,GAAP,UAAQ,aAAuB;QAC7B,qCAAqC;QACrC,IAAM,mBAAmB,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC;QAC1D,IAAM,WAAW,GAAG,cAAc,EAAE,CAAC;QAErC,4EAA4E;QAC5E,4EAA4E;QAC5E,IAAM,MAAM,GAAY,aAAa,CAAC,GAAG,CAAC,cAAM,OAAA,EAAE,EAAF,CAAE,CAAC,CAAC;QACpD,IAAI,CAAC,YAAY;aACd,SAAS,EAAE;aACX,IAAI,EAAE;aACN,OAAO,CAAC,UAAC,KAAK;YACb,IAAM,GAAG,GAAG,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC/C,IAAI,GAAG,KAAK,CAAC,CAAC,EAAE;gBACd,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aACzB;QACH,CAAC,CAAC,CAAC;QAEL,IAAM,qBAAqB,GAAG,MAAM,CAAC,GAAG,CAAC,UAAC,SAAS;YACjD,OAAA,SAAS,CAAC,GAAG,CAAC,UAAC,KAAK,IAAK,OAAA,0BAA0B,CAAC,KAAK,CAAC,EAAjC,CAAiC,CAAC;QAA3D,CAA2D,CAC5D,CAAC;QAEF,OAAO,OAAO,CAAC,OAAO,CAAC;YACrB,OAAO,EAAE,IAAI;YACb,cAAc,EAAE,MAAM;YACtB,WAAW,aAAA;YACX,MAAM,EAAE,qBAAqB;YAC7B,cAAc,EAAE,IAAI,CAAC,iBAAiB,CAAC,EAAE,IAAI,mBAAmB;SACjE,CAAC,CAAC;IACL,CAAC;IAOD,qCAAO,GAAP,UAAQ,OAA8D;QACpE,OAAO,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAClD,CAAC;IAES,sCAAQ,GAAlB,UACE,KAAa,EACb,OAAqF;;QAE7E,IAAA,WAAW,GAAe,OAAO,YAAtB,EAAE,QAAQ,GAAK,OAAO,SAAZ,CAAa;QACpC,IAAA,SAAS,GAAoD,OAAO,UAA3D,EAAE,kBAAkB,GAAgC,OAAO,mBAAvC,EAAE,WAAW,GAAmB,OAAO,YAA1B,EAAE,YAAY,GAAK,OAAO,aAAZ,CAAa;QAC3E,SAAS,aAAT,SAAS,cAAT,SAAS,IAAT,SAAS,GAAK,IAAI,CAAC,gBAAgB,EAAC;QACpC,IAAI,CAAC,gBAAgB,GAAG,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAE7C,kBAAkB,aAAlB,kBAAkB,cAAlB,kBAAkB,IAAlB,kBAAkB,GAAK,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,EAAC;QAC/C,IAAM,SAAS,GAAG,MAAA,MAAA,OAAO,CAAC,SAAS,0CAAE,SAAS,EAAE,mCAAI,SAAS,CAAC,aAAa,EAAE,CAAC,CAAC;QAC/E,IAAM,SAAS,GAAG,MAAA,MAAA,OAAO,CAAC,SAAS,0CAAE,SAAS,EAAE,mCAAI,SAAS,CAAC,SAAS,CAAC,CAAC;QACzE,IAAM,UAAU,GAAG,MAAA,MAAA,OAAO,CAAC,UAAU,0CAAE,SAAS,EAAE,mCAAI,SAAS,CAAC,aAAa,EAAE,CAAC,CAAC;QACjF,IAAM,WAAW,GAAG,MAAA,MAAA,OAAO,CAAC,WAAW,0CAAE,SAAS,EAAE,mCAAI,UAAU,CAAC;QACnE,IAAM,gBAAgB,GAAG,MAAA,MAAA,OAAO,CAAC,gBAAgB,0CAAE,SAAS,EAAE,mCAAI,SAAS,CAAC,YAAY,CAAC,CAAC;QAE1F,WAAW,aAAX,WAAW,cAAX,WAAW,IAAX,WAAW,GAAK,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,EAAC;QAChD,YAAY,aAAZ,YAAY,cAAZ,YAAY,IAAZ,YAAY,GAAK,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAC;QAE/C,IAAM,OAAO,GAAG,MAAA,OAAO,CAAC,OAAO,mCAAI,IAAI,CAAC;QACxC,IAAM,MAAM,GAAG,CAAC,kBAAkB,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;QAC1D,IAAM,cAAc,GAAG,MAAA,OAAO,CAAC,cAAc,mCAAI,cAAc,EAAE,CAAC;QAClE,IAAM,IAAI,GAAG;YACX,SAAS,WAAA;YACT,aAAa,EAAE,MAAA,OAAO,CAAC,aAAa,mCAAI,IAAI,CAAC,OAAO;YACpD,kBAAkB,oBAAA;YAClB,SAAS,WAAA;YACT,SAAS,WAAA;YACT,UAAU,YAAA;YACV,WAAW,aAAA;YACX,WAAW,aAAA;YACX,YAAY,cAAA;YACZ,cAAc,gBAAA;YACd,YAAY,EAAE,MAAA,OAAO,CAAC,YAAY,mCAAI,cAAc,GAAG,IAAI;YAC3D,gBAAgB,kBAAA;YAChB,mBAAmB,EAAE,MAAA,OAAO,CAAC,mBAAmB,mCAAI,cAAc,GAAG,GAAG;YACxE,OAAO,SAAA;SACR,CAAC;QAEF,OAAO,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC;YACrC,KAAK,OAAA;YACL,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO;YAC/B,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,UAAC,KAAK,IAAK,OAAA,KAAK,CAAC,QAAQ,EAAE,EAAhB,CAAgB,CAAC;YAC/C,IAAI,MAAA;YACJ,WAAW,aAAA;YACX,gBAAgB,EAAE,QAAQ;SAC3B,CAAC,CAAC;IACL,CAAC;IAED,uCAAS,GAAT,UAAU,IAA+E;QACvF,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;IAC9C,CAAC;IAES,wCAAU,GAApB,UACE,KAAa,EACb,IAA+E;;QAEvE,IAAA,WAAW,GAAe,IAAI,YAAnB,EAAE,QAAQ,GAAK,IAAI,SAAT,CAAU;QACjC,IAAA,aAAa,GAAyD,IAAI,cAA7D,EAAE,SAAS,GAA8C,IAAI,UAAlD,EAAE,WAAW,GAAiC,IAAI,YAArC,EAAE,YAAY,GAAmB,IAAI,aAAvB,EAAE,YAAY,GAAK,IAAI,aAAT,CAAU;QACjF,aAAa,aAAb,aAAa,cAAb,aAAa,IAAb,aAAa,GAAK,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,EAAC;QAC1C,SAAS,aAAT,SAAS,cAAT,SAAS,IAAT,SAAS,GAAK,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,MAAO,EAAE,KAAK,CAAC,CAAC,EAAC;QACxD,WAAW,aAAX,WAAW,cAAX,WAAW,IAAX,WAAW,GAAK,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,EAAC;QAChD,YAAY,aAAZ,YAAY,cAAZ,YAAY,IAAZ,YAAY,GAAK,WAAW,EAAC;QAC7B,YAAY,aAAZ,YAAY,cAAZ,YAAY,IAAZ,YAAY,GAAK,cAAc,EAAE,GAAG,EAAE,EAAC;QAEvC,IAAM,SAAS,GAAG,MAAA,MAAA,IAAI,CAAC,SAAS,0CAAE,SAAS,EAAE,mCAAI,SAAS,CAAC,aAAa,EAAE,CAAC,CAAC;QAC5E,IAAM,SAAS,GAAG,MAAA,MAAA,IAAI,CAAC,SAAS,0CAAE,SAAS,EAAE,mCAAI,SAAS,CAAC,SAAS,CAAC,CAAC;QACtE,IAAM,UAAU,GAAG,MAAA,MAAA,IAAI,CAAC,UAAU,0CAAE,SAAS,EAAE,mCAAI,SAAS,CAAC,aAAa,EAAE,CAAC,CAAC;QAC9E,IAAM,WAAW,GAAG,MAAA,MAAA,IAAI,CAAC,WAAW,0CAAE,SAAS,EAAE,mCAAI,SAAS,CAAC,YAAY,CAAC,CAAC;QAC7E,IAAM,gBAAgB,GAAG,MAAA,MAAA,IAAI,CAAC,gBAAgB,0CAAE,SAAS,EAAE,mCAAI,SAAS,CAAC,YAAY,CAAC,CAAC;QACvF,IAAM,OAAO,GAAG,MAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,SAAS,EAAE,mCAAI,SAAS,CAAC,aAAa,EAAE,CAAC,CAAC;QAExE,IAAM,MAAM,GAAG,CAAC,aAAa,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QACnD,IAAM,OAAO,GAAG,MAAA,IAAI,CAAC,OAAO,mCAAI,aAAa,CAAC;QAC9C,IAAM,cAAc,GAAG,MAAA,MAAA,IAAI,CAAC,kBAAkB,0CAAE,cAAc,mCAAI,OAAO,CAAC;QAC1E,IAAM,gBAAgB,GAAG,MAAA,MAAA,IAAI,CAAC,kBAAkB,0CAAE,gBAAgB,CAAC,SAAS,EAAE,mCAAI,SAAS,CAAC;QAE5F,IAAM,kBAAkB,GAAG;YACzB,gBAAgB,kBAAA;YAChB,mBAAmB,EAAE,MAAA,MAAA,IAAI,CAAC,kBAAkB,0CAAE,mBAAmB,mCAAI,YAAY;YACjF,QAAQ,EAAE,MAAA,MAAA,IAAI,CAAC,kBAAkB,0CAAE,QAAQ,mCAAI,QAAQ,CAAC,QAAQ;SACjE,CAAC;QAEF,IAAM,KAAK,GAAG;YACZ,UAAU,YAAA;YACV,WAAW,aAAA;YACX,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,gBAAgB,EAAE,MAAA,IAAI,CAAC,gBAAgB,mCAAI,IAAI,CAAC,OAAO;YACvD,aAAa,eAAA;YACb,SAAS,WAAA;YACT,YAAY,cAAA;YACZ,mBAAmB,EAAE,MAAA,IAAI,CAAC,mBAAmB,mCAAI,YAAY;YAC7D,gBAAgB,kBAAA;YAChB,OAAO,SAAA;YACP,SAAS,WAAA;YACT,SAAS,WAAA;YACT,kBAAkB,EAAE;gBAClB,gBAAgB,kBAAA;gBAChB,mBAAmB,EAAE,MAAA,MAAA,IAAI,CAAC,kBAAkB,0CAAE,mBAAmB,mCAAI,YAAY;gBACjF,QAAQ,EAAE,MAAA,MAAA,IAAI,CAAC,kBAAkB,0CAAE,QAAQ,mCAAI,QAAQ,CAAC,QAAQ;aACjE;SACF,CAAC;QAEF,IAAM,IAAI,yBACL,KAAK,KACR,WAAW,EAAE,cAAc,CAAC,OAAO,CAAC,EACpC,kBAAkB,wBACb,kBAAkB,KACrB,kBAAkB,EAAE,cAAc,CAAC,cAAc,CAAC,MAErD,CAAC;QAEF,OAAO,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC;YACrC,KAAK,OAAA;YACL,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO;YAC/B,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,UAAC,KAAK,IAAK,OAAA,KAAK,CAAC,QAAQ,EAAE,EAAhB,CAAgB,CAAC;YAC/C,IAAI,MAAA;YACJ,WAAW,aAAA;YACX,gBAAgB,EAAE,QAAQ;SAC3B,CAAC,CAAC;IACL,CAAC;IAED,4CAAc,GAAd,UAAe,OAAgB;QAC7B,OAAO,IAAI,CAAC,eAAe,CAAC,yBAAyB,EAAE,OAAO,CAAC,CAAC;IAClE,CAAC;IAES,6CAAe,GAAzB,UAA0B,KAAa,EAAE,OAAgB;QACvD,IAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;QAChD,IAAM,MAAM,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAC9C,IAAM,IAAI,gBAAQ,OAAO,CAAE,CAAC;QAE5B,OAAO,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC;YACrC,KAAK,OAAA;YACL,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO;YAC/B,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,UAAC,KAAK,IAAK,OAAA,KAAK,CAAC,QAAQ,EAAE,EAAhB,CAAgB,CAAC;YAC/C,IAAI,wBACC,IAAI,KACP,SAAS,WAAA,EACT,gBAAgB,EAAE,OAAO,CAAC,gBAAgB,CAAC,SAAS,EAAE,GACvD;SACF,CAAC,CAAC;IACL,CAAC;IAED,8CAAgB,GAAhB,UAAiB,aAA4B;QAC3C,IAAM,KAAK,GAAG,eAAe,CAAC;QAC9B,IAAM,MAAM,GAAG,CAAC,aAAa,CAAC,OAAO,EAAE,aAAa,CAAC,MAAM,EAAE,aAAa,CAAC,cAAc,CAAC,CAAC;QAC3F,IAAM,IAAI,gBAAQ,aAAa,CAAE,CAAC;QAElC,OAAO,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC;YACrC,KAAK,OAAA;YACL,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO;YAC/B,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,UAAC,KAAK,IAAK,OAAA,KAAK,CAAC,QAAQ,EAAE,EAAhB,CAAgB,CAAC;YAC/C,IAAI,MAAA;SACL,CAAC,CAAC;IACL,CAAC;IAED,6CAAe,GAAf,UAAgB,OAA6E;QAC3F,OAAO,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;IAC7D,CAAC;IAES,8CAAgB,GAA1B,UACE,KAAa,EACb,OAA6E;;QAErE,IAAA,aAAa,GAAgB,OAAO,cAAvB,EAAE,SAAS,GAAK,OAAO,UAAZ,CAAa;QAC7C,IAAM,MAAM,GAAG,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;QAC1C,IAAM,IAAI,gBAAQ,OAAO,CAAE,CAAC;QAE5B,IAAM,SAAS,GAAG,MAAA,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,mCAAI,SAAS,CAAC,aAAa,EAAE,CAAC,CAAC;QAE3E,OAAO,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC;YACrC,KAAK,OAAA;YACL,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO;YAC/B,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,UAAC,KAAK,IAAK,OAAA,KAAK,CAAC,QAAQ,EAAE,EAAhB,CAAgB,CAAC;YAC/C,IAAI,wBACC,IAAI,KACP,kBAAkB,EAAE,IAAI,CAAC,OAAO,EAChC,SAAS,WAAA,EACT,SAAS,EAAE,MAAA,MAAA,IAAI,CAAC,SAAS,0CAAE,SAAS,EAAE,mCAAI,SAAS,EACnD,UAAU,EAAE,MAAA,MAAA,IAAI,CAAC,UAAU,0CAAE,SAAS,EAAE,mCAAI,SAAS,CAAC,aAAa,EAAE,CAAC,EACtE,WAAW,EAAE,MAAA,MAAA,IAAI,CAAC,WAAW,0CAAE,SAAS,EAAE,mCAAI,SAAS,CAAC,YAAY,CAAC,EACrE,gBAAgB,EAAE,MAAA,MAAA,IAAI,CAAC,gBAAgB,0CAAE,SAAS,EAAE,mCAAI,SAAS,CAAC,YAAY,CAAC,EAC/E,WAAW,EAAE,MAAA,IAAI,CAAC,WAAW,mCAAI,UAAU,GAC5C;YACD,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,gBAAgB,EAAE,OAAO,CAAC,QAAQ;SACnC,CAAC,CAAC;IACL,CAAC;IAED,+CAA+C;IAC/C,qFAAqF;IACrF,kDAAoB,GAApB,UAAqB,IAAuC;QAC1D,IAAM,IAAI,yBACL,IAAI,CAAC,SAAS,KACjB,kBAAkB,EAAE,IAAI,CAAC,OAAO,EAChC,OAAO,EAAE,aAAa,CAAC,YAAY,CAAC,EACpC,gBAAgB,EAAE,CAAC,EACnB,kBAAkB,EAAE;gBAClB,gBAAgB,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS;gBAC1C,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;gBAC7C,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO;gBACtC,kBAAkB,EAAE,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;gBAC1D,QAAQ,EAAE,QAAQ,CAAC,QAAQ;aAC5B,GACF,CAAC;QAEF,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;IAED,sDAAwB,GAAxB,UAAyB,MAAuD;;QAC9E,IAAM,KAAK,GAAG,2BAA2B,CAAC;QAE1C,IAAM,OAAO,GAAG,MAAA,MAAM,CAAC,OAAO,mCAAI,IAAI,CAAC,OAAO,CAAC;QAC/C,MAAM,CAAC,OAAO,KAAK,IAAI,CAAC,OAAO,CAAC,CAAC;QAEzB,IAAA,YAAY,GAAa,MAAM,aAAnB,EAAE,MAAM,GAAK,MAAM,OAAX,CAAY;QACxC,IAAM,MAAM,GAAG,CAAC,OAAO,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;QAC/C,IAAM,IAAI,GAAG;YACX,OAAO,SAAA;YACP,YAAY,cAAA;YACZ,MAAM,QAAA;YACN,cAAc,EAAE,MAAM,CAAC,cAAc;YACrC,cAAc,EAAE,MAAM,CAAC,cAAc;YACrC,eAAe,EAAE,MAAM,CAAC,eAAe;YACvC,aAAa,EAAE,MAAM,CAAC,aAAa;SACpC,CAAC;QAEF,OAAO,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC;YACrC,KAAK,OAAA;YACL,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO;YAC/B,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,UAAC,KAAK,IAAK,OAAA,KAAK,CAAC,QAAQ,EAAE,EAAhB,CAAgB,CAAC;YAC/C,IAAI,MAAA;YACJ,WAAW,EAAE,MAAM,CAAC,WAAW;SAChC,CAAC,CAAC;IACL,CAAC;IAED,4CAAc,GAAd,UACE,WAAmB,EACnB,kBAA0B,EAC1B,OAAgB,EAChB,SAA8B;QAA9B,0BAAA,EAAA,cAA8B;QAE9B,IAAM,KAAK,GAAG,qBAAqB,CAAC;QAEpC,IAAM,MAAM,GAAG,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC;QACjD,IAAM,IAAI,GAAG,EAAE,WAAW,aAAA,EAAE,kBAAkB,oBAAA,EAAE,OAAO,SAAA,EAAE,CAAC;QAE1D,OAAO,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC;YACrC,KAAK,OAAA;YACL,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO;YAC/B,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,UAAC,KAAK,IAAK,OAAA,KAAK,CAAC,QAAQ,EAAE,EAAhB,CAAgB,CAAC;YAC/C,IAAI,MAAA;YACJ,WAAW,EAAE,SAAS,CAAC,WAAW;SACnC,CAAC,CAAC;IACL,CAAC;IACH,0BAAC;AAAD,CAAC,AAjWD,CAAyC,kBAAkB,GAiW1D"}

package/dist/esm/clients/mocks/MockSvmSpokePoolClient.d.ts

@@ -2,7 +2,7 @@ import winston from "winston";
 import { SvmSpokeClient } from "@across-protocol/contracts";
 import { Address } from "@solana/kit";
 import { DepositWithBlock, RelayerRefundExecution, SortableEvent, SlowFillLeaf, Log } from "../../interfaces";
-import { MakeOptional, EventSearchConfig } from "../../utils";
+import { MakeOptional, EventSearchConfig, Address as SDKAddress } from "../../utils";
 import { SpokePoolUpdate, SVMSpokePoolClient } from "../SpokePoolClient";
 import { HubPoolClient } from "../HubPoolClient";
 import { EventOverrides } from "./MockEvents";
@@ -17,7 +17,7 @@ export declare class MockSvmSpokePoolClient extends SVMSpokePoolClient {
     });
     setConfigStoreClient(configStore?: AcrossConfigStoreClient): void;
     setDestinationTokenForChain(chainId: number, token: string): void;
-    getDestinationTokenForDeposit(deposit: DepositWithBlock): string;
+    getDestinationTokenForDeposit(deposit: DepositWithBlock): SDKAddress;
     setLatestBlockNumber(blockNumber: number): void;
     _update(eventsToQuery: string[]): Promise<SpokePoolUpdate>;
     deposit(deposit: SvmSpokeClient.FundsDeposited & Partial<EventWithData>): EventWithData;

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

@@ -1,6 +1,6 @@
 import { __assign, __awaiter, __extends, __generator } from "tslib";
 import { SvmSpokeClient } from "@across-protocol/contracts";
-import { getCurrentTime, bnZero } from "../../utils";
+import { getCurrentTime, bnZero, toAddressType, isDefined, } from "../../utils";
 import { SVMSpokePoolClient } from "../SpokePoolClient";
 import { MockSvmCpiEventsClient } from "./MockSvmCpiEventsClient";
 import { unwrapEventData } from "../../arch/svm";
@@ -26,8 +26,8 @@ var MockSvmSpokePoolClient = /** @class */ (function (_super) {
         this.destinationTokenForChainOverride[chainId] = token;
     };
     MockSvmSpokePoolClient.prototype.getDestinationTokenForDeposit = function (deposit) {
-        var _a;
-        return (_a = this.destinationTokenForChainOverride[deposit.originChainId]) !== null && _a !== void 0 ? _a : _super.prototype.getDestinationTokenForDeposit.call(this, deposit);
+        var override = this.destinationTokenForChainOverride[deposit.originChainId];
+        return isDefined(override) ? toAddressType(override) : _super.prototype.getDestinationTokenForDeposit.call(this, deposit);
     };
     MockSvmSpokePoolClient.prototype.setLatestBlockNumber = function (blockNumber) {
         this.latestHeightSearched = blockNumber;

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

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

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

@@ -1,4 +1,4 @@
-import { BigNumber } from "../utils";
+import { Address, BigNumber, EvmAddress } from "../utils";
 import { SortableEvent } from "./Common";
 export interface PoolRebalanceLeaf {
     chainId: number;
@@ -7,15 +7,15 @@ export interface PoolRebalanceLeaf {
     netSendAmounts: BigNumber[];
     runningBalances: BigNumber[];
     leafId: number;
-    l1Tokens: string[];
+    l1Tokens: EvmAddress[];
 }
 export interface RelayerRefundLeaf {
     amountToReturn: BigNumber;
     chainId: number;
     refundAmounts: BigNumber[];
     leafId: number;
-    l2TokenAddress: string;
-    refundAddresses: string[];
+    l2TokenAddress: Address;
+    refundAddresses: Address[];
 }
 export interface ProposedRootBundle extends SortableEvent {
     challengePeriodEndTimestamp: number;
@@ -24,7 +24,7 @@ export interface ProposedRootBundle extends SortableEvent {
     poolRebalanceRoot: string;
     relayerRefundRoot: string;
     slowRelayRoot: string;
-    proposer: string;
+    proposer: EvmAddress;
 }
 export type RealizedLpFee = {
     quoteBlock: number;
@@ -47,7 +47,7 @@ export interface ExecutedRootBundle extends SortableEvent {
     netSendAmounts: BigNumber[];
     runningBalances: BigNumber[];
     leafId: number;
-    l1Tokens: string[];
+    l1Tokens: EvmAddress[];
     proof: string[];
 }
 export type ExecutedRootBundleStringified = Omit<ExecutedRootBundle, "bundleLpFees" | "netSendAmounts" | "runningBalances"> & {
@@ -61,8 +61,13 @@ export type TokenRunningBalance = {
 export interface RelayerRefundLeafWithGroup extends RelayerRefundLeaf {
     groupIndex: number;
 }
-export interface L1Token {
-    address: string;
+export interface L1TokenInfo {
+    address: EvmAddress;
+    symbol: string;
+    decimals: number;
+}
+export interface TokenInfo {
+    address: Address;
     symbol: string;
     decimals: number;
 }
@@ -72,22 +77,22 @@ export interface LpToken {
 }
 export interface CrossChainContractsSet extends SortableEvent {
     l2ChainId: number;
-    spokePool: string;
+    spokePool: Address;
 }
 export interface DestinationTokenWithBlock extends SortableEvent {
-    l2Token: string;
-    l1Token: string;
+    l2Token: Address;
+    l1Token: EvmAddress;
 }
 export interface SetPoolRebalanceRoot extends SortableEvent {
     destinationChainId: number;
-    l1Token: string;
-    destinationToken: string;
+    l1Token: EvmAddress;
+    destinationToken: Address;
 }
 export interface PendingRootBundle {
     poolRebalanceRoot: string;
     relayerRefundRoot: string;
     slowRelayRoot: string;
-    proposer: string;
+    proposer: EvmAddress;
     unclaimedPoolRebalanceLeafCount: number;
     challengePeriodEndTimestamp: number;
     bundleEvaluationBlockNumbers: number[];

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

@@ -1,21 +1,19 @@
 import { SortableEvent } from "./Common";
-import { FilledV3RelayEvent, V3FundsDepositedEvent } from "../typechain";
 import { SpokePoolClient } from "../clients";
-import { BigNumber } from "../utils";
+import { BigNumber, Address, EvmAddress } from "../utils";
 import { RelayerRefundLeaf } from "./HubPool";
-export type { FilledV3RelayEvent, V3FundsDepositedEvent };
 export interface RelayData {
     originChainId: number;
-    depositor: string;
-    recipient: string;
+    depositor: Address;
+    recipient: Address;
     depositId: BigNumber;
-    inputToken: string;
+    inputToken: Address;
     inputAmount: BigNumber;
-    outputToken: string;
+    outputToken: Address;
     outputAmount: BigNumber;
     message: string;
     fillDeadline: number;
-    exclusiveRelayer: string;
+    exclusiveRelayer: Address;
     exclusivityDeadline: number;
 }
 export interface Deposit extends RelayData {
@@ -23,7 +21,7 @@ export interface Deposit extends RelayData {
     destinationChainId: number;
     quoteTimestamp: number;
     speedUpSignature?: string;
-    updatedRecipient?: string;
+    updatedRecipient?: Address;
     updatedOutputAmount?: BigNumber;
     updatedMessage?: string;
     fromLiteChain: boolean;
@@ -46,7 +44,7 @@ export declare enum FillType {
     SlowFill = 2
 }
 export interface RelayExecutionEventInfo {
-    updatedRecipient: string;
+    updatedRecipient: Address;
     updatedOutputAmount: BigNumber;
     updatedMessage?: string;
     updatedMessageHash: string;
@@ -55,7 +53,7 @@ export interface RelayExecutionEventInfo {
 export interface Fill extends Omit<RelayData, "message"> {
     messageHash: string;
     destinationChainId: number;
-    relayer: string;
+    relayer: Address;
     repaymentChainId: number;
     relayExecutionInfo: RelayExecutionEventInfo;
 }
@@ -65,24 +63,24 @@ export interface FillWithTime extends Fill, SortableEvent {
     fillTimestamp: number;
 }
 export interface EnabledDepositRoute {
-    originToken: string;
+    originToken: Address;
     destinationChainId: number;
     enabled: boolean;
 }
 export interface EnabledDepositRouteWithBlock extends EnabledDepositRoute, SortableEvent {
 }
 export interface SpeedUp {
-    depositor: string;
+    depositor: EvmAddress;
     depositorSignature: string;
     depositId: BigNumber;
     originChainId: number;
-    updatedRecipient: string;
+    updatedRecipient: Address;
     updatedOutputAmount: BigNumber;
     updatedMessage: string;
 }
 export interface SpeedUpWithBlock extends SpeedUp, SortableEvent {
 }
-export interface SlowFillRequest extends RelayData {
+export interface SlowFillRequest extends Omit<RelayData, "message"> {
     messageHash: string;
     destinationChainId: number;
 }
@@ -117,7 +115,7 @@ export interface TokensBridged extends SortableEvent {
     amountToReturn: BigNumber;
     chainId: number;
     leafId: number;
-    l2TokenAddress: string;
+    l2TokenAddress: Address;
 }
 export interface SpokePoolClientsByChain {
     [chainId: number]: SpokePoolClient;

package/dist/esm/interfaces/SpokePool.js.map

@@ -1 +1 @@
-{"version":3,"file":"SpokePool.js","sourceRoot":"","sources":["../../../src/interfaces/SpokePool.ts"],"names":[],"mappings":"AA2CA,MAAM,CAAN,IAAY,UAIX;AAJD,WAAY,UAAU;IACpB,mDAAY,CAAA;IACZ,qEAAiB,CAAA;IACjB,+CAAM,CAAA;AACR,CAAC,EAJW,UAAU,KAAV,UAAU,QAIrB;AAED,MAAM,CAAN,IAAY,QAIX;AAJD,WAAY,QAAQ;IAClB,+CAAY,CAAA;IACZ,+DAAgB,CAAA;IAChB,+CAAQ,CAAA;AACV,CAAC,EAJW,QAAQ,KAAR,QAAQ,QAInB"}
+{"version":3,"file":"SpokePool.js","sourceRoot":"","sources":["../../../src/interfaces/SpokePool.ts"],"names":[],"mappings":"AAwCA,MAAM,CAAN,IAAY,UAIX;AAJD,WAAY,UAAU;IACpB,mDAAY,CAAA;IACZ,qEAAiB,CAAA;IACjB,+CAAM,CAAA;AACR,CAAC,EAJW,UAAU,KAAV,UAAU,QAIrB;AAED,MAAM,CAAN,IAAY,QAIX;AAJD,WAAY,QAAQ;IAClB,+CAAY,CAAA;IACZ,+DAAgB,CAAA;IAChB,+CAAQ,CAAA;AACV,CAAC,EAJW,QAAQ,KAAR,QAAQ,QAInB"}

package/dist/esm/relayFeeCalculator/chain-queries/baseQuery.d.ts

@@ -2,7 +2,7 @@ import { L2Provider } from "@eth-optimism/sdk/dist/interfaces/l2-provider";
 import { PopulatedTransaction, providers } from "ethers";
 import { Deposit } from "../../interfaces";
 import { SpokePool } from "../../typechain";
-import { BigNumberish, TransactionCostEstimate, BigNumber } from "../../utils";
+import { BigNumberish, TransactionCostEstimate, BigNumber, Address } from "../../utils";
 import { Logger, QueryInterface } from "../relayFeeCalculator";
 import { Transport } from "viem";
 import { EvmProvider } from "../../arch/evm/types";
@@ -46,7 +46,7 @@ export declare class QueryBase implements QueryInterface {
      * @param options.transport Optional transport object for custom gas price retrieval.
      * @returns The gas estimate for this function call (multiplied with the optional buffer).
      */
-    getGasCosts(deposit: Omit<Deposit, "messageHash">, relayer?: string, options?: Partial<{
+    getGasCosts(deposit: Omit<Deposit, "messageHash">, relayer?: import("../../utils").SvmAddress | Address | import("../../utils").EvmAddress, options?: Partial<{
         gasPrice: BigNumberish;
         gasUnits: BigNumberish;
         baseFeeMultiplier: BigNumber;
@@ -60,14 +60,14 @@ export declare class QueryBase implements QueryInterface {
      * @param relayer Sender of PopulatedTransaction
      * @returns PopulatedTransaction
      */
-    getUnsignedTxFromDeposit(deposit: Omit<Deposit, "messageHash">, relayer?: string): Promise<PopulatedTransaction>;
+    getUnsignedTxFromDeposit(deposit: Omit<Deposit, "messageHash">, relayer?: import("../../utils").SvmAddress | Address | import("../../utils").EvmAddress): Promise<PopulatedTransaction>;
     /**
      * @notice Return the gas cost of a simulated transaction
      * @param deposit
      * @param relayer Sender of PopulatedTransaction
      * @returns Estimated gas cost based on ethers.VoidSigner's gas estimation
      */
-    getNativeGasCost(deposit: Omit<Deposit, "messageHash">, relayer?: string): Promise<BigNumber>;
+    getNativeGasCost(deposit: Omit<Deposit, "messageHash">, relayer?: import("../../utils").SvmAddress | Address | import("../../utils").EvmAddress): Promise<BigNumber>;
     /**
      * @notice Return L1 data fee for OP stack L2 transaction, which is based on L2 calldata.
      * @dev https://docs.optimism.io/stack/transactions/fees#l1-data-fee
@@ -76,7 +76,7 @@ export declare class QueryBase implements QueryInterface {
      * @param options Specify gas units to avoid additional gas estimation call and multiplier for L1 data fee
      * @returns BigNumber L1 data fee in gas units
      */
-    getOpStackL1DataFee(unsignedTx: PopulatedTransaction, relayer: string | undefined, options: Partial<{
+    getOpStackL1DataFee(unsignedTx: PopulatedTransaction, relayer: import("../../utils").SvmAddress | Address | import("../../utils").EvmAddress | undefined, options: Partial<{
         opStackL2GasUnits: BigNumberish;
         opStackL1DataFeeMultiplier: BigNumber;
     }>): Promise<BigNumber>;
@@ -91,7 +91,7 @@ export declare class QueryBase implements QueryInterface {
      * @param options.transport A custom transport object for custom gas price retrieval.
      * @returns Estimated cost in units of gas and the underlying gas token (gasPrice * estimatedGasUnits).
      */
-    estimateGas(unsignedTx: PopulatedTransaction, senderAddress: string, provider: providers.Provider | L2Provider<providers.Provider>, options?: Partial<{
+    estimateGas(unsignedTx: PopulatedTransaction, senderAddress: Address, provider: providers.Provider | L2Provider<providers.Provider>, options?: Partial<{
         gasPrice: BigNumberish;
         gasUnits: BigNumberish;
         baseFeeMultiplier: BigNumber;