@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
|
@@ -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;
|
|
@@ -6,7 +6,7 @@ var superstruct_1 = require("superstruct");
|
|
|
6
6
|
var utils_1 = require("../../../utils");
|
|
7
7
|
var PositiveIntegerStringSS = (0, superstruct_1.pattern)((0, superstruct_1.string)(), /\d+/);
|
|
8
8
|
var Web3AddressSS = (0, superstruct_1.pattern)((0, superstruct_1.string)(), /^0x[a-fA-F0-9]{40}$/);
|
|
9
|
-
var BigNumberType = (0, superstruct_1.coerce)((0, superstruct_1.instance)(utils_1.BigNumber), (0, superstruct_1.string)(), function (value) {
|
|
9
|
+
var BigNumberType = (0, superstruct_1.coerce)((0, superstruct_1.instance)(utils_1.BigNumber), (0, superstruct_1.union)([(0, superstruct_1.string)(), (0, superstruct_1.number)()]), function (value) {
|
|
10
10
|
try {
|
|
11
11
|
return utils_1.BigNumber.from(value);
|
|
12
12
|
}
|
|
@@ -26,7 +26,7 @@ var V3RelayDataSS = {
|
|
|
26
26
|
originChainId: (0, superstruct_1.number)(),
|
|
27
27
|
depositor: (0, superstruct_1.string)(),
|
|
28
28
|
recipient: (0, superstruct_1.string)(),
|
|
29
|
-
depositId:
|
|
29
|
+
depositId: BigNumberType,
|
|
30
30
|
message: (0, superstruct_1.string)(),
|
|
31
31
|
};
|
|
32
32
|
var SortableEventSS = {
|
|
@@ -55,7 +55,7 @@ var V3RelayExecutionEventInfoSS = (0, superstruct_1.object)({
|
|
|
55
55
|
updatedRecipient: (0, superstruct_1.string)(),
|
|
56
56
|
updatedMessage: (0, superstruct_1.string)(),
|
|
57
57
|
});
|
|
58
|
-
var V3FillSS = tslib_1.__assign(tslib_1.__assign({}, V3RelayDataSS), { destinationChainId: (0, superstruct_1.number)(), relayer: (0, superstruct_1.string)(), repaymentChainId: (0, superstruct_1.number)(), relayExecutionInfo: V3RelayExecutionEventInfoSS, quoteTimestamp: (0, superstruct_1.number)() });
|
|
58
|
+
var V3FillSS = tslib_1.__assign(tslib_1.__assign({}, V3RelayDataSS), { destinationChainId: (0, superstruct_1.number)(), relayer: (0, superstruct_1.string)(), repaymentChainId: (0, superstruct_1.number)(), relayExecutionInfo: V3RelayExecutionEventInfoSS, quoteTimestamp: (0, superstruct_1.number)(), messageHash: (0, superstruct_1.optional)((0, superstruct_1.string)()) });
|
|
59
59
|
var V3FillWithBlockSS = tslib_1.__assign(tslib_1.__assign({}, SortableEventSS), V3FillSS);
|
|
60
60
|
var BundleFillV3SS = (0, superstruct_1.object)(tslib_1.__assign(tslib_1.__assign({}, V3FillWithBlockSS), { lpFeePct: BigNumberType }));
|
|
61
61
|
var nestedV3DepositRecordSS = (0, superstruct_1.record)(PositiveIntegerStringSS, (0, superstruct_1.record)(Web3AddressSS, (0, superstruct_1.array)(V3DepositWithBlockSS)));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SuperstructUtils.js","sourceRoot":"","sources":["../../../../../src/clients/BundleDataClient/utils/SuperstructUtils.ts"],"names":[],"mappings":";;;;AAAA,
|
|
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
|
};
|
|
@@ -35,7 +35,7 @@ export declare class SpokePoolClient extends BaseAbstractClient {
|
|
|
35
35
|
};
|
|
36
36
|
protected speedUps: {
|
|
37
37
|
[depositorAddress: string]: {
|
|
38
|
-
[depositId:
|
|
38
|
+
[depositId: string]: SpeedUpWithBlock[];
|
|
39
39
|
};
|
|
40
40
|
};
|
|
41
41
|
protected slowFillRequests: {
|
|
@@ -51,10 +51,10 @@ export declare class SpokePoolClient extends BaseAbstractClient {
|
|
|
51
51
|
protected relayerRefundExecutions: RelayerRefundExecutionWithBlock[];
|
|
52
52
|
protected queryableEventNames: string[];
|
|
53
53
|
protected configStoreClient: AcrossConfigStoreClient | undefined;
|
|
54
|
-
earliestDepositIdQueried:
|
|
55
|
-
latestDepositIdQueried:
|
|
56
|
-
firstDepositIdForSpokePool:
|
|
57
|
-
lastDepositIdForSpokePool:
|
|
54
|
+
earliestDepositIdQueried: BigNumber;
|
|
55
|
+
latestDepositIdQueried: BigNumber;
|
|
56
|
+
firstDepositIdForSpokePool: BigNumber;
|
|
57
|
+
lastDepositIdForSpokePool: BigNumber;
|
|
58
58
|
fills: {
|
|
59
59
|
[OriginChainId: number]: FillWithBlock[];
|
|
60
60
|
};
|
|
@@ -81,12 +81,12 @@ export declare class SpokePoolClient extends BaseAbstractClient {
|
|
|
81
81
|
getLatestRootBundleId(): number;
|
|
82
82
|
getRelayerRefundExecutions(): RelayerRefundExecutionWithBlock[];
|
|
83
83
|
appendMaxSpeedUpSignatureToDeposit(deposit: DepositWithBlock): DepositWithBlock;
|
|
84
|
-
getDeposit(depositId:
|
|
84
|
+
getDeposit(depositId: BigNumber): DepositWithBlock | undefined;
|
|
85
85
|
getSlowFillRequest(relayData: RelayData): SlowFillRequestWithBlock | undefined;
|
|
86
86
|
getSlowFillRequestsForOriginChain(originChainId: number): SlowFillRequestWithBlock[];
|
|
87
87
|
getSpeedUps(): {
|
|
88
88
|
[depositorAddress: string]: {
|
|
89
|
-
[depositId:
|
|
89
|
+
[depositId: string]: SpeedUpWithBlock[];
|
|
90
90
|
};
|
|
91
91
|
};
|
|
92
92
|
getDepositForFill(fill: Fill): DepositWithBlock | undefined;
|
|
@@ -97,10 +97,10 @@ export declare class SpokePoolClient extends BaseAbstractClient {
|
|
|
97
97
|
invalidFills: Fill[];
|
|
98
98
|
};
|
|
99
99
|
getDepositHash(event: {
|
|
100
|
-
depositId:
|
|
100
|
+
depositId: BigNumber;
|
|
101
101
|
originChainId: number;
|
|
102
102
|
}): string;
|
|
103
|
-
_getDepositIdAtBlock(blockTag: number): Promise<
|
|
103
|
+
_getDepositIdAtBlock(blockTag: number): Promise<BigNumber>;
|
|
104
104
|
getMaxFillDeadlineInRange(startBlock: number, endBlock: number): Promise<number>;
|
|
105
105
|
protected _update(eventsToQuery: string[]): Promise<SpokePoolUpdate>;
|
|
106
106
|
update(eventsToQuery?: string[]): Promise<void>;
|
|
@@ -113,7 +113,7 @@ export declare class SpokePoolClient extends BaseAbstractClient {
|
|
|
113
113
|
protected log(level: DefaultLogLevels, message: string, data?: AnyObject): void;
|
|
114
114
|
getCurrentTime(): number;
|
|
115
115
|
getOldestTime(): number;
|
|
116
|
-
findDeposit(depositId:
|
|
116
|
+
findDeposit(depositId: BigNumber, destinationChainId: number): Promise<DepositWithBlock>;
|
|
117
117
|
protected isOriginLiteChain(deposit: DepositWithBlock): boolean;
|
|
118
118
|
protected isDestinationLiteChain(deposit: DepositWithBlock): boolean;
|
|
119
119
|
getTimestampForBlock(blockTag: number): Promise<number>;
|
|
@@ -30,10 +30,10 @@ var SpokePoolClient = (function (_super) {
|
|
|
30
30
|
_this.rootBundleRelays = [];
|
|
31
31
|
_this.relayerRefundExecutions = [];
|
|
32
32
|
_this.queryableEventNames = [];
|
|
33
|
-
_this.earliestDepositIdQueried =
|
|
34
|
-
_this.latestDepositIdQueried =
|
|
35
|
-
_this.firstDepositIdForSpokePool =
|
|
36
|
-
_this.lastDepositIdForSpokePool =
|
|
33
|
+
_this.earliestDepositIdQueried = utils_1.MAX_BIG_INT;
|
|
34
|
+
_this.latestDepositIdQueried = utils_1.bnZero;
|
|
35
|
+
_this.firstDepositIdForSpokePool = utils_1.MAX_BIG_INT;
|
|
36
|
+
_this.lastDepositIdForSpokePool = utils_1.MAX_BIG_INT;
|
|
37
37
|
_this.fills = {};
|
|
38
38
|
_this.firstBlockToSearch = eventSearchConfig.fromBlock;
|
|
39
39
|
_this.latestBlockSearched = 0;
|
|
@@ -110,7 +110,7 @@ var SpokePoolClient = (function (_super) {
|
|
|
110
110
|
SpokePoolClient.prototype.appendMaxSpeedUpSignatureToDeposit = function (deposit) {
|
|
111
111
|
var _a;
|
|
112
112
|
var depositId = deposit.depositId, depositor = deposit.depositor;
|
|
113
|
-
var speedups = (_a = this.speedUps[depositor]) === null || _a === void 0 ? void 0 : _a[depositId];
|
|
113
|
+
var speedups = (_a = this.speedUps[depositor]) === null || _a === void 0 ? void 0 : _a[depositId.toString()];
|
|
114
114
|
if (!(0, utils_1.isDefined)(speedups) || speedups.length === 0) {
|
|
115
115
|
return deposit;
|
|
116
116
|
}
|
|
@@ -171,7 +171,7 @@ var SpokePoolClient = (function (_super) {
|
|
|
171
171
|
}
|
|
172
172
|
return groupedFills;
|
|
173
173
|
}, { validFills: [], invalidFills: [] }), validFills = _a.validFills, invalidFills = _a.invalidFills;
|
|
174
|
-
var invalidFillsForDeposit = invalidFills.filter(function (x) { return x.depositId
|
|
174
|
+
var invalidFillsForDeposit = invalidFills.filter(function (x) { return x.depositId.eq(deposit.depositId); });
|
|
175
175
|
if (invalidFillsForDeposit.length > 0) {
|
|
176
176
|
this.logger.warn({
|
|
177
177
|
at: "SpokePoolClient",
|
|
@@ -215,17 +215,18 @@ var SpokePoolClient = (function (_super) {
|
|
|
215
215
|
};
|
|
216
216
|
SpokePoolClient.prototype._update = function (eventsToQuery) {
|
|
217
217
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
218
|
-
var firstDepositId, searchConfig, reason, eventSearchConfigs, spokePool, timerStart, multicallFunctions, _a, multicallOutput, oldestTime, events, _b, currentTime,
|
|
218
|
+
var firstDepositId, searchConfig, reason, eventSearchConfigs, spokePool, timerStart, multicallFunctions, _a, multicallOutput, oldestTime, events, _b, currentTime, _numberOfDeposits, _latestDepositId, errMsg;
|
|
219
219
|
var _this = this;
|
|
220
220
|
return tslib_1.__generator(this, function (_c) {
|
|
221
221
|
switch (_c.label) {
|
|
222
222
|
case 0:
|
|
223
223
|
firstDepositId = this.firstDepositIdForSpokePool;
|
|
224
|
-
if (!
|
|
224
|
+
if (!firstDepositId.eq(utils_1.MAX_BIG_INT)) return [3, 2];
|
|
225
225
|
return [4, this.spokePool.numberOfDeposits({ blockTag: this.deploymentBlock })];
|
|
226
226
|
case 1:
|
|
227
227
|
firstDepositId = _c.sent();
|
|
228
|
-
|
|
228
|
+
firstDepositId = utils_1.BigNumber.from(firstDepositId);
|
|
229
|
+
if (!utils_1.BigNumber.isBigNumber(firstDepositId) || firstDepositId.lt(utils_1.bnZero)) {
|
|
229
230
|
throw new Error("SpokePoolClient::update: Invalid first deposit id (".concat(firstDepositId, ")"));
|
|
230
231
|
}
|
|
231
232
|
_c.label = 2;
|
|
@@ -264,7 +265,8 @@ var SpokePoolClient = (function (_super) {
|
|
|
264
265
|
case 4:
|
|
265
266
|
_a = _c.sent(), multicallOutput = _a[0], oldestTime = _a[1], events = _a.slice(2);
|
|
266
267
|
this.log("debug", "Time to query new events from RPC for ".concat(this.chainId, ": ").concat(Date.now() - timerStart, " ms"));
|
|
267
|
-
_b = multicallFunctions.map(function (fn, idx) { return spokePool.interface.decodeFunctionResult(fn, multicallOutput[idx])[0]; }), currentTime = _b[0],
|
|
268
|
+
_b = multicallFunctions.map(function (fn, idx) { return spokePool.interface.decodeFunctionResult(fn, multicallOutput[idx])[0]; }), currentTime = _b[0], _numberOfDeposits = _b[1];
|
|
269
|
+
_latestDepositId = utils_1.BigNumber.from(_numberOfDeposits).sub(utils_1.bnOne);
|
|
268
270
|
if (!utils_1.BigNumber.isBigNumber(currentTime) || currentTime.lt(this.currentTime)) {
|
|
269
271
|
errMsg = utils_1.BigNumber.isBigNumber(currentTime)
|
|
270
272
|
? "currentTime: ".concat(currentTime, " < ").concat((0, utils_1.toBN)(this.currentTime))
|
|
@@ -277,7 +279,7 @@ var SpokePoolClient = (function (_super) {
|
|
|
277
279
|
currentTime: currentTime.toNumber(),
|
|
278
280
|
oldestTime: oldestTime.toNumber(),
|
|
279
281
|
firstDepositId: firstDepositId,
|
|
280
|
-
latestDepositId:
|
|
282
|
+
latestDepositId: _latestDepositId.gt(utils_1.bnZero) ? _latestDepositId : utils_1.bnZero,
|
|
281
283
|
searchEndBlock: searchConfig.toBlock,
|
|
282
284
|
events: events,
|
|
283
285
|
}];
|
|
@@ -335,10 +337,10 @@ var SpokePoolClient = (function (_super) {
|
|
|
335
337
|
continue;
|
|
336
338
|
}
|
|
337
339
|
(0, utils_1.assign)(this.depositHashes, [this.getDepositHash(deposit)], deposit);
|
|
338
|
-
if (deposit.depositId
|
|
340
|
+
if (deposit.depositId.lt(this.earliestDepositIdQueried) && !(0, utils_1.isUnsafeDepositId)(deposit.depositId)) {
|
|
339
341
|
this.earliestDepositIdQueried = deposit.depositId;
|
|
340
342
|
}
|
|
341
|
-
if (deposit.depositId
|
|
343
|
+
if (deposit.depositId.gt(this.latestDepositIdQueried) && !(0, utils_1.isUnsafeDepositId)(deposit.depositId)) {
|
|
342
344
|
this.latestDepositIdQueried = deposit.depositId;
|
|
343
345
|
}
|
|
344
346
|
}
|
|
@@ -349,7 +351,7 @@ var SpokePoolClient = (function (_super) {
|
|
|
349
351
|
for (_f = 0, speedUpEvents_1 = speedUpEvents; _f < speedUpEvents_1.length; _f++) {
|
|
350
352
|
event_3 = speedUpEvents_1[_f];
|
|
351
353
|
speedUp = tslib_1.__assign(tslib_1.__assign({}, (0, EventUtils_1.spreadEventWithBlockNumber)(event_3)), { originChainId: this.chainId });
|
|
352
|
-
(0, utils_1.assign)(this.speedUps, [speedUp.depositor, speedUp.depositId], [speedUp]);
|
|
354
|
+
(0, utils_1.assign)(this.speedUps, [speedUp.depositor, speedUp.depositId.toString()], [speedUp]);
|
|
353
355
|
depositHash = this.getDepositHash(speedUp);
|
|
354
356
|
depositDataAssociatedWithSpeedUp = this.depositHashes[depositHash];
|
|
355
357
|
if ((0, utils_1.isDefined)(depositDataAssociatedWithSpeedUp)) {
|
|
@@ -479,7 +481,7 @@ var SpokePoolClient = (function (_super) {
|
|
|
479
481
|
tStop = Date.now();
|
|
480
482
|
event = query.find(function (_a) {
|
|
481
483
|
var args = _a.args;
|
|
482
|
-
return args["depositId"]
|
|
484
|
+
return args["depositId"].eq(depositId);
|
|
483
485
|
});
|
|
484
486
|
if (event === undefined) {
|
|
485
487
|
srcChain = (0, NetworkUtils_1.getNetworkName)(this.chainId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SpokePoolClient.js","sourceRoot":"","sources":["../../../src/clients/SpokePoolClient.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"SpokePoolClient.js","sourceRoot":"","sources":["../../../src/clients/SpokePoolClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Contract } from "ethers";
|
|
2
2
|
import winston from "winston";
|
|
3
3
|
import { Log, DepositWithBlock, RelayerRefundExecutionWithBlock, SlowFillRequestWithBlock, FillWithBlock, SlowFillLeaf, SpeedUp } from "../../interfaces";
|
|
4
|
+
import { BigNumber } from "../../utils";
|
|
4
5
|
import { SpokePoolClient, SpokePoolUpdate } from "../SpokePoolClient";
|
|
5
6
|
import { HubPoolClient } from "../HubPoolClient";
|
|
6
7
|
import { EventManager, EventOverrides } from "./MockEvents";
|
|
@@ -8,8 +9,8 @@ import { AcrossConfigStoreClient } from "../AcrossConfigStoreClient";
|
|
|
8
9
|
export declare class MockSpokePoolClient extends SpokePoolClient {
|
|
9
10
|
eventManager: EventManager;
|
|
10
11
|
private destinationTokenForChainOverride;
|
|
11
|
-
depositIdAtBlock:
|
|
12
|
-
numberOfDeposits:
|
|
12
|
+
depositIdAtBlock: BigNumber[];
|
|
13
|
+
numberOfDeposits: BigNumber;
|
|
13
14
|
constructor(logger: winston.Logger, spokePool: Contract, chainId: number, deploymentBlock: number, opts?: {
|
|
14
15
|
hubPoolClient: HubPoolClient | null;
|
|
15
16
|
});
|
|
@@ -17,8 +18,8 @@ export declare class MockSpokePoolClient extends SpokePoolClient {
|
|
|
17
18
|
setDestinationTokenForChain(chainId: number, token: string): void;
|
|
18
19
|
getDestinationTokenForDeposit(deposit: DepositWithBlock): string;
|
|
19
20
|
setLatestBlockNumber(blockNumber: number): void;
|
|
20
|
-
setDepositIds(_depositIds:
|
|
21
|
-
_getDepositIdAtBlock(blockTag: number): Promise<
|
|
21
|
+
setDepositIds(_depositIds: BigNumber[]): void;
|
|
22
|
+
_getDepositIdAtBlock(blockTag: number): Promise<BigNumber>;
|
|
22
23
|
_update(eventsToQuery: string[]): Promise<SpokePoolUpdate>;
|
|
23
24
|
readonly eventSignatures: Record<string, string>;
|
|
24
25
|
depositV3(deposit: DepositWithBlock): Log;
|
|
@@ -16,7 +16,7 @@ var MockSpokePoolClient = (function (_super) {
|
|
|
16
16
|
var _this = _super.call(this, logger, spokePool, opts.hubPoolClient, chainId, deploymentBlock) || this;
|
|
17
17
|
_this.destinationTokenForChainOverride = {};
|
|
18
18
|
_this.depositIdAtBlock = [];
|
|
19
|
-
_this.numberOfDeposits =
|
|
19
|
+
_this.numberOfDeposits = utils_1.bnZero;
|
|
20
20
|
_this.eventSignatures = {
|
|
21
21
|
EnabledDepositRoute: "address,uint256,bool",
|
|
22
22
|
};
|
|
@@ -44,7 +44,7 @@ var MockSpokePoolClient = (function (_super) {
|
|
|
44
44
|
}
|
|
45
45
|
var lastDepositId = _depositIds[0];
|
|
46
46
|
for (var i = 0; i < _depositIds.length; i++) {
|
|
47
|
-
if (_depositIds[i]
|
|
47
|
+
if (_depositIds[i].lt(lastDepositId)) {
|
|
48
48
|
throw new Error("deposit ID must be equal to or greater than previous");
|
|
49
49
|
}
|
|
50
50
|
this.depositIdAtBlock[i] = _depositIds[i];
|
|
@@ -69,10 +69,10 @@ var MockSpokePoolClient = (function (_super) {
|
|
|
69
69
|
}
|
|
70
70
|
});
|
|
71
71
|
var idx = eventsToQuery.indexOf("V3FundsDeposited");
|
|
72
|
-
var latestDepositId = ((_a = events[idx]) !== null && _a !== void 0 ? _a : []).reduce(function (depositId, event) { var _a; return
|
|
72
|
+
var latestDepositId = ((_a = events[idx]) !== null && _a !== void 0 ? _a : []).reduce(function (depositId, event) { var _a; return (0, utils_1.bnMax)(depositId, (_a = event.args["depositId"]) !== null && _a !== void 0 ? _a : utils_1.bnZero); }, this.latestDepositIdQueried);
|
|
73
73
|
return Promise.resolve({
|
|
74
74
|
success: true,
|
|
75
|
-
firstDepositId:
|
|
75
|
+
firstDepositId: utils_1.bnZero,
|
|
76
76
|
latestDepositId: latestDepositId,
|
|
77
77
|
currentTime: currentTime,
|
|
78
78
|
oldestTime: 0,
|
|
@@ -86,8 +86,8 @@ var MockSpokePoolClient = (function (_super) {
|
|
|
86
86
|
var blockNumber = deposit.blockNumber, transactionIndex = deposit.transactionIndex;
|
|
87
87
|
var depositId = deposit.depositId, depositor = deposit.depositor, destinationChainId = deposit.destinationChainId, inputToken = deposit.inputToken, inputAmount = deposit.inputAmount, outputToken = deposit.outputToken, outputAmount = deposit.outputAmount;
|
|
88
88
|
depositId !== null && depositId !== void 0 ? depositId : (depositId = this.numberOfDeposits);
|
|
89
|
-
(0, assert_1.default)(depositId
|
|
90
|
-
this.numberOfDeposits = depositId
|
|
89
|
+
(0, assert_1.default)(depositId.gte(this.numberOfDeposits), "".concat(depositId, " < ").concat(this.numberOfDeposits));
|
|
90
|
+
this.numberOfDeposits = depositId.add(utils_1.bnOne);
|
|
91
91
|
destinationChainId !== null && destinationChainId !== void 0 ? destinationChainId : (destinationChainId = (0, lodash_1.random)(1, 42161, false));
|
|
92
92
|
depositor !== null && depositor !== void 0 ? depositor : (depositor = (0, utils_1.randomAddress)());
|
|
93
93
|
inputToken !== null && inputToken !== void 0 ? inputToken : (inputToken = (0, utils_1.randomAddress)());
|
|
@@ -128,7 +128,7 @@ var MockSpokePoolClient = (function (_super) {
|
|
|
128
128
|
var blockNumber = fill.blockNumber, transactionIndex = fill.transactionIndex;
|
|
129
129
|
var originChainId = fill.originChainId, depositId = fill.depositId, inputToken = fill.inputToken, inputAmount = fill.inputAmount, outputAmount = fill.outputAmount, fillDeadline = fill.fillDeadline, relayer = fill.relayer;
|
|
130
130
|
originChainId !== null && originChainId !== void 0 ? originChainId : (originChainId = (0, lodash_1.random)(1, 42161, false));
|
|
131
|
-
depositId !== null && depositId !== void 0 ? depositId : (depositId = (0, lodash_1.random)(1, 100000, false));
|
|
131
|
+
depositId !== null && depositId !== void 0 ? depositId : (depositId = utils_1.BigNumber.from((0, lodash_1.random)(1, 100000, false)));
|
|
132
132
|
inputToken !== null && inputToken !== void 0 ? inputToken : (inputToken = (0, utils_1.randomAddress)());
|
|
133
133
|
inputAmount !== null && inputAmount !== void 0 ? inputAmount : (inputAmount = (0, utils_1.toBNWei)((0, lodash_1.random)(1, 1000, false)));
|
|
134
134
|
outputAmount !== null && outputAmount !== void 0 ? outputAmount : (outputAmount = inputAmount);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MockSpokePoolClient.js","sourceRoot":"","sources":["../../../../src/clients/mocks/MockSpokePoolClient.ts"],"names":[],"mappings":";;;;AAAA,0DAA4B;AAE5B,iCAAgC;AAEhC,6CAA+C;AAC/C,+CAU0B;AAC1B,
|
|
1
|
+
{"version":3,"file":"MockSpokePoolClient.js","sourceRoot":"","sources":["../../../../src/clients/mocks/MockSpokePoolClient.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/constants.d.ts
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
export { ChainFamily, CHAIN_IDs, MAINNET_CHAIN_IDs, PUBLIC_NETWORKS, TESTNET_CHAIN_IDs, TOKEN_SYMBOLS_MAP, } from "@across-protocol/constants";
|
|
2
|
-
export declare const ZERO_ADDRESS: string;
|
|
2
|
+
export declare const ZERO_ADDRESS: string, ZERO_BYTES: string;
|
|
3
3
|
export declare const MAX_SAFE_ALLOWANCE = "79228162514264337593543950335";
|
|
4
4
|
export declare const MAX_SAFE_DEPOSIT_ID = "4294967295";
|
|
5
5
|
export declare const SECONDS_PER_YEAR = 31557600;
|
|
6
6
|
export declare const HUBPOOL_CHAIN_ID = 1;
|
|
7
7
|
export declare const TRANSFER_THRESHOLD_MAX_CONFIG_STORE_VERSION = 1;
|
|
8
8
|
export declare const ARWEAVE_TAG_APP_NAME = "across-protocol";
|
|
9
|
-
export declare const ARWEAVE_TAG_APP_VERSION =
|
|
9
|
+
export declare const ARWEAVE_TAG_APP_VERSION = 3;
|
|
10
10
|
export declare const PROTOCOL_DEFAULT_CHAIN_ID_INDICES: number[];
|
|
11
11
|
export declare const DEFAULT_CACHING_TTL: number;
|
|
12
12
|
export declare const DEFAULT_CACHING_SAFE_LAG: number;
|
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.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_ADDRESS = exports.TOKEN_SYMBOLS_MAP = exports.TESTNET_CHAIN_IDs = exports.PUBLIC_NETWORKS = exports.MAINNET_CHAIN_IDs = exports.CHAIN_IDs = exports.ChainFamily = void 0;
|
|
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.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");
|
|
@@ -11,14 +11,14 @@ Object.defineProperty(exports, "MAINNET_CHAIN_IDs", { enumerable: true, get: fun
|
|
|
11
11
|
Object.defineProperty(exports, "PUBLIC_NETWORKS", { enumerable: true, get: function () { return constants_2.PUBLIC_NETWORKS; } });
|
|
12
12
|
Object.defineProperty(exports, "TESTNET_CHAIN_IDs", { enumerable: true, get: function () { return constants_2.TESTNET_CHAIN_IDs; } });
|
|
13
13
|
Object.defineProperty(exports, "TOKEN_SYMBOLS_MAP", { enumerable: true, get: function () { return constants_2.TOKEN_SYMBOLS_MAP; } });
|
|
14
|
-
exports.ZERO_ADDRESS = ethers_1.constants.AddressZero;
|
|
14
|
+
exports.ZERO_ADDRESS = ethers_1.constants.AddressZero, exports.ZERO_BYTES = ethers_1.constants.HashZero;
|
|
15
15
|
exports.MAX_SAFE_ALLOWANCE = "79228162514264337593543950335";
|
|
16
16
|
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
20
|
exports.ARWEAVE_TAG_APP_NAME = "across-protocol";
|
|
21
|
-
exports.ARWEAVE_TAG_APP_VERSION =
|
|
21
|
+
exports.ARWEAVE_TAG_APP_VERSION = 3;
|
|
22
22
|
exports.PROTOCOL_DEFAULT_CHAIN_ID_INDICES = [1, 10, 137, 288, 42161];
|
|
23
23
|
exports.DEFAULT_CACHING_TTL = 60 * 60 * 24 * 7 * 2;
|
|
24
24
|
exports.DEFAULT_CACHING_SAFE_LAG = 60 * 60;
|
|
@@ -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,GAAK,kBAAe,
|
|
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,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"}
|
|
@@ -8,7 +8,7 @@ export interface RelayData {
|
|
|
8
8
|
originChainId: number;
|
|
9
9
|
depositor: string;
|
|
10
10
|
recipient: string;
|
|
11
|
-
depositId:
|
|
11
|
+
depositId: BigNumber;
|
|
12
12
|
inputToken: string;
|
|
13
13
|
inputAmount: BigNumber;
|
|
14
14
|
outputToken: string;
|
|
@@ -58,7 +58,7 @@ export interface FillWithBlock extends Fill, SortableEvent {
|
|
|
58
58
|
export interface SpeedUp {
|
|
59
59
|
depositor: string;
|
|
60
60
|
depositorSignature: string;
|
|
61
|
-
depositId:
|
|
61
|
+
depositId: BigNumber;
|
|
62
62
|
originChainId: number;
|
|
63
63
|
updatedRecipient: string;
|
|
64
64
|
updatedOutputAmount: BigNumber;
|