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

package/dist/cjs/test/fixtures/SpokePool.Fixture.d.ts

@@ -2,9 +2,99 @@ import "@nomiclabs/hardhat-ethers";
 import "@openzeppelin/hardhat-upgrades";
 import "hardhat-deploy";
 import hre from "hardhat";
-import { Contract } from "ethers";
+import { BigNumber, Contract } from "ethers";
+import type { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
 import { zeroAddress } from "../constants";
 export { zeroAddress };
+export interface ContractRelayData {
+    depositor: string;
+    recipient: string;
+    destinationToken: string;
+    amount: BigNumber;
+    realizedLpFeePct: BigNumber;
+    relayerFeePct: BigNumber;
+    depositId: string;
+    originChainId: string;
+    destinationChainId: string;
+    message: string;
+}
+export interface V3RelayData {
+    depositor: string;
+    recipient: string;
+    exclusiveRelayer: string;
+    inputToken: string;
+    outputToken: string;
+    inputAmount: BigNumber;
+    outputAmount: BigNumber;
+    originChainId: number;
+    depositId: BigNumber;
+    fillDeadline: number;
+    exclusivityDeadline: number;
+    message: string;
+}
+export interface V3RelayExecutionParams {
+    relay: V3RelayData;
+    relayHash: string;
+    updatedOutputAmount: BigNumber;
+    updatedRecipient: string;
+    updatedMessage: string;
+    repaymentChainId: number;
+}
+export interface SlowFill {
+    relayData: ContractRelayData;
+    payoutAdjustmentPct: BigNumber;
+}
+export interface V3SlowFill {
+    relayData: V3RelayData;
+    chainId: number;
+    updatedOutputAmount: BigNumber;
+}
+export interface UpdatedRelayerFeeData {
+    newRelayerFeePct: string;
+    depositorMessageHash: string;
+    depositorSignature: string;
+}
+export declare const enum FillType {
+    FastFill = 0,
+    ReplacedSlowFill = 1,
+    SlowFill = 2
+}
+export declare const enum FillStatus {
+    Unfilled = 0,
+    RequestedSlowFill = 1,
+    Filled = 2
+}
+export declare function getRelayHash(_depositor: string, _recipient: string, _depositId: number, _originChainId: number, _destinationChainId: number, _destinationToken: string, _amount?: BigNumber, _realizedLpFeePct?: BigNumber, _relayerFeePct?: BigNumber, _message?: string): {
+    relayHash: string;
+    relayData: ContractRelayData;
+};
+export declare function getV3RelayHash(relayData: V3RelayData, destChainId: number): string;
+export declare function getLegacyV3RelayHash(relayData: V3RelayData, destChainId: number): string;
+export declare function getDepositParams(args: {
+    recipient?: string;
+    originToken: string;
+    amount: BigNumber;
+    destinationChainId: number;
+    relayerFeePct: BigNumber;
+    quoteTimestamp: number;
+    message?: string;
+    maxCount?: BigNumber;
+}): string[];
+export declare function getFillRelayParams(_relayData: ContractRelayData, _maxTokensToSend: BigNumber, _repaymentChain?: number, _maxCount?: BigNumber): string[];
+export declare function getFillRelayUpdatedFeeParams(_relayData: ContractRelayData, _maxTokensToSend: BigNumber, _updatedFee: BigNumber, _signature: string, _repaymentChain?: number, _updatedRecipient?: string, _updatedMessage?: string, _maxCount?: BigNumber): string[];
+export declare function getExecuteSlowRelayParams(_depositor: string, _recipient: string, _destToken: string, _amount: BigNumber, _originChainId: number, _realizedLpFeePct: BigNumber, _relayerFeePct: BigNumber, _depositId: number, _relayerRefundId: number, _message: string, _payoutAdjustment: BigNumber, _proof: string[]): (string | string[])[];
+export declare function modifyRelayHelper(modifiedRelayerFeePct: BigNumber, depositId: string, originChainId: string, depositor: SignerWithAddress, updatedRecipient: string, updatedMessage: string): Promise<{
+    signature: string;
+}>;
+export declare function getUpdatedV3DepositSignature(depositor: SignerWithAddress, depositId: BigNumber, originChainId: number, updatedOutputAmount: BigNumber, updatedRecipient: string, updatedMessage: string): Promise<string>;
+export declare function deployMockSpokePoolCaller(spokePool: Contract, rootBundleId: number, leaf: {
+    amountToReturn: BigNumber;
+    chainId: BigNumber;
+    refundAmounts: BigNumber[];
+    leafId: BigNumber;
+    l2TokenAddress: string;
+    refundAddresses: string[];
+}, proof: string[]): Promise<Contract>;
 export declare function deploySpokePool(ethers: typeof hre.ethers, spokePoolName?: string): Promise<{
     weth: Contract;
     erc20: Contract;

package/dist/cjs/test/fixtures/SpokePool.Fixture.js

@@ -1,16 +1,211 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.spokePoolFixture = exports.zeroAddress = void 0;
+exports.getRelayHash = getRelayHash;
+exports.getV3RelayHash = getV3RelayHash;
+exports.getLegacyV3RelayHash = getLegacyV3RelayHash;
+exports.getDepositParams = getDepositParams;
+exports.getFillRelayParams = getFillRelayParams;
+exports.getFillRelayUpdatedFeeParams = getFillRelayUpdatedFeeParams;
+exports.getExecuteSlowRelayParams = getExecuteSlowRelayParams;
+exports.modifyRelayHelper = modifyRelayHelper;
+exports.getUpdatedV3DepositSignature = getUpdatedV3DepositSignature;
+exports.deployMockSpokePoolCaller = deployMockSpokePoolCaller;
 exports.deploySpokePool = deploySpokePool;
 var tslib_1 = require("tslib");
 require("@nomiclabs/hardhat-ethers");
 require("@openzeppelin/hardhat-upgrades");
 require("hardhat-deploy");
 var hardhat_1 = tslib_1.__importDefault(require("hardhat"));
+var ethers_1 = require("ethers");
 var getContractFactory_1 = require("../utils/getContractFactory");
 var constants_1 = require("../constants");
 Object.defineProperty(exports, "zeroAddress", { enumerable: true, get: function () { return constants_1.zeroAddress; } });
-function deploySpokePool(ethers_1) {
+var _a = ethers_1.ethers.utils, defaultAbiCoder = _a.defaultAbiCoder, keccak256 = _a.keccak256;
+function getRelayHash(_depositor, _recipient, _depositId, _originChainId, _destinationChainId, _destinationToken, _amount, _realizedLpFeePct, _relayerFeePct, _message) {
+    var relayData = {
+        depositor: _depositor,
+        recipient: _recipient,
+        destinationToken: _destinationToken,
+        amount: _amount || constants_1.amountToDeposit,
+        originChainId: _originChainId.toString(),
+        destinationChainId: _destinationChainId.toString(),
+        realizedLpFeePct: _realizedLpFeePct || constants_1.realizedLpFeePct,
+        relayerFeePct: _relayerFeePct || constants_1.depositRelayerFeePct,
+        depositId: _depositId.toString(),
+        message: _message || "0x",
+    };
+    var relayHash = keccak256(defaultAbiCoder.encode([
+        "tuple(address depositor, address recipient, address destinationToken, uint256 amount, uint256 originChainId, uint256 destinationChainId, int64 realizedLpFeePct, int64 relayerFeePct, uint32 depositId, bytes message)",
+    ], [relayData]));
+    return { relayHash: relayHash, relayData: relayData };
+}
+function getV3RelayHash(relayData, destChainId) {
+    return keccak256(defaultAbiCoder.encode([
+        "tuple(bytes32 depositor, bytes32 recipient, bytes32 exclusiveRelayer, bytes32 inputToken, bytes32 outputToken, uint256 inputAmount, uint256 outputAmount, uint256 originChainId, uint256 depositId, uint32 fillDeadline, uint32 exclusivityDeadline, bytes message)",
+        "uint256 destinationChainId",
+    ], [relayData, destChainId]));
+}
+function getLegacyV3RelayHash(relayData, destChainId) {
+    return keccak256(defaultAbiCoder.encode([
+        "tuple(address depositor, address recipient, address exclusiveRelayer, address inputToken, address outputToken, uint256 inputAmount, uint256 outputAmount, uint256 originChainId, uint32 depositId, uint32 fillDeadline, uint32 exclusivityDeadline, bytes message)",
+        "uint256 destinationChainId",
+    ], [relayData, destChainId]));
+}
+function getDepositParams(args) {
+    var _a, _b, _c, _d;
+    return [
+        (_a = args.recipient) !== null && _a !== void 0 ? _a : (0, constants_1.randomAddress)(),
+        args.originToken,
+        args.amount.toString(),
+        args.destinationChainId.toString(),
+        args.relayerFeePct.toString(),
+        args.quoteTimestamp.toString(),
+        (_b = args.message) !== null && _b !== void 0 ? _b : "0x",
+        (_d = (_c = args === null || args === void 0 ? void 0 : args.maxCount) === null || _c === void 0 ? void 0 : _c.toString()) !== null && _d !== void 0 ? _d : constants_1.maxUint256.toString(),
+    ];
+}
+function getFillRelayParams(_relayData, _maxTokensToSend, _repaymentChain, _maxCount) {
+    return [
+        _relayData.depositor,
+        _relayData.recipient,
+        _relayData.destinationToken,
+        _relayData.amount.toString(),
+        _maxTokensToSend.toString(),
+        _repaymentChain ? _repaymentChain.toString() : constants_1.repaymentChainId.toString(),
+        _relayData.originChainId,
+        _relayData.realizedLpFeePct.toString(),
+        _relayData.relayerFeePct.toString(),
+        _relayData.depositId,
+        _relayData.message || "0x",
+        _maxCount ? _maxCount.toString() : constants_1.maxUint256.toString(),
+    ];
+}
+function getFillRelayUpdatedFeeParams(_relayData, _maxTokensToSend, _updatedFee, _signature, _repaymentChain, _updatedRecipient, _updatedMessage, _maxCount) {
+    return [
+        _relayData.depositor,
+        _relayData.recipient,
+        _updatedRecipient || _relayData.recipient,
+        _relayData.destinationToken,
+        _relayData.amount.toString(),
+        _maxTokensToSend.toString(),
+        _repaymentChain ? _repaymentChain.toString() : constants_1.repaymentChainId.toString(),
+        _relayData.originChainId,
+        _relayData.realizedLpFeePct.toString(),
+        _relayData.relayerFeePct.toString(),
+        _updatedFee.toString(),
+        _relayData.depositId,
+        _relayData.message,
+        _updatedMessage || _relayData.message,
+        _signature,
+        _maxCount ? _maxCount.toString() : constants_1.maxUint256.toString(),
+    ];
+}
+function getExecuteSlowRelayParams(_depositor, _recipient, _destToken, _amount, _originChainId, _realizedLpFeePct, _relayerFeePct, _depositId, _relayerRefundId, _message, _payoutAdjustment, _proof) {
+    return [
+        _depositor,
+        _recipient,
+        _destToken,
+        _amount.toString(),
+        _originChainId.toString(),
+        _realizedLpFeePct.toString(),
+        _relayerFeePct.toString(),
+        _depositId.toString(),
+        _relayerRefundId.toString(),
+        _message,
+        _payoutAdjustment.toString(),
+        _proof,
+    ];
+}
+function modifyRelayHelper(modifiedRelayerFeePct, depositId, originChainId, depositor, updatedRecipient, updatedMessage) {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
+        var typedData, signature;
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    typedData = {
+                        types: {
+                            UpdateDepositDetails: [
+                                { name: "depositId", type: "uint32" },
+                                { name: "originChainId", type: "uint256" },
+                                { name: "updatedRelayerFeePct", type: "int64" },
+                                { name: "updatedRecipient", type: "address" },
+                                { name: "updatedMessage", type: "bytes" },
+                            ],
+                        },
+                        domain: {
+                            name: "ACROSS-V2",
+                            version: "1.0.0",
+                            chainId: Number(originChainId),
+                        },
+                        message: {
+                            depositId: depositId,
+                            originChainId: originChainId,
+                            updatedRelayerFeePct: modifiedRelayerFeePct,
+                            updatedRecipient: updatedRecipient,
+                            updatedMessage: updatedMessage,
+                        },
+                    };
+                    return [4, depositor._signTypedData(typedData.domain, typedData.types, typedData.message)];
+                case 1:
+                    signature = _a.sent();
+                    return [2, { signature: signature }];
+            }
+        });
+    });
+}
+function getUpdatedV3DepositSignature(depositor, depositId, originChainId, updatedOutputAmount, updatedRecipient, updatedMessage) {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
+        var typedData;
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    typedData = {
+                        types: {
+                            UpdateDepositDetails: [
+                                { name: "depositId", type: "uint256" },
+                                { name: "originChainId", type: "uint256" },
+                                { name: "updatedOutputAmount", type: "uint256" },
+                                { name: "updatedRecipient", type: "bytes32" },
+                                { name: "updatedMessage", type: "bytes" },
+                            ],
+                        },
+                        domain: {
+                            name: "ACROSS-V2",
+                            version: "1.0.0",
+                            chainId: originChainId,
+                        },
+                        message: {
+                            depositId: depositId,
+                            originChainId: originChainId,
+                            updatedOutputAmount: updatedOutputAmount,
+                            updatedRecipient: updatedRecipient,
+                            updatedMessage: updatedMessage,
+                        },
+                    };
+                    return [4, depositor._signTypedData(typedData.domain, typedData.types, typedData.message)];
+                case 1: return [2, _a.sent()];
+            }
+        });
+    });
+}
+function deployMockSpokePoolCaller(spokePool, rootBundleId, leaf, proof) {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
+        var _a, _b;
+        return tslib_1.__generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    _a = getContractFactory_1.getContractFactory;
+                    _b = ["MockCaller"];
+                    return [4, hardhat_1.default.ethers.getSigners()];
+                case 1: return [4, _a.apply(void 0, _b.concat([(_c.sent())[0]]))];
+                case 2: return [4, (_c.sent()).deploy(spokePool.address, rootBundleId, leaf, proof)];
+                case 3: return [2, _c.sent()];
+            }
+        });
+    });
+}
+function deploySpokePool(ethers_2) {
     return tslib_1.__awaiter(this, arguments, void 0, function (ethers, spokePoolName) {
         var _a, deployerWallet, crossChainAdmin, hubPool, weth, erc20, unwhitelistedErc20, destErc20, spokePool, _b, _c, erc1271;
         if (spokePoolName === void 0) { spokePoolName = "MockSpokePool"; }

package/dist/cjs/test/fixtures/SpokePool.Fixture.js.map

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

package/dist/cjs/test/types/index.d.ts

@@ -1,7 +1,6 @@
 import { HardhatEthersHelpers } from "@nomiclabs/hardhat-ethers/types";
-import type { ethers } from "ethers";
+import type { ethers, Contract, BigNumber } from "ethers";
 import winston from "winston";
-import * as utils from "@across-protocol/contracts/dist/test-utils";
 import { sinon } from "../utils";
 export type EthersTestLibrary = typeof ethers & HardhatEthersHelpers;
 export type SpyLoggerResult = {
@@ -9,20 +8,20 @@ export type SpyLoggerResult = {
     spyLogger: winston.Logger;
 };
 export type SpokePoolDeploymentResult = {
-    weth: utils.Contract;
-    erc20: utils.Contract;
-    spokePool: utils.Contract;
-    unwhitelistedErc20: utils.Contract;
-    destErc20: utils.Contract;
+    weth: Contract;
+    erc20: Contract;
+    spokePool: Contract;
+    unwhitelistedErc20: Contract;
+    destErc20: Contract;
     deploymentBlock: number;
 };
 export type ContractsV2SlowFillRelayData = {
     depositor: string;
     recipient: string;
     destinationToken: string;
-    amount: utils.BigNumber;
-    realizedLpFeePct: utils.BigNumber;
-    relayerFeePct: utils.BigNumber;
+    amount: BigNumber;
+    realizedLpFeePct: BigNumber;
+    relayerFeePct: BigNumber;
     depositId: string;
     originChainId: string;
     destinationChainId: string;
@@ -30,5 +29,5 @@ export type ContractsV2SlowFillRelayData = {
 };
 export type ContractsV2SlowFill = {
     relayData: ContractsV2SlowFillRelayData;
-    payoutAdjustmentPct: utils.BigNumber;
+    payoutAdjustmentPct: BigNumber;
 };

package/dist/cjs/test/utils/MerkleLib.utils.d.ts

@@ -1,4 +1,4 @@
-import { BigNumber, ethers } from "ethers";
+import { BigNumber, Contract, ethers } from "ethers";
 import { MerkleTree } from "@across-protocol/contracts/dist/utils/MerkleTree";
 export declare function getParamType(contractName: string, functionName: string, paramName: string): Promise<ethers.utils.ParamType | string>;
 export declare function buildRelayerRefundTree(relayerRefundLeaves: {
@@ -37,3 +37,28 @@ export declare function buildPoolRebalanceLeaves(destinationChainIds: number[],
 }[];
 export declare function buildSlowRelayTree(slowFills: unknown[]): Promise<MerkleTree<unknown>>;
 export declare function buildV3SlowRelayTree(slowFills: unknown[]): Promise<MerkleTree<unknown>>;
+export declare function constructSingleRelayerRefundTree(l2Token: Contract | string, destinationChainId: number, amount?: BigNumber): Promise<{
+    leaves: {
+        leafId: BigNumber;
+        chainId: BigNumber;
+        amountToReturn: BigNumber;
+        l2TokenAddress: string;
+        refundAddresses: string[];
+        refundAmounts: BigNumber[];
+    }[];
+    tree: MerkleTree<unknown>;
+}>;
+export declare function constructSingleChainTree(token: string, scalingSize?: number, repaymentChain?: number, decimals?: number): Promise<{
+    tokensSendToL2: BigNumber;
+    realizedLpFees: BigNumber;
+    leaves: {
+        leafId: BigNumber;
+        chainId: BigNumber;
+        groupIndex: BigNumber;
+        bundleLpFees: BigNumber[];
+        netSendAmounts: BigNumber[];
+        runningBalances: BigNumber[];
+        l1Tokens: string[];
+    }[];
+    tree: MerkleTree<unknown>;
+}>;

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

@@ -7,11 +7,14 @@ exports.buildPoolRebalanceLeafTree = buildPoolRebalanceLeafTree;
 exports.buildPoolRebalanceLeaves = buildPoolRebalanceLeaves;
 exports.buildSlowRelayTree = buildSlowRelayTree;
 exports.buildV3SlowRelayTree = buildV3SlowRelayTree;
+exports.constructSingleRelayerRefundTree = constructSingleRelayerRefundTree;
+exports.constructSingleChainTree = constructSingleChainTree;
 var tslib_1 = require("tslib");
 var ethers_1 = require("ethers");
 var getContractFactory_1 = require("./getContractFactory");
 var MerkleTree_1 = require("@across-protocol/contracts/dist/utils/MerkleTree");
 var chai_1 = require("chai");
+var constants_1 = require("../constants");
 var _a = ethers_1.ethers.utils, keccak256 = _a.keccak256, defaultAbiCoder = _a.defaultAbiCoder;
 function getParamType(contractName, functionName, paramName) {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
@@ -129,4 +132,41 @@ function buildV3SlowRelayTree(slowFills) {
         });
     });
 }
+function constructSingleRelayerRefundTree(l2Token, destinationChainId, amount) {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
+        var amountToUse, l2TokenAddress, leaves, tree;
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    amountToUse = amount !== undefined ? amount : constants_1.amountToReturn;
+                    l2TokenAddress = typeof l2Token === "string" ? l2Token : l2Token.address;
+                    leaves = buildRelayerRefundLeaves([destinationChainId], [amountToUse], [l2TokenAddress], [[]], [[]]);
+                    return [4, buildRelayerRefundTree(leaves)];
+                case 1:
+                    tree = _a.sent();
+                    return [2, { leaves: leaves, tree: tree }];
+            }
+        });
+    });
+}
+function constructSingleChainTree(token_1) {
+    return tslib_1.__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 = constants_1.repaymentChainId; }
+        if (decimals === void 0) { decimals = 18; }
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    tokensSendToL2 = ethers_1.ethers.utils.parseUnits((100 * scalingSize).toString(), decimals);
+                    realizedLpFees = ethers_1.ethers.utils.parseUnits((10 * scalingSize).toString(), decimals);
+                    leaves = buildPoolRebalanceLeaves([repaymentChain], [[token]], [[realizedLpFees]], [[tokensSendToL2]], [[tokensSendToL2]], [0]);
+                    return [4, buildPoolRebalanceLeafTree(leaves)];
+                case 1:
+                    tree = _a.sent();
+                    return [2, { tokensSendToL2: tokensSendToL2, realizedLpFees: realizedLpFees, leaves: leaves, tree: tree }];
+            }
+        });
+    });
+}
 //# sourceMappingURL=MerkleLib.utils.js.map

package/dist/cjs/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/cjs/test/utils/index.d.ts

@@ -1,5 +1,4 @@
 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/cjs/test/utils/index.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.smock = exports.ethers = exports.contractsV2Utils = void 0;
+exports.smock = exports.ethers = void 0;
 var tslib_1 = require("tslib");
 require("@nomiclabs/hardhat-ethers");
-exports.contractsV2Utils = tslib_1.__importStar(require("@across-protocol/contracts/dist/test-utils"));
 var hardhat_1 = require("hardhat");
 Object.defineProperty(exports, "ethers", { enumerable: true, get: function () { return hardhat_1.ethers; } });
 var smock_1 = require("@defi-wonderland/smock");

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../test/utils/index.ts"],"names":[],"mappings":";;;;AAAA,qCAAmC;AACnC,uGAA+E;AAC/E,mCAAiC;AAAxB,iGAAA,MAAM,OAAA;AACf,gDAA+C;AAAtC,8FAAA,KAAK,OAAA;AAEd,kDAAwB;AACxB,4DAAkC;AAClC,2DAAiC;AACjC,yDAA+B;AAC/B,sDAA4B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../test/utils/index.ts"],"names":[],"mappings":";;;;AAAA,qCAAmC;AACnC,mCAAiC;AAAxB,iGAAA,MAAM,OAAA;AACf,gDAA+C;AAAtC,8FAAA,KAAK,OAAA;AAEd,kDAAwB;AACxB,4DAAkC;AAClC,2DAAiC;AACjC,yDAA+B;AAC/B,sDAA4B"}

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

@@ -1,53 +1,80 @@
 import { AcrossConfigStore } from "@across-protocol/contracts";
-import * as utils from "@across-protocol/contracts/dist/test-utils";
 import chai, { expect } from "chai";
-import { Contract, providers } from "ethers";
+import { ethers, BaseContract, Contract, providers, Signer } from "ethers";
+import { FakeContract } from "@defi-wonderland/smock";
 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 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";
+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";
 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: utils.Contract, wallet: utils.SignerWithAddress, tokens: utils.Contract[], weth?: utils.Contract, seedMultiplier?: number): Promise<void>;
+export declare function setupTokensForWallet(contractToApprove: Contract, wallet: SignerWithAddress, tokens: Contract[], weth?: Contract, seedMultiplier?: number): Promise<void>;
 export declare function createSpyLogger(): SpyLoggerResult;
 export declare function deploySpokePoolWithToken(fromChainId?: number): Promise<SpokePoolDeploymentResult>;
-export declare function deployConfigStore(signer: utils.SignerWithAddress, tokensToAdd: utils.Contract[], maxL1TokensPerPoolRebalanceLeaf?: number, maxRefundPerRelayerRefundLeaf?: number, rateModel?: unknown, additionalChainIdIndices?: number[]): Promise<{
+export declare function deployConfigStore(signer: SignerWithAddress, tokensToAdd: Contract[], maxL1TokensPerPoolRebalanceLeaf?: number, maxRefundPerRelayerRefundLeaf?: number, rateModel?: unknown, additionalChainIdIndices?: number[]): Promise<{
     configStore: AcrossConfigStore;
     deploymentBlock: number;
 }>;
-export declare function deployAndConfigureHubPool(signer: utils.SignerWithAddress, spokePools: {
+export declare function deployAndConfigureHubPool(signer: SignerWithAddress, spokePools: {
     l2ChainId: number;
-    spokePool: utils.Contract;
+    spokePool: Contract;
 }[], finderAddress?: string, timerAddress?: string): Promise<{
-    hubPool: utils.Contract;
-    mockAdapter: utils.Contract;
-    l1Token_1: utils.Contract;
-    l1Token_2: utils.Contract;
+    hubPool: Contract;
+    mockAdapter: Contract;
+    l1Token_1: Contract;
+    l1Token_2: Contract;
     hubPoolDeploymentBlock: number;
 }>;
-export declare function enableRoutesOnHubPool(hubPool: utils.Contract, rebalanceRouteTokens: {
+export declare function enableRoutesOnHubPool(hubPool: Contract, rebalanceRouteTokens: {
     destinationChainId: number;
-    l1Token: utils.Contract;
-    destinationToken: utils.Contract;
+    l1Token: Contract;
+    destinationToken: Contract;
 }[]): Promise<void>;
 export declare function appendMessageToResult<T>(body: T): T & {
     message: string;
 };
 export declare function getLastBlockTime(provider: providers.Provider): Promise<number>;
-export declare function addLiquidity(signer: utils.SignerWithAddress, hubPool: utils.Contract, l1Token: utils.Contract, amount: utils.BigNumber): Promise<void>;
+export declare function addLiquidity(signer: SignerWithAddress, hubPool: Contract, l1Token: Contract, amount: 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;