@across-protocol/sdk 4.0.0-beta.34 → 4.0.0-beta.5
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.
- package/dist/cjs/clients/BundleDataClient/BundleDataClient.d.ts +4 -5
- package/dist/cjs/clients/BundleDataClient/BundleDataClient.js +189 -352
- package/dist/cjs/clients/BundleDataClient/BundleDataClient.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/utils/DataworkerUtils.d.ts +2 -1
- package/dist/cjs/clients/BundleDataClient/utils/DataworkerUtils.js +2 -1
- package/dist/cjs/clients/BundleDataClient/utils/DataworkerUtils.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/utils/FillUtils.d.ts +1 -5
- package/dist/cjs/clients/BundleDataClient/utils/FillUtils.js +1 -47
- package/dist/cjs/clients/BundleDataClient/utils/FillUtils.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/utils/SuperstructUtils.d.ts +4 -4
- package/dist/cjs/clients/SpokePoolClient.d.ts +0 -1
- package/dist/cjs/clients/SpokePoolClient.js +1 -10
- package/dist/cjs/clients/SpokePoolClient.js.map +1 -1
- package/dist/cjs/clients/mocks/MockSpokePoolClient.d.ts +1 -2
- package/dist/cjs/clients/mocks/MockSpokePoolClient.js +1 -11
- package/dist/cjs/clients/mocks/MockSpokePoolClient.js.map +1 -1
- package/dist/cjs/constants.d.ts +1 -1
- package/dist/cjs/constants.js +2 -2
- package/dist/cjs/constants.js.map +1 -1
- package/dist/cjs/providers/index.d.ts +0 -1
- package/dist/cjs/providers/index.js +0 -2
- package/dist/cjs/providers/index.js.map +1 -1
- package/dist/cjs/utils/AddressUtils.d.ts +0 -1
- package/dist/cjs/utils/AddressUtils.js +1 -6
- package/dist/cjs/utils/AddressUtils.js.map +1 -1
- package/dist/cjs/utils/DepositUtils.js +1 -1
- package/dist/cjs/utils/DepositUtils.js.map +1 -1
- package/dist/cjs/utils/EventUtils.js +0 -21
- package/dist/cjs/utils/EventUtils.js.map +1 -1
- package/dist/cjs/utils/SpokeUtils.d.ts +0 -1
- package/dist/cjs/utils/SpokeUtils.js +8 -15
- package/dist/cjs/utils/SpokeUtils.js.map +1 -1
- package/dist/cjs/utils/common.d.ts +0 -1
- package/dist/cjs/utils/common.js +1 -2
- package/dist/cjs/utils/common.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/BundleDataClient.d.ts +4 -5
- package/dist/esm/clients/BundleDataClient/BundleDataClient.js +274 -455
- package/dist/esm/clients/BundleDataClient/BundleDataClient.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/utils/DataworkerUtils.d.ts +2 -1
- package/dist/esm/clients/BundleDataClient/utils/DataworkerUtils.js +3 -2
- package/dist/esm/clients/BundleDataClient/utils/DataworkerUtils.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/utils/FillUtils.d.ts +1 -5
- package/dist/esm/clients/BundleDataClient/utils/FillUtils.js +1 -54
- package/dist/esm/clients/BundleDataClient/utils/FillUtils.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.d.ts +4 -4
- package/dist/esm/clients/SpokePoolClient.d.ts +0 -8
- package/dist/esm/clients/SpokePoolClient.js +1 -17
- package/dist/esm/clients/SpokePoolClient.js.map +1 -1
- package/dist/esm/clients/mocks/MockSpokePoolClient.d.ts +1 -2
- package/dist/esm/clients/mocks/MockSpokePoolClient.js +1 -11
- package/dist/esm/clients/mocks/MockSpokePoolClient.js.map +1 -1
- package/dist/esm/constants.d.ts +1 -1
- package/dist/esm/constants.js +2 -2
- package/dist/esm/constants.js.map +1 -1
- package/dist/esm/providers/index.d.ts +0 -1
- package/dist/esm/providers/index.js +0 -2
- package/dist/esm/providers/index.js.map +1 -1
- package/dist/esm/utils/AddressUtils.d.ts +0 -1
- package/dist/esm/utils/AddressUtils.js +0 -9
- package/dist/esm/utils/AddressUtils.js.map +1 -1
- package/dist/esm/utils/DepositUtils.js +2 -2
- package/dist/esm/utils/DepositUtils.js.map +1 -1
- package/dist/esm/utils/EventUtils.js +1 -29
- package/dist/esm/utils/EventUtils.js.map +1 -1
- package/dist/esm/utils/SpokeUtils.d.ts +0 -1
- package/dist/esm/utils/SpokeUtils.js +7 -13
- package/dist/esm/utils/SpokeUtils.js.map +1 -1
- package/dist/esm/utils/common.d.ts +0 -1
- package/dist/esm/utils/common.js +0 -1
- package/dist/esm/utils/common.js.map +1 -1
- package/dist/types/clients/BundleDataClient/BundleDataClient.d.ts +4 -5
- package/dist/types/clients/BundleDataClient/BundleDataClient.d.ts.map +1 -1
- package/dist/types/clients/BundleDataClient/utils/DataworkerUtils.d.ts +2 -1
- package/dist/types/clients/BundleDataClient/utils/DataworkerUtils.d.ts.map +1 -1
- package/dist/types/clients/BundleDataClient/utils/FillUtils.d.ts +1 -5
- package/dist/types/clients/BundleDataClient/utils/FillUtils.d.ts.map +1 -1
- package/dist/types/clients/BundleDataClient/utils/SuperstructUtils.d.ts +4 -4
- package/dist/types/clients/SpokePoolClient.d.ts +0 -8
- package/dist/types/clients/SpokePoolClient.d.ts.map +1 -1
- package/dist/types/clients/mocks/MockSpokePoolClient.d.ts +1 -2
- package/dist/types/clients/mocks/MockSpokePoolClient.d.ts.map +1 -1
- package/dist/types/constants.d.ts +1 -1
- package/dist/types/constants.d.ts.map +1 -1
- package/dist/types/providers/index.d.ts +0 -1
- package/dist/types/providers/index.d.ts.map +1 -1
- package/dist/types/utils/AddressUtils.d.ts +0 -1
- package/dist/types/utils/AddressUtils.d.ts.map +1 -1
- package/dist/types/utils/EventUtils.d.ts.map +1 -1
- package/dist/types/utils/SpokeUtils.d.ts +0 -1
- package/dist/types/utils/SpokeUtils.d.ts.map +1 -1
- package/dist/types/utils/common.d.ts +0 -1
- package/dist/types/utils/common.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/clients/BundleDataClient/BundleDataClient.ts +243 -427
- package/src/clients/BundleDataClient/utils/DataworkerUtils.ts +8 -0
- package/src/clients/BundleDataClient/utils/FillUtils.ts +2 -66
- package/src/clients/SpokePoolClient.ts +3 -16
- package/src/clients/mocks/MockSpokePoolClient.ts +1 -14
- package/src/constants.ts +3 -3
- package/src/providers/index.ts +0 -1
- package/src/utils/AddressUtils.ts +0 -10
- package/src/utils/DepositUtils.ts +2 -2
- package/src/utils/EventUtils.ts +1 -29
- package/src/utils/SpokeUtils.ts +8 -21
- package/src/utils/common.ts +0 -2
- package/dist/cjs/providers/mockProvider.d.ts +0 -19
- package/dist/cjs/providers/mockProvider.js +0 -70
- package/dist/cjs/providers/mockProvider.js.map +0 -1
- package/dist/esm/providers/mockProvider.d.ts +0 -23
- package/dist/esm/providers/mockProvider.js +0 -73
- package/dist/esm/providers/mockProvider.js.map +0 -1
- package/dist/types/providers/mockProvider.d.ts +0 -24
- package/dist/types/providers/mockProvider.d.ts.map +0 -1
- package/src/providers/mockProvider.ts +0 -77
package/dist/cjs/constants.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var _a;
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
-
exports.CUSTOM_GAS_TOKENS = exports.BRIDGED_USDC_SYMBOLS = exports.EMPTY_MESSAGE = exports.DEFAULT_ARWEAVE_STORAGE_ADDRESS = exports.DEFAULT_SIMULATED_RELAYER_ADDRESS_TEST = exports.DEFAULT_SIMULATED_RELAYER_ADDRESS = exports.DEFAULT_CACHING_SAFE_LAG = exports.DEFAULT_CACHING_TTL = exports.PROTOCOL_DEFAULT_CHAIN_ID_INDICES = exports.ARWEAVE_TAG_APP_VERSION = exports.ARWEAVE_TAG_APP_NAME = exports.
|
|
4
|
+
exports.CUSTOM_GAS_TOKENS = exports.BRIDGED_USDC_SYMBOLS = exports.EMPTY_MESSAGE_HASH = exports.EMPTY_MESSAGE = exports.DEFAULT_ARWEAVE_STORAGE_ADDRESS = exports.DEFAULT_SIMULATED_RELAYER_ADDRESS_TEST = exports.DEFAULT_SIMULATED_RELAYER_ADDRESS = exports.DEFAULT_CACHING_SAFE_LAG = exports.DEFAULT_CACHING_TTL = exports.PROTOCOL_DEFAULT_CHAIN_ID_INDICES = exports.ARWEAVE_TAG_APP_VERSION = exports.ARWEAVE_TAG_APP_NAME = exports.TRANSFER_THRESHOLD_MAX_CONFIG_STORE_VERSION = exports.HUBPOOL_CHAIN_ID = exports.SECONDS_PER_YEAR = exports.MAX_SAFE_DEPOSIT_ID = exports.MAX_SAFE_ALLOWANCE = exports.ZERO_BYTES = exports.ZERO_ADDRESS = exports.TOKEN_SYMBOLS_MAP = exports.TESTNET_CHAIN_IDs = exports.PUBLIC_NETWORKS = exports.MAINNET_CHAIN_IDs = exports.CHAIN_IDs = exports.ChainFamily = void 0;
|
|
5
5
|
var ethers_1 = require("ethers");
|
|
6
6
|
var constants_1 = require("@across-protocol/constants");
|
|
7
7
|
var constants_2 = require("@across-protocol/constants");
|
|
@@ -17,7 +17,6 @@ exports.MAX_SAFE_DEPOSIT_ID = "4294967295";
|
|
|
17
17
|
exports.SECONDS_PER_YEAR = 31557600;
|
|
18
18
|
exports.HUBPOOL_CHAIN_ID = 1;
|
|
19
19
|
exports.TRANSFER_THRESHOLD_MAX_CONFIG_STORE_VERSION = 1;
|
|
20
|
-
exports.PRE_FILL_MIN_CONFIG_STORE_VERSION = 5;
|
|
21
20
|
exports.ARWEAVE_TAG_APP_NAME = "across-protocol";
|
|
22
21
|
exports.ARWEAVE_TAG_APP_VERSION = 3;
|
|
23
22
|
exports.PROTOCOL_DEFAULT_CHAIN_ID_INDICES = [1, 10, 137, 288, 42161];
|
|
@@ -27,6 +26,7 @@ exports.DEFAULT_SIMULATED_RELAYER_ADDRESS = "0x07aE8551Be970cB1cCa11Dd7a11F47Ae8
|
|
|
27
26
|
exports.DEFAULT_SIMULATED_RELAYER_ADDRESS_TEST = "0x9A8f92a830A5cB89a3816e3D267CB7791c16b04D";
|
|
28
27
|
exports.DEFAULT_ARWEAVE_STORAGE_ADDRESS = "Z6hjBM8FHu90lYWB8o5jR1dfX92FlV2WBaND9xgp8Lg";
|
|
29
28
|
exports.EMPTY_MESSAGE = "0x";
|
|
29
|
+
exports.EMPTY_MESSAGE_HASH = ethers_1.constants.HashZero;
|
|
30
30
|
exports.BRIDGED_USDC_SYMBOLS = [
|
|
31
31
|
constants_1.TOKEN_SYMBOLS_MAP["USDC.e"].symbol,
|
|
32
32
|
constants_1.TOKEN_SYMBOLS_MAP.USDbC.symbol,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":";;;;AAAA,iCAAsD;AACtD,wDAA0E;AAE1E,wDAOoC;AANlC,wGAAA,WAAW,OAAA;AACX,sGAAA,SAAS,OAAA;AACT,8GAAA,iBAAiB,OAAA;AACjB,4GAAA,eAAe,OAAA;AACf,8GAAA,iBAAiB,OAAA;AACjB,8GAAA,iBAAiB,OAAA;AAGS,QAAA,YAAY,GAA2B,kBAAe,cAA9B,QAAA,UAAU,GAAK,kBAAe,UAAC;AAGtE,QAAA,kBAAkB,GAAG,+BAA+B,CAAC;AAIrD,QAAA,mBAAmB,GAAG,YAAY,CAAC;AAEnC,QAAA,gBAAgB,GAAG,QAAQ,CAAC;AAK5B,QAAA,gBAAgB,GAAG,CAAC,CAAC;AAGrB,QAAA,2CAA2C,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":";;;;AAAA,iCAAsD;AACtD,wDAA0E;AAE1E,wDAOoC;AANlC,wGAAA,WAAW,OAAA;AACX,sGAAA,SAAS,OAAA;AACT,8GAAA,iBAAiB,OAAA;AACjB,4GAAA,eAAe,OAAA;AACf,8GAAA,iBAAiB,OAAA;AACjB,8GAAA,iBAAiB,OAAA;AAGS,QAAA,YAAY,GAA2B,kBAAe,cAA9B,QAAA,UAAU,GAAK,kBAAe,UAAC;AAGtE,QAAA,kBAAkB,GAAG,+BAA+B,CAAC;AAIrD,QAAA,mBAAmB,GAAG,YAAY,CAAC;AAEnC,QAAA,gBAAgB,GAAG,QAAQ,CAAC;AAK5B,QAAA,gBAAgB,GAAG,CAAC,CAAC;AAGrB,QAAA,2CAA2C,GAAG,CAAC,CAAC;AAGhD,QAAA,oBAAoB,GAAG,iBAAiB,CAAC;AAGzC,QAAA,uBAAuB,GAAG,CAAC,CAAC;AAU5B,QAAA,iCAAiC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;AAE7D,QAAA,mBAAmB,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;AAC3C,QAAA,wBAAwB,GAAG,EAAE,GAAG,EAAE,CAAC;AAEnC,QAAA,iCAAiC,GAAG,4CAA4C,CAAC;AACjF,QAAA,sCAAsC,GAAG,4CAA4C,CAAC;AAEtF,QAAA,+BAA+B,GAAG,6CAA6C,CAAC;AAEhF,QAAA,aAAa,GAAG,IAAI,CAAC;AAErB,QAAA,kBAAkB,GAAG,kBAAe,CAAC,QAAQ,CAAC;AAE9C,QAAA,oBAAoB,GAAG;IAClC,6BAAiB,CAAC,QAAQ,CAAC,CAAC,MAAM;IAClC,6BAAiB,CAAC,KAAK,CAAC,MAAM;IAC9B,6BAAiB,CAAC,KAAK,CAAC,MAAM;CAC/B,CAAC;AAEW,QAAA,iBAAiB;IAC5B,GAAC,qBAAS,CAAC,OAAO,IAAG,OAAO;IAC5B,GAAC,qBAAS,CAAC,YAAY,IAAG,OAAO;IACjC,GAAC,qBAAS,CAAC,UAAU,IAAG,OAAO;IAG/B,GAAC,qBAAS,CAAC,YAAY,IAAG,KAAK;QAC/B"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.mocks = void 0;
|
|
4
3
|
var tslib_1 = require("tslib");
|
|
5
4
|
tslib_1.__exportStar(require("./rateLimitedProvider"), exports);
|
|
6
5
|
tslib_1.__exportStar(require("./cachedProvider"), exports);
|
|
@@ -9,5 +8,4 @@ tslib_1.__exportStar(require("./speedProvider"), exports);
|
|
|
9
8
|
tslib_1.__exportStar(require("./constants"), exports);
|
|
10
9
|
tslib_1.__exportStar(require("./types"), exports);
|
|
11
10
|
tslib_1.__exportStar(require("./utils"), exports);
|
|
12
|
-
exports.mocks = tslib_1.__importStar(require("./mockProvider"));
|
|
13
11
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/providers/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/providers/index.ts"],"names":[],"mappings":";;;AAAA,gEAAsC;AACtC,2DAAiC;AACjC,0DAAgC;AAChC,0DAAgC;AAChC,sDAA4B;AAC5B,kDAAwB;AACxB,kDAAwB"}
|
|
@@ -2,5 +2,4 @@ import { providers } from "ethers";
|
|
|
2
2
|
export declare function isContractDeployedToAddress(address: string, provider: providers.Provider): Promise<boolean>;
|
|
3
3
|
export declare function compareAddresses(addressA: string, addressB: string): 1 | -1 | 0;
|
|
4
4
|
export declare function compareAddressesSimple(addressA?: string, addressB?: string): boolean;
|
|
5
|
-
export declare function toAddress(hexString: string): string;
|
|
6
5
|
export declare function isValidEvmAddress(address: string): boolean;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.isValidEvmAddress = exports.
|
|
3
|
+
exports.isValidEvmAddress = exports.compareAddressesSimple = exports.compareAddresses = exports.isContractDeployedToAddress = void 0;
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
5
|
var ethers_1 = require("ethers");
|
|
6
6
|
var BigNumberUtils_1 = require("./BigNumberUtils");
|
|
@@ -43,11 +43,6 @@ function compareAddressesSimple(addressA, addressB) {
|
|
|
43
43
|
return addressA.toLowerCase() === addressB.toLowerCase();
|
|
44
44
|
}
|
|
45
45
|
exports.compareAddressesSimple = compareAddressesSimple;
|
|
46
|
-
function toAddress(hexString) {
|
|
47
|
-
var rawAddress = ethers_1.utils.hexZeroPad(ethers_1.utils.hexStripZeros(hexString), 20);
|
|
48
|
-
return ethers_1.utils.getAddress(rawAddress);
|
|
49
|
-
}
|
|
50
|
-
exports.toAddress = toAddress;
|
|
51
46
|
function isValidEvmAddress(address) {
|
|
52
47
|
if (ethers_1.utils.isAddress(address)) {
|
|
53
48
|
return true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AddressUtils.js","sourceRoot":"","sources":["../../../src/utils/AddressUtils.ts"],"names":[],"mappings":";;;;AAAA,iCAA0C;AAC1C,mDAA6C;AAQ7C,SAAsB,2BAA2B,CAAC,OAAe,EAAE,QAA4B;;;;;;oBAE7F,IAAI,CAAC,OAAO,IAAI,CAAC,cAAK,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;wBACzC,WAAO,KAAK,EAAC;qBACd;oBAEY,WAAM,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAA;;oBAAtC,IAAI,GAAG,SAA+B;oBAE5C,WAAO,IAAI,KAAK,IAAI,EAAC;;;;CACtB;AATD,kEASC;AAED,SAAgB,gBAAgB,CAAC,QAAgB,EAAE,QAAgB;IAGjE,IAAM,UAAU,GAAG,0BAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC5C,IAAM,UAAU,GAAG,0BAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC5C,IAAI,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,EAAE;QAC7B,OAAO,CAAC,CAAC;KACV;SAAM,IAAI,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,EAAE;QACpC,OAAO,CAAC,CAAC,CAAC;KACX;SAAM;QACL,OAAO,CAAC,CAAC;KACV;AACH,CAAC;AAZD,4CAYC;AAED,SAAgB,sBAAsB,CAAC,QAAiB,EAAE,QAAiB;IACzE,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,SAAS,EAAE;QACpD,OAAO,KAAK,CAAC;KACd;IACD,OAAO,QAAQ,CAAC,WAAW,EAAE,KAAK,QAAQ,CAAC,WAAW,EAAE,CAAC;AAC3D,CAAC;AALD,wDAKC;
|
|
1
|
+
{"version":3,"file":"AddressUtils.js","sourceRoot":"","sources":["../../../src/utils/AddressUtils.ts"],"names":[],"mappings":";;;;AAAA,iCAA0C;AAC1C,mDAA6C;AAQ7C,SAAsB,2BAA2B,CAAC,OAAe,EAAE,QAA4B;;;;;;oBAE7F,IAAI,CAAC,OAAO,IAAI,CAAC,cAAK,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;wBACzC,WAAO,KAAK,EAAC;qBACd;oBAEY,WAAM,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAA;;oBAAtC,IAAI,GAAG,SAA+B;oBAE5C,WAAO,IAAI,KAAK,IAAI,EAAC;;;;CACtB;AATD,kEASC;AAED,SAAgB,gBAAgB,CAAC,QAAgB,EAAE,QAAgB;IAGjE,IAAM,UAAU,GAAG,0BAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC5C,IAAM,UAAU,GAAG,0BAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC5C,IAAI,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,EAAE;QAC7B,OAAO,CAAC,CAAC;KACV;SAAM,IAAI,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,EAAE;QACpC,OAAO,CAAC,CAAC,CAAC;KACX;SAAM;QACL,OAAO,CAAC,CAAC;KACV;AACH,CAAC;AAZD,4CAYC;AAED,SAAgB,sBAAsB,CAAC,QAAiB,EAAE,QAAiB;IACzE,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,SAAS,EAAE;QACpD,OAAO,KAAK,CAAC;KACd;IACD,OAAO,QAAQ,CAAC,WAAW,EAAE,KAAK,QAAQ,CAAC,WAAW,EAAE,CAAC;AAC3D,CAAC;AALD,wDAKC;AAED,SAAgB,iBAAiB,CAAC,OAAe;IAC/C,IAAI,cAAK,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;QAC5B,OAAO,IAAI,CAAC;KACb;IAKD,IAAI;QACF,IAAM,UAAU,GAAG,cAAK,CAAC,UAAU,CAAC,cAAK,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QACtE,OAAO,cAAK,CAAC,SAAS,CAAC,cAAK,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;KACtD;IAAC,OAAO,EAAE,EAAE;QACX,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAdD,8CAcC"}
|
|
@@ -122,7 +122,7 @@ function isMessageEmpty(message) {
|
|
|
122
122
|
}
|
|
123
123
|
exports.isMessageEmpty = isMessageEmpty;
|
|
124
124
|
function isFillOrSlowFillRequestMessageEmpty(message) {
|
|
125
|
-
return isMessageEmpty(message) || message === constants_1.
|
|
125
|
+
return isMessageEmpty(message) || message === constants_1.EMPTY_MESSAGE_HASH;
|
|
126
126
|
}
|
|
127
127
|
exports.isFillOrSlowFillRequestMessageEmpty = isFillOrSlowFillRequestMessageEmpty;
|
|
128
128
|
function isDepositSpedUp(deposit) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DepositUtils.js","sourceRoot":"","sources":["../../../src/utils/DepositUtils.ts"],"names":[],"mappings":";;;;AAAA,0DAA4B;AAE5B,
|
|
1
|
+
{"version":3,"file":"DepositUtils.js","sourceRoot":"","sources":["../../../src/utils/DepositUtils.ts"],"names":[],"mappings":";;;;AAAA,0DAA4B;AAE5B,0CAAsF;AAEtF,+CAAgD;AAChD,+CAAqF;AACrF,yCAAqD;AACrD,2CAAiD;AACjD,yCAA6C;AAC7C,2CAAyC;AACzC,mDAA4D;AAM5D,IAAY,WAKX;AALD,WAAY,WAAW;IACrB,qEAAoB,CAAA;IACpB,uEAAiB,CAAA;IACjB,6DAAY,CAAA;IACZ,2EAAmB,CAAA;AACrB,CAAC,EALW,WAAW,2BAAX,WAAW,QAKtB;AAkBD,SAAsB,6BAA6B,CACjD,eAAgC,EAChC,IAA4B,EAC5B,KAAiC;;;;;;oBAEjC,IAAI,IAAA,8BAAiB,EAAC,IAAI,CAAC,SAAS,CAAC,EAAE;wBACrC,WAAO;gCACL,KAAK,EAAE,KAAK;gCACZ,IAAI,EAAE,WAAW,CAAC,mBAAmB;gCACrC,MAAM,EAAE,yEAAkE,IAAI,CAAC,SAAS,MAAG;6BAC5F,EAAC;qBACH;oBACD,IAAI,IAAI,CAAC,aAAa,KAAK,eAAe,CAAC,OAAO,EAAE;wBAClD,MAAM,IAAI,KAAK,CAAC,kCAA2B,IAAI,CAAC,aAAa,iBAAO,eAAe,CAAC,OAAO,MAAG,CAAC,CAAC;qBACjG;oBAID,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE;wBAC9B,MAAM,IAAI,KAAK,CAAC,qEAAqE,CAAC,CAAC;qBACxF;oBAEO,SAAS,GAAK,IAAI,UAAT,CAAU;oBACO,KAAK,GAAwC,eAAe,2BAAvD,EAA6B,MAAM,GAAK,eAAe,0BAApB,CAAqB;oBAC/F,IAAI,SAAS,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE;wBAC/C,WAAO;gCACL,KAAK,EAAE,KAAK;gCACZ,IAAI,EAAE,WAAW,CAAC,gBAAgB;gCAClC,MAAM,EAAE,qBAAc,SAAS,CAAC,QAAQ,EAAE,8CAAoC,KAAK,cAAI,MAAM,OAAI;6BAClG,EAAC;qBACH;oBAED,CAA6B,KAAK,GAAqC,eAAe,yBAApD,EAA0B,MAAM,GAAK,eAAe,uBAApB,CAAqB,CAAC;oBACxF,IAAI,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;wBAC3C,WAAW,GAAG,IAAA,6BAAc,EAAC,IAAI,CAAC,aAAa,CAAC,CAAC;wBACjD,YAAU,eAAe,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;wBACtD,IAAI,IAAA,sBAAS,EAAC,SAAO,CAAC,EAAE;4BAChB,UAAQ,IAAA,kCAAsB,EAAC,IAAI,EAAE,SAAO,CAAC,CAAC;4BACpD,IAAI,OAAK,CAAC,KAAK,EAAE;gCACf,WAAO,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,WAAA,EAAE,EAAC;6BACjC;4BAED,WAAO;oCACL,KAAK,EAAE,KAAK;oCACZ,IAAI,EAAE,WAAW,CAAC,YAAY;oCAC9B,MAAM,EAAE,mBAAY,WAAW,yBAAe,SAAS,CAAC,QAAQ,EAAE,0BAAgB,OAAK,CAAC,MAAM,OAAI;iCACnG,EAAC;yBACH;wBAED,WAAO;gCACL,KAAK,EAAE,KAAK;gCACZ,IAAI,EAAE,WAAW,CAAC,iBAAiB;gCACnC,MAAM,EAAE,UAAG,WAAW,yBAAe,SAAS,CAAC,QAAQ,EAAE,gDAA6C;6BACvG,EAAC;qBACH;yBAGG,KAAK,EAAL,cAAK;oBACS,WAAM,IAAA,gCAAiB,EAAC,IAAA,4BAAa,EAAC,IAAI,CAAC,EAAE,KAAK,CAAC,EAAA;;oBAAnE,aAAa,GAAG,SAAmD,CAAC;oBAIpE,IAAI,IAAA,sBAAS,EAAC,aAAa,CAAC,IAAI,CAAC,IAAA,yCAAwB,EAAC,aAAa,CAAC,EAAE;wBACxE,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC;4BAC1B,EAAE,EAAE,kDAAkD;4BACtD,OAAO,EAAE,8DAA8D;4BACvE,IAAI,MAAA;4BACJ,aAAa,eAAA;yBACd,CAAC,CAAC;wBAIH,aAAa,GAAG,SAAS,CAAC;qBAC3B;;;yBAGC,IAAA,sBAAS,EAAC,aAAa,CAAC,EAAxB,cAAwB;oBAC1B,OAAO,GAAG,aAAiC,CAAC;;wBAElC,WAAM,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,kBAAkB,CAAC,EAAA;;oBAApF,OAAO,GAAG,SAA0E,CAAC;yBACjF,KAAK,EAAL,cAAK;oBACP,WAAM,IAAA,gCAAiB,EAAC,OAAO,EAAE,IAAA,0BAAc,GAAE,EAAE,KAAK,EAAE,+BAAmB,CAAC,EAAA;;oBAA9E,SAA8E,CAAC;;;oBAI7E,KAAK,GAAG,IAAA,kCAAsB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;oBACpD,IAAI,KAAK,CAAC,KAAK,EAAE;wBACf,WAAO,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,SAAA,EAAE,EAAC;qBACjC;oBAED,WAAO;4BACL,KAAK,EAAE,KAAK;4BACZ,IAAI,EAAE,WAAW,CAAC,YAAY;4BAC9B,MAAM,EAAE,KAAK,CAAC,MAAM;yBACrB,EAAC;;;;CACH;AA/FD,sEA+FC;AAUD,SAAgB,kBAAkB,CAAC,OAAiD;IAClF,OAAO,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;AACtE,CAAC;AAFD,gDAEC;AAED,SAAgB,gCAAgC,CAAC,CAA0D;IACzG,OAAO,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,mCAAmC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;AAC/E,CAAC;AAFD,4EAEC;AAOD,SAAgB,cAAc,CAAC,OAAuB;IAAvB,wBAAA,EAAA,UAAU,yBAAa;IACpD,OAAO,OAAO,KAAK,EAAE,IAAI,OAAO,KAAK,IAAI,CAAC;AAC5C,CAAC;AAFD,wCAEC;AAED,SAAgB,mCAAmC,CAAC,OAAe;IACjE,OAAO,cAAc,CAAC,OAAO,CAAC,IAAI,OAAO,KAAK,8BAAkB,CAAC;AACnE,CAAC;AAFD,kFAEC;AAOD,SAAgB,eAAe,CAAC,OAAgB;IAC9C,OAAO,IAAA,sBAAS,EAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,IAAA,sBAAS,EAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;AACvF,CAAC;AAFD,0CAEC;AAOD,SAAgB,qBAAqB,CAAC,OAAgB;IACpD,IAAM,OAAO,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC;IACpF,IAAA,gBAAM,EAAC,IAAA,sBAAS,EAAC,OAAO,CAAC,CAAC,CAAC;IAC3B,OAAO,OAAO,CAAC;AACjB,CAAC;AAJD,sDAIC"}
|
|
@@ -6,16 +6,6 @@ var common_1 = require("./common");
|
|
|
6
6
|
var _1 = require("./");
|
|
7
7
|
var maxRetries = 3;
|
|
8
8
|
var retrySleepTime = 10;
|
|
9
|
-
var knownExtendedAddressFields = [
|
|
10
|
-
"l2TokenAddress",
|
|
11
|
-
"inputToken",
|
|
12
|
-
"outputToken",
|
|
13
|
-
"depositor",
|
|
14
|
-
"recipient",
|
|
15
|
-
"exclusiveRelayer",
|
|
16
|
-
"relayer",
|
|
17
|
-
"updatedRecipient",
|
|
18
|
-
];
|
|
19
9
|
function spreadEvent(args) {
|
|
20
10
|
var keys = Object.keys(args).filter(function (key) { return isNaN(+key); });
|
|
21
11
|
var returnedObject = {};
|
|
@@ -66,17 +56,6 @@ function spreadEvent(args) {
|
|
|
66
56
|
if ((0, _1.isDefined)(returnedObject.depositId)) {
|
|
67
57
|
returnedObject.depositId = (0, _1.toBN)(returnedObject.depositId);
|
|
68
58
|
}
|
|
69
|
-
for (var _i = 0, knownExtendedAddressFields_1 = knownExtendedAddressFields; _i < knownExtendedAddressFields_1.length; _i++) {
|
|
70
|
-
var field = knownExtendedAddressFields_1[_i];
|
|
71
|
-
if ((0, _1.isDefined)(returnedObject[field])) {
|
|
72
|
-
var address = String(returnedObject[field]);
|
|
73
|
-
try {
|
|
74
|
-
address = (0, _1.toAddress)(address);
|
|
75
|
-
}
|
|
76
|
-
catch (_) { }
|
|
77
|
-
returnedObject[field] = address;
|
|
78
|
-
}
|
|
79
|
-
}
|
|
80
59
|
return returnedObject;
|
|
81
60
|
}
|
|
82
61
|
exports.spreadEvent = spreadEvent;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EventUtils.js","sourceRoot":"","sources":["../../../src/utils/EventUtils.ts"],"names":[],"mappings":";;;;AAIA,mCAAiC;AACjC,
|
|
1
|
+
{"version":3,"file":"EventUtils.js","sourceRoot":"","sources":["../../../src/utils/EventUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,5 +17,4 @@ export declare function fillStatusArray(spokePool: Contract, relayData: RelayDat
|
|
|
17
17
|
export declare function findFillBlock(spokePool: Contract, relayData: RelayData, lowBlockNumber: number, highBlockNumber?: number): Promise<number | undefined>;
|
|
18
18
|
export declare function findFillEvent(spokePool: Contract, relayData: RelayData, lowBlockNumber: number, highBlockNumber?: number): Promise<FillWithBlock | undefined>;
|
|
19
19
|
export declare function isZeroAddress(address: string): boolean;
|
|
20
|
-
export declare function getMessageHash(message: string): string;
|
|
21
20
|
export {};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.isZeroAddress = exports.findFillEvent = exports.findFillBlock = exports.fillStatusArray = exports.relayFillStatus = exports.isUnsafeDepositId = exports.getRelayHashFromEvent = exports.getRelayDataHash = exports.getDepositIdAtBlock = exports.getBlockRangeForDepositId = exports.populateV3Relay = void 0;
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
5
|
var assert_1 = tslib_1.__importDefault(require("assert"));
|
|
6
6
|
var ethers_1 = require("ethers");
|
|
@@ -8,8 +8,6 @@ var constants_1 = require("../constants");
|
|
|
8
8
|
var interfaces_1 = require("../interfaces");
|
|
9
9
|
var ArrayUtils_1 = require("./ArrayUtils");
|
|
10
10
|
var BigNumberUtils_1 = require("./BigNumberUtils");
|
|
11
|
-
var common_1 = require("./common");
|
|
12
|
-
var DepositUtils_1 = require("./DepositUtils");
|
|
13
11
|
var TypeGuards_1 = require("./TypeGuards");
|
|
14
12
|
var NetworkUtils_1 = require("./NetworkUtils");
|
|
15
13
|
var EventUtils_1 = require("./EventUtils");
|
|
@@ -145,24 +143,23 @@ function getDepositIdAtBlock(contract, blockTag) {
|
|
|
145
143
|
}
|
|
146
144
|
exports.getDepositIdAtBlock = getDepositIdAtBlock;
|
|
147
145
|
function getRelayDataHash(relayData, destinationChainId) {
|
|
148
|
-
var _relayData = tslib_1.__assign(tslib_1.__assign({}, relayData), { depositor: ethers_1.utils.hexZeroPad(relayData.depositor, 32), recipient: ethers_1.utils.hexZeroPad(relayData.recipient, 32), inputToken: ethers_1.utils.hexZeroPad(relayData.inputToken, 32), outputToken: ethers_1.utils.hexZeroPad(relayData.outputToken, 32), exclusiveRelayer: ethers_1.utils.hexZeroPad(relayData.exclusiveRelayer, 32) });
|
|
149
146
|
return ethers_1.utils.keccak256(ethers_1.utils.defaultAbiCoder.encode([
|
|
150
147
|
"tuple(" +
|
|
151
|
-
"
|
|
152
|
-
"
|
|
153
|
-
"
|
|
154
|
-
"
|
|
155
|
-
"
|
|
148
|
+
"address depositor," +
|
|
149
|
+
"address recipient," +
|
|
150
|
+
"address exclusiveRelayer," +
|
|
151
|
+
"address inputToken," +
|
|
152
|
+
"address outputToken," +
|
|
156
153
|
"uint256 inputAmount," +
|
|
157
154
|
"uint256 outputAmount," +
|
|
158
155
|
"uint256 originChainId," +
|
|
159
|
-
"
|
|
156
|
+
"uint32 depositId," +
|
|
160
157
|
"uint32 fillDeadline," +
|
|
161
158
|
"uint32 exclusivityDeadline," +
|
|
162
159
|
"bytes message" +
|
|
163
160
|
")",
|
|
164
161
|
"uint256 destinationChainId",
|
|
165
|
-
], [
|
|
162
|
+
], [relayData, destinationChainId]));
|
|
166
163
|
}
|
|
167
164
|
exports.getRelayDataHash = getRelayDataHash;
|
|
168
165
|
function getRelayHashFromEvent(e) {
|
|
@@ -352,8 +349,4 @@ function isZeroAddress(address) {
|
|
|
352
349
|
return address === constants_1.ZERO_ADDRESS || address === constants_1.ZERO_BYTES;
|
|
353
350
|
}
|
|
354
351
|
exports.isZeroAddress = isZeroAddress;
|
|
355
|
-
function getMessageHash(message) {
|
|
356
|
-
return (0, DepositUtils_1.isMessageEmpty)(message) ? constants_1.ZERO_BYTES : (0, common_1.keccak256)(message);
|
|
357
|
-
}
|
|
358
|
-
exports.getMessageHash = getMessageHash;
|
|
359
352
|
//# sourceMappingURL=SpokeUtils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SpokeUtils.js","sourceRoot":"","sources":["../../../src/utils/SpokeUtils.ts"],"names":[],"mappings":";;;;AAAA,0DAA4B;AAC5B,iCAAoG;AACpG,0CAAwF;AACxF,4CAAqG;AAErG,2CAAqC;AACrC,mDAAkE;AAClE,
|
|
1
|
+
{"version":3,"file":"SpokeUtils.js","sourceRoot":"","sources":["../../../src/utils/SpokeUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,6 @@ import { BigNumber, BigNumberish, BN } from "./BigNumberUtils";
|
|
|
4
4
|
export type Decimalish = string | number | Decimal;
|
|
5
5
|
export declare const AddressZero = "0x0000000000000000000000000000000000000000";
|
|
6
6
|
export declare const MAX_BIG_INT: ethers.BigNumber;
|
|
7
|
-
export declare const keccak256: typeof ethers.utils.keccak256;
|
|
8
7
|
export declare const toBNWei: (num: BigNumberish, decimals?: number) => BN;
|
|
9
8
|
export declare const fromWei: (num: BigNumberish, decimals?: number) => string;
|
|
10
9
|
export declare function min(a: BigNumberish, b: BigNumberish): BN;
|
package/dist/cjs/utils/common.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.randomAddress = exports.retry = exports.delay = exports.getSamplesBetween = exports.calcApr = exports.calcPeriodicCompoundInterest = exports.calcContinuousCompoundInterest = exports.percent = exports.calculateGasFees = exports.gasCost = exports.nativeToToken = exports.fixedPointAdjustment = exports.max = exports.min = exports.fromWei = exports.toBNWei = exports.
|
|
3
|
+
exports.randomAddress = exports.retry = exports.delay = exports.getSamplesBetween = exports.calcApr = exports.calcPeriodicCompoundInterest = exports.calcContinuousCompoundInterest = exports.percent = exports.calculateGasFees = exports.gasCost = exports.nativeToToken = exports.fixedPointAdjustment = exports.max = exports.min = exports.fromWei = exports.toBNWei = exports.MAX_BIG_INT = exports.AddressZero = void 0;
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
5
|
var decimal_js_1 = tslib_1.__importDefault(require("decimal.js"));
|
|
6
6
|
var ethers_1 = require("ethers");
|
|
@@ -8,7 +8,6 @@ var BigNumberUtils_1 = require("./BigNumberUtils");
|
|
|
8
8
|
var FormattingUtils_1 = require("./FormattingUtils");
|
|
9
9
|
exports.AddressZero = ethers_1.ethers.constants.AddressZero;
|
|
10
10
|
exports.MAX_BIG_INT = BigNumberUtils_1.BigNumber.from(Number.MAX_SAFE_INTEGER.toString());
|
|
11
|
-
exports.keccak256 = ethers_1.ethers.utils.keccak256;
|
|
12
11
|
var toBNWei = function (num, decimals) { return (0, BigNumberUtils_1.parseUnits)(num.toString(), decimals); };
|
|
13
12
|
exports.toBNWei = toBNWei;
|
|
14
13
|
var fromWei = function (num, decimals) { return (0, BigNumberUtils_1.formatUnits)(num.toString(), decimals); };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/utils/common.ts"],"names":[],"mappings":";;;;AAAA,kEAAiC;AACjC,iCAAgC;AAChC,mDAA8F;AAC9F,qDAAoD;AAGvC,QAAA,WAAW,GAAG,eAAM,CAAC,SAAS,CAAC,WAAW,CAAC;AAC3C,QAAA,WAAW,GAAG,0BAAS,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/utils/common.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { ProposedRootBundle,
|
|
1
|
+
import { ProposedRootBundle, SpokePoolClientsByChain, LoadDataReturnValue, Clients, CombinedRefunds } from "../../interfaces";
|
|
2
2
|
import { SpokePoolClient } from "..";
|
|
3
3
|
import { BigNumber } from "../../utils";
|
|
4
4
|
import winston from "winston";
|
|
5
|
-
import { PoolRebalanceRoot
|
|
5
|
+
import { PoolRebalanceRoot } from "./utils";
|
|
6
6
|
export declare const INFINITE_FILL_DEADLINE: BigNumber;
|
|
7
7
|
export declare class BundleDataClient {
|
|
8
8
|
readonly logger: winston.Logger;
|
|
@@ -35,7 +35,7 @@ export declare class BundleDataClient {
|
|
|
35
35
|
private loadPersistedDataFromArweave;
|
|
36
36
|
getPendingRefundsFromValidBundles(): Promise<CombinedRefunds[]>;
|
|
37
37
|
getPendingRefundsFromBundle(bundle: ProposedRootBundle): Promise<CombinedRefunds>;
|
|
38
|
-
getApproximateRefundsForBlockRange(chainIds: number[], blockRanges: number[][]):
|
|
38
|
+
getApproximateRefundsForBlockRange(chainIds: number[], blockRanges: number[][]): CombinedRefunds;
|
|
39
39
|
getUpcomingDepositAmount(chainId: number, l2Token: string, latestBlockToSearch: number): BigNumber;
|
|
40
40
|
private getLatestProposedBundleData;
|
|
41
41
|
getLatestPoolRebalanceRoot(): Promise<{
|
|
@@ -54,8 +54,7 @@ export declare class BundleDataClient {
|
|
|
54
54
|
private loadArweaveData;
|
|
55
55
|
loadData(blockRangesForChains: number[][], spokePoolClients: SpokePoolClientsByChain, attemptArweaveLoad?: boolean): Promise<LoadDataReturnValue>;
|
|
56
56
|
private loadDataFromScratch;
|
|
57
|
-
|
|
58
|
-
protected findMatchingFillEvent(deposit: DepositWithBlock, spokePoolClient: SpokePoolClient): Promise<FillWithBlock | undefined>;
|
|
57
|
+
private getRelayHashFromEvent;
|
|
59
58
|
getBundleBlockTimestamps(chainIds: number[], blockRangesForChains: number[][], spokePoolClients: SpokePoolClientsByChain): Promise<{
|
|
60
59
|
[chainId: string]: number[];
|
|
61
60
|
}>;
|