@across-protocol/sdk 4.3.126-alpha.0 → 4.3.126

package/dist/esm/test/utils/utils.js

@@ -1,3 +1,4 @@
+import { __assign, __awaiter, __generator, __spreadArray } from "tslib";
 import * as utils from "@across-protocol/contracts/dist/test-utils";
 import assert from "assert";
 import chai, { expect } from "chai";
@@ -12,9 +13,9 @@ import { BigNumber, bnOne, bnUint32Max, getCurrentTime, getMessageHash, isDefine
 import { MAX_L1_TOKENS_PER_POOL_REBALANCE_LEAF, MAX_REFUNDS_PER_RELAYER_REFUND_LEAF, sampleRateModel, } from "../constants";
 import { SpyTransport } from "./SpyTransport";
 chai.use(chaiExclude);
-const chaiAssert = chai.assert;
+var chaiAssert = chai.assert;
 // Import fixtures that don't use getContractFactory from @across-protocol/contracts
-export const { getDepositParams, getUpdatedV3DepositSignature, modifyRelayHelper, randomAddress, zeroAddress } = utils;
+export var getDepositParams = utils.getDepositParams, getUpdatedV3DepositSignature = utils.getUpdatedV3DepositSignature, modifyRelayHelper = utils.modifyRelayHelper, randomAddress = utils.randomAddress, zeroAddress = utils.zeroAddress;
 // Import local Merkle utilities that use our local getContractFactory
 export { buildPoolRebalanceLeafTree, buildPoolRebalanceLeaves, buildRelayerRefundTree, buildRelayerRefundLeaves, buildSlowRelayTree, buildV3SlowRelayTree, getParamType, } from "./MerkleLib.utils";
 // Import and export the local getContractFactory
@@ -25,114 +26,269 @@ import { hubPoolFixture, deployHubPool } from "../fixtures/HubPool.Fixture";
 import { spokePoolFixture, deploySpokePool } from "../fixtures/SpokePool.Fixture";
 export { hubPoolFixture, deployHubPool, spokePoolFixture, deploySpokePool };
 export { BigNumber, Contract, chai, chaiAssert, expect, sinon, toBN, toBNWei, toWei, utf8ToHex, winston };
-const TokenRolesEnum = {
+var TokenRolesEnum = {
     OWNER: "0",
     MINTER: "1",
     BURNER: "3",
 };
-export function deepEqualsWithBigNumber(x, y, omitKeys = []) {
+export function deepEqualsWithBigNumber(x, y, omitKeys) {
+    if (omitKeys === void 0) { omitKeys = []; }
     if (x === undefined || y === undefined || x === null || y === null) {
         return false;
     }
-    const xObj = x;
-    const yObj = y;
-    const sortedKeysX = Object.fromEntries(Object.keys(xObj)
+    var xObj = x;
+    var yObj = y;
+    var sortedKeysX = Object.fromEntries(Object.keys(xObj)
         .sort()
-        .map((key) => [key, xObj[key]]));
-    const sortedKeysY = Object.fromEntries(Object.keys(yObj)
+        .map(function (key) { return [key, xObj[key]]; }));
+    var sortedKeysY = Object.fromEntries(Object.keys(yObj)
         .sort()
-        .map((key) => [key, yObj[key]]));
+        .map(function (key) { return [key, yObj[key]]; }));
     chaiAssert.deepStrictEqual(_.omit(sortedKeysX, omitKeys), _.omit(sortedKeysY, omitKeys));
     return true;
 }
-export async function assertPromiseError(promise, errMessage) {
-    const SPECIAL_ERROR_MESSAGE = "Promise didn't fail";
-    try {
-        await promise;
-        throw new Error(SPECIAL_ERROR_MESSAGE);
-    }
-    catch (e) {
-        const err = e;
-        if (err.message.includes(SPECIAL_ERROR_MESSAGE)) {
-            throw err;
-        }
-        if (errMessage) {
-            chaiAssert.isTrue(err.message.includes(errMessage));
-        }
-    }
+export function assertPromiseError(promise, errMessage) {
+    return __awaiter(this, void 0, void 0, function () {
+        var SPECIAL_ERROR_MESSAGE, e_1, err;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    SPECIAL_ERROR_MESSAGE = "Promise didn't fail";
+                    _a.label = 1;
+                case 1:
+                    _a.trys.push([1, 3, , 4]);
+                    return [4 /*yield*/, promise];
+                case 2:
+                    _a.sent();
+                    throw new Error(SPECIAL_ERROR_MESSAGE);
+                case 3:
+                    e_1 = _a.sent();
+                    err = e_1;
+                    if (err.message.includes(SPECIAL_ERROR_MESSAGE)) {
+                        throw err;
+                    }
+                    if (errMessage) {
+                        chaiAssert.isTrue(err.message.includes(errMessage));
+                    }
+                    return [3 /*break*/, 4];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
 }
-export async function assertPromisePasses(promise) {
-    try {
-        await promise;
-    }
-    catch (e) {
-        const err = e;
-        throw new Error("Promise failed: " + err.message);
-    }
+export function assertPromisePasses(promise) {
+    return __awaiter(this, void 0, void 0, function () {
+        var e_2, err;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    _a.trys.push([0, 2, , 3]);
+                    return [4 /*yield*/, promise];
+                case 1:
+                    _a.sent();
+                    return [3 /*break*/, 3];
+                case 2:
+                    e_2 = _a.sent();
+                    err = e_2;
+                    throw new Error("Promise failed: " + err.message);
+                case 3: return [2 /*return*/];
+            }
+        });
+    });
 }
-export async function setupTokensForWallet(contractToApprove, wallet, tokens, weth, seedMultiplier = 1) {
-    const approveToken = async (token) => {
-        const balance = await token.balanceOf(wallet.address);
-        await token.connect(wallet).approve(contractToApprove.address, balance);
-    };
-    await utils.seedWallet(wallet, tokens, weth, utils.amountToSeedWallets.mul(seedMultiplier));
-    await Promise.all(tokens.map(approveToken));
-    if (weth) {
-        await approveToken(weth);
-    }
+export function setupTokensForWallet(contractToApprove_1, wallet_1, tokens_1, weth_1) {
+    return __awaiter(this, arguments, void 0, function (contractToApprove, wallet, tokens, weth, seedMultiplier) {
+        var approveToken;
+        var _this = this;
+        if (seedMultiplier === void 0) { seedMultiplier = 1; }
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    approveToken = function (token) { return __awaiter(_this, void 0, void 0, function () {
+                        var balance;
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0: return [4 /*yield*/, token.balanceOf(wallet.address)];
+                                case 1:
+                                    balance = _a.sent();
+                                    return [4 /*yield*/, token.connect(wallet).approve(contractToApprove.address, balance)];
+                                case 2:
+                                    _a.sent();
+                                    return [2 /*return*/];
+                            }
+                        });
+                    }); };
+                    return [4 /*yield*/, utils.seedWallet(wallet, tokens, weth, utils.amountToSeedWallets.mul(seedMultiplier))];
+                case 1:
+                    _a.sent();
+                    return [4 /*yield*/, Promise.all(tokens.map(approveToken))];
+                case 2:
+                    _a.sent();
+                    if (!weth) return [3 /*break*/, 4];
+                    return [4 /*yield*/, approveToken(weth)];
+                case 3:
+                    _a.sent();
+                    _a.label = 4;
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
 }
 export function createSpyLogger() {
-    const spy = sinon.spy();
-    const spyLogger = winston.createLogger({
+    var spy = sinon.spy();
+    var spyLogger = winston.createLogger({
         level: "debug",
         format: winston.format.combine(winston.format(bigNumberFormatter)(), winston.format.json()),
         transports: [
-            new SpyTransport({ level: "debug" }, { spy }),
+            new SpyTransport({ level: "debug" }, { spy: spy }),
             process.env.LOG_IN_TEST ? new winston.transports.Console() : null,
-        ].filter((n) => n),
+        ].filter(function (n) { return n; }),
     });
-    return { spy, spyLogger };
+    return { spy: spy, spyLogger: spyLogger };
 }
-export async function deploySpokePoolWithToken(fromChainId = 0) {
-    const { weth, erc20, spokePool, unwhitelistedErc20, destErc20 } = await deploySpokePool(utils.ethers);
-    const receipt = await spokePool.deployTransaction.wait();
-    await spokePool.setChainId(fromChainId == 0 ? utils.originChainId : fromChainId);
-    return { weth, erc20, spokePool, unwhitelistedErc20, destErc20, deploymentBlock: receipt.blockNumber };
+export function deploySpokePoolWithToken() {
+    return __awaiter(this, arguments, void 0, function (fromChainId) {
+        var _a, weth, erc20, spokePool, unwhitelistedErc20, destErc20, receipt;
+        if (fromChainId === void 0) { fromChainId = 0; }
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0: return [4 /*yield*/, deploySpokePool(utils.ethers)];
+                case 1:
+                    _a = _b.sent(), weth = _a.weth, erc20 = _a.erc20, spokePool = _a.spokePool, unwhitelistedErc20 = _a.unwhitelistedErc20, destErc20 = _a.destErc20;
+                    return [4 /*yield*/, spokePool.deployTransaction.wait()];
+                case 2:
+                    receipt = _b.sent();
+                    return [4 /*yield*/, spokePool.setChainId(fromChainId == 0 ? utils.originChainId : fromChainId)];
+                case 3:
+                    _b.sent();
+                    return [2 /*return*/, { weth: weth, erc20: erc20, spokePool: spokePool, unwhitelistedErc20: unwhitelistedErc20, destErc20: destErc20, deploymentBlock: receipt.blockNumber }];
+            }
+        });
+    });
 }
-export async function deployConfigStore(signer, tokensToAdd, maxL1TokensPerPoolRebalanceLeaf = MAX_L1_TOKENS_PER_POOL_REBALANCE_LEAF, maxRefundPerRelayerRefundLeaf = MAX_REFUNDS_PER_RELAYER_REFUND_LEAF, rateModel = sampleRateModel, additionalChainIdIndices) {
-    const configStore = (await (await getContractFactory("AcrossConfigStore", signer)).deploy());
-    const { blockNumber: deploymentBlock } = await configStore.deployTransaction.wait();
-    for (const token of tokensToAdd) {
-        await configStore.updateTokenConfig(token.address, JSON.stringify({
-            rateModel: rateModel,
-        }));
-    }
-    await configStore.updateGlobalConfig(utf8ToHex(GLOBAL_CONFIG_STORE_KEYS.MAX_POOL_REBALANCE_LEAF_SIZE), maxL1TokensPerPoolRebalanceLeaf.toString());
-    await configStore.updateGlobalConfig(utf8ToHex(GLOBAL_CONFIG_STORE_KEYS.MAX_RELAYER_REPAYMENT_LEAF_SIZE), maxRefundPerRelayerRefundLeaf.toString());
-    if (additionalChainIdIndices) {
-        await configStore.updateGlobalConfig(utf8ToHex(GLOBAL_CONFIG_STORE_KEYS.CHAIN_ID_INDICES), JSON.stringify([...PROTOCOL_DEFAULT_CHAIN_ID_INDICES, ...additionalChainIdIndices]));
-    }
-    return { configStore, deploymentBlock };
+export function deployConfigStore(signer_1, tokensToAdd_1) {
+    return __awaiter(this, arguments, void 0, function (signer, tokensToAdd, maxL1TokensPerPoolRebalanceLeaf, maxRefundPerRelayerRefundLeaf, rateModel, additionalChainIdIndices) {
+        var configStore, deploymentBlock, _i, tokensToAdd_2, token;
+        if (maxL1TokensPerPoolRebalanceLeaf === void 0) { maxL1TokensPerPoolRebalanceLeaf = MAX_L1_TOKENS_PER_POOL_REBALANCE_LEAF; }
+        if (maxRefundPerRelayerRefundLeaf === void 0) { maxRefundPerRelayerRefundLeaf = MAX_REFUNDS_PER_RELAYER_REFUND_LEAF; }
+        if (rateModel === void 0) { rateModel = sampleRateModel; }
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, getContractFactory("AcrossConfigStore", signer)];
+                case 1: return [4 /*yield*/, (_a.sent()).deploy()];
+                case 2:
+                    configStore = (_a.sent());
+                    return [4 /*yield*/, configStore.deployTransaction.wait()];
+                case 3:
+                    deploymentBlock = (_a.sent()).blockNumber;
+                    _i = 0, tokensToAdd_2 = tokensToAdd;
+                    _a.label = 4;
+                case 4:
+                    if (!(_i < tokensToAdd_2.length)) return [3 /*break*/, 7];
+                    token = tokensToAdd_2[_i];
+                    return [4 /*yield*/, configStore.updateTokenConfig(token.address, JSON.stringify({
+                            rateModel: rateModel,
+                        }))];
+                case 5:
+                    _a.sent();
+                    _a.label = 6;
+                case 6:
+                    _i++;
+                    return [3 /*break*/, 4];
+                case 7: return [4 /*yield*/, configStore.updateGlobalConfig(utf8ToHex(GLOBAL_CONFIG_STORE_KEYS.MAX_POOL_REBALANCE_LEAF_SIZE), maxL1TokensPerPoolRebalanceLeaf.toString())];
+                case 8:
+                    _a.sent();
+                    return [4 /*yield*/, configStore.updateGlobalConfig(utf8ToHex(GLOBAL_CONFIG_STORE_KEYS.MAX_RELAYER_REPAYMENT_LEAF_SIZE), maxRefundPerRelayerRefundLeaf.toString())];
+                case 9:
+                    _a.sent();
+                    if (!additionalChainIdIndices) return [3 /*break*/, 11];
+                    return [4 /*yield*/, configStore.updateGlobalConfig(utf8ToHex(GLOBAL_CONFIG_STORE_KEYS.CHAIN_ID_INDICES), JSON.stringify(__spreadArray(__spreadArray([], PROTOCOL_DEFAULT_CHAIN_ID_INDICES, true), additionalChainIdIndices, true)))];
+                case 10:
+                    _a.sent();
+                    _a.label = 11;
+                case 11: return [2 /*return*/, { configStore: configStore, deploymentBlock: deploymentBlock }];
+            }
+        });
+    });
 }
-export async function deployAndConfigureHubPool(signer, spokePools, finderAddress = zeroAddress, timerAddress = zeroAddress) {
-    const lpTokenFactory = await (await getContractFactory("LpTokenFactory", signer)).deploy();
-    const hubPool = await (await getContractFactory("HubPool", signer)).deploy(lpTokenFactory.address, finderAddress, zeroAddress, timerAddress);
-    const receipt = await hubPool.deployTransaction.wait();
-    const mockAdapter = await (await getContractFactory("Mock_Adapter", signer)).deploy();
-    for (const spokePool of spokePools) {
-        await hubPool.setCrossChainContracts(spokePool.l2ChainId, mockAdapter.address, spokePool.spokePool.address);
-    }
-    const l1Token_1 = await (await getContractFactory("ExpandedERC20", signer)).deploy("L1Token1", "L1Token1", 18);
-    await l1Token_1.addMember(TokenRolesEnum.MINTER, signer.address);
-    const l1Token_2 = await (await getContractFactory("ExpandedERC20", signer)).deploy("L1Token2", "L1Token2", 18);
-    await l1Token_2.addMember(TokenRolesEnum.MINTER, signer.address);
-    return { hubPool, mockAdapter, l1Token_1, l1Token_2, hubPoolDeploymentBlock: receipt.blockNumber };
+export function deployAndConfigureHubPool(signer_1, spokePools_1) {
+    return __awaiter(this, arguments, void 0, function (signer, spokePools, finderAddress, timerAddress) {
+        var lpTokenFactory, hubPool, receipt, mockAdapter, _i, spokePools_2, spokePool, l1Token_1, l1Token_2;
+        if (finderAddress === void 0) { finderAddress = zeroAddress; }
+        if (timerAddress === void 0) { timerAddress = zeroAddress; }
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, getContractFactory("LpTokenFactory", signer)];
+                case 1: return [4 /*yield*/, (_a.sent()).deploy()];
+                case 2:
+                    lpTokenFactory = _a.sent();
+                    return [4 /*yield*/, getContractFactory("HubPool", signer)];
+                case 3: return [4 /*yield*/, (_a.sent()).deploy(lpTokenFactory.address, finderAddress, zeroAddress, timerAddress)];
+                case 4:
+                    hubPool = _a.sent();
+                    return [4 /*yield*/, hubPool.deployTransaction.wait()];
+                case 5:
+                    receipt = _a.sent();
+                    return [4 /*yield*/, getContractFactory("Mock_Adapter", signer)];
+                case 6: return [4 /*yield*/, (_a.sent()).deploy()];
+                case 7:
+                    mockAdapter = _a.sent();
+                    _i = 0, spokePools_2 = spokePools;
+                    _a.label = 8;
+                case 8:
+                    if (!(_i < spokePools_2.length)) return [3 /*break*/, 11];
+                    spokePool = spokePools_2[_i];
+                    return [4 /*yield*/, hubPool.setCrossChainContracts(spokePool.l2ChainId, mockAdapter.address, spokePool.spokePool.address)];
+                case 9:
+                    _a.sent();
+                    _a.label = 10;
+                case 10:
+                    _i++;
+                    return [3 /*break*/, 8];
+                case 11: return [4 /*yield*/, getContractFactory("ExpandedERC20", signer)];
+                case 12: return [4 /*yield*/, (_a.sent()).deploy("L1Token1", "L1Token1", 18)];
+                case 13:
+                    l1Token_1 = _a.sent();
+                    return [4 /*yield*/, l1Token_1.addMember(TokenRolesEnum.MINTER, signer.address)];
+                case 14:
+                    _a.sent();
+                    return [4 /*yield*/, getContractFactory("ExpandedERC20", signer)];
+                case 15: return [4 /*yield*/, (_a.sent()).deploy("L1Token2", "L1Token2", 18)];
+                case 16:
+                    l1Token_2 = _a.sent();
+                    return [4 /*yield*/, l1Token_2.addMember(TokenRolesEnum.MINTER, signer.address)];
+                case 17:
+                    _a.sent();
+                    return [2 /*return*/, { hubPool: hubPool, mockAdapter: mockAdapter, l1Token_1: l1Token_1, l1Token_2: l1Token_2, hubPoolDeploymentBlock: receipt.blockNumber }];
+            }
+        });
+    });
 }
-export async function enableRoutesOnHubPool(hubPool, rebalanceRouteTokens) {
-    for (const tkn of rebalanceRouteTokens) {
-        await hubPool.setPoolRebalanceRoute(tkn.destinationChainId, tkn.l1Token.address, tkn.destinationToken.address);
-        await hubPool.enableL1TokenForLiquidityProvision(tkn.l1Token.address);
-    }
+export function enableRoutesOnHubPool(hubPool, rebalanceRouteTokens) {
+    return __awaiter(this, void 0, void 0, function () {
+        var _i, rebalanceRouteTokens_1, tkn;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    _i = 0, rebalanceRouteTokens_1 = rebalanceRouteTokens;
+                    _a.label = 1;
+                case 1:
+                    if (!(_i < rebalanceRouteTokens_1.length)) return [3 /*break*/, 5];
+                    tkn = rebalanceRouteTokens_1[_i];
+                    return [4 /*yield*/, hubPool.setPoolRebalanceRoute(tkn.destinationChainId, tkn.l1Token.address, tkn.destinationToken.address)];
+                case 2:
+                    _a.sent();
+                    return [4 /*yield*/, hubPool.enableL1TokenForLiquidityProvision(tkn.l1Token.address)];
+                case 3:
+                    _a.sent();
+                    _a.label = 4;
+                case 4:
+                    _i++;
+                    return [3 /*break*/, 1];
+                case 5: return [2 /*return*/];
+            }
+        });
+    });
 }
 /**
  * Takes as input a body and returns a new object with the body and a message property. Used to appease the typescript
@@ -141,163 +297,231 @@ export async function enableRoutesOnHubPool(hubPool, rebalanceRouteTokens) {
  * @returns A new object with the body and a message property.
  */
 export function appendMessageToResult(body) {
-    return { ...body, message: "" };
-}
-export async function getLastBlockTime(provider) {
-    return (await provider.getBlock(await provider.getBlockNumber())).timestamp;
-}
-export async function addLiquidity(signer, hubPool, l1Token, amount) {
-    await utils.seedWallet(signer, [l1Token], undefined, amount);
-    await l1Token.connect(signer).approve(hubPool.address, amount);
-    await hubPool.enableL1TokenForLiquidityProvision(l1Token.address);
-    await hubPool.connect(signer).addLiquidity(l1Token.address, amount);
+    return __assign(__assign({}, body), { message: "" });
 }
-export function deposit(spokePool, destinationChainId, signer, inputToken, inputAmount, outputToken, outputAmount, opts = {}) {
-    return _deposit(spokePool, destinationChainId, signer, inputToken, inputAmount, outputToken, outputAmount, {
-        ...opts,
-        addressModifier: toBytes32,
+export function getLastBlockTime(provider) {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    _b = (_a = provider).getBlock;
+                    return [4 /*yield*/, provider.getBlockNumber()];
+                case 1: return [4 /*yield*/, _b.apply(_a, [_c.sent()])];
+                case 2: return [2 /*return*/, (_c.sent()).timestamp];
+            }
+        });
     });
 }
-export function depositV3(spokePool, destinationChainId, signer, inputToken, inputAmount, outputToken, outputAmount, opts = {}) {
-    return _deposit(spokePool, destinationChainId, signer, inputToken, inputAmount, outputToken, outputAmount, {
-        ...opts,
-        addressModifier: toEvmAddress,
+export function addLiquidity(signer, hubPool, l1Token, amount) {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, utils.seedWallet(signer, [l1Token], undefined, amount)];
+                case 1:
+                    _a.sent();
+                    return [4 /*yield*/, l1Token.connect(signer).approve(hubPool.address, amount)];
+                case 2:
+                    _a.sent();
+                    return [4 /*yield*/, hubPool.enableL1TokenForLiquidityProvision(l1Token.address)];
+                case 3:
+                    _a.sent();
+                    return [4 /*yield*/, hubPool.connect(signer).addLiquidity(l1Token.address, amount)];
+                case 4:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
     });
 }
-async function _deposit(spokePool, destinationChainId, signer, inputToken, inputAmount, outputToken, outputAmount, opts = {}) {
-    const depositor = toAddressType(signer.address, await spokePool.chainId());
-    const recipient = opts.recipient ?? depositor;
-    const [spokePoolTime, fillDeadlineBuffer] = (await Promise.all([spokePool.getCurrentTime(), spokePool.fillDeadlineBuffer()])).map((n) => Number(n));
-    const quoteTimestamp = opts.quoteTimestamp ?? spokePoolTime;
-    const message = opts.message ?? EMPTY_MESSAGE;
-    const fillDeadline = opts.fillDeadline ?? spokePoolTime + fillDeadlineBuffer;
-    const exclusivityDeadline = opts.exclusivityDeadline ?? 0;
-    const exclusiveRelayer = opts.exclusiveRelayer ?? toAddressType(zeroAddress, destinationChainId);
-    await spokePool
-        .connect(signer)
-        .deposit(depositor.toBytes32(), recipient.toBytes32(), inputToken.toBytes32(), outputToken.toBytes32(), inputAmount, outputAmount, destinationChainId, exclusiveRelayer.toBytes32(), quoteTimestamp, fillDeadline, exclusivityDeadline, message);
-    const getChainId = async () => Promise.resolve(Number(await spokePool.chainId()));
-    const [events, originChainId] = await Promise.all([
-        spokePool.queryFilter(spokePool.filters.FundsDeposited()),
-        getChainId(),
-    ]);
-    const lastEvent = events.at(-1);
-    let args = lastEvent?.args;
-    chaiAssert.exists(args);
-    args = args;
-    const { blockNumber, transactionHash, transactionIndex, logIndex } = lastEvent;
-    assert(args.destinationChainId.toNumber() === destinationChainId);
-    return {
-        depositId: toBN(args.depositId),
-        originChainId: originChainId,
-        destinationChainId,
-        depositor: toAddressType(args.depositor, originChainId),
-        recipient: toAddressType(args.recipient, destinationChainId),
-        inputToken: toAddressType(args.inputToken, originChainId),
-        inputAmount: args.inputAmount,
-        outputToken: toAddressType(args.outputToken, destinationChainId),
-        outputAmount: args.outputAmount,
-        quoteTimestamp: args.quoteTimestamp,
-        message: args.message,
-        messageHash: getMessageHash(args.message),
-        fillDeadline: args.fillDeadline,
-        exclusivityDeadline: args.exclusivityDeadline,
-        exclusiveRelayer: toAddressType(args.exclusiveRelayer, destinationChainId),
-        fromLiteChain: false,
-        toLiteChain: false,
-        quoteBlockNumber: 0, // @todo
-        blockNumber,
-        txnRef: transactionHash,
-        txnIndex: transactionIndex,
-        logIndex,
-    };
+export function deposit(spokePool, destinationChainId, signer, inputToken, inputAmount, outputToken, outputAmount, opts) {
+    if (opts === void 0) { opts = {}; }
+    return _deposit(spokePool, destinationChainId, signer, inputToken, inputAmount, outputToken, outputAmount, __assign(__assign({}, opts), { addressModifier: toBytes32 }));
+}
+export function depositV3(spokePool, destinationChainId, signer, inputToken, inputAmount, outputToken, outputAmount, opts) {
+    if (opts === void 0) { opts = {}; }
+    return _deposit(spokePool, destinationChainId, signer, inputToken, inputAmount, outputToken, outputAmount, __assign(__assign({}, opts), { addressModifier: toEvmAddress }));
 }
-export async function requestV3SlowFill(spokePool, relayData, signer) {
-    const destinationChainId = Number(await spokePool.chainId());
-    chaiAssert.notEqual(relayData.originChainId, destinationChainId);
-    await spokePool.connect(signer).requestSlowFill({
-        ...relayData,
-        depositor: relayData.depositor.toBytes32(),
-        recipient: relayData.recipient.toBytes32(),
-        inputToken: relayData.inputToken.toBytes32(),
-        outputToken: relayData.outputToken.toBytes32(),
-        exclusiveRelayer: relayData.exclusiveRelayer.toBytes32(),
+function _deposit(spokePool_1, destinationChainId_1, signer_1, inputToken_1, inputAmount_1, outputToken_1, outputAmount_1) {
+    return __awaiter(this, arguments, void 0, function (spokePool, destinationChainId, signer, inputToken, inputAmount, outputToken, outputAmount, opts) {
+        var depositor, _a, _b, recipient, _c, spokePoolTime, fillDeadlineBuffer, quoteTimestamp, message, fillDeadline, exclusivityDeadline, exclusiveRelayer, getChainId, _d, events, originChainId, lastEvent, args, _e, blockNumber, transactionHash, transactionIndex, logIndex;
+        var _this = this;
+        var _f, _g, _h, _j, _k, _l;
+        if (opts === void 0) { opts = {}; }
+        return __generator(this, function (_m) {
+            switch (_m.label) {
+                case 0:
+                    _a = toAddressType;
+                    _b = [signer.address];
+                    return [4 /*yield*/, spokePool.chainId()];
+                case 1:
+                    depositor = _a.apply(void 0, _b.concat([_m.sent()]));
+                    recipient = (_f = opts.recipient) !== null && _f !== void 0 ? _f : depositor;
+                    return [4 /*yield*/, Promise.all([spokePool.getCurrentTime(), spokePool.fillDeadlineBuffer()])];
+                case 2:
+                    _c = (_m.sent()).map(function (n) { return Number(n); }), spokePoolTime = _c[0], fillDeadlineBuffer = _c[1];
+                    quoteTimestamp = (_g = opts.quoteTimestamp) !== null && _g !== void 0 ? _g : spokePoolTime;
+                    message = (_h = opts.message) !== null && _h !== void 0 ? _h : EMPTY_MESSAGE;
+                    fillDeadline = (_j = opts.fillDeadline) !== null && _j !== void 0 ? _j : spokePoolTime + fillDeadlineBuffer;
+                    exclusivityDeadline = (_k = opts.exclusivityDeadline) !== null && _k !== void 0 ? _k : 0;
+                    exclusiveRelayer = (_l = opts.exclusiveRelayer) !== null && _l !== void 0 ? _l : toAddressType(zeroAddress, destinationChainId);
+                    return [4 /*yield*/, spokePool
+                            .connect(signer)
+                            .deposit(depositor.toBytes32(), recipient.toBytes32(), inputToken.toBytes32(), outputToken.toBytes32(), inputAmount, outputAmount, destinationChainId, exclusiveRelayer.toBytes32(), quoteTimestamp, fillDeadline, exclusivityDeadline, message)];
+                case 3:
+                    _m.sent();
+                    getChainId = function () { return __awaiter(_this, void 0, void 0, function () { var _a, _b, _c; return __generator(this, function (_d) {
+                        switch (_d.label) {
+                            case 0:
+                                _b = (_a = Promise).resolve;
+                                _c = Number;
+                                return [4 /*yield*/, spokePool.chainId()];
+                            case 1: return [2 /*return*/, _b.apply(_a, [_c.apply(void 0, [_d.sent()])])];
+                        }
+                    }); }); };
+                    return [4 /*yield*/, Promise.all([
+                            spokePool.queryFilter(spokePool.filters.FundsDeposited()),
+                            getChainId(),
+                        ])];
+                case 4:
+                    _d = _m.sent(), events = _d[0], originChainId = _d[1];
+                    lastEvent = events.at(-1);
+                    args = lastEvent === null || lastEvent === void 0 ? void 0 : lastEvent.args;
+                    chaiAssert.exists(args);
+                    args = args;
+                    _e = lastEvent, blockNumber = _e.blockNumber, transactionHash = _e.transactionHash, transactionIndex = _e.transactionIndex, logIndex = _e.logIndex;
+                    assert(args.destinationChainId.toNumber() === destinationChainId);
+                    return [2 /*return*/, {
+                            depositId: toBN(args.depositId),
+                            originChainId: originChainId,
+                            destinationChainId: destinationChainId,
+                            depositor: toAddressType(args.depositor, originChainId),
+                            recipient: toAddressType(args.recipient, destinationChainId),
+                            inputToken: toAddressType(args.inputToken, originChainId),
+                            inputAmount: args.inputAmount,
+                            outputToken: toAddressType(args.outputToken, destinationChainId),
+                            outputAmount: args.outputAmount,
+                            quoteTimestamp: args.quoteTimestamp,
+                            message: args.message,
+                            messageHash: getMessageHash(args.message),
+                            fillDeadline: args.fillDeadline,
+                            exclusivityDeadline: args.exclusivityDeadline,
+                            exclusiveRelayer: toAddressType(args.exclusiveRelayer, destinationChainId),
+                            fromLiteChain: false,
+                            toLiteChain: false,
+                            quoteBlockNumber: 0, // @todo
+                            blockNumber: blockNumber,
+                            txnRef: transactionHash,
+                            txnIndex: transactionIndex,
+                            logIndex: logIndex,
+                        }];
+            }
+        });
     });
-    const events = await spokePool.queryFilter(spokePool.filters.RequestedSlowFill());
-    const lastEvent = events.at(-1);
-    expect(lastEvent).to.exist;
-    const { blockNumber, transactionHash, transactionIndex, logIndex } = lastEvent;
-    expect(lastEvent.args).to.exist;
-    const args = lastEvent.args;
-    const originChainId = Number(args.originChainId);
-    return {
-        depositId: toBN(args.depositId),
-        originChainId,
-        destinationChainId,
-        depositor: toAddressType(args.depositor, originChainId),
-        recipient: toAddressType(args.recipient, destinationChainId),
-        inputToken: toAddressType(args.inputToken, originChainId),
-        inputAmount: args.inputAmount,
-        outputToken: toAddressType(args.outputToken, destinationChainId),
-        outputAmount: args.outputAmount,
-        messageHash: getMessageHash(args.message),
-        fillDeadline: args.fillDeadline,
-        exclusivityDeadline: args.exclusivityDeadline,
-        exclusiveRelayer: toAddressType(args.exclusiveRelayer, destinationChainId),
-        blockNumber,
-        txnRef: transactionHash,
-        txnIndex: transactionIndex,
-        logIndex,
-    };
 }
-export async function fillRelay(spokePool, _deposit, signer, repayment) {
-    const destinationChainId = Number(await spokePool.chainId());
-    chaiAssert.notEqual(_deposit.originChainId, destinationChainId);
-    const deposit = {
-        ..._deposit,
-        depositor: _deposit.depositor.toBytes32(),
-        recipient: _deposit.recipient.toBytes32(),
-        exclusiveRelayer: _deposit.exclusiveRelayer.toBytes32(),
-        inputToken: _deposit.inputToken.toBytes32(),
-        outputToken: _deposit.outputToken.toBytes32(),
-    };
-    const repaymentAddress = repayment?.repaymentAddress.toBytes32() ?? toBytes32(signer.address);
-    await spokePool
-        .connect(signer)
-        .fillRelay(deposit, repayment?.repaymentChainId ?? destinationChainId, repaymentAddress);
-    const events = await spokePool.queryFilter(spokePool.filters.FilledRelay());
-    const lastEvent = events.at(-1);
-    let args = lastEvent.args;
-    chaiAssert.exists(args);
-    args = args;
-    const { blockNumber, transactionHash, transactionIndex, logIndex } = lastEvent;
-    return {
-        depositId: toBN(args.depositId),
-        originChainId: Number(args.originChainId),
-        destinationChainId,
-        depositor: toAddressType(args.depositor, args.originChainId),
-        recipient: toAddressType(args.recipient, destinationChainId),
-        inputToken: toAddressType(args.inputToken, args.originChainId),
-        inputAmount: args.inputAmount,
-        outputToken: toAddressType(args.outputToken, destinationChainId),
-        outputAmount: args.outputAmount,
-        messageHash: getMessageHash(args.message),
-        fillDeadline: args.fillDeadline,
-        exclusivityDeadline: args.exclusivityDeadline,
-        exclusiveRelayer: toAddressType(args.exclusiveRelayer, destinationChainId),
-        relayer: args.relayer,
-        repaymentChainId: Number(args.repaymentChainId),
-        relayExecutionInfo: {
-            updatedRecipient: toAddressType(args.relayExecutionInfo.updatedRecipient, destinationChainId),
-            updatedMessageHash: args.relayExecutionInfo.updatedMessageHash,
-            updatedOutputAmount: args.relayExecutionInfo.updatedOutputAmount,
-            fillType: args.relayExecutionInfo.fillType,
-        },
-        blockNumber,
-        txnRef: transactionHash,
-        txnIndex: transactionIndex,
-        logIndex,
-    };
+export function requestV3SlowFill(spokePool, relayData, signer) {
+    return __awaiter(this, void 0, void 0, function () {
+        var destinationChainId, _a, events, lastEvent, _b, blockNumber, transactionHash, transactionIndex, logIndex, args, originChainId;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    _a = Number;
+                    return [4 /*yield*/, spokePool.chainId()];
+                case 1:
+                    destinationChainId = _a.apply(void 0, [_c.sent()]);
+                    chaiAssert.notEqual(relayData.originChainId, destinationChainId);
+                    return [4 /*yield*/, spokePool.connect(signer).requestSlowFill(__assign(__assign({}, relayData), { depositor: relayData.depositor.toBytes32(), recipient: relayData.recipient.toBytes32(), inputToken: relayData.inputToken.toBytes32(), outputToken: relayData.outputToken.toBytes32(), exclusiveRelayer: relayData.exclusiveRelayer.toBytes32() }))];
+                case 2:
+                    _c.sent();
+                    return [4 /*yield*/, spokePool.queryFilter(spokePool.filters.RequestedSlowFill())];
+                case 3:
+                    events = _c.sent();
+                    lastEvent = events.at(-1);
+                    expect(lastEvent).to.exist;
+                    _b = lastEvent, blockNumber = _b.blockNumber, transactionHash = _b.transactionHash, transactionIndex = _b.transactionIndex, logIndex = _b.logIndex;
+                    expect(lastEvent.args).to.exist;
+                    args = lastEvent.args;
+                    originChainId = Number(args.originChainId);
+                    return [2 /*return*/, {
+                            depositId: toBN(args.depositId),
+                            originChainId: originChainId,
+                            destinationChainId: destinationChainId,
+                            depositor: toAddressType(args.depositor, originChainId),
+                            recipient: toAddressType(args.recipient, destinationChainId),
+                            inputToken: toAddressType(args.inputToken, originChainId),
+                            inputAmount: args.inputAmount,
+                            outputToken: toAddressType(args.outputToken, destinationChainId),
+                            outputAmount: args.outputAmount,
+                            messageHash: getMessageHash(args.message),
+                            fillDeadline: args.fillDeadline,
+                            exclusivityDeadline: args.exclusivityDeadline,
+                            exclusiveRelayer: toAddressType(args.exclusiveRelayer, destinationChainId),
+                            blockNumber: blockNumber,
+                            txnRef: transactionHash,
+                            txnIndex: transactionIndex,
+                            logIndex: logIndex,
+                        }];
+            }
+        });
+    });
+}
+export function fillRelay(spokePool, _deposit, signer, repayment) {
+    return __awaiter(this, void 0, void 0, function () {
+        var destinationChainId, _a, deposit, repaymentAddress, events, lastEvent, args, _b, blockNumber, transactionHash, transactionIndex, logIndex;
+        var _c, _d;
+        return __generator(this, function (_e) {
+            switch (_e.label) {
+                case 0:
+                    _a = Number;
+                    return [4 /*yield*/, spokePool.chainId()];
+                case 1:
+                    destinationChainId = _a.apply(void 0, [_e.sent()]);
+                    chaiAssert.notEqual(_deposit.originChainId, destinationChainId);
+                    deposit = __assign(__assign({}, _deposit), { depositor: _deposit.depositor.toBytes32(), recipient: _deposit.recipient.toBytes32(), exclusiveRelayer: _deposit.exclusiveRelayer.toBytes32(), inputToken: _deposit.inputToken.toBytes32(), outputToken: _deposit.outputToken.toBytes32() });
+                    repaymentAddress = (_c = repayment === null || repayment === void 0 ? void 0 : repayment.repaymentAddress.toBytes32()) !== null && _c !== void 0 ? _c : toBytes32(signer.address);
+                    return [4 /*yield*/, spokePool
+                            .connect(signer)
+                            .fillRelay(deposit, (_d = repayment === null || repayment === void 0 ? void 0 : repayment.repaymentChainId) !== null && _d !== void 0 ? _d : destinationChainId, repaymentAddress)];
+                case 2:
+                    _e.sent();
+                    return [4 /*yield*/, spokePool.queryFilter(spokePool.filters.FilledRelay())];
+                case 3:
+                    events = _e.sent();
+                    lastEvent = events.at(-1);
+                    args = lastEvent.args;
+                    chaiAssert.exists(args);
+                    args = args;
+                    _b = lastEvent, blockNumber = _b.blockNumber, transactionHash = _b.transactionHash, transactionIndex = _b.transactionIndex, logIndex = _b.logIndex;
+                    return [2 /*return*/, {
+                            depositId: toBN(args.depositId),
+                            originChainId: Number(args.originChainId),
+                            destinationChainId: destinationChainId,
+                            depositor: toAddressType(args.depositor, args.originChainId),
+                            recipient: toAddressType(args.recipient, destinationChainId),
+                            inputToken: toAddressType(args.inputToken, args.originChainId),
+                            inputAmount: args.inputAmount,
+                            outputToken: toAddressType(args.outputToken, destinationChainId),
+                            outputAmount: args.outputAmount,
+                            messageHash: getMessageHash(args.message),
+                            fillDeadline: args.fillDeadline,
+                            exclusivityDeadline: args.exclusivityDeadline,
+                            exclusiveRelayer: toAddressType(args.exclusiveRelayer, destinationChainId),
+                            relayer: args.relayer,
+                            repaymentChainId: Number(args.repaymentChainId),
+                            relayExecutionInfo: {
+                                updatedRecipient: toAddressType(args.relayExecutionInfo.updatedRecipient, destinationChainId),
+                                updatedMessageHash: args.relayExecutionInfo.updatedMessageHash,
+                                updatedOutputAmount: args.relayExecutionInfo.updatedOutputAmount,
+                                fillType: args.relayExecutionInfo.fillType,
+                            },
+                            blockNumber: blockNumber,
+                            txnRef: transactionHash,
+                            txnIndex: transactionIndex,
+                            logIndex: logIndex,
+                        }];
+            }
+        });
+    });
 }
 /**
  * Grabs the latest block number from the hardhat provider.
@@ -315,12 +539,12 @@ export function convertMockedConfigClient(_client) {
 export function bigNumberFormatter(logEntry) {
     try {
         // Out is the original object if and only if one or more BigNumbers were replaced.
-        const out = iterativelyReplaceBigNumbers(logEntry);
+        var out_1 = iterativelyReplaceBigNumbers(logEntry);
         // Because winston depends on some non-enumerable symbol properties, we explicitly copy those over, as they are not
         // handled in iterativelyReplaceBigNumbers. This only needs to happen if logEntry is being replaced.
-        if (out !== logEntry)
-            Object.getOwnPropertySymbols(logEntry).map((symbol) => (out[symbol] = logEntry[symbol]));
-        return out;
+        if (out_1 !== logEntry)
+            Object.getOwnPropertySymbols(logEntry).map(function (symbol) { return (out_1[symbol] = logEntry[symbol]); });
+        return out_1;
     }
     catch (_) {
         return logEntry;
@@ -328,10 +552,11 @@ export function bigNumberFormatter(logEntry) {
 }
 // Traverse a potentially nested object and replace any element that is either a Ethers BigNumber or web3 BigNumber
 // with the string version of it for easy logging.
-const iterativelyReplaceBigNumbers = (obj) => {
+var iterativelyReplaceBigNumbers = function (obj) {
     // This does a DFS, recursively calling this function to find the desired value for each key.
     // It doesn't modify the original object. Instead, it creates an array of keys and updated values.
-    const replacements = Object.entries(obj).map(([key, value]) => {
+    var replacements = Object.entries(obj).map(function (_a) {
+        var key = _a[0], value = _a[1];
         if (BigNumber.isBigNumber(value))
             return [key, value.toString()];
         else if (typeof value === "object" && value !== null)
@@ -341,30 +566,33 @@ const iterativelyReplaceBigNumbers = (obj) => {
     });
     // This will catch any values that were changed by value _or_ by reference.
     // If no changes were detected, no copy is needed and it is fine to discard the copy and return the original object.
-    const copyNeeded = replacements.some(([key, value]) => obj[key] !== value);
+    var copyNeeded = replacements.some(function (_a) {
+        var key = _a[0], value = _a[1];
+        return obj[key] !== value;
+    });
     // Only copy if something changed. Otherwise, return the original object.
     return copyNeeded ? Object.fromEntries(replacements) : obj;
 };
 export function buildDepositForRelayerFeeTest(amount, tokenSymbol, originChainId, toChainId) {
-    const _inputToken = resolveContractFromSymbol(tokenSymbol, originChainId);
-    assert(isDefined(_inputToken), `${tokenSymbol} not found on ${originChainId}`);
-    const inputToken = toAddressType(_inputToken, originChainId);
-    const _outputToken = resolveContractFromSymbol(tokenSymbol, toChainId);
-    assert(isDefined(_outputToken), `${tokenSymbol} not found on ${toChainId}`);
-    const outputToken = toAddressType(_outputToken, toChainId);
-    const currentTime = getCurrentTime();
-    const message = EMPTY_MESSAGE;
+    var _inputToken = resolveContractFromSymbol(tokenSymbol, originChainId);
+    assert(isDefined(_inputToken), "".concat(tokenSymbol, " not found on ").concat(originChainId));
+    var inputToken = toAddressType(_inputToken, originChainId);
+    var _outputToken = resolveContractFromSymbol(tokenSymbol, toChainId);
+    assert(isDefined(_outputToken), "".concat(tokenSymbol, " not found on ").concat(toChainId));
+    var outputToken = toAddressType(_outputToken, toChainId);
+    var currentTime = getCurrentTime();
+    var message = EMPTY_MESSAGE;
     return {
         depositId: bnUint32Max,
         originChainId: originChainId,
         destinationChainId: toChainId,
         depositor: toAddressType(randomAddress(), originChainId),
         recipient: toAddressType(randomAddress(), toChainId),
-        inputToken,
+        inputToken: inputToken,
         inputAmount: toBN(amount),
-        outputToken,
+        outputToken: outputToken,
         outputAmount: toBN(amount).sub(bnOne),
-        message,
+        message: message,
         messageHash: getMessageHash(message),
         quoteTimestamp: currentTime,
         fillDeadline: currentTime + 7200,