@across-protocol/sdk 4.3.126 → 4.3.128

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (72) hide show
  1. package/dist/cjs/src/providers/cachedProvider.js +3 -0
  2. package/dist/cjs/src/providers/cachedProvider.js.map +1 -1
  3. package/dist/cjs/src/providers/retryProvider.js +1 -1
  4. package/dist/cjs/src/providers/retryProvider.js.map +1 -1
  5. package/dist/cjs/test/constants.d.ts +58 -8
  6. package/dist/cjs/test/constants.js +70 -13
  7. package/dist/cjs/test/constants.js.map +1 -1
  8. package/dist/cjs/test/fixtures/MerkleLib.Fixture.d.ts +4 -0
  9. package/dist/cjs/test/fixtures/MerkleLib.Fixture.js +22 -0
  10. package/dist/cjs/test/fixtures/MerkleLib.Fixture.js.map +1 -0
  11. package/dist/cjs/test/fixtures/SpokePool.Fixture.d.ts +91 -1
  12. package/dist/cjs/test/fixtures/SpokePool.Fixture.js +196 -1
  13. package/dist/cjs/test/fixtures/SpokePool.Fixture.js.map +1 -1
  14. package/dist/cjs/test/types/index.d.ts +10 -11
  15. package/dist/cjs/test/utils/MerkleLib.utils.d.ts +26 -1
  16. package/dist/cjs/test/utils/MerkleLib.utils.js +40 -0
  17. package/dist/cjs/test/utils/MerkleLib.utils.js.map +1 -1
  18. package/dist/cjs/test/utils/index.d.ts +0 -1
  19. package/dist/cjs/test/utils/index.js +1 -2
  20. package/dist/cjs/test/utils/index.js.map +1 -1
  21. package/dist/cjs/test/utils/utils.d.ts +44 -17
  22. package/dist/cjs/test/utils/utils.js +223 -37
  23. package/dist/cjs/test/utils/utils.js.map +1 -1
  24. package/dist/cjs/test-utils.d.ts +1 -1
  25. package/dist/cjs/test-utils.js +47 -12
  26. package/dist/cjs/test-utils.js.map +1 -1
  27. package/dist/esm/src/providers/cachedProvider.js +4 -0
  28. package/dist/esm/src/providers/cachedProvider.js.map +1 -1
  29. package/dist/esm/src/providers/retryProvider.js +3 -3
  30. package/dist/esm/src/providers/retryProvider.js.map +1 -1
  31. package/dist/esm/test/constants.d.ts +58 -8
  32. package/dist/esm/test/constants.js +87 -13
  33. package/dist/esm/test/constants.js.map +1 -1
  34. package/dist/esm/test/fixtures/MerkleLib.Fixture.d.ts +4 -0
  35. package/dist/esm/test/fixtures/MerkleLib.Fixture.js +19 -0
  36. package/dist/esm/test/fixtures/MerkleLib.Fixture.js.map +1 -0
  37. package/dist/esm/test/fixtures/SpokePool.Fixture.d.ts +92 -1
  38. package/dist/esm/test/fixtures/SpokePool.Fixture.js +201 -1
  39. package/dist/esm/test/fixtures/SpokePool.Fixture.js.map +1 -1
  40. package/dist/esm/test/types/index.d.ts +10 -11
  41. package/dist/esm/test/utils/MerkleLib.utils.d.ts +32 -1
  42. package/dist/esm/test/utils/MerkleLib.utils.js +44 -0
  43. package/dist/esm/test/utils/MerkleLib.utils.js.map +1 -1
  44. package/dist/esm/test/utils/index.d.ts +0 -1
  45. package/dist/esm/test/utils/index.js +0 -2
  46. package/dist/esm/test/utils/index.js.map +1 -1
  47. package/dist/esm/test/utils/utils.d.ts +44 -17
  48. package/dist/esm/test/utils/utils.js +205 -29
  49. package/dist/esm/test/utils/utils.js.map +1 -1
  50. package/dist/esm/test-utils.d.ts +1 -1
  51. package/dist/esm/test-utils.js +1 -1
  52. package/dist/esm/test-utils.js.map +1 -1
  53. package/dist/types/src/providers/cachedProvider.d.ts.map +1 -1
  54. package/dist/types/test/constants.d.ts +58 -8
  55. package/dist/types/test/constants.d.ts.map +1 -1
  56. package/dist/types/test/fixtures/MerkleLib.Fixture.d.ts +5 -0
  57. package/dist/types/test/fixtures/MerkleLib.Fixture.d.ts.map +1 -0
  58. package/dist/types/test/fixtures/SpokePool.Fixture.d.ts +92 -1
  59. package/dist/types/test/fixtures/SpokePool.Fixture.d.ts.map +1 -1
  60. package/dist/types/test/types/index.d.ts +10 -11
  61. package/dist/types/test/types/index.d.ts.map +1 -1
  62. package/dist/types/test/utils/MerkleLib.utils.d.ts +32 -1
  63. package/dist/types/test/utils/MerkleLib.utils.d.ts.map +1 -1
  64. package/dist/types/test/utils/index.d.ts +0 -1
  65. package/dist/types/test/utils/index.d.ts.map +1 -1
  66. package/dist/types/test/utils/utils.d.ts +44 -17
  67. package/dist/types/test/utils/utils.d.ts.map +1 -1
  68. package/dist/types/test-utils.d.ts +1 -1
  69. package/dist/types/test-utils.d.ts.map +1 -1
  70. package/package.json +1 -1
  71. package/src/providers/cachedProvider.ts +5 -0
  72. package/src/providers/retryProvider.ts +3 -3
@@ -1 +1 @@
1
- {"version":3,"file":"SpokePool.Fixture.js","sourceRoot":"","sources":["../../../../test/fixtures/SpokePool.Fixture.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SpokePool.Fixture.js","sourceRoot":"","sources":["../../../../test/fixtures/SpokePool.Fixture.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,6 @@
1
1
  import { HardhatEthersHelpers } from "@nomiclabs/hardhat-ethers/types";
2
- import type { ethers } from "ethers";
2
+ import type { ethers, Contract, BigNumber } from "ethers";
3
3
  import winston from "winston";
4
- import * as utils from "@across-protocol/contracts/dist/test-utils";
5
4
  import { sinon } from "../utils";
6
5
  export type EthersTestLibrary = typeof ethers & HardhatEthersHelpers;
7
6
  export type SpyLoggerResult = {
@@ -9,20 +8,20 @@ export type SpyLoggerResult = {
9
8
  spyLogger: winston.Logger;
10
9
  };
11
10
  export type SpokePoolDeploymentResult = {
12
- weth: utils.Contract;
13
- erc20: utils.Contract;
14
- spokePool: utils.Contract;
15
- unwhitelistedErc20: utils.Contract;
16
- destErc20: utils.Contract;
11
+ weth: Contract;
12
+ erc20: Contract;
13
+ spokePool: Contract;
14
+ unwhitelistedErc20: Contract;
15
+ destErc20: Contract;
17
16
  deploymentBlock: number;
18
17
  };
19
18
  export type ContractsV2SlowFillRelayData = {
20
19
  depositor: string;
21
20
  recipient: string;
22
21
  destinationToken: string;
23
- amount: utils.BigNumber;
24
- realizedLpFeePct: utils.BigNumber;
25
- relayerFeePct: utils.BigNumber;
22
+ amount: BigNumber;
23
+ realizedLpFeePct: BigNumber;
24
+ relayerFeePct: BigNumber;
26
25
  depositId: string;
27
26
  originChainId: string;
28
27
  destinationChainId: string;
@@ -30,5 +29,5 @@ export type ContractsV2SlowFillRelayData = {
30
29
  };
31
30
  export type ContractsV2SlowFill = {
32
31
  relayData: ContractsV2SlowFillRelayData;
33
- payoutAdjustmentPct: utils.BigNumber;
32
+ payoutAdjustmentPct: BigNumber;
34
33
  };
@@ -1,4 +1,4 @@
1
- import { BigNumber, ethers } from "ethers";
1
+ import { BigNumber, Contract, ethers } from "ethers";
2
2
  import { MerkleTree } from "@across-protocol/contracts/dist/utils/MerkleTree";
3
3
  export declare function getParamType(contractName: string, functionName: string, paramName: string): Promise<ethers.utils.ParamType | string>;
4
4
  export declare function buildRelayerRefundTree(relayerRefundLeaves: {
@@ -37,3 +37,28 @@ export declare function buildPoolRebalanceLeaves(destinationChainIds: number[],
37
37
  }[];
38
38
  export declare function buildSlowRelayTree(slowFills: unknown[]): Promise<MerkleTree<unknown>>;
39
39
  export declare function buildV3SlowRelayTree(slowFills: unknown[]): Promise<MerkleTree<unknown>>;
40
+ export declare function constructSingleRelayerRefundTree(l2Token: Contract | string, destinationChainId: number, amount?: BigNumber): Promise<{
41
+ leaves: {
42
+ leafId: BigNumber;
43
+ chainId: BigNumber;
44
+ amountToReturn: BigNumber;
45
+ l2TokenAddress: string;
46
+ refundAddresses: string[];
47
+ refundAmounts: BigNumber[];
48
+ }[];
49
+ tree: MerkleTree<unknown>;
50
+ }>;
51
+ export declare function constructSingleChainTree(token: string, scalingSize?: number, repaymentChain?: number, decimals?: number): Promise<{
52
+ tokensSendToL2: BigNumber;
53
+ realizedLpFees: BigNumber;
54
+ leaves: {
55
+ leafId: BigNumber;
56
+ chainId: BigNumber;
57
+ groupIndex: BigNumber;
58
+ bundleLpFees: BigNumber[];
59
+ netSendAmounts: BigNumber[];
60
+ runningBalances: BigNumber[];
61
+ l1Tokens: string[];
62
+ }[];
63
+ tree: MerkleTree<unknown>;
64
+ }>;
@@ -7,11 +7,14 @@ exports.buildPoolRebalanceLeafTree = buildPoolRebalanceLeafTree;
7
7
  exports.buildPoolRebalanceLeaves = buildPoolRebalanceLeaves;
8
8
  exports.buildSlowRelayTree = buildSlowRelayTree;
9
9
  exports.buildV3SlowRelayTree = buildV3SlowRelayTree;
10
+ exports.constructSingleRelayerRefundTree = constructSingleRelayerRefundTree;
11
+ exports.constructSingleChainTree = constructSingleChainTree;
10
12
  var tslib_1 = require("tslib");
11
13
  var ethers_1 = require("ethers");
12
14
  var getContractFactory_1 = require("./getContractFactory");
13
15
  var MerkleTree_1 = require("@across-protocol/contracts/dist/utils/MerkleTree");
14
16
  var chai_1 = require("chai");
17
+ var constants_1 = require("../constants");
15
18
  var _a = ethers_1.ethers.utils, keccak256 = _a.keccak256, defaultAbiCoder = _a.defaultAbiCoder;
16
19
  function getParamType(contractName, functionName, paramName) {
17
20
  return tslib_1.__awaiter(this, void 0, void 0, function () {
@@ -129,4 +132,41 @@ function buildV3SlowRelayTree(slowFills) {
129
132
  });
130
133
  });
131
134
  }
135
+ function constructSingleRelayerRefundTree(l2Token, destinationChainId, amount) {
136
+ return tslib_1.__awaiter(this, void 0, void 0, function () {
137
+ var amountToUse, l2TokenAddress, leaves, tree;
138
+ return tslib_1.__generator(this, function (_a) {
139
+ switch (_a.label) {
140
+ case 0:
141
+ amountToUse = amount !== undefined ? amount : constants_1.amountToReturn;
142
+ l2TokenAddress = typeof l2Token === "string" ? l2Token : l2Token.address;
143
+ leaves = buildRelayerRefundLeaves([destinationChainId], [amountToUse], [l2TokenAddress], [[]], [[]]);
144
+ return [4, buildRelayerRefundTree(leaves)];
145
+ case 1:
146
+ tree = _a.sent();
147
+ return [2, { leaves: leaves, tree: tree }];
148
+ }
149
+ });
150
+ });
151
+ }
152
+ function constructSingleChainTree(token_1) {
153
+ return tslib_1.__awaiter(this, arguments, void 0, function (token, scalingSize, repaymentChain, decimals) {
154
+ var tokensSendToL2, realizedLpFees, leaves, tree;
155
+ if (scalingSize === void 0) { scalingSize = 1; }
156
+ if (repaymentChain === void 0) { repaymentChain = constants_1.repaymentChainId; }
157
+ if (decimals === void 0) { decimals = 18; }
158
+ return tslib_1.__generator(this, function (_a) {
159
+ switch (_a.label) {
160
+ case 0:
161
+ tokensSendToL2 = ethers_1.ethers.utils.parseUnits((100 * scalingSize).toString(), decimals);
162
+ realizedLpFees = ethers_1.ethers.utils.parseUnits((10 * scalingSize).toString(), decimals);
163
+ leaves = buildPoolRebalanceLeaves([repaymentChain], [[token]], [[realizedLpFees]], [[tokensSendToL2]], [[tokensSendToL2]], [0]);
164
+ return [4, buildPoolRebalanceLeafTree(leaves)];
165
+ case 1:
166
+ tree = _a.sent();
167
+ return [2, { tokensSendToL2: tokensSendToL2, realizedLpFees: realizedLpFees, leaves: leaves, tree: tree }];
168
+ }
169
+ });
170
+ });
171
+ }
132
172
  //# sourceMappingURL=MerkleLib.utils.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"MerkleLib.utils.js","sourceRoot":"","sources":["../../../../test/utils/MerkleLib.utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"MerkleLib.utils.js","sourceRoot":"","sources":["../../../../test/utils/MerkleLib.utils.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,4 @@
1
1
  import "@nomiclabs/hardhat-ethers";
2
- export * as contractsV2Utils from "@across-protocol/contracts/dist/test-utils";
3
2
  export { ethers } from "hardhat";
4
3
  export { smock } from "@defi-wonderland/smock";
5
4
  export * from "./utils";
@@ -1,9 +1,8 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.smock = exports.ethers = exports.contractsV2Utils = void 0;
3
+ exports.smock = exports.ethers = void 0;
4
4
  var tslib_1 = require("tslib");
5
5
  require("@nomiclabs/hardhat-ethers");
6
- exports.contractsV2Utils = tslib_1.__importStar(require("@across-protocol/contracts/dist/test-utils"));
7
6
  var hardhat_1 = require("hardhat");
8
7
  Object.defineProperty(exports, "ethers", { enumerable: true, get: function () { return hardhat_1.ethers; } });
9
8
  var smock_1 = require("@defi-wonderland/smock");
@@ -1 +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"}
1
+ {"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"}
@@ -1,53 +1,80 @@
1
1
  import { AcrossConfigStore } from "@across-protocol/contracts";
2
- import * as utils from "@across-protocol/contracts/dist/test-utils";
3
2
  import chai, { expect } from "chai";
4
- import { Contract, providers } from "ethers";
3
+ import { ethers, BaseContract, Contract, providers, Signer } from "ethers";
4
+ import { FakeContract } from "@defi-wonderland/smock";
5
5
  import sinon from "sinon";
6
6
  import winston from "winston";
7
+ import type { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
7
8
  import { AcrossConfigStoreClient as ConfigStoreClient } from "../../src/clients";
8
9
  import { Deposit, DepositWithBlock, FillWithBlock, RelayData, SlowFillRequestWithBlock } from "../../src/interfaces";
9
10
  import { Address, BigNumber, BigNumberish, toBN, toBNWei, toWei, utf8ToHex } from "../../src/utils";
11
+ import { randomAddress, zeroAddress } from "../constants";
10
12
  import { SpokePoolDeploymentResult, SpyLoggerResult } from "../types";
11
13
  declare const chaiAssert: Chai.AssertStatic;
12
- export type SignerWithAddress = utils.SignerWithAddress;
13
- export declare const getDepositParams: typeof utils.getDepositParams, getUpdatedV3DepositSignature: typeof utils.getUpdatedV3DepositSignature, modifyRelayHelper: typeof utils.modifyRelayHelper, randomAddress: typeof utils.randomAddress, zeroAddress: string;
14
- export { buildPoolRebalanceLeafTree, buildPoolRebalanceLeaves, buildRelayerRefundTree, buildRelayerRefundLeaves, buildSlowRelayTree, buildV3SlowRelayTree, getParamType, } from "./MerkleLib.utils";
14
+ export { ethers };
15
+ export type { SignerWithAddress };
16
+ export { getDepositParams, getUpdatedV3DepositSignature, modifyRelayHelper, getRelayHash, getV3RelayHash, getLegacyV3RelayHash, getFillRelayParams, getFillRelayUpdatedFeeParams, getExecuteSlowRelayParams, deployMockSpokePoolCaller, } from "../fixtures/SpokePool.Fixture";
17
+ export type { ContractRelayData, V3RelayData, V3RelayExecutionParams, SlowFill, V3SlowFill, UpdatedRelayerFeeData, } from "../fixtures/SpokePool.Fixture";
18
+ export { FillType, FillStatus } from "../fixtures/SpokePool.Fixture";
19
+ export { randomAddress, zeroAddress };
20
+ export { buildPoolRebalanceLeafTree, buildPoolRebalanceLeaves, buildRelayerRefundTree, buildRelayerRefundLeaves, buildSlowRelayTree, buildV3SlowRelayTree, getParamType, constructSingleRelayerRefundTree, constructSingleChainTree, } from "./MerkleLib.utils";
15
21
  import { getContractFactory } from "./getContractFactory";
16
22
  export { getContractFactory };
17
23
  import { hubPoolFixture, deployHubPool } from "../fixtures/HubPool.Fixture";
18
24
  import { spokePoolFixture, deploySpokePool } from "../fixtures/SpokePool.Fixture";
19
25
  export { hubPoolFixture, deployHubPool, spokePoolFixture, deploySpokePool };
26
+ export { merkleLibFixture } from "../fixtures/MerkleLib.Fixture";
20
27
  export { BigNumber, Contract, chai, chaiAssert, expect, sinon, toBN, toBNWei, toWei, utf8ToHex, winston };
28
+ declare const defaultAbiCoder: ethers.utils.AbiCoder, keccak256: typeof ethers.utils.keccak256;
29
+ export { defaultAbiCoder, keccak256, Signer, FakeContract };
30
+ export declare const toWeiWithDecimals: (num: string | number | BigNumber, decimals: number) => BigNumber;
31
+ export declare const toBNWeiWithDecimals: (num: string | number | BigNumber, decimals: number) => BigNumber;
32
+ export declare const fromWei: (num: string | number | BigNumber) => string;
33
+ export declare const hexToUtf8: (input: string) => string;
34
+ export declare const hexZeroPad: (input: string, length: number) => string;
35
+ export declare const addressToBytes: (input: string) => string;
36
+ export declare const bytes32ToAddress: (input: string) => string;
37
+ export declare const isBytes32: (input: string) => boolean;
38
+ export declare function randomBigNumber(bytes?: number, signed?: boolean): BigNumber;
39
+ export declare function randomBytes32(): string;
40
+ export declare function seedWallet(walletToFund: Signer, tokens: Contract[], weth: Contract | undefined, amountToSeedWith: number | BigNumber): Promise<void>;
41
+ export declare function seedContract(contract: Contract, walletToFund: Signer, tokens: Contract[], weth: Contract | undefined, amountToSeedWith: number | BigNumber): Promise<void>;
42
+ export declare function createFake(contractName: string, targetAddress?: string): Promise<FakeContract<BaseContract>>;
43
+ export declare function createFakeFromABI(abi: unknown[], targetAddress?: string): Promise<FakeContract<BaseContract>>;
44
+ export declare function createTypedFakeFromABI<T extends BaseContract>(abi: unknown[], targetAddress?: string): Promise<FakeContract<T>>;
45
+ export declare function trimSolanaAddress(bytes32Address: string): string;
46
+ export declare function hashNonEmptyMessage(message: string): string;
47
+ export declare const createRandomBytes32: () => string;
21
48
  export declare function deepEqualsWithBigNumber(x: unknown, y: unknown, omitKeys?: string[]): boolean;
22
49
  export declare function assertPromiseError<T>(promise: Promise<T>, errMessage?: string): Promise<void>;
23
50
  export declare function assertPromisePasses<T>(promise: Promise<T>): Promise<void>;
24
- export declare function setupTokensForWallet(contractToApprove: utils.Contract, wallet: utils.SignerWithAddress, tokens: utils.Contract[], weth?: utils.Contract, seedMultiplier?: number): Promise<void>;
51
+ export declare function setupTokensForWallet(contractToApprove: Contract, wallet: SignerWithAddress, tokens: Contract[], weth?: Contract, seedMultiplier?: number): Promise<void>;
25
52
  export declare function createSpyLogger(): SpyLoggerResult;
26
53
  export declare function deploySpokePoolWithToken(fromChainId?: number): Promise<SpokePoolDeploymentResult>;
27
- export declare function deployConfigStore(signer: utils.SignerWithAddress, tokensToAdd: utils.Contract[], maxL1TokensPerPoolRebalanceLeaf?: number, maxRefundPerRelayerRefundLeaf?: number, rateModel?: unknown, additionalChainIdIndices?: number[]): Promise<{
54
+ export declare function deployConfigStore(signer: SignerWithAddress, tokensToAdd: Contract[], maxL1TokensPerPoolRebalanceLeaf?: number, maxRefundPerRelayerRefundLeaf?: number, rateModel?: unknown, additionalChainIdIndices?: number[]): Promise<{
28
55
  configStore: AcrossConfigStore;
29
56
  deploymentBlock: number;
30
57
  }>;
31
- export declare function deployAndConfigureHubPool(signer: utils.SignerWithAddress, spokePools: {
58
+ export declare function deployAndConfigureHubPool(signer: SignerWithAddress, spokePools: {
32
59
  l2ChainId: number;
33
- spokePool: utils.Contract;
60
+ spokePool: Contract;
34
61
  }[], finderAddress?: string, timerAddress?: string): Promise<{
35
- hubPool: utils.Contract;
36
- mockAdapter: utils.Contract;
37
- l1Token_1: utils.Contract;
38
- l1Token_2: utils.Contract;
62
+ hubPool: Contract;
63
+ mockAdapter: Contract;
64
+ l1Token_1: Contract;
65
+ l1Token_2: Contract;
39
66
  hubPoolDeploymentBlock: number;
40
67
  }>;
41
- export declare function enableRoutesOnHubPool(hubPool: utils.Contract, rebalanceRouteTokens: {
68
+ export declare function enableRoutesOnHubPool(hubPool: Contract, rebalanceRouteTokens: {
42
69
  destinationChainId: number;
43
- l1Token: utils.Contract;
44
- destinationToken: utils.Contract;
70
+ l1Token: Contract;
71
+ destinationToken: Contract;
45
72
  }[]): Promise<void>;
46
73
  export declare function appendMessageToResult<T>(body: T): T & {
47
74
  message: string;
48
75
  };
49
76
  export declare function getLastBlockTime(provider: providers.Provider): Promise<number>;
50
- export declare function addLiquidity(signer: utils.SignerWithAddress, hubPool: utils.Contract, l1Token: utils.Contract, amount: utils.BigNumber): Promise<void>;
77
+ export declare function addLiquidity(signer: SignerWithAddress, hubPool: Contract, l1Token: Contract, amount: BigNumber): Promise<void>;
51
78
  export declare function deposit(spokePool: Contract, destinationChainId: number, signer: SignerWithAddress, inputToken: Address, inputAmount: BigNumber, outputToken: Address, outputAmount: BigNumber, opts?: {
52
79
  destinationChainId?: number;
53
80
  recipient?: Address;