@across-protocol/sdk 3.4.12 → 3.4.13
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/utils/SuperstructUtils.d.ts +12 -10
- package/dist/cjs/clients/BundleDataClient/utils/SuperstructUtils.js +3 -3
- package/dist/cjs/clients/BundleDataClient/utils/SuperstructUtils.js.map +1 -1
- package/dist/cjs/clients/SpokePoolClient.d.ts +12 -12
- package/dist/cjs/clients/SpokePoolClient.js +17 -15
- package/dist/cjs/clients/SpokePoolClient.js.map +1 -1
- package/dist/cjs/clients/mocks/MockSpokePoolClient.d.ts +5 -4
- package/dist/cjs/clients/mocks/MockSpokePoolClient.js +7 -7
- package/dist/cjs/clients/mocks/MockSpokePoolClient.js.map +1 -1
- package/dist/cjs/constants.d.ts +2 -2
- package/dist/cjs/constants.js +3 -3
- package/dist/cjs/constants.js.map +1 -1
- package/dist/cjs/interfaces/SpokePool.d.ts +2 -2
- package/dist/cjs/utils/BigNumberUtils.d.ts +1 -0
- package/dist/cjs/utils/BigNumberUtils.js +5 -1
- package/dist/cjs/utils/BigNumberUtils.js.map +1 -1
- package/dist/cjs/utils/DepositUtils.js +2 -2
- package/dist/cjs/utils/DepositUtils.js.map +1 -1
- package/dist/cjs/utils/EventUtils.js +4 -0
- package/dist/cjs/utils/EventUtils.js.map +1 -1
- package/dist/cjs/utils/SpokeUtils.d.ts +5 -3
- package/dist/cjs/utils/SpokeUtils.js +15 -8
- package/dist/cjs/utils/SpokeUtils.js.map +1 -1
- package/dist/cjs/utils/ValidatorUtils.js +1 -1
- package/dist/cjs/utils/ValidatorUtils.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.d.ts +12 -10
- package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.js +4 -4
- package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.js.map +1 -1
- package/dist/esm/clients/SpokePoolClient.d.ts +12 -12
- package/dist/esm/clients/SpokePoolClient.js +18 -16
- package/dist/esm/clients/SpokePoolClient.js.map +1 -1
- package/dist/esm/clients/mocks/MockSpokePoolClient.d.ts +5 -4
- package/dist/esm/clients/mocks/MockSpokePoolClient.js +8 -8
- package/dist/esm/clients/mocks/MockSpokePoolClient.js.map +1 -1
- package/dist/esm/constants.d.ts +2 -2
- package/dist/esm/constants.js +2 -2
- package/dist/esm/constants.js.map +1 -1
- package/dist/esm/interfaces/SpokePool.d.ts +2 -2
- package/dist/esm/utils/BigNumberUtils.d.ts +8 -0
- package/dist/esm/utils/BigNumberUtils.js +10 -0
- package/dist/esm/utils/BigNumberUtils.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 +8 -0
- package/dist/esm/utils/EventUtils.js.map +1 -1
- package/dist/esm/utils/SpokeUtils.d.ts +5 -3
- package/dist/esm/utils/SpokeUtils.js +17 -9
- package/dist/esm/utils/SpokeUtils.js.map +1 -1
- package/dist/esm/utils/ValidatorUtils.js +1 -1
- package/dist/esm/utils/ValidatorUtils.js.map +1 -1
- package/dist/types/clients/BundleDataClient/utils/SuperstructUtils.d.ts +12 -10
- package/dist/types/clients/BundleDataClient/utils/SuperstructUtils.d.ts.map +1 -1
- package/dist/types/clients/SpokePoolClient.d.ts +12 -12
- package/dist/types/clients/SpokePoolClient.d.ts.map +1 -1
- package/dist/types/clients/mocks/MockSpokePoolClient.d.ts +5 -4
- package/dist/types/clients/mocks/MockSpokePoolClient.d.ts.map +1 -1
- package/dist/types/constants.d.ts +2 -2
- package/dist/types/constants.d.ts.map +1 -1
- package/dist/types/interfaces/SpokePool.d.ts +2 -2
- package/dist/types/interfaces/SpokePool.d.ts.map +1 -1
- package/dist/types/utils/BigNumberUtils.d.ts +8 -0
- package/dist/types/utils/BigNumberUtils.d.ts.map +1 -1
- package/dist/types/utils/EventUtils.d.ts.map +1 -1
- package/dist/types/utils/SpokeUtils.d.ts +5 -3
- package/dist/types/utils/SpokeUtils.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/clients/BundleDataClient/utils/SuperstructUtils.ts +4 -2
- package/src/clients/SpokePoolClient.ts +27 -23
- package/src/clients/mocks/MockSpokePoolClient.ts +11 -11
- package/src/constants.ts +2 -2
- package/src/interfaces/SpokePool.ts +2 -2
- package/src/utils/BigNumberUtils.ts +11 -0
- package/src/utils/DepositUtils.ts +2 -2
- package/src/utils/EventUtils.ts +8 -0
- package/src/utils/SpokeUtils.ts +25 -14
- package/src/utils/ValidatorUtils.ts +1 -1
|
@@ -10,3 +10,4 @@ export declare const bnUint256Max: BigNumber;
|
|
|
10
10
|
export declare function toWei(num: BigNumberish): BN;
|
|
11
11
|
export declare function toGWei(num: BigNumberish): BN;
|
|
12
12
|
export declare const toBN: (num: BigNumberish, rounding?: "floor" | "round" | "ceil") => BN;
|
|
13
|
+
export declare const bnMax: (val: BigNumber, cmp: BigNumber) => BigNumber;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.toBN = exports.toGWei = exports.toWei = exports.bnUint256Max = exports.bnUint32Max = exports.bnOne = exports.bnZero = exports.parseUnits = exports.parseEther = exports.formatUnits = exports.formatEther = void 0;
|
|
3
|
+
exports.bnMax = exports.toBN = exports.toGWei = exports.toWei = exports.bnUint256Max = exports.bnUint32Max = exports.bnOne = exports.bnZero = exports.parseUnits = exports.parseEther = exports.formatUnits = exports.formatEther = void 0;
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
5
|
var ethers_1 = require("ethers");
|
|
6
6
|
var bignumber_1 = require("@ethersproject/bignumber");
|
|
@@ -28,4 +28,8 @@ var toBN = function (num, rounding) {
|
|
|
28
28
|
return bignumber_1.BigNumber.from(num.toString());
|
|
29
29
|
};
|
|
30
30
|
exports.toBN = toBN;
|
|
31
|
+
var bnMax = function (val, cmp) {
|
|
32
|
+
return val.gt(cmp) ? val : cmp;
|
|
33
|
+
};
|
|
34
|
+
exports.bnMax = bnMax;
|
|
31
35
|
//# sourceMappingURL=BigNumberUtils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BigNumberUtils.js","sourceRoot":"","sources":["../../../src/utils/BigNumberUtils.ts"],"names":[],"mappings":";;;;AAMA,iCAA8C;AAG9C,sDAAmE;AAGnE,mEAAyC;AAG1B,QAAA,WAAW,GAA0C,cAAW,cAAnD,QAAA,WAAW,GAA6B,cAAW,cAAtC,QAAA,UAAU,GAAiB,cAAW,aAA1B,QAAA,UAAU,GAAK,cAAW,YAAC;AACnE,QAAA,MAAM,GAAG,qBAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7B,QAAA,KAAK,GAAG,qBAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC5B,QAAA,WAAW,GAAG,qBAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;AAC3C,QAAA,YAAY,GAAG,qBAAS,CAAC,IAAI,CAAC,oEAAoE,CAAC,CAAC;AAOjH,SAAgB,KAAK,CAAC,GAAiB;IACrC,OAAO,cAAW,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;AAChD,CAAC;AAFD,sBAEC;AAOD,SAAgB,MAAM,CAAC,GAAiB;IACtC,OAAO,cAAW,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;AACnD,CAAC;AAFD,wBAEC;AAUM,IAAM,IAAI,GAAG,UAAC,GAAiB,EAAE,QAA8C;IAA9C,yBAAA,EAAA,kBAA8C;IAEpF,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QAE1B,IAAA,KAAqB,GAAG,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,EAA7C,OAAO,QAAA,EAAE,OAAO,QAA6B,CAAC;QAMrD,IAAM,OAAO,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,QAAQ,KAAK,MAAM,IAAI,CAAC,QAAQ,KAAK,OAAO,IAAI,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAEnH,OAAO,qBAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KACrD;IAED,OAAO,qBAAS,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;AACxC,CAAC,CAAC;AAhBW,QAAA,IAAI,QAgBf"}
|
|
1
|
+
{"version":3,"file":"BigNumberUtils.js","sourceRoot":"","sources":["../../../src/utils/BigNumberUtils.ts"],"names":[],"mappings":";;;;AAMA,iCAA8C;AAG9C,sDAAmE;AAGnE,mEAAyC;AAG1B,QAAA,WAAW,GAA0C,cAAW,cAAnD,QAAA,WAAW,GAA6B,cAAW,cAAtC,QAAA,UAAU,GAAiB,cAAW,aAA1B,QAAA,UAAU,GAAK,cAAW,YAAC;AACnE,QAAA,MAAM,GAAG,qBAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7B,QAAA,KAAK,GAAG,qBAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC5B,QAAA,WAAW,GAAG,qBAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;AAC3C,QAAA,YAAY,GAAG,qBAAS,CAAC,IAAI,CAAC,oEAAoE,CAAC,CAAC;AAOjH,SAAgB,KAAK,CAAC,GAAiB;IACrC,OAAO,cAAW,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;AAChD,CAAC;AAFD,sBAEC;AAOD,SAAgB,MAAM,CAAC,GAAiB;IACtC,OAAO,cAAW,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;AACnD,CAAC;AAFD,wBAEC;AAUM,IAAM,IAAI,GAAG,UAAC,GAAiB,EAAE,QAA8C;IAA9C,yBAAA,EAAA,kBAA8C;IAEpF,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QAE1B,IAAA,KAAqB,GAAG,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,EAA7C,OAAO,QAAA,EAAE,OAAO,QAA6B,CAAC;QAMrD,IAAM,OAAO,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,QAAQ,KAAK,MAAM,IAAI,CAAC,QAAQ,KAAK,OAAO,IAAI,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAEnH,OAAO,qBAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KACrD;IAED,OAAO,qBAAS,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;AACxC,CAAC,CAAC;AAhBW,QAAA,IAAI,QAgBf;AASK,IAAM,KAAK,GAAG,UAAC,GAAc,EAAE,GAAc;IAClD,OAAO,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;AACjC,CAAC,CAAC;AAFW,QAAA,KAAK,SAEhB"}
|
|
@@ -30,7 +30,7 @@ function queryHistoricalDepositForFill(spokePoolClient, fill, cache) {
|
|
|
30
30
|
}
|
|
31
31
|
depositId = fill.depositId;
|
|
32
32
|
lowId = spokePoolClient.firstDepositIdForSpokePool, highId = spokePoolClient.lastDepositIdForSpokePool;
|
|
33
|
-
if (depositId
|
|
33
|
+
if (depositId.lt(lowId) || depositId.gt(highId)) {
|
|
34
34
|
return [2, {
|
|
35
35
|
found: false,
|
|
36
36
|
code: InvalidFill.DepositIdInvalid,
|
|
@@ -38,7 +38,7 @@ function queryHistoricalDepositForFill(spokePoolClient, fill, cache) {
|
|
|
38
38
|
}];
|
|
39
39
|
}
|
|
40
40
|
(lowId = spokePoolClient.earliestDepositIdQueried, highId = spokePoolClient.latestDepositIdQueried);
|
|
41
|
-
if (depositId
|
|
41
|
+
if (depositId.gte(lowId) && depositId.lte(highId)) {
|
|
42
42
|
originChain = (0, NetworkUtils_1.getNetworkName)(fill.originChainId);
|
|
43
43
|
deposit_1 = spokePoolClient.getDeposit(depositId);
|
|
44
44
|
if ((0, TypeGuards_1.isDefined)(deposit_1)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DepositUtils.js","sourceRoot":"","sources":["../../../src/utils/DepositUtils.ts"],"names":[],"mappings":";;;;AAAA,0DAA4B;AAE5B,0CAAkE;AAElE,+CAAgD;AAChD,+CAAqF;AACrF,yCAAqD;AACrD,yCAA6C;AAC7C,2CAAyC;AACzC,mDAA4D;AAM5D,IAAY,WAIX;AAJD,WAAY,WAAW;IACrB,qEAAoB,CAAA;IACpB,uEAAiB,CAAA;IACjB,6DAAY,CAAA;AACd,CAAC,EAJW,WAAW,2BAAX,WAAW,QAItB;AAkBD,SAAsB,6BAA6B,CACjD,eAAgC,EAChC,IAA4B,EAC5B,KAAiC;;;;;;oBAEjC,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,
|
|
1
|
+
{"version":3,"file":"DepositUtils.js","sourceRoot":"","sources":["../../../src/utils/DepositUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getTransactionHashes = exports.isEventOlder = exports.sortEventsDescendingInPlace = exports.sortEventsDescending = exports.sortEventsAscendingInPlace = exports.sortEventsAscending = exports.spreadEventWithBlockNumber = exports.getPaginatedBlockRanges = exports.paginatedEventQuery = exports.eventToLog = exports.spreadEvent = void 0;
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
5
|
var common_1 = require("./common");
|
|
6
|
+
var _1 = require("./");
|
|
6
7
|
var maxRetries = 3;
|
|
7
8
|
var retrySleepTime = 10;
|
|
8
9
|
function spreadEvent(args) {
|
|
@@ -52,6 +53,9 @@ function spreadEvent(args) {
|
|
|
52
53
|
if (returnedObject.rootBundleId) {
|
|
53
54
|
returnedObject.rootBundleId = Number(returnedObject.rootBundleId);
|
|
54
55
|
}
|
|
56
|
+
if ((0, _1.isDefined)(returnedObject.depositId)) {
|
|
57
|
+
returnedObject.depositId = (0, _1.toBN)(returnedObject.depositId);
|
|
58
|
+
}
|
|
55
59
|
return returnedObject;
|
|
56
60
|
}
|
|
57
61
|
exports.spreadEvent = spreadEvent;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EventUtils.js","sourceRoot":"","sources":["../../../src/utils/EventUtils.ts"],"names":[],"mappings":";;;;AAIA,mCAAiC;
|
|
1
|
+
{"version":3,"file":"EventUtils.js","sourceRoot":"","sources":["../../../src/utils/EventUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,19 @@
|
|
|
1
1
|
import { Contract, PopulatedTransaction, providers } from "ethers";
|
|
2
2
|
import { Deposit, Fill, FillStatus, RelayData, SlowFillRequest } from "../interfaces";
|
|
3
3
|
import { SpokePoolClient } from "../clients";
|
|
4
|
+
import { BigNumber } from "./BigNumberUtils";
|
|
4
5
|
type BlockTag = providers.BlockTag;
|
|
5
6
|
export declare function populateV3Relay(spokePool: Contract, deposit: Deposit, relayer: string, repaymentChainId?: number): Promise<PopulatedTransaction>;
|
|
6
|
-
export declare function getBlockRangeForDepositId(targetDepositId:
|
|
7
|
+
export declare function getBlockRangeForDepositId(targetDepositId: BigNumber, initLow: number, initHigh: number, maxSearches: number, spokePool: SpokePoolClient): Promise<{
|
|
7
8
|
low: number;
|
|
8
9
|
high: number;
|
|
9
10
|
}>;
|
|
10
|
-
export declare function getDepositIdAtBlock(contract: Contract, blockTag: number): Promise<
|
|
11
|
+
export declare function getDepositIdAtBlock(contract: Contract, blockTag: number): Promise<BigNumber>;
|
|
11
12
|
export declare function getRelayDataHash(relayData: RelayData, destinationChainId: number): string;
|
|
12
13
|
export declare function getRelayHashFromEvent(e: Deposit | Fill | SlowFillRequest): string;
|
|
13
|
-
export declare function isUnsafeDepositId(depositId:
|
|
14
|
+
export declare function isUnsafeDepositId(depositId: BigNumber): boolean;
|
|
14
15
|
export declare function relayFillStatus(spokePool: Contract, relayData: RelayData, blockTag?: number | "latest", destinationChainId?: number): Promise<FillStatus>;
|
|
15
16
|
export declare function fillStatusArray(spokePool: Contract, relayData: RelayData[], blockTag?: BlockTag): Promise<(FillStatus | undefined)[]>;
|
|
16
17
|
export declare function findFillBlock(spokePool: Contract, relayData: RelayData, lowBlockNumber: number, highBlockNumber?: number): Promise<number | undefined>;
|
|
18
|
+
export declare function isZeroAddress(address: string): boolean;
|
|
17
19
|
export {};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.findFillBlock = exports.fillStatusArray = exports.relayFillStatus = exports.isUnsafeDepositId = exports.getRelayHashFromEvent = exports.getRelayDataHash = exports.getDepositIdAtBlock = exports.getBlockRangeForDepositId = exports.populateV3Relay = void 0;
|
|
3
|
+
exports.isZeroAddress = 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");
|
|
@@ -42,6 +42,8 @@ function getBlockRangeForDepositId(targetDepositId, initLow, initHigh, maxSearch
|
|
|
42
42
|
return tslib_1.__generator(this, function (_b) {
|
|
43
43
|
switch (_b.label) {
|
|
44
44
|
case 0:
|
|
45
|
+
if (isUnsafeDepositId(targetDepositId))
|
|
46
|
+
throw new Error("Target deposit ID ".concat(targetDepositId, " is deterministic and therefore unresolvable via a binary search."));
|
|
45
47
|
deploymentBlock = spokePool.deploymentBlock;
|
|
46
48
|
initHigh = Math.min(initHigh, spokePool.latestBlockSearched);
|
|
47
49
|
[
|
|
@@ -85,10 +87,10 @@ function getBlockRangeForDepositId(targetDepositId, initLow, initHigh, maxSearch
|
|
|
85
87
|
])];
|
|
86
88
|
case 1:
|
|
87
89
|
_a = _b.sent(), highestDepositIdInRange = _a[0], lowestDepositIdInRange = _a[1];
|
|
88
|
-
if (highestDepositIdInRange
|
|
90
|
+
if (highestDepositIdInRange.lte(targetDepositId)) {
|
|
89
91
|
throw new Error("Target depositId is greater than the initial high block (".concat(targetDepositId, " > ").concat(highestDepositIdInRange, ")"));
|
|
90
92
|
}
|
|
91
|
-
if (lowestDepositIdInRange
|
|
93
|
+
if (lowestDepositIdInRange.gt(targetDepositId)) {
|
|
92
94
|
throw new Error("Target depositId is less than the initial low block (".concat(targetDepositId, " > ").concat(lowestDepositIdInRange, ")"));
|
|
93
95
|
}
|
|
94
96
|
low = initLow;
|
|
@@ -100,8 +102,8 @@ function getBlockRangeForDepositId(targetDepositId, initLow, initHigh, maxSearch
|
|
|
100
102
|
return [4, _getDepositIdAtBlock(mid)];
|
|
101
103
|
case 3:
|
|
102
104
|
midDepositId = _b.sent();
|
|
103
|
-
accountedIdByMidBlock = midDepositId
|
|
104
|
-
if (targetDepositId
|
|
105
|
+
accountedIdByMidBlock = midDepositId.sub(BigNumberUtils_1.bnOne);
|
|
106
|
+
if (targetDepositId.lte(accountedIdByMidBlock)) {
|
|
105
107
|
high = mid;
|
|
106
108
|
}
|
|
107
109
|
else {
|
|
@@ -123,13 +125,14 @@ function getBlockRangeForDepositId(targetDepositId, initLow, initHigh, maxSearch
|
|
|
123
125
|
exports.getBlockRangeForDepositId = getBlockRangeForDepositId;
|
|
124
126
|
function getDepositIdAtBlock(contract, blockTag) {
|
|
125
127
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
126
|
-
var depositIdAtBlock;
|
|
128
|
+
var _depositIdAtBlock, depositIdAtBlock;
|
|
127
129
|
return tslib_1.__generator(this, function (_a) {
|
|
128
130
|
switch (_a.label) {
|
|
129
131
|
case 0: return [4, contract.numberOfDeposits({ blockTag: blockTag })];
|
|
130
132
|
case 1:
|
|
131
|
-
|
|
132
|
-
|
|
133
|
+
_depositIdAtBlock = _a.sent();
|
|
134
|
+
depositIdAtBlock = (0, BigNumberUtils_1.toBN)(_depositIdAtBlock);
|
|
135
|
+
if (depositIdAtBlock.lt(BigNumberUtils_1.bnZero)) {
|
|
133
136
|
throw new Error("Invalid deposit count");
|
|
134
137
|
}
|
|
135
138
|
return [2, depositIdAtBlock];
|
|
@@ -301,4 +304,8 @@ function findFillBlock(spokePool, relayData, lowBlockNumber, highBlockNumber) {
|
|
|
301
304
|
});
|
|
302
305
|
}
|
|
303
306
|
exports.findFillBlock = findFillBlock;
|
|
307
|
+
function isZeroAddress(address) {
|
|
308
|
+
return address === constants_1.ZERO_ADDRESS || address === constants_1.ZERO_BYTES;
|
|
309
|
+
}
|
|
310
|
+
exports.isZeroAddress = isZeroAddress;
|
|
304
311
|
//# 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,
|
|
1
|
+
{"version":3,"file":"SpokeUtils.js","sourceRoot":"","sources":["../../../src/utils/SpokeUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ var AddressValidator = (0, superstruct_1.define)("AddressValidator", function (v
|
|
|
8
8
|
var HexValidator = (0, superstruct_1.define)("HexValidator", function (v) { return ethers_1.utils.isHexString(String(v)); });
|
|
9
9
|
var BigNumberValidator = (0, superstruct_1.define)("BigNumberValidator", function (v) { return utils_1.BigNumber.isBigNumber(v); });
|
|
10
10
|
var V3DepositSchema = (0, superstruct_1.object)({
|
|
11
|
-
depositId:
|
|
11
|
+
depositId: BigNumberValidator,
|
|
12
12
|
depositor: AddressValidator,
|
|
13
13
|
recipient: AddressValidator,
|
|
14
14
|
inputToken: AddressValidator,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ValidatorUtils.js","sourceRoot":"","sources":["../../../src/utils/ValidatorUtils.ts"],"names":[],"mappings":";;;AAAA,iCAA8C;AAC9C,2CAA6F;AAE7F,kCAAqC;AAErC,IAAM,gBAAgB,GAAG,IAAA,oBAAM,EAAS,kBAAkB,EAAE,UAAC,CAAC,IAAK,OAAA,cAAW,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAhC,CAAgC,CAAC,CAAC;AACrG,IAAM,YAAY,GAAG,IAAA,oBAAM,EAAS,cAAc,EAAE,UAAC,CAAC,IAAK,OAAA,cAAW,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAlC,CAAkC,CAAC,CAAC;AAC/F,IAAM,kBAAkB,GAAG,IAAA,oBAAM,EAAY,oBAAoB,EAAE,UAAC,CAAC,IAAK,OAAA,iBAAS,CAAC,WAAW,CAAC,CAAC,CAAC,EAAxB,CAAwB,CAAC,CAAC;AAEpG,IAAM,eAAe,GAAG,IAAA,oBAAM,EAAC;IAC7B,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"ValidatorUtils.js","sourceRoot":"","sources":["../../../src/utils/ValidatorUtils.ts"],"names":[],"mappings":";;;AAAA,iCAA8C;AAC9C,2CAA6F;AAE7F,kCAAqC;AAErC,IAAM,gBAAgB,GAAG,IAAA,oBAAM,EAAS,kBAAkB,EAAE,UAAC,CAAC,IAAK,OAAA,cAAW,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAhC,CAAgC,CAAC,CAAC;AACrG,IAAM,YAAY,GAAG,IAAA,oBAAM,EAAS,cAAc,EAAE,UAAC,CAAC,IAAK,OAAA,cAAW,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAlC,CAAkC,CAAC,CAAC;AAC/F,IAAM,kBAAkB,GAAG,IAAA,oBAAM,EAAY,oBAAoB,EAAE,UAAC,CAAC,IAAK,OAAA,iBAAS,CAAC,WAAW,CAAC,CAAC,CAAC,EAAxB,CAAwB,CAAC,CAAC;AAEpG,IAAM,eAAe,GAAG,IAAA,oBAAM,EAAC;IAC7B,SAAS,EAAE,kBAAkB;IAC7B,SAAS,EAAE,gBAAgB;IAC3B,SAAS,EAAE,gBAAgB;IAC3B,UAAU,EAAE,gBAAgB;IAC5B,WAAW,EAAE,kBAAkB;IAC/B,aAAa,EAAE,IAAA,iBAAG,EAAC,IAAA,qBAAO,GAAE,EAAE,CAAC,CAAC;IAChC,kBAAkB,EAAE,IAAA,iBAAG,EAAC,IAAA,qBAAO,GAAE,EAAE,CAAC,CAAC;IACrC,cAAc,EAAE,IAAA,iBAAG,EAAC,IAAA,qBAAO,GAAE,EAAE,CAAC,CAAC;IACjC,YAAY,EAAE,IAAA,iBAAG,EAAC,IAAA,qBAAO,GAAE,EAAE,CAAC,CAAC;IAC/B,mBAAmB,EAAE,IAAA,iBAAG,EAAC,IAAA,qBAAO,GAAE,EAAE,CAAC,CAAC;IACtC,gBAAgB,EAAE,gBAAgB;IAClC,gBAAgB,EAAE,IAAA,sBAAQ,EAAC,kBAAkB,CAAC;IAC9C,WAAW,EAAE,gBAAgB;IAC7B,YAAY,EAAE,kBAAkB;IAChC,OAAO,EAAE,IAAA,oBAAM,GAAE;IACjB,gBAAgB,EAAE,IAAA,sBAAQ,EAAC,YAAY,CAAC;IACxC,mBAAmB,EAAE,IAAA,sBAAQ,EAAC,kBAAkB,CAAC;IACjD,gBAAgB,EAAE,IAAA,sBAAQ,EAAC,IAAA,oBAAM,GAAE,CAAC;IACpC,cAAc,EAAE,IAAA,sBAAQ,EAAC,IAAA,oBAAM,GAAE,CAAC;IAClC,WAAW,EAAE,IAAA,iBAAG,EAAC,IAAA,qBAAO,GAAE,EAAE,CAAC,CAAC;IAC9B,gBAAgB,EAAE,IAAA,iBAAG,EAAC,IAAA,qBAAO,GAAE,EAAE,CAAC,CAAC;IACnC,QAAQ,EAAE,IAAA,iBAAG,EAAC,IAAA,qBAAO,GAAE,EAAE,CAAC,CAAC;IAC3B,gBAAgB,EAAE,IAAA,iBAAG,EAAC,IAAA,qBAAO,GAAE,EAAE,CAAC,CAAC;IACnC,eAAe,EAAE,YAAY;IAC7B,aAAa,EAAE,IAAA,sBAAQ,EAAC,IAAA,qBAAO,GAAE,CAAC;IAClC,WAAW,EAAE,IAAA,sBAAQ,EAAC,IAAA,qBAAO,GAAE,CAAC;CACjC,CAAC,CAAC;AAEH,SAAgB,wBAAwB,CAAC,OAAgB;IACvD,OAAO,eAAe,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;AACrC,CAAC;AAFD,4DAEC"}
|
|
@@ -15,7 +15,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
15
15
|
toLiteChain: boolean;
|
|
16
16
|
depositor: string;
|
|
17
17
|
recipient: string;
|
|
18
|
-
depositId:
|
|
18
|
+
depositId: BigNumber;
|
|
19
19
|
outputToken: string;
|
|
20
20
|
outputAmount: BigNumber;
|
|
21
21
|
fillDeadline: number;
|
|
@@ -42,7 +42,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
42
42
|
destinationChainId: number;
|
|
43
43
|
depositor: string;
|
|
44
44
|
recipient: string;
|
|
45
|
-
depositId:
|
|
45
|
+
depositId: BigNumber;
|
|
46
46
|
outputToken: string;
|
|
47
47
|
outputAmount: BigNumber;
|
|
48
48
|
fillDeadline: number;
|
|
@@ -57,6 +57,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
57
57
|
updatedMessage: string;
|
|
58
58
|
fillType: number;
|
|
59
59
|
};
|
|
60
|
+
messageHash?: string | undefined;
|
|
60
61
|
}[];
|
|
61
62
|
refunds: Record<string, BigNumber>;
|
|
62
63
|
realizedLpFees: BigNumber;
|
|
@@ -77,7 +78,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
77
78
|
toLiteChain: boolean;
|
|
78
79
|
depositor: string;
|
|
79
80
|
recipient: string;
|
|
80
|
-
depositId:
|
|
81
|
+
depositId: BigNumber;
|
|
81
82
|
outputToken: string;
|
|
82
83
|
outputAmount: BigNumber;
|
|
83
84
|
fillDeadline: number;
|
|
@@ -106,7 +107,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
106
107
|
toLiteChain: boolean;
|
|
107
108
|
depositor: string;
|
|
108
109
|
recipient: string;
|
|
109
|
-
depositId:
|
|
110
|
+
depositId: BigNumber;
|
|
110
111
|
outputToken: string;
|
|
111
112
|
outputAmount: BigNumber;
|
|
112
113
|
fillDeadline: number;
|
|
@@ -134,7 +135,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
134
135
|
toLiteChain: boolean;
|
|
135
136
|
depositor: string;
|
|
136
137
|
recipient: string;
|
|
137
|
-
depositId:
|
|
138
|
+
depositId: BigNumber;
|
|
138
139
|
outputToken: string;
|
|
139
140
|
outputAmount: BigNumber;
|
|
140
141
|
fillDeadline: number;
|
|
@@ -164,7 +165,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
164
165
|
toLiteChain: boolean;
|
|
165
166
|
depositor: string;
|
|
166
167
|
recipient: string;
|
|
167
|
-
depositId:
|
|
168
|
+
depositId: BigNumber;
|
|
168
169
|
outputToken: string;
|
|
169
170
|
outputAmount: BigNumber;
|
|
170
171
|
fillDeadline: number;
|
|
@@ -192,7 +193,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
192
193
|
toLiteChain: boolean;
|
|
193
194
|
depositor: string;
|
|
194
195
|
recipient: string;
|
|
195
|
-
depositId:
|
|
196
|
+
depositId: BigNumber;
|
|
196
197
|
outputToken: string;
|
|
197
198
|
outputAmount: BigNumber;
|
|
198
199
|
fillDeadline: number;
|
|
@@ -220,7 +221,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
220
221
|
toLiteChain: boolean;
|
|
221
222
|
depositor: string;
|
|
222
223
|
recipient: string;
|
|
223
|
-
depositId:
|
|
224
|
+
depositId: BigNumber;
|
|
224
225
|
outputToken: string;
|
|
225
226
|
outputAmount: BigNumber;
|
|
226
227
|
fillDeadline: number;
|
|
@@ -249,7 +250,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
249
250
|
toLiteChain: boolean;
|
|
250
251
|
depositor: string;
|
|
251
252
|
recipient: string;
|
|
252
|
-
depositId:
|
|
253
|
+
depositId: BigNumber;
|
|
253
254
|
outputToken: string;
|
|
254
255
|
outputAmount: BigNumber;
|
|
255
256
|
fillDeadline: number;
|
|
@@ -277,7 +278,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
277
278
|
destinationChainId: number;
|
|
278
279
|
depositor: string;
|
|
279
280
|
recipient: string;
|
|
280
|
-
depositId:
|
|
281
|
+
depositId: BigNumber;
|
|
281
282
|
outputToken: string;
|
|
282
283
|
outputAmount: BigNumber;
|
|
283
284
|
fillDeadline: number;
|
|
@@ -292,6 +293,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
292
293
|
updatedMessage: string;
|
|
293
294
|
fillType: number;
|
|
294
295
|
};
|
|
296
|
+
messageHash?: string | undefined;
|
|
295
297
|
}[];
|
|
296
298
|
refunds: Record<string, BigNumber>;
|
|
297
299
|
realizedLpFees: BigNumber;
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { __assign } from "tslib";
|
|
2
|
-
import { object, number, optional, string, array, record, coerce, instance, pattern, boolean, defaulted, type, } from "superstruct";
|
|
2
|
+
import { object, number, optional, string, array, record, coerce, instance, pattern, boolean, defaulted, union, type, } from "superstruct";
|
|
3
3
|
import { BigNumber } from "../../../utils";
|
|
4
4
|
var PositiveIntegerStringSS = pattern(string(), /\d+/);
|
|
5
5
|
var Web3AddressSS = pattern(string(), /^0x[a-fA-F0-9]{40}$/);
|
|
6
|
-
var BigNumberType = coerce(instance(BigNumber), string(), function (value) {
|
|
6
|
+
var BigNumberType = coerce(instance(BigNumber), union([string(), number()]), function (value) {
|
|
7
7
|
try {
|
|
8
8
|
// Attempt to convert the string to a BigNumber
|
|
9
9
|
return BigNumber.from(value);
|
|
@@ -26,7 +26,7 @@ var V3RelayDataSS = {
|
|
|
26
26
|
originChainId: number(),
|
|
27
27
|
depositor: string(),
|
|
28
28
|
recipient: string(),
|
|
29
|
-
depositId:
|
|
29
|
+
depositId: BigNumberType,
|
|
30
30
|
message: string(),
|
|
31
31
|
};
|
|
32
32
|
var SortableEventSS = {
|
|
@@ -55,7 +55,7 @@ var V3RelayExecutionEventInfoSS = object({
|
|
|
55
55
|
updatedRecipient: string(),
|
|
56
56
|
updatedMessage: string(),
|
|
57
57
|
});
|
|
58
|
-
var V3FillSS = __assign(__assign({}, V3RelayDataSS), { destinationChainId: number(), relayer: string(), repaymentChainId: number(), relayExecutionInfo: V3RelayExecutionEventInfoSS, quoteTimestamp: number() });
|
|
58
|
+
var V3FillSS = __assign(__assign({}, V3RelayDataSS), { destinationChainId: number(), relayer: string(), repaymentChainId: number(), relayExecutionInfo: V3RelayExecutionEventInfoSS, quoteTimestamp: number(), messageHash: optional(string()) });
|
|
59
59
|
var V3FillWithBlockSS = __assign(__assign({}, SortableEventSS), V3FillSS);
|
|
60
60
|
var BundleFillV3SS = object(__assign(__assign({}, V3FillWithBlockSS), { lpFeePct: BigNumberType }));
|
|
61
61
|
var nestedV3DepositRecordSS = record(PositiveIntegerStringSS, record(Web3AddressSS, array(V3DepositWithBlockSS)));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SuperstructUtils.js","sourceRoot":"","sources":["../../../../../src/clients/BundleDataClient/utils/SuperstructUtils.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,MAAM,EACN,MAAM,EACN,QAAQ,EACR,MAAM,EACN,KAAK,EACL,MAAM,EACN,MAAM,EACN,QAAQ,EACR,OAAO,EACP,OAAO,EACP,SAAS,EACT,IAAI,GACL,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,IAAM,uBAAuB,GAAG,OAAO,CAAC,MAAM,EAAE,EAAE,KAAK,CAAC,CAAC;AACzD,IAAM,aAAa,GAAG,OAAO,CAAC,MAAM,EAAE,EAAE,qBAAqB,CAAC,CAAC;AAE/D,IAAM,aAAa,GAAG,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,EAAE,UAAC,KAAK;
|
|
1
|
+
{"version":3,"file":"SuperstructUtils.js","sourceRoot":"","sources":["../../../../../src/clients/BundleDataClient/utils/SuperstructUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,8 +9,8 @@ type SpokePoolUpdateSuccess = {
|
|
|
9
9
|
success: true;
|
|
10
10
|
currentTime: number;
|
|
11
11
|
oldestTime: number;
|
|
12
|
-
firstDepositId:
|
|
13
|
-
latestDepositId:
|
|
12
|
+
firstDepositId: BigNumber;
|
|
13
|
+
latestDepositId: BigNumber;
|
|
14
14
|
events: Log[][];
|
|
15
15
|
searchEndBlock: number;
|
|
16
16
|
};
|
|
@@ -39,7 +39,7 @@ export declare class SpokePoolClient extends BaseAbstractClient {
|
|
|
39
39
|
};
|
|
40
40
|
protected speedUps: {
|
|
41
41
|
[depositorAddress: string]: {
|
|
42
|
-
[depositId:
|
|
42
|
+
[depositId: string]: SpeedUpWithBlock[];
|
|
43
43
|
};
|
|
44
44
|
};
|
|
45
45
|
protected slowFillRequests: {
|
|
@@ -55,10 +55,10 @@ export declare class SpokePoolClient extends BaseAbstractClient {
|
|
|
55
55
|
protected relayerRefundExecutions: RelayerRefundExecutionWithBlock[];
|
|
56
56
|
protected queryableEventNames: string[];
|
|
57
57
|
protected configStoreClient: AcrossConfigStoreClient | undefined;
|
|
58
|
-
earliestDepositIdQueried:
|
|
59
|
-
latestDepositIdQueried:
|
|
60
|
-
firstDepositIdForSpokePool:
|
|
61
|
-
lastDepositIdForSpokePool:
|
|
58
|
+
earliestDepositIdQueried: BigNumber;
|
|
59
|
+
latestDepositIdQueried: BigNumber;
|
|
60
|
+
firstDepositIdForSpokePool: BigNumber;
|
|
61
|
+
lastDepositIdForSpokePool: BigNumber;
|
|
62
62
|
fills: {
|
|
63
63
|
[OriginChainId: number]: FillWithBlock[];
|
|
64
64
|
};
|
|
@@ -155,7 +155,7 @@ export declare class SpokePoolClient extends BaseAbstractClient {
|
|
|
155
155
|
* @param depositId The unique ID of the deposit being queried.
|
|
156
156
|
* @returns The corresponding deposit if found, undefined otherwise.
|
|
157
157
|
*/
|
|
158
|
-
getDeposit(depositId:
|
|
158
|
+
getDeposit(depositId: BigNumber): DepositWithBlock | undefined;
|
|
159
159
|
/**
|
|
160
160
|
* Find a SlowFillRequested event based on its deposit RelayData.
|
|
161
161
|
* @param relayData RelayData field for the SlowFill request.
|
|
@@ -174,7 +174,7 @@ export declare class SpokePoolClient extends BaseAbstractClient {
|
|
|
174
174
|
*/
|
|
175
175
|
getSpeedUps(): {
|
|
176
176
|
[depositorAddress: string]: {
|
|
177
|
-
[depositId:
|
|
177
|
+
[depositId: string]: SpeedUpWithBlock[];
|
|
178
178
|
};
|
|
179
179
|
};
|
|
180
180
|
/**
|
|
@@ -209,7 +209,7 @@ export declare class SpokePoolClient extends BaseAbstractClient {
|
|
|
209
209
|
* @note This hash takes the form of: `${depositId}-${originChainId}`.
|
|
210
210
|
*/
|
|
211
211
|
getDepositHash(event: {
|
|
212
|
-
depositId:
|
|
212
|
+
depositId: BigNumber;
|
|
213
213
|
originChainId: number;
|
|
214
214
|
}): string;
|
|
215
215
|
/**
|
|
@@ -217,7 +217,7 @@ export declare class SpokePoolClient extends BaseAbstractClient {
|
|
|
217
217
|
* @param blockTag The block number to search for the deposit ID at.
|
|
218
218
|
* @returns The deposit ID.
|
|
219
219
|
*/
|
|
220
|
-
_getDepositIdAtBlock(blockTag: number): Promise<
|
|
220
|
+
_getDepositIdAtBlock(blockTag: number): Promise<BigNumber>;
|
|
221
221
|
/**
|
|
222
222
|
* @notice Return maximum of fill deadline buffer at start and end of block range. This is a contract
|
|
223
223
|
* immutable state variable so we can't query other events to find its updates.
|
|
@@ -292,7 +292,7 @@ export declare class SpokePoolClient extends BaseAbstractClient {
|
|
|
292
292
|
* @returns The oldest time searched, which will be 0 if there has been no update() yet.
|
|
293
293
|
*/
|
|
294
294
|
getOldestTime(): number;
|
|
295
|
-
findDeposit(depositId:
|
|
295
|
+
findDeposit(depositId: BigNumber, destinationChainId: number): Promise<DepositWithBlock>;
|
|
296
296
|
/**
|
|
297
297
|
* Determines whether a deposit originates from a lite chain.
|
|
298
298
|
* @param deposit The deposit to evaluate.
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { __assign, __awaiter, __extends, __generator, __spreadArray } from "tslib";
|
|
2
|
-
import { BigNumber, bnZero, MAX_BIG_INT, assign, getRelayDataHash, isDefined, toBN, } from "../utils";
|
|
2
|
+
import { BigNumber, bnZero, MAX_BIG_INT, assign, getRelayDataHash, isDefined, toBN, bnOne, isUnsafeDepositId, } from "../utils";
|
|
3
3
|
import { paginatedEventQuery, sortEventsAscendingInPlace, spreadEvent, spreadEventWithBlockNumber, } from "../utils/EventUtils";
|
|
4
4
|
import { validateFillForDeposit } from "../utils/FlowUtils";
|
|
5
5
|
import { ZERO_ADDRESS } from "../constants";
|
|
@@ -42,10 +42,10 @@ var SpokePoolClient = /** @class */ (function (_super) {
|
|
|
42
42
|
_this.rootBundleRelays = [];
|
|
43
43
|
_this.relayerRefundExecutions = [];
|
|
44
44
|
_this.queryableEventNames = [];
|
|
45
|
-
_this.earliestDepositIdQueried =
|
|
46
|
-
_this.latestDepositIdQueried =
|
|
47
|
-
_this.firstDepositIdForSpokePool =
|
|
48
|
-
_this.lastDepositIdForSpokePool =
|
|
45
|
+
_this.earliestDepositIdQueried = MAX_BIG_INT;
|
|
46
|
+
_this.latestDepositIdQueried = bnZero;
|
|
47
|
+
_this.firstDepositIdForSpokePool = MAX_BIG_INT;
|
|
48
|
+
_this.lastDepositIdForSpokePool = MAX_BIG_INT;
|
|
49
49
|
_this.fills = {};
|
|
50
50
|
_this.firstBlockToSearch = eventSearchConfig.fromBlock;
|
|
51
51
|
_this.latestBlockSearched = 0;
|
|
@@ -177,7 +177,7 @@ var SpokePoolClient = /** @class */ (function (_super) {
|
|
|
177
177
|
SpokePoolClient.prototype.appendMaxSpeedUpSignatureToDeposit = function (deposit) {
|
|
178
178
|
var _a;
|
|
179
179
|
var depositId = deposit.depositId, depositor = deposit.depositor;
|
|
180
|
-
var speedups = (_a = this.speedUps[depositor]) === null || _a === void 0 ? void 0 : _a[depositId];
|
|
180
|
+
var speedups = (_a = this.speedUps[depositor]) === null || _a === void 0 ? void 0 : _a[depositId.toString()];
|
|
181
181
|
if (!isDefined(speedups) || speedups.length === 0) {
|
|
182
182
|
return deposit;
|
|
183
183
|
}
|
|
@@ -280,7 +280,7 @@ var SpokePoolClient = /** @class */ (function (_super) {
|
|
|
280
280
|
return groupedFills;
|
|
281
281
|
}, { validFills: [], invalidFills: [] }), validFills = _a.validFills, invalidFills = _a.invalidFills;
|
|
282
282
|
// Log any invalid deposits with same deposit id but different params.
|
|
283
|
-
var invalidFillsForDeposit = invalidFills.filter(function (x) { return x.depositId
|
|
283
|
+
var invalidFillsForDeposit = invalidFills.filter(function (x) { return x.depositId.eq(deposit.depositId); });
|
|
284
284
|
if (invalidFillsForDeposit.length > 0) {
|
|
285
285
|
this.logger.warn({
|
|
286
286
|
at: "SpokePoolClient",
|
|
@@ -356,17 +356,18 @@ var SpokePoolClient = /** @class */ (function (_super) {
|
|
|
356
356
|
*/
|
|
357
357
|
SpokePoolClient.prototype._update = function (eventsToQuery) {
|
|
358
358
|
return __awaiter(this, void 0, void 0, function () {
|
|
359
|
-
var firstDepositId, searchConfig, reason, eventSearchConfigs, spokePool, timerStart, multicallFunctions, _a, multicallOutput, oldestTime, events, _b, currentTime,
|
|
359
|
+
var firstDepositId, searchConfig, reason, eventSearchConfigs, spokePool, timerStart, multicallFunctions, _a, multicallOutput, oldestTime, events, _b, currentTime, _numberOfDeposits, _latestDepositId, errMsg;
|
|
360
360
|
var _this = this;
|
|
361
361
|
return __generator(this, function (_c) {
|
|
362
362
|
switch (_c.label) {
|
|
363
363
|
case 0:
|
|
364
364
|
firstDepositId = this.firstDepositIdForSpokePool;
|
|
365
|
-
if (!
|
|
365
|
+
if (!firstDepositId.eq(MAX_BIG_INT)) return [3 /*break*/, 2];
|
|
366
366
|
return [4 /*yield*/, this.spokePool.numberOfDeposits({ blockTag: this.deploymentBlock })];
|
|
367
367
|
case 1:
|
|
368
368
|
firstDepositId = _c.sent();
|
|
369
|
-
|
|
369
|
+
firstDepositId = BigNumber.from(firstDepositId); // Cast input to a big number.
|
|
370
|
+
if (!BigNumber.isBigNumber(firstDepositId) || firstDepositId.lt(bnZero)) {
|
|
370
371
|
throw new Error("SpokePoolClient::update: Invalid first deposit id (".concat(firstDepositId, ")"));
|
|
371
372
|
}
|
|
372
373
|
_c.label = 2;
|
|
@@ -408,7 +409,8 @@ var SpokePoolClient = /** @class */ (function (_super) {
|
|
|
408
409
|
case 4:
|
|
409
410
|
_a = _c.sent(), multicallOutput = _a[0], oldestTime = _a[1], events = _a.slice(2);
|
|
410
411
|
this.log("debug", "Time to query new events from RPC for ".concat(this.chainId, ": ").concat(Date.now() - timerStart, " ms"));
|
|
411
|
-
_b = multicallFunctions.map(function (fn, idx) { return spokePool.interface.decodeFunctionResult(fn, multicallOutput[idx])[0]; }), currentTime = _b[0],
|
|
412
|
+
_b = multicallFunctions.map(function (fn, idx) { return spokePool.interface.decodeFunctionResult(fn, multicallOutput[idx])[0]; }), currentTime = _b[0], _numberOfDeposits = _b[1];
|
|
413
|
+
_latestDepositId = BigNumber.from(_numberOfDeposits).sub(bnOne);
|
|
412
414
|
if (!BigNumber.isBigNumber(currentTime) || currentTime.lt(this.currentTime)) {
|
|
413
415
|
errMsg = BigNumber.isBigNumber(currentTime)
|
|
414
416
|
? "currentTime: ".concat(currentTime, " < ").concat(toBN(this.currentTime))
|
|
@@ -422,7 +424,7 @@ var SpokePoolClient = /** @class */ (function (_super) {
|
|
|
422
424
|
currentTime: currentTime.toNumber(),
|
|
423
425
|
oldestTime: oldestTime.toNumber(),
|
|
424
426
|
firstDepositId: firstDepositId,
|
|
425
|
-
latestDepositId:
|
|
427
|
+
latestDepositId: _latestDepositId.gt(bnZero) ? _latestDepositId : bnZero,
|
|
426
428
|
searchEndBlock: searchConfig.toBlock,
|
|
427
429
|
events: events,
|
|
428
430
|
}];
|
|
@@ -490,10 +492,10 @@ var SpokePoolClient = /** @class */ (function (_super) {
|
|
|
490
492
|
continue;
|
|
491
493
|
}
|
|
492
494
|
assign(this.depositHashes, [this.getDepositHash(deposit)], deposit);
|
|
493
|
-
if (deposit.depositId
|
|
495
|
+
if (deposit.depositId.lt(this.earliestDepositIdQueried) && !isUnsafeDepositId(deposit.depositId)) {
|
|
494
496
|
this.earliestDepositIdQueried = deposit.depositId;
|
|
495
497
|
}
|
|
496
|
-
if (deposit.depositId
|
|
498
|
+
if (deposit.depositId.gt(this.latestDepositIdQueried) && !isUnsafeDepositId(deposit.depositId)) {
|
|
497
499
|
this.latestDepositIdQueried = deposit.depositId;
|
|
498
500
|
}
|
|
499
501
|
}
|
|
@@ -505,7 +507,7 @@ var SpokePoolClient = /** @class */ (function (_super) {
|
|
|
505
507
|
for (_f = 0, speedUpEvents_1 = speedUpEvents; _f < speedUpEvents_1.length; _f++) {
|
|
506
508
|
event_3 = speedUpEvents_1[_f];
|
|
507
509
|
speedUp = __assign(__assign({}, spreadEventWithBlockNumber(event_3)), { originChainId: this.chainId });
|
|
508
|
-
assign(this.speedUps, [speedUp.depositor, speedUp.depositId], [speedUp]);
|
|
510
|
+
assign(this.speedUps, [speedUp.depositor, speedUp.depositId.toString()], [speedUp]);
|
|
509
511
|
depositHash = this.getDepositHash(speedUp);
|
|
510
512
|
depositDataAssociatedWithSpeedUp = this.depositHashes[depositHash];
|
|
511
513
|
if (isDefined(depositDataAssociatedWithSpeedUp)) {
|
|
@@ -679,7 +681,7 @@ var SpokePoolClient = /** @class */ (function (_super) {
|
|
|
679
681
|
tStop = Date.now();
|
|
680
682
|
event = query.find(function (_a) {
|
|
681
683
|
var args = _a.args;
|
|
682
|
-
return args["depositId"]
|
|
684
|
+
return args["depositId"].eq(depositId);
|
|
683
685
|
});
|
|
684
686
|
if (event === undefined) {
|
|
685
687
|
srcChain = getNetworkName(this.chainId);
|