@across-protocol/sdk 4.3.120-alpha.1 → 4.3.120

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

@@ -8,7 +8,6 @@ import { BigNumber, ethers } from "ethers";
 import { getContractFactory } from "./getContractFactory";
 import { MerkleTree } from "@across-protocol/contracts/dist/utils/MerkleTree";
 import { expect } from "chai";
-import { amountToReturn, repaymentChainId } from "../constants";
 var _a = ethers.utils, keccak256 = _a.keccak256, defaultAbiCoder = _a.defaultAbiCoder;
 /**
  * Get the parameter type for a contract function parameter.
@@ -148,47 +147,4 @@ export function buildV3SlowRelayTree(slowFills) {
         });
     });
 }
-/**
- * Construct a single-leaf relayer refund tree.
- */
-export function constructSingleRelayerRefundTree(l2Token, destinationChainId, amount) {
-    return __awaiter(this, void 0, void 0, function () {
-        var amountToUse, l2TokenAddress, leaves, tree;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    amountToUse = amount !== undefined ? amount : amountToReturn;
-                    l2TokenAddress = typeof l2Token === "string" ? l2Token : l2Token.address;
-                    leaves = buildRelayerRefundLeaves([destinationChainId], [amountToUse], [l2TokenAddress], [[]], [[]]);
-                    return [4 /*yield*/, buildRelayerRefundTree(leaves)];
-                case 1:
-                    tree = _a.sent();
-                    return [2 /*return*/, { leaves: leaves, tree: tree }];
-            }
-        });
-    });
-}
-/**
- * Construct a single-chain pool rebalance tree.
- */
-export function constructSingleChainTree(token_1) {
-    return __awaiter(this, arguments, void 0, function (token, scalingSize, repaymentChain, decimals) {
-        var tokensSendToL2, realizedLpFees, leaves, tree;
-        if (scalingSize === void 0) { scalingSize = 1; }
-        if (repaymentChain === void 0) { repaymentChain = repaymentChainId; }
-        if (decimals === void 0) { decimals = 18; }
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    tokensSendToL2 = ethers.utils.parseUnits((100 * scalingSize).toString(), decimals);
-                    realizedLpFees = ethers.utils.parseUnits((10 * scalingSize).toString(), decimals);
-                    leaves = buildPoolRebalanceLeaves([repaymentChain], [[token]], [[realizedLpFees]], [[tokensSendToL2]], [[tokensSendToL2]], [0]);
-                    return [4 /*yield*/, buildPoolRebalanceLeafTree(leaves)];
-                case 1:
-                    tree = _a.sent();
-                    return [2 /*return*/, { tokensSendToL2: tokensSendToL2, realizedLpFees: realizedLpFees, leaves: leaves, tree: tree }];
-            }
-        });
-    });
-}
 //# sourceMappingURL=MerkleLib.utils.js.map

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

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

package/dist/esm/test/utils/index.d.ts

@@ -1,4 +1,5 @@
 import "@nomiclabs/hardhat-ethers";
+export * as contractsV2Utils from "@across-protocol/contracts/dist/test-utils";
 export { ethers } from "hardhat";
 export { smock } from "@defi-wonderland/smock";
 export * from "./utils";

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

@@ -1,4 +1,6 @@
 import "@nomiclabs/hardhat-ethers";
+import * as contractsV2Utils_1 from "@across-protocol/contracts/dist/test-utils";
+export { contractsV2Utils_1 as contractsV2Utils };
 export { ethers } from "hardhat";
 export { smock } from "@defi-wonderland/smock";
 export * from "./utils";

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../test/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,2BAA2B,CAAC;AACnC,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAE/C,cAAc,SAAS,CAAC;AACxB,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../test/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,2BAA2B,CAAC;oCACD,4CAA4C;+BAAlE,gBAAgB;AAC5B,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAE/C,cAAc,SAAS,CAAC;AACxB,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC"}

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

@@ -1,74 +1,47 @@
 import { AcrossConfigStore } from "@across-protocol/contracts";
+import * as utils from "@across-protocol/contracts/dist/test-utils";
 import chai, { expect } from "chai";
-import { ethers, BaseContract, Contract, providers, Signer } from "ethers";
-import { FakeContract } from "@defi-wonderland/smock";
+import { Contract, providers } from "ethers";
 import sinon from "sinon";
 import winston from "winston";
-import type { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
 import { AcrossConfigStoreClient as ConfigStoreClient } from "../../src/clients";
 import { Deposit, DepositWithBlock, FillWithBlock, RelayData, SlowFillRequestWithBlock } from "../../src/interfaces";
 import { Address, BigNumber, BigNumberish, toBN, toBNWei, toWei, utf8ToHex } from "../../src/utils";
-import { randomAddress, zeroAddress } from "../constants";
 import { SpokePoolDeploymentResult, SpyLoggerResult } from "../types";
 declare const chaiAssert: Chai.AssertStatic;
-export { ethers };
-export type { SignerWithAddress };
-export { getDepositParams, getUpdatedV3DepositSignature, modifyRelayHelper, getRelayHash, getV3RelayHash, getLegacyV3RelayHash, getFillRelayParams, getFillRelayUpdatedFeeParams, getExecuteSlowRelayParams, deployMockSpokePoolCaller, } from "../fixtures/SpokePool.Fixture";
-export type { ContractRelayData, V3RelayData, V3RelayExecutionParams, SlowFill, V3SlowFill, UpdatedRelayerFeeData, } from "../fixtures/SpokePool.Fixture";
-export { FillType, FillStatus } from "../fixtures/SpokePool.Fixture";
-export { randomAddress, zeroAddress };
-export { buildPoolRebalanceLeafTree, buildPoolRebalanceLeaves, buildRelayerRefundTree, buildRelayerRefundLeaves, buildSlowRelayTree, buildV3SlowRelayTree, getParamType, constructSingleRelayerRefundTree, constructSingleChainTree, } from "./MerkleLib.utils";
+export type SignerWithAddress = utils.SignerWithAddress;
+export declare const getDepositParams: typeof utils.getDepositParams, getUpdatedV3DepositSignature: typeof utils.getUpdatedV3DepositSignature, modifyRelayHelper: typeof utils.modifyRelayHelper, randomAddress: typeof utils.randomAddress, zeroAddress: string;
+export { buildPoolRebalanceLeafTree, buildPoolRebalanceLeaves, buildRelayerRefundTree, buildRelayerRefundLeaves, buildSlowRelayTree, buildV3SlowRelayTree, getParamType, } from "./MerkleLib.utils";
 import { getContractFactory } from "./getContractFactory";
 export { getContractFactory };
 import { hubPoolFixture, deployHubPool } from "../fixtures/HubPool.Fixture";
 import { spokePoolFixture, deploySpokePool } from "../fixtures/SpokePool.Fixture";
 export { hubPoolFixture, deployHubPool, spokePoolFixture, deploySpokePool };
-export { merkleLibFixture } from "../fixtures/MerkleLib.Fixture";
 export { BigNumber, Contract, chai, chaiAssert, expect, sinon, toBN, toBNWei, toWei, utf8ToHex, winston };
-declare const defaultAbiCoder: ethers.utils.AbiCoder, keccak256: typeof ethers.utils.keccak256;
-export { defaultAbiCoder, keccak256, Signer, FakeContract };
-export declare const toWeiWithDecimals: (num: string | number | BigNumber, decimals: number) => BigNumber;
-export declare const toBNWeiWithDecimals: (num: string | number | BigNumber, decimals: number) => BigNumber;
-export declare const fromWei: (num: string | number | BigNumber) => string;
-export declare const hexToUtf8: (input: string) => string;
-export declare const hexZeroPad: (input: string, length: number) => string;
-export declare const addressToBytes: (input: string) => string;
-export declare const bytes32ToAddress: (input: string) => string;
-export declare const isBytes32: (input: string) => boolean;
-export declare function randomBigNumber(bytes?: number, signed?: boolean): BigNumber;
-export declare function randomBytes32(): string;
-export declare function seedWallet(walletToFund: Signer, tokens: Contract[], weth: Contract | undefined, amountToSeedWith: number | BigNumber): Promise<void>;
-export declare function seedContract(contract: Contract, walletToFund: Signer, tokens: Contract[], weth: Contract | undefined, amountToSeedWith: number | BigNumber): Promise<void>;
-export declare function createFake(contractName: string, targetAddress?: string): Promise<FakeContract<BaseContract>>;
-export declare function createFakeFromABI(abi: unknown[], targetAddress?: string): Promise<FakeContract<BaseContract>>;
-export declare function createTypedFakeFromABI<T extends BaseContract>(abi: unknown[], targetAddress?: string): Promise<FakeContract<T>>;
-export declare function trimSolanaAddress(bytes32Address: string): string;
-export declare function hashNonEmptyMessage(message: string): string;
-export declare const createRandomBytes32: () => string;
 export declare function deepEqualsWithBigNumber(x: unknown, y: unknown, omitKeys?: string[]): boolean;
 export declare function assertPromiseError<T>(promise: Promise<T>, errMessage?: string): Promise<void>;
 export declare function assertPromisePasses<T>(promise: Promise<T>): Promise<void>;
-export declare function setupTokensForWallet(contractToApprove: Contract, wallet: SignerWithAddress, tokens: Contract[], weth?: Contract, seedMultiplier?: number): Promise<void>;
+export declare function setupTokensForWallet(contractToApprove: utils.Contract, wallet: utils.SignerWithAddress, tokens: utils.Contract[], weth?: utils.Contract, seedMultiplier?: number): Promise<void>;
 export declare function createSpyLogger(): SpyLoggerResult;
 export declare function deploySpokePoolWithToken(fromChainId?: number): Promise<SpokePoolDeploymentResult>;
-export declare function deployConfigStore(signer: SignerWithAddress, tokensToAdd: Contract[], maxL1TokensPerPoolRebalanceLeaf?: number, maxRefundPerRelayerRefundLeaf?: number, rateModel?: unknown, additionalChainIdIndices?: number[]): Promise<{
+export declare function deployConfigStore(signer: utils.SignerWithAddress, tokensToAdd: utils.Contract[], maxL1TokensPerPoolRebalanceLeaf?: number, maxRefundPerRelayerRefundLeaf?: number, rateModel?: unknown, additionalChainIdIndices?: number[]): Promise<{
     configStore: AcrossConfigStore;
     deploymentBlock: number;
 }>;
-export declare function deployAndConfigureHubPool(signer: SignerWithAddress, spokePools: {
+export declare function deployAndConfigureHubPool(signer: utils.SignerWithAddress, spokePools: {
     l2ChainId: number;
-    spokePool: Contract;
+    spokePool: utils.Contract;
 }[], finderAddress?: string, timerAddress?: string): Promise<{
-    hubPool: Contract;
-    mockAdapter: Contract;
-    l1Token_1: Contract;
-    l1Token_2: Contract;
+    hubPool: utils.Contract;
+    mockAdapter: utils.Contract;
+    l1Token_1: utils.Contract;
+    l1Token_2: utils.Contract;
     hubPoolDeploymentBlock: number;
 }>;
-export declare function enableRoutesOnHubPool(hubPool: Contract, rebalanceRouteTokens: {
+export declare function enableRoutesOnHubPool(hubPool: utils.Contract, rebalanceRouteTokens: {
     destinationChainId: number;
-    l1Token: Contract;
-    destinationToken: Contract;
+    l1Token: utils.Contract;
+    destinationToken: utils.Contract;
 }[]): Promise<void>;
 /**
  * Takes as input a body and returns a new object with the body and a message property. Used to appease the typescript
@@ -80,7 +53,7 @@ export declare function appendMessageToResult<T>(body: T): T & {
     message: string;
 };
 export declare function getLastBlockTime(provider: providers.Provider): Promise<number>;
-export declare function addLiquidity(signer: SignerWithAddress, hubPool: Contract, l1Token: Contract, amount: BigNumber): Promise<void>;
+export declare function addLiquidity(signer: utils.SignerWithAddress, hubPool: utils.Contract, l1Token: utils.Contract, amount: utils.BigNumber): Promise<void>;
 export declare function deposit(spokePool: Contract, destinationChainId: number, signer: SignerWithAddress, inputToken: Address, inputAmount: BigNumber, outputToken: Address, outputAmount: BigNumber, opts?: {
     destinationChainId?: number;
     recipient?: Address;

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

@@ -1,27 +1,23 @@
 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";
 import chaiExclude from "chai-exclude";
-import { ethers, Contract, Signer } from "ethers";
-import { ethers as hreEthers } from "hardhat";
-import { smock } from "@defi-wonderland/smock";
+import { Contract } from "ethers";
 import _ from "lodash";
 import sinon from "sinon";
 import winston from "winston";
 import { GLOBAL_CONFIG_STORE_KEYS } from "../../src/clients";
 import { EMPTY_MESSAGE, PROTOCOL_DEFAULT_CHAIN_ID_INDICES, ZERO_ADDRESS } from "../../src/constants";
 import { BigNumber, bnOne, bnUint32Max, getCurrentTime, getMessageHash, isDefined, resolveContractFromSymbol, toAddressType, toBN, toBNWei, toBytes32, toEvmAddress, toWei, utf8ToHex, } from "../../src/utils";
-import { amountToSeedWallets, MAX_L1_TOKENS_PER_POOL_REBALANCE_LEAF, MAX_REFUNDS_PER_RELAYER_REFUND_LEAF, originChainId, randomAddress, sampleRateModel, TokenRolesEnum, zeroAddress, } from "../constants";
+import { MAX_L1_TOKENS_PER_POOL_REBALANCE_LEAF, MAX_REFUNDS_PER_RELAYER_REFUND_LEAF, sampleRateModel, } from "../constants";
 import { SpyTransport } from "./SpyTransport";
 chai.use(chaiExclude);
 var chaiAssert = chai.assert;
-export { ethers };
-// Re-export from fixtures
-export { getDepositParams, getUpdatedV3DepositSignature, modifyRelayHelper, getRelayHash, getV3RelayHash, getLegacyV3RelayHash, getFillRelayParams, getFillRelayUpdatedFeeParams, getExecuteSlowRelayParams, deployMockSpokePoolCaller, } from "../fixtures/SpokePool.Fixture";
-// Re-export constants
-export { randomAddress, zeroAddress };
+// Import fixtures that don't use getContractFactory from @across-protocol/contracts
+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, constructSingleRelayerRefundTree, constructSingleChainTree, } from "./MerkleLib.utils";
+export { buildPoolRebalanceLeafTree, buildPoolRebalanceLeaves, buildRelayerRefundTree, buildRelayerRefundLeaves, buildSlowRelayTree, buildV3SlowRelayTree, getParamType, } from "./MerkleLib.utils";
 // Import and export the local getContractFactory
 import { getContractFactory } from "./getContractFactory";
 export { getContractFactory };
@@ -29,184 +25,12 @@ export { getContractFactory };
 import { hubPoolFixture, deployHubPool } from "../fixtures/HubPool.Fixture";
 import { spokePoolFixture, deploySpokePool } from "../fixtures/SpokePool.Fixture";
 export { hubPoolFixture, deployHubPool, spokePoolFixture, deploySpokePool };
-// Import and export the merkle lib fixture
-export { merkleLibFixture } from "../fixtures/MerkleLib.Fixture";
 export { BigNumber, Contract, chai, chaiAssert, expect, sinon, toBN, toBNWei, toWei, utf8ToHex, winston };
-// Re-export ethers utilities
-var _a = ethers.utils, defaultAbiCoder = _a.defaultAbiCoder, keccak256 = _a.keccak256;
-export { defaultAbiCoder, keccak256, Signer };
-// ---------------------------------------------------------------------------
-// Conversion / encoding helpers (mirroring contracts test-utils)
-// ---------------------------------------------------------------------------
-export var toWeiWithDecimals = function (num, decimals) {
-    return ethers.utils.parseUnits(num.toString(), decimals);
+var TokenRolesEnum = {
+    OWNER: "0",
+    MINTER: "1",
+    BURNER: "3",
 };
-export var toBNWeiWithDecimals = function (num, decimals) {
-    return BigNumber.from(toWeiWithDecimals(num, decimals));
-};
-export var fromWei = function (num) { return ethers.utils.formatUnits(num.toString()); };
-export var hexToUtf8 = function (input) { return ethers.utils.toUtf8String(input); };
-export var hexZeroPad = function (input, length) { return ethers.utils.hexZeroPad(input, length); };
-export var addressToBytes = function (input) { return hexZeroPad(input.toLowerCase(), 32); };
-export var bytes32ToAddress = function (input) {
-    if (!/^0x[a-fA-F0-9]{64}$/.test(input)) {
-        throw new Error("Invalid bytes32 input");
-    }
-    return ethers.utils.getAddress("0x" + input.slice(26));
-};
-export var isBytes32 = function (input) { return /^0x[0-9a-fA-F]{64}$/.test(input); };
-// ---------------------------------------------------------------------------
-// Random data generators
-// ---------------------------------------------------------------------------
-export function randomBigNumber(bytes, signed) {
-    if (bytes === void 0) { bytes = 32; }
-    if (signed === void 0) { signed = false; }
-    var sign = signed && Math.random() < 0.5 ? "-" : "";
-    var byteString = "0x" + Buffer.from(ethers.utils.randomBytes(signed ? bytes - 1 : bytes)).toString("hex");
-    return ethers.BigNumber.from(sign + byteString);
-}
-export function randomBytes32() {
-    return ethers.utils.hexlify(ethers.utils.randomBytes(32));
-}
-// ---------------------------------------------------------------------------
-// Wallet / contract seeding
-// ---------------------------------------------------------------------------
-export function seedWallet(walletToFund, tokens, weth, amountToSeedWith) {
-    return __awaiter(this, void 0, void 0, function () {
-        var _i, tokens_1, token, _a, _b;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0:
-                    _i = 0, tokens_1 = tokens;
-                    _c.label = 1;
-                case 1:
-                    if (!(_i < tokens_1.length)) return [3 /*break*/, 5];
-                    token = tokens_1[_i];
-                    _b = (_a = token).mint;
-                    return [4 /*yield*/, walletToFund.getAddress()];
-                case 2: return [4 /*yield*/, _b.apply(_a, [_c.sent(), amountToSeedWith])];
-                case 3:
-                    _c.sent();
-                    _c.label = 4;
-                case 4:
-                    _i++;
-                    return [3 /*break*/, 1];
-                case 5:
-                    if (!weth) return [3 /*break*/, 7];
-                    return [4 /*yield*/, weth.connect(walletToFund).deposit({ value: amountToSeedWith })];
-                case 6:
-                    _c.sent();
-                    _c.label = 7;
-                case 7: return [2 /*return*/];
-            }
-        });
-    });
-}
-export function seedContract(contract, walletToFund, tokens, weth, amountToSeedWith) {
-    return __awaiter(this, void 0, void 0, function () {
-        var _i, tokens_2, token;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, seedWallet(walletToFund, tokens, weth, amountToSeedWith)];
-                case 1:
-                    _a.sent();
-                    _i = 0, tokens_2 = tokens;
-                    _a.label = 2;
-                case 2:
-                    if (!(_i < tokens_2.length)) return [3 /*break*/, 5];
-                    token = tokens_2[_i];
-                    return [4 /*yield*/, token.connect(walletToFund).transfer(contract.address, amountToSeedWith)];
-                case 3:
-                    _a.sent();
-                    _a.label = 4;
-                case 4:
-                    _i++;
-                    return [3 /*break*/, 2];
-                case 5:
-                    if (!weth) return [3 /*break*/, 7];
-                    return [4 /*yield*/, weth.connect(walletToFund).transfer(contract.address, amountToSeedWith)];
-                case 6:
-                    _a.sent();
-                    _a.label = 7;
-                case 7: return [2 /*return*/];
-            }
-        });
-    });
-}
-// ---------------------------------------------------------------------------
-// Smock fakes
-// ---------------------------------------------------------------------------
-export function createFake(contractName_1) {
-    return __awaiter(this, arguments, void 0, function (contractName, targetAddress) {
-        var contractFactory;
-        if (targetAddress === void 0) { targetAddress = ""; }
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, getContractFactory(contractName, new ethers.VoidSigner(ethers.constants.AddressZero))];
-                case 1:
-                    contractFactory = _a.sent();
-                    return [2 /*return*/, smock.fake(contractFactory.interface.fragments, {
-                            address: targetAddress === "" ? undefined : targetAddress,
-                            provider: contractFactory.signer.provider,
-                        })];
-            }
-        });
-    });
-}
-export function createFakeFromABI(abi_1) {
-    return __awaiter(this, arguments, void 0, function (abi, targetAddress) {
-        if (targetAddress === void 0) { targetAddress = ""; }
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, createTypedFakeFromABI(abi, targetAddress)];
-                case 1: return [2 /*return*/, _a.sent()];
-            }
-        });
-    });
-}
-export function createTypedFakeFromABI(abi_1) {
-    return __awaiter(this, arguments, void 0, function (abi, targetAddress) {
-        var signer;
-        if (targetAddress === void 0) { targetAddress = ""; }
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    signer = new ethers.VoidSigner(ethers.constants.AddressZero);
-                    return [4 /*yield*/, smock.fake(abi, {
-                            address: !targetAddress ? undefined : targetAddress,
-                            provider: signer.provider,
-                        })];
-                case 1: return [2 /*return*/, _a.sent()];
-            }
-        });
-    });
-}
-// ---------------------------------------------------------------------------
-// Solana / message helpers
-// ---------------------------------------------------------------------------
-export function trimSolanaAddress(bytes32Address) {
-    if (!ethers.utils.isHexString(bytes32Address, 32)) {
-        throw new Error("Invalid bytes32 address");
-    }
-    var uint160Address = ethers.BigNumber.from(bytes32Address).mask(160);
-    return ethers.utils.hexZeroPad(ethers.utils.hexlify(uint160Address), 20);
-}
-export function hashNonEmptyMessage(message) {
-    if (!ethers.utils.isHexString(message) || message.length % 2 !== 0)
-        throw new Error("Invalid hex message bytes");
-    // account for 0x prefix when checking length
-    if (message.length > 2) {
-        return ethers.utils.keccak256(message);
-    }
-    return ethers.utils.hexlify(new Uint8Array(32));
-}
-// ---------------------------------------------------------------------------
-// createRandomBytes32 (kept for backward compatibility)
-// ---------------------------------------------------------------------------
-export var createRandomBytes32 = function () { return ethers.utils.hexlify(ethers.utils.randomBytes(32)); };
-// ---------------------------------------------------------------------------
-// Test helper functions
-// ---------------------------------------------------------------------------
 export function deepEqualsWithBigNumber(x, y, omitKeys) {
     if (omitKeys === void 0) { omitKeys = []; }
     if (x === undefined || y === undefined || x === null || y === null) {
@@ -272,7 +96,7 @@ export function assertPromisePasses(promise) {
         });
     });
 }
-export function setupTokensForWallet(contractToApprove_1, wallet_1, tokens_3, weth_1) {
+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;
@@ -294,7 +118,7 @@ export function setupTokensForWallet(contractToApprove_1, wallet_1, tokens_3, we
                             }
                         });
                     }); };
-                    return [4 /*yield*/, seedWallet(wallet, tokens, weth, amountToSeedWallets.mul(seedMultiplier))];
+                    return [4 /*yield*/, utils.seedWallet(wallet, tokens, weth, utils.amountToSeedWallets.mul(seedMultiplier))];
                 case 1:
                     _a.sent();
                     return [4 /*yield*/, Promise.all(tokens.map(approveToken))];
@@ -328,13 +152,13 @@ export function deploySpokePoolWithToken() {
         if (fromChainId === void 0) { fromChainId = 0; }
         return __generator(this, function (_b) {
             switch (_b.label) {
-                case 0: return [4 /*yield*/, deploySpokePool(hreEthers)];
+                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 ? originChainId : fromChainId)];
+                    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 }];
@@ -493,7 +317,7 @@ 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*/, seedWallet(signer, [l1Token], undefined, amount)];
+                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)];
@@ -520,7 +344,7 @@ export function depositV3(spokePool, destinationChainId, signer, inputToken, inp
 }
 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, fetchedOriginChainId, lastEvent, args, _e, blockNumber, transactionHash, transactionIndex, logIndex;
+        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 = {}; }
@@ -560,7 +384,7 @@ function _deposit(spokePool_1, destinationChainId_1, signer_1, inputToken_1, inp
                             getChainId(),
                         ])];
                 case 4:
-                    _d = _m.sent(), events = _d[0], fetchedOriginChainId = _d[1];
+                    _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);
@@ -569,11 +393,11 @@ function _deposit(spokePool_1, destinationChainId_1, signer_1, inputToken_1, inp
                     assert(args.destinationChainId.toNumber() === destinationChainId);
                     return [2 /*return*/, {
                             depositId: toBN(args.depositId),
-                            originChainId: fetchedOriginChainId,
+                            originChainId: originChainId,
                             destinationChainId: destinationChainId,
-                            depositor: toAddressType(args.depositor, fetchedOriginChainId),
+                            depositor: toAddressType(args.depositor, originChainId),
                             recipient: toAddressType(args.recipient, destinationChainId),
-                            inputToken: toAddressType(args.inputToken, fetchedOriginChainId),
+                            inputToken: toAddressType(args.inputToken, originChainId),
                             inputAmount: args.inputAmount,
                             outputToken: toAddressType(args.outputToken, destinationChainId),
                             outputAmount: args.outputAmount,
@@ -597,7 +421,7 @@ function _deposit(spokePool_1, destinationChainId_1, signer_1, inputToken_1, inp
 }
 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, fetchedOriginChainId;
+        var destinationChainId, _a, events, lastEvent, _b, blockNumber, transactionHash, transactionIndex, logIndex, args, originChainId;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -617,14 +441,14 @@ export function requestV3SlowFill(spokePool, relayData, signer) {
                     _b = lastEvent, blockNumber = _b.blockNumber, transactionHash = _b.transactionHash, transactionIndex = _b.transactionIndex, logIndex = _b.logIndex;
                     expect(lastEvent.args).to.exist;
                     args = lastEvent.args;
-                    fetchedOriginChainId = Number(args.originChainId);
+                    originChainId = Number(args.originChainId);
                     return [2 /*return*/, {
                             depositId: toBN(args.depositId),
-                            originChainId: fetchedOriginChainId,
+                            originChainId: originChainId,
                             destinationChainId: destinationChainId,
-                            depositor: toAddressType(args.depositor, fetchedOriginChainId),
+                            depositor: toAddressType(args.depositor, originChainId),
                             recipient: toAddressType(args.recipient, destinationChainId),
-                            inputToken: toAddressType(args.inputToken, fetchedOriginChainId),
+                            inputToken: toAddressType(args.inputToken, originChainId),
                             inputAmount: args.inputAmount,
                             outputToken: toAddressType(args.outputToken, destinationChainId),
                             outputAmount: args.outputAmount,
@@ -643,7 +467,7 @@ export function requestV3SlowFill(spokePool, relayData, signer) {
 }
 export function fillRelay(spokePool, _deposit, signer, repayment) {
     return __awaiter(this, void 0, void 0, function () {
-        var destinationChainId, _a, depositData, repaymentAddress, events, lastEvent, args, _b, blockNumber, transactionHash, transactionIndex, logIndex;
+        var destinationChainId, _a, deposit, repaymentAddress, events, lastEvent, args, _b, blockNumber, transactionHash, transactionIndex, logIndex;
         var _c, _d;
         return __generator(this, function (_e) {
             switch (_e.label) {
@@ -653,11 +477,11 @@ export function fillRelay(spokePool, _deposit, signer, repayment) {
                 case 1:
                     destinationChainId = _a.apply(void 0, [_e.sent()]);
                     chaiAssert.notEqual(_deposit.originChainId, destinationChainId);
-                    depositData = __assign(__assign({}, _deposit), { depositor: _deposit.depositor.toBytes32(), recipient: _deposit.recipient.toBytes32(), exclusiveRelayer: _deposit.exclusiveRelayer.toBytes32(), inputToken: _deposit.inputToken.toBytes32(), outputToken: _deposit.outputToken.toBytes32() });
+                    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(depositData, (_d = repayment === null || repayment === void 0 ? void 0 : repayment.repaymentChainId) !== null && _d !== void 0 ? _d : destinationChainId, repaymentAddress)];
+                            .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())];
@@ -704,7 +528,7 @@ export function fillRelay(spokePool, _deposit, signer, repayment) {
  * @returns The latest block number.
  */
 export function getLastBlockNumber() {
-    return hreEthers.provider.getBlockNumber();
+    return utils.ethers.provider.getBlockNumber();
 }
 export function convertMockedConfigClient(_client) {
     return true;