@across-protocol/sdk 4.3.57 → 4.3.58
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/SpokePoolClient/EVMSpokePoolClient.d.ts +1 -0
- package/dist/cjs/clients/SpokePoolClient/EVMSpokePoolClient.js +48 -30
- package/dist/cjs/clients/SpokePoolClient/EVMSpokePoolClient.js.map +1 -1
- package/dist/cjs/clients/SpokePoolClient/SVMSpokePoolClient.js +7 -2
- package/dist/cjs/clients/SpokePoolClient/SVMSpokePoolClient.js.map +1 -1
- package/dist/cjs/interfaces/SpokePool.d.ts +5 -0
- package/dist/cjs/utils/SpokeUtils.d.ts +5 -1
- package/dist/cjs/utils/SpokeUtils.js +67 -0
- package/dist/cjs/utils/SpokeUtils.js.map +1 -1
- package/dist/esm/clients/SpokePoolClient/EVMSpokePoolClient.d.ts +1 -0
- package/dist/esm/clients/SpokePoolClient/EVMSpokePoolClient.js +48 -30
- package/dist/esm/clients/SpokePoolClient/EVMSpokePoolClient.js.map +1 -1
- package/dist/esm/clients/SpokePoolClient/SVMSpokePoolClient.js +7 -2
- package/dist/esm/clients/SpokePoolClient/SVMSpokePoolClient.js.map +1 -1
- package/dist/esm/interfaces/SpokePool.d.ts +5 -0
- package/dist/esm/utils/SpokeUtils.d.ts +5 -1
- package/dist/esm/utils/SpokeUtils.js +72 -3
- package/dist/esm/utils/SpokeUtils.js.map +1 -1
- package/dist/types/clients/SpokePoolClient/EVMSpokePoolClient.d.ts +1 -0
- package/dist/types/clients/SpokePoolClient/EVMSpokePoolClient.d.ts.map +1 -1
- package/dist/types/clients/SpokePoolClient/SVMSpokePoolClient.d.ts.map +1 -1
- package/dist/types/interfaces/SpokePool.d.ts +5 -0
- package/dist/types/interfaces/SpokePool.d.ts.map +1 -1
- package/dist/types/utils/SpokeUtils.d.ts +5 -1
- package/dist/types/utils/SpokeUtils.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/clients/SpokePoolClient/EVMSpokePoolClient.ts +54 -39
- package/src/clients/SpokePoolClient/SVMSpokePoolClient.ts +5 -0
- package/src/interfaces/SpokePool.ts +6 -0
- package/src/utils/SpokeUtils.ts +63 -2
|
@@ -18,4 +18,5 @@ export declare class EVMSpokePoolClient extends SpokePoolClient {
|
|
|
18
18
|
getTimeAt(blockNumber: number): Promise<number>;
|
|
19
19
|
findDeposit(depositId: BigNumber): Promise<DepositSearchResult>;
|
|
20
20
|
getTimestampForBlock(blockNumber: number): Promise<number>;
|
|
21
|
+
private queryDepositEvents;
|
|
21
22
|
}
|
|
@@ -109,7 +109,7 @@ var EVMSpokePoolClient = (function (_super) {
|
|
|
109
109
|
};
|
|
110
110
|
EVMSpokePoolClient.prototype.findDeposit = function (depositId) {
|
|
111
111
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
112
|
-
var deposit,
|
|
112
|
+
var deposit, result, event, elapsedMs, partialDeposit, quoteBlockNumber, outputToken;
|
|
113
113
|
return tslib_1.__generator(this, function (_a) {
|
|
114
114
|
switch (_a.label) {
|
|
115
115
|
case 0:
|
|
@@ -117,59 +117,77 @@ var EVMSpokePoolClient = (function (_super) {
|
|
|
117
117
|
if (deposit) {
|
|
118
118
|
return [2, { found: true, deposit: deposit }];
|
|
119
119
|
}
|
|
120
|
+
return [4, this.queryDepositEvents(depositId)];
|
|
121
|
+
case 1:
|
|
122
|
+
result = _a.sent();
|
|
123
|
+
if ("reason" in result) {
|
|
124
|
+
return [2, { found: false, code: utils_1.InvalidFill.DepositIdNotFound, reason: result.reason }];
|
|
125
|
+
}
|
|
126
|
+
event = result.event, elapsedMs = result.elapsedMs;
|
|
127
|
+
partialDeposit = (0, utils_1.unpackDepositEvent)((0, EventUtils_1.spreadEventWithBlockNumber)(event), this.chainId);
|
|
128
|
+
return [4, this.getBlockNumber(partialDeposit.quoteTimestamp)];
|
|
129
|
+
case 2:
|
|
130
|
+
quoteBlockNumber = _a.sent();
|
|
131
|
+
outputToken = partialDeposit.outputToken.isZeroAddress()
|
|
132
|
+
? this.getDestinationTokenForDeposit(tslib_1.__assign(tslib_1.__assign({}, partialDeposit), { quoteBlockNumber: quoteBlockNumber }))
|
|
133
|
+
: partialDeposit.outputToken;
|
|
134
|
+
deposit = tslib_1.__assign(tslib_1.__assign({}, partialDeposit), { outputToken: outputToken, quoteBlockNumber: quoteBlockNumber, fromLiteChain: this.isOriginLiteChain(partialDeposit), toLiteChain: this.isDestinationLiteChain(partialDeposit) });
|
|
135
|
+
this.logger.debug({
|
|
136
|
+
at: "SpokePoolClient#findDeposit",
|
|
137
|
+
message: "Located deposit outside of SpokePoolClient's search range",
|
|
138
|
+
deposit: deposit,
|
|
139
|
+
elapsedMs: elapsedMs,
|
|
140
|
+
});
|
|
141
|
+
return [2, { found: true, deposit: deposit }];
|
|
142
|
+
}
|
|
143
|
+
});
|
|
144
|
+
});
|
|
145
|
+
};
|
|
146
|
+
EVMSpokePoolClient.prototype.getTimestampForBlock = function (blockNumber) {
|
|
147
|
+
return (0, evm_1.getTimestampForBlock)(this.spokePool.provider, blockNumber);
|
|
148
|
+
};
|
|
149
|
+
EVMSpokePoolClient.prototype.queryDepositEvents = function (depositId) {
|
|
150
|
+
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
151
|
+
var tStart, upperBound, from, chain, to, maxLookBack, events, tStop, event;
|
|
152
|
+
return tslib_1.__generator(this, function (_a) {
|
|
153
|
+
switch (_a.label) {
|
|
154
|
+
case 0:
|
|
155
|
+
tStart = Date.now();
|
|
120
156
|
upperBound = this.latestHeightSearched || undefined;
|
|
121
157
|
return [4, (0, evm_1.findDepositBlock)(this.spokePool, depositId, this.deploymentBlock, upperBound)];
|
|
122
158
|
case 1:
|
|
123
159
|
from = _a.sent();
|
|
124
160
|
chain = (0, utils_1.getNetworkName)(this.chainId);
|
|
125
161
|
if (!from) {
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
162
|
+
return [2, {
|
|
163
|
+
reason: "Unable to find ".concat(chain, " depositId ").concat(depositId, " within blocks [").concat(this.deploymentBlock, ", ").concat(upperBound !== null && upperBound !== void 0 ? upperBound : "latest", "]."),
|
|
164
|
+
}];
|
|
129
165
|
}
|
|
130
166
|
to = from;
|
|
131
|
-
tStart = Date.now();
|
|
132
167
|
maxLookBack = this.eventSearchConfig.maxLookBack;
|
|
133
168
|
return [4, Promise.all([
|
|
134
169
|
(0, EventUtils_1.paginatedEventQuery)(this.spokePool, this.spokePool.filters.V3FundsDeposited(null, null, null, null, null, depositId), { from: from, to: to, maxLookBack: maxLookBack }),
|
|
135
170
|
(0, EventUtils_1.paginatedEventQuery)(this.spokePool, this.spokePool.filters.FundsDeposited(null, null, null, null, null, depositId), { from: from, to: to, maxLookBack: maxLookBack }),
|
|
136
171
|
])];
|
|
137
172
|
case 2:
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
173
|
+
events = (_a.sent())
|
|
174
|
+
.flat()
|
|
175
|
+
.filter(function (_a) {
|
|
141
176
|
var args = _a.args;
|
|
142
177
|
return args["depositId"].eq(depositId);
|
|
143
178
|
});
|
|
144
|
-
|
|
179
|
+
tStop = Date.now();
|
|
180
|
+
event = events[0];
|
|
181
|
+
if (!event) {
|
|
145
182
|
return [2, {
|
|
146
|
-
|
|
147
|
-
code: utils_1.InvalidFill.DepositIdNotFound,
|
|
148
|
-
reason: "".concat(chain, " depositId ").concat(depositId, " not found at block ").concat(from, "."),
|
|
183
|
+
reason: "Unable to find ".concat(chain, " depositId ").concat(depositId, " within blocks [").concat(from, ", ").concat(upperBound !== null && upperBound !== void 0 ? upperBound : "latest", "]."),
|
|
149
184
|
}];
|
|
150
185
|
}
|
|
151
|
-
|
|
152
|
-
return [4, this.getBlockNumber(partialDeposit.quoteTimestamp)];
|
|
153
|
-
case 3:
|
|
154
|
-
quoteBlockNumber = _a.sent();
|
|
155
|
-
outputToken = partialDeposit.outputToken.isZeroAddress()
|
|
156
|
-
? this.getDestinationTokenForDeposit(tslib_1.__assign(tslib_1.__assign({}, partialDeposit), { quoteBlockNumber: quoteBlockNumber }))
|
|
157
|
-
: partialDeposit.outputToken;
|
|
158
|
-
deposit = tslib_1.__assign(tslib_1.__assign({}, partialDeposit), { outputToken: outputToken, quoteBlockNumber: quoteBlockNumber, fromLiteChain: this.isOriginLiteChain(partialDeposit), toLiteChain: this.isDestinationLiteChain(partialDeposit) });
|
|
159
|
-
this.logger.debug({
|
|
160
|
-
at: "SpokePoolClient#findDeposit",
|
|
161
|
-
message: "Located deposit outside of SpokePoolClient's search range",
|
|
162
|
-
deposit: deposit,
|
|
163
|
-
elapsedMs: tStop - tStart,
|
|
164
|
-
});
|
|
165
|
-
return [2, { found: true, deposit: deposit }];
|
|
186
|
+
return [2, { event: event, elapsedMs: tStop - tStart }];
|
|
166
187
|
}
|
|
167
188
|
});
|
|
168
189
|
});
|
|
169
190
|
};
|
|
170
|
-
EVMSpokePoolClient.prototype.getTimestampForBlock = function (blockNumber) {
|
|
171
|
-
return (0, evm_1.getTimestampForBlock)(this.spokePool.provider, blockNumber);
|
|
172
|
-
};
|
|
173
191
|
return EVMSpokePoolClient;
|
|
174
192
|
}(SpokePoolClient_1.SpokePoolClient));
|
|
175
193
|
exports.EVMSpokePoolClient = EVMSpokePoolClient;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EVMSpokePoolClient.js","sourceRoot":"","sources":["../../../../src/clients/SpokePoolClient/EVMSpokePoolClient.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"EVMSpokePoolClient.js","sourceRoot":"","sources":["../../../../src/clients/SpokePoolClient/EVMSpokePoolClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -150,11 +150,16 @@ var SVMSpokePoolClient = (function (_super) {
|
|
|
150
150
|
};
|
|
151
151
|
SVMSpokePoolClient.prototype.findDeposit = function (depositId) {
|
|
152
152
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
153
|
-
var deposit, originChainId, _a;
|
|
153
|
+
var memoryDeposit, deposit, originChainId, _a;
|
|
154
154
|
var _b, _c;
|
|
155
155
|
return tslib_1.__generator(this, function (_d) {
|
|
156
156
|
switch (_d.label) {
|
|
157
|
-
case 0:
|
|
157
|
+
case 0:
|
|
158
|
+
memoryDeposit = this.getDeposit(depositId);
|
|
159
|
+
if (memoryDeposit) {
|
|
160
|
+
return [2, { found: true, deposit: memoryDeposit }];
|
|
161
|
+
}
|
|
162
|
+
return [4, (0, svm_1.findDeposit)(this.svmEventsClient, depositId, this.logger)];
|
|
158
163
|
case 1:
|
|
159
164
|
deposit = _d.sent();
|
|
160
165
|
if (!deposit) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SVMSpokePoolClient.js","sourceRoot":"","sources":["../../../../src/clients/SpokePoolClient/SVMSpokePoolClient.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"SVMSpokePoolClient.js","sourceRoot":"","sources":["../../../../src/clients/SpokePoolClient/SVMSpokePoolClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -150,3 +150,8 @@ export interface SpokePoolClientsByChain {
|
|
|
150
150
|
export interface RelayDataWithMessageHash extends RelayData {
|
|
151
151
|
messageHash?: string;
|
|
152
152
|
}
|
|
153
|
+
export interface InvalidFill {
|
|
154
|
+
fill: FillWithBlock;
|
|
155
|
+
reason: string;
|
|
156
|
+
deposit?: DepositWithBlock;
|
|
157
|
+
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import { DepositWithBlock, Fill, FillWithBlock, RelayData, SlowFillLeaf, SortableEvent } from "../interfaces";
|
|
1
|
+
import { DepositWithBlock, Fill, FillWithBlock, InvalidFill, RelayData, SlowFillLeaf, SortableEvent } from "../interfaces";
|
|
2
2
|
import { BigNumber } from "./BigNumberUtils";
|
|
3
|
+
import { SpokePoolClient } from "../clients";
|
|
3
4
|
export declare function isSlowFill(fill: Fill): boolean;
|
|
4
5
|
export declare function getSlowFillLeafLpFeePct(leaf: SlowFillLeaf): BigNumber;
|
|
5
6
|
export declare function unpackDepositEvent(rawEvent: SortableEvent, originChainId: number): Omit<DepositWithBlock, "quoteBlockNumber" | "fromLiteChain" | "toLiteChain">;
|
|
@@ -10,3 +11,6 @@ export declare function getRelayHashFromEvent(e: RelayData & {
|
|
|
10
11
|
}): string;
|
|
11
12
|
export declare function isUnsafeDepositId(depositId: BigNumber): boolean;
|
|
12
13
|
export declare function getMessageHash(message: string): string;
|
|
14
|
+
export declare function findInvalidFills(spokePoolClients: {
|
|
15
|
+
[chainId: number]: SpokePoolClient;
|
|
16
|
+
}): Promise<InvalidFill[]>;
|
|
@@ -8,6 +8,7 @@ exports.getRelayDataHash = getRelayDataHash;
|
|
|
8
8
|
exports.getRelayHashFromEvent = getRelayHashFromEvent;
|
|
9
9
|
exports.isUnsafeDepositId = isUnsafeDepositId;
|
|
10
10
|
exports.getMessageHash = getMessageHash;
|
|
11
|
+
exports.findInvalidFills = findInvalidFills;
|
|
11
12
|
var tslib_1 = require("tslib");
|
|
12
13
|
var viem_1 = require("viem");
|
|
13
14
|
var common_1 = require("./common");
|
|
@@ -71,4 +72,70 @@ function isUnsafeDepositId(depositId) {
|
|
|
71
72
|
function getMessageHash(message) {
|
|
72
73
|
return (0, DepositUtils_1.isMessageEmpty)(message) ? constants_1.ZERO_BYTES : (0, viem_1.keccak256)(message);
|
|
73
74
|
}
|
|
75
|
+
function findInvalidFills(spokePoolClients) {
|
|
76
|
+
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
77
|
+
var invalidFills, _i, _a, spokePoolClient, fills, fillDepositPairs, _b, fillDepositPairs_1, pair;
|
|
78
|
+
var _this = this;
|
|
79
|
+
return tslib_1.__generator(this, function (_c) {
|
|
80
|
+
switch (_c.label) {
|
|
81
|
+
case 0:
|
|
82
|
+
invalidFills = [];
|
|
83
|
+
_i = 0, _a = Object.values(spokePoolClients);
|
|
84
|
+
_c.label = 1;
|
|
85
|
+
case 1:
|
|
86
|
+
if (!(_i < _a.length)) return [3, 4];
|
|
87
|
+
spokePoolClient = _a[_i];
|
|
88
|
+
fills = spokePoolClient.getFills();
|
|
89
|
+
return [4, Promise.all(fills.map(function (fill) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
|
|
90
|
+
var depositResult, validationResult;
|
|
91
|
+
var _a;
|
|
92
|
+
return tslib_1.__generator(this, function (_b) {
|
|
93
|
+
switch (_b.label) {
|
|
94
|
+
case 0:
|
|
95
|
+
if (isUnsafeDepositId(fill.depositId)) {
|
|
96
|
+
return [2, null];
|
|
97
|
+
}
|
|
98
|
+
return [4, ((_a = spokePoolClients[fill.originChainId]) === null || _a === void 0 ? void 0 : _a.findDeposit(fill.depositId))];
|
|
99
|
+
case 1:
|
|
100
|
+
depositResult = _b.sent();
|
|
101
|
+
if (!(depositResult === null || depositResult === void 0 ? void 0 : depositResult.found)) {
|
|
102
|
+
return [2, {
|
|
103
|
+
fill: fill,
|
|
104
|
+
deposit: null,
|
|
105
|
+
reason: "No ".concat((0, NetworkUtils_1.getNetworkName)(fill.originChainId), " deposit with depositId ").concat(fill.depositId, " found"),
|
|
106
|
+
}];
|
|
107
|
+
}
|
|
108
|
+
validationResult = (0, DepositUtils_1.validateFillForDeposit)(fill, depositResult.deposit);
|
|
109
|
+
if (!validationResult.valid) {
|
|
110
|
+
return [2, {
|
|
111
|
+
fill: fill,
|
|
112
|
+
deposit: depositResult.deposit,
|
|
113
|
+
reason: validationResult.reason,
|
|
114
|
+
}];
|
|
115
|
+
}
|
|
116
|
+
return [2, null];
|
|
117
|
+
}
|
|
118
|
+
});
|
|
119
|
+
}); }))];
|
|
120
|
+
case 2:
|
|
121
|
+
fillDepositPairs = _c.sent();
|
|
122
|
+
for (_b = 0, fillDepositPairs_1 = fillDepositPairs; _b < fillDepositPairs_1.length; _b++) {
|
|
123
|
+
pair = fillDepositPairs_1[_b];
|
|
124
|
+
if (pair) {
|
|
125
|
+
invalidFills.push({
|
|
126
|
+
fill: pair.fill,
|
|
127
|
+
reason: pair.reason,
|
|
128
|
+
deposit: pair.deposit || undefined,
|
|
129
|
+
});
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
_c.label = 3;
|
|
133
|
+
case 3:
|
|
134
|
+
_i++;
|
|
135
|
+
return [3, 1];
|
|
136
|
+
case 4: return [2, invalidFills];
|
|
137
|
+
}
|
|
138
|
+
});
|
|
139
|
+
});
|
|
140
|
+
}
|
|
74
141
|
//# sourceMappingURL=SpokeUtils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SpokeUtils.js","sourceRoot":"","sources":["../../../src/utils/SpokeUtils.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"SpokeUtils.js","sourceRoot":"","sources":["../../../src/utils/SpokeUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,4 +21,5 @@ export declare class EVMSpokePoolClient extends SpokePoolClient {
|
|
|
21
21
|
getTimeAt(blockNumber: number): Promise<number>;
|
|
22
22
|
findDeposit(depositId: BigNumber): Promise<DepositSearchResult>;
|
|
23
23
|
getTimestampForBlock(blockNumber: number): Promise<number>;
|
|
24
|
+
private queryDepositEvents;
|
|
24
25
|
}
|
|
@@ -113,7 +113,7 @@ var EVMSpokePoolClient = /** @class */ (function (_super) {
|
|
|
113
113
|
};
|
|
114
114
|
EVMSpokePoolClient.prototype.findDeposit = function (depositId) {
|
|
115
115
|
return __awaiter(this, void 0, void 0, function () {
|
|
116
|
-
var deposit,
|
|
116
|
+
var deposit, result, event, elapsedMs, partialDeposit, quoteBlockNumber, outputToken;
|
|
117
117
|
return __generator(this, function (_a) {
|
|
118
118
|
switch (_a.label) {
|
|
119
119
|
case 0:
|
|
@@ -121,59 +121,77 @@ var EVMSpokePoolClient = /** @class */ (function (_super) {
|
|
|
121
121
|
if (deposit) {
|
|
122
122
|
return [2 /*return*/, { found: true, deposit: deposit }];
|
|
123
123
|
}
|
|
124
|
+
return [4 /*yield*/, this.queryDepositEvents(depositId)];
|
|
125
|
+
case 1:
|
|
126
|
+
result = _a.sent();
|
|
127
|
+
if ("reason" in result) {
|
|
128
|
+
return [2 /*return*/, { found: false, code: InvalidFill.DepositIdNotFound, reason: result.reason }];
|
|
129
|
+
}
|
|
130
|
+
event = result.event, elapsedMs = result.elapsedMs;
|
|
131
|
+
partialDeposit = unpackDepositEvent(spreadEventWithBlockNumber(event), this.chainId);
|
|
132
|
+
return [4 /*yield*/, this.getBlockNumber(partialDeposit.quoteTimestamp)];
|
|
133
|
+
case 2:
|
|
134
|
+
quoteBlockNumber = _a.sent();
|
|
135
|
+
outputToken = partialDeposit.outputToken.isZeroAddress()
|
|
136
|
+
? this.getDestinationTokenForDeposit(__assign(__assign({}, partialDeposit), { quoteBlockNumber: quoteBlockNumber }))
|
|
137
|
+
: partialDeposit.outputToken;
|
|
138
|
+
deposit = __assign(__assign({}, partialDeposit), { outputToken: outputToken, quoteBlockNumber: quoteBlockNumber, fromLiteChain: this.isOriginLiteChain(partialDeposit), toLiteChain: this.isDestinationLiteChain(partialDeposit) });
|
|
139
|
+
this.logger.debug({
|
|
140
|
+
at: "SpokePoolClient#findDeposit",
|
|
141
|
+
message: "Located deposit outside of SpokePoolClient's search range",
|
|
142
|
+
deposit: deposit,
|
|
143
|
+
elapsedMs: elapsedMs,
|
|
144
|
+
});
|
|
145
|
+
return [2 /*return*/, { found: true, deposit: deposit }];
|
|
146
|
+
}
|
|
147
|
+
});
|
|
148
|
+
});
|
|
149
|
+
};
|
|
150
|
+
EVMSpokePoolClient.prototype.getTimestampForBlock = function (blockNumber) {
|
|
151
|
+
return _getTimestampForBlock(this.spokePool.provider, blockNumber);
|
|
152
|
+
};
|
|
153
|
+
EVMSpokePoolClient.prototype.queryDepositEvents = function (depositId) {
|
|
154
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
155
|
+
var tStart, upperBound, from, chain, to, maxLookBack, events, tStop, event;
|
|
156
|
+
return __generator(this, function (_a) {
|
|
157
|
+
switch (_a.label) {
|
|
158
|
+
case 0:
|
|
159
|
+
tStart = Date.now();
|
|
124
160
|
upperBound = this.latestHeightSearched || undefined;
|
|
125
161
|
return [4 /*yield*/, findDepositBlock(this.spokePool, depositId, this.deploymentBlock, upperBound)];
|
|
126
162
|
case 1:
|
|
127
163
|
from = _a.sent();
|
|
128
164
|
chain = getNetworkName(this.chainId);
|
|
129
165
|
if (!from) {
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
166
|
+
return [2 /*return*/, {
|
|
167
|
+
reason: "Unable to find ".concat(chain, " depositId ").concat(depositId, " within blocks [").concat(this.deploymentBlock, ", ").concat(upperBound !== null && upperBound !== void 0 ? upperBound : "latest", "]."),
|
|
168
|
+
}];
|
|
133
169
|
}
|
|
134
170
|
to = from;
|
|
135
|
-
tStart = Date.now();
|
|
136
171
|
maxLookBack = this.eventSearchConfig.maxLookBack;
|
|
137
172
|
return [4 /*yield*/, Promise.all([
|
|
138
173
|
paginatedEventQuery(this.spokePool, this.spokePool.filters.V3FundsDeposited(null, null, null, null, null, depositId), { from: from, to: to, maxLookBack: maxLookBack }),
|
|
139
174
|
paginatedEventQuery(this.spokePool, this.spokePool.filters.FundsDeposited(null, null, null, null, null, depositId), { from: from, to: to, maxLookBack: maxLookBack }),
|
|
140
175
|
])];
|
|
141
176
|
case 2:
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
177
|
+
events = (_a.sent())
|
|
178
|
+
.flat()
|
|
179
|
+
.filter(function (_a) {
|
|
145
180
|
var args = _a.args;
|
|
146
181
|
return args["depositId"].eq(depositId);
|
|
147
182
|
});
|
|
148
|
-
|
|
183
|
+
tStop = Date.now();
|
|
184
|
+
event = events[0];
|
|
185
|
+
if (!event) {
|
|
149
186
|
return [2 /*return*/, {
|
|
150
|
-
|
|
151
|
-
code: InvalidFill.DepositIdNotFound,
|
|
152
|
-
reason: "".concat(chain, " depositId ").concat(depositId, " not found at block ").concat(from, "."),
|
|
187
|
+
reason: "Unable to find ".concat(chain, " depositId ").concat(depositId, " within blocks [").concat(from, ", ").concat(upperBound !== null && upperBound !== void 0 ? upperBound : "latest", "]."),
|
|
153
188
|
}];
|
|
154
189
|
}
|
|
155
|
-
|
|
156
|
-
return [4 /*yield*/, this.getBlockNumber(partialDeposit.quoteTimestamp)];
|
|
157
|
-
case 3:
|
|
158
|
-
quoteBlockNumber = _a.sent();
|
|
159
|
-
outputToken = partialDeposit.outputToken.isZeroAddress()
|
|
160
|
-
? this.getDestinationTokenForDeposit(__assign(__assign({}, partialDeposit), { quoteBlockNumber: quoteBlockNumber }))
|
|
161
|
-
: partialDeposit.outputToken;
|
|
162
|
-
deposit = __assign(__assign({}, partialDeposit), { outputToken: outputToken, quoteBlockNumber: quoteBlockNumber, fromLiteChain: this.isOriginLiteChain(partialDeposit), toLiteChain: this.isDestinationLiteChain(partialDeposit) });
|
|
163
|
-
this.logger.debug({
|
|
164
|
-
at: "SpokePoolClient#findDeposit",
|
|
165
|
-
message: "Located deposit outside of SpokePoolClient's search range",
|
|
166
|
-
deposit: deposit,
|
|
167
|
-
elapsedMs: tStop - tStart,
|
|
168
|
-
});
|
|
169
|
-
return [2 /*return*/, { found: true, deposit: deposit }];
|
|
190
|
+
return [2 /*return*/, { event: event, elapsedMs: tStop - tStart }];
|
|
170
191
|
}
|
|
171
192
|
});
|
|
172
193
|
});
|
|
173
194
|
};
|
|
174
|
-
EVMSpokePoolClient.prototype.getTimestampForBlock = function (blockNumber) {
|
|
175
|
-
return _getTimestampForBlock(this.spokePool.provider, blockNumber);
|
|
176
|
-
};
|
|
177
195
|
return EVMSpokePoolClient;
|
|
178
196
|
}(SpokePoolClient));
|
|
179
197
|
export { EVMSpokePoolClient };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EVMSpokePoolClient.js","sourceRoot":"","sources":["../../../../src/clients/SpokePoolClient/EVMSpokePoolClient.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"EVMSpokePoolClient.js","sourceRoot":"","sources":["../../../../src/clients/SpokePoolClient/EVMSpokePoolClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -186,11 +186,16 @@ var SVMSpokePoolClient = /** @class */ (function (_super) {
|
|
|
186
186
|
*/
|
|
187
187
|
SVMSpokePoolClient.prototype.findDeposit = function (depositId) {
|
|
188
188
|
return __awaiter(this, void 0, void 0, function () {
|
|
189
|
-
var deposit, originChainId, _a;
|
|
189
|
+
var memoryDeposit, deposit, originChainId, _a;
|
|
190
190
|
var _b, _c;
|
|
191
191
|
return __generator(this, function (_d) {
|
|
192
192
|
switch (_d.label) {
|
|
193
|
-
case 0:
|
|
193
|
+
case 0:
|
|
194
|
+
memoryDeposit = this.getDeposit(depositId);
|
|
195
|
+
if (memoryDeposit) {
|
|
196
|
+
return [2 /*return*/, { found: true, deposit: memoryDeposit }];
|
|
197
|
+
}
|
|
198
|
+
return [4 /*yield*/, findDeposit(this.svmEventsClient, depositId, this.logger)];
|
|
194
199
|
case 1:
|
|
195
200
|
deposit = _d.sent();
|
|
196
201
|
if (!deposit) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SVMSpokePoolClient.js","sourceRoot":"","sources":["../../../../src/clients/SpokePoolClient/SVMSpokePoolClient.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"SVMSpokePoolClient.js","sourceRoot":"","sources":["../../../../src/clients/SpokePoolClient/SVMSpokePoolClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -150,3 +150,8 @@ export interface SpokePoolClientsByChain {
|
|
|
150
150
|
export interface RelayDataWithMessageHash extends RelayData {
|
|
151
151
|
messageHash?: string;
|
|
152
152
|
}
|
|
153
|
+
export interface InvalidFill {
|
|
154
|
+
fill: FillWithBlock;
|
|
155
|
+
reason: string;
|
|
156
|
+
deposit?: DepositWithBlock;
|
|
157
|
+
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import { DepositWithBlock, Fill, FillWithBlock, RelayData, SlowFillLeaf, SortableEvent } from "../interfaces";
|
|
1
|
+
import { DepositWithBlock, Fill, FillWithBlock, InvalidFill, RelayData, SlowFillLeaf, SortableEvent } from "../interfaces";
|
|
2
2
|
import { BigNumber } from "./BigNumberUtils";
|
|
3
|
+
import { SpokePoolClient } from "../clients";
|
|
3
4
|
export declare function isSlowFill(fill: Fill): boolean;
|
|
4
5
|
export declare function getSlowFillLeafLpFeePct(leaf: SlowFillLeaf): BigNumber;
|
|
5
6
|
/**
|
|
@@ -29,3 +30,6 @@ export declare function getRelayHashFromEvent(e: RelayData & {
|
|
|
29
30
|
}): string;
|
|
30
31
|
export declare function isUnsafeDepositId(depositId: BigNumber): boolean;
|
|
31
32
|
export declare function getMessageHash(message: string): string;
|
|
33
|
+
export declare function findInvalidFills(spokePoolClients: {
|
|
34
|
+
[chainId: number]: SpokePoolClient;
|
|
35
|
+
}): Promise<InvalidFill[]>;
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import { __assign } from "tslib";
|
|
1
|
+
import { __assign, __awaiter, __generator } from "tslib";
|
|
2
2
|
import { encodeAbiParameters, keccak256 } from "viem";
|
|
3
3
|
import { fixedPointAdjustment as fixedPoint } from "./common";
|
|
4
4
|
import { MAX_SAFE_DEPOSIT_ID, ZERO_BYTES } from "../constants";
|
|
5
5
|
import { FillType, } from "../interfaces";
|
|
6
6
|
import { svm } from "../arch";
|
|
7
7
|
import { BigNumber } from "./BigNumberUtils";
|
|
8
|
-
import { isMessageEmpty } from "./DepositUtils";
|
|
9
|
-
import { chainIsSvm } from "./NetworkUtils";
|
|
8
|
+
import { isMessageEmpty, validateFillForDeposit } from "./DepositUtils";
|
|
9
|
+
import { chainIsSvm, getNetworkName } from "./NetworkUtils";
|
|
10
10
|
import { toAddressType } from "./AddressUtils";
|
|
11
11
|
export function isSlowFill(fill) {
|
|
12
12
|
return fill.relayExecutionInfo.fillType === FillType.SlowFill;
|
|
@@ -85,4 +85,73 @@ export function isUnsafeDepositId(depositId) {
|
|
|
85
85
|
export function getMessageHash(message) {
|
|
86
86
|
return isMessageEmpty(message) ? ZERO_BYTES : keccak256(message);
|
|
87
87
|
}
|
|
88
|
+
export function findInvalidFills(spokePoolClients) {
|
|
89
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
90
|
+
var invalidFills, _i, _a, spokePoolClient, fills, fillDepositPairs, _b, fillDepositPairs_1, pair;
|
|
91
|
+
var _this = this;
|
|
92
|
+
return __generator(this, function (_c) {
|
|
93
|
+
switch (_c.label) {
|
|
94
|
+
case 0:
|
|
95
|
+
invalidFills = [];
|
|
96
|
+
_i = 0, _a = Object.values(spokePoolClients);
|
|
97
|
+
_c.label = 1;
|
|
98
|
+
case 1:
|
|
99
|
+
if (!(_i < _a.length)) return [3 /*break*/, 4];
|
|
100
|
+
spokePoolClient = _a[_i];
|
|
101
|
+
fills = spokePoolClient.getFills();
|
|
102
|
+
return [4 /*yield*/, Promise.all(fills.map(function (fill) { return __awaiter(_this, void 0, void 0, function () {
|
|
103
|
+
var depositResult, validationResult;
|
|
104
|
+
var _a;
|
|
105
|
+
return __generator(this, function (_b) {
|
|
106
|
+
switch (_b.label) {
|
|
107
|
+
case 0:
|
|
108
|
+
// Skip fills with unsafe deposit IDs
|
|
109
|
+
if (isUnsafeDepositId(fill.depositId)) {
|
|
110
|
+
return [2 /*return*/, null]; // Return null for unsafe deposits
|
|
111
|
+
}
|
|
112
|
+
return [4 /*yield*/, ((_a = spokePoolClients[fill.originChainId]) === null || _a === void 0 ? void 0 : _a.findDeposit(fill.depositId))];
|
|
113
|
+
case 1:
|
|
114
|
+
depositResult = _b.sent();
|
|
115
|
+
// If no deposits found at all
|
|
116
|
+
if (!(depositResult === null || depositResult === void 0 ? void 0 : depositResult.found)) {
|
|
117
|
+
return [2 /*return*/, {
|
|
118
|
+
fill: fill,
|
|
119
|
+
deposit: null,
|
|
120
|
+
reason: "No ".concat(getNetworkName(fill.originChainId), " deposit with depositId ").concat(fill.depositId, " found"),
|
|
121
|
+
}];
|
|
122
|
+
}
|
|
123
|
+
validationResult = validateFillForDeposit(fill, depositResult.deposit);
|
|
124
|
+
if (!validationResult.valid) {
|
|
125
|
+
return [2 /*return*/, {
|
|
126
|
+
fill: fill,
|
|
127
|
+
deposit: depositResult.deposit,
|
|
128
|
+
reason: validationResult.reason,
|
|
129
|
+
}];
|
|
130
|
+
}
|
|
131
|
+
// Valid fill with deposit - return null to filter out
|
|
132
|
+
return [2 /*return*/, null];
|
|
133
|
+
}
|
|
134
|
+
});
|
|
135
|
+
}); }))];
|
|
136
|
+
case 2:
|
|
137
|
+
fillDepositPairs = _c.sent();
|
|
138
|
+
for (_b = 0, fillDepositPairs_1 = fillDepositPairs; _b < fillDepositPairs_1.length; _b++) {
|
|
139
|
+
pair = fillDepositPairs_1[_b];
|
|
140
|
+
if (pair) {
|
|
141
|
+
invalidFills.push({
|
|
142
|
+
fill: pair.fill,
|
|
143
|
+
reason: pair.reason,
|
|
144
|
+
deposit: pair.deposit || undefined,
|
|
145
|
+
});
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
_c.label = 3;
|
|
149
|
+
case 3:
|
|
150
|
+
_i++;
|
|
151
|
+
return [3 /*break*/, 1];
|
|
152
|
+
case 4: return [2 /*return*/, invalidFills];
|
|
153
|
+
}
|
|
154
|
+
});
|
|
155
|
+
});
|
|
156
|
+
}
|
|
88
157
|
//# sourceMappingURL=SpokeUtils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SpokeUtils.js","sourceRoot":"","sources":["../../../src/utils/SpokeUtils.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,mBAAmB,EAAO,SAAS,EAAE,MAAM,MAAM,CAAC;AAC3D,OAAO,EAAE,oBAAoB,IAAI,UAAU,EAAE,MAAM,UAAU,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,EAIL,QAAQ,
|
|
1
|
+
{"version":3,"file":"SpokeUtils.js","sourceRoot":"","sources":["../../../src/utils/SpokeUtils.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,mBAAmB,EAAO,SAAS,EAAE,MAAM,MAAM,CAAC;AAC3D,OAAO,EAAE,oBAAoB,IAAI,UAAU,EAAE,MAAM,UAAU,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,EAIL,QAAQ,GAMT,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,GAAG,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AACxE,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAG/C,MAAM,UAAU,UAAU,CAAC,IAAU;IACnC,OAAO,IAAI,CAAC,kBAAkB,CAAC,QAAQ,KAAK,QAAQ,CAAC,QAAQ,CAAC;AAChE,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,IAAkB;IAChD,IAAA,SAAS,GAA0B,IAAI,UAA9B,EAAE,mBAAmB,GAAK,IAAI,oBAAT,CAAU;IAChD,OAAO,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;AACnG,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,kBAAkB,CAChC,QAAuB,EACvB,aAAqB;IAErB,IAAM,KAAK,GAAG,QAiBb,CAAC;IAEF,OAAO,sBACF,KAAK,KACR,aAAa,eAAA,EACb,SAAS,EAAE,aAAa,CAAC,KAAK,CAAC,SAAS,EAAE,aAAa,CAAC,EACxD,SAAS,EAAE,aAAa,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,kBAAkB,CAAC,EACnE,UAAU,EAAE,aAAa,CAAC,KAAK,CAAC,UAAU,EAAE,aAAa,CAAC,EAC1D,WAAW,EAAE,aAAa,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,kBAAkB,CAAC,EACvE,gBAAgB,EAAE,aAAa,CAAC,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,kBAAkB,CAAC,EACjF,WAAW,EAAE,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC,GAC4C,CAAC;AAC3F,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,eAAe,CAAC,QAAuB,EAAE,kBAA0B;IACjF,IAAM,KAAK,GAAG,QAkBb,CAAC;IAEF,OAAO,sBACF,KAAK,KACR,kBAAkB,oBAAA,EAClB,SAAS,EAAE,aAAa,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,aAAa,CAAC,EAC9D,SAAS,EAAE,aAAa,CAAC,KAAK,CAAC,SAAS,EAAE,kBAAkB,CAAC,EAC7D,UAAU,EAAE,aAAa,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,aAAa,CAAC,EAChE,WAAW,EAAE,aAAa,CAAC,KAAK,CAAC,WAAW,EAAE,kBAAkB,CAAC,EACjE,gBAAgB,EAAE,aAAa,CAAC,KAAK,CAAC,gBAAgB,EAAE,kBAAkB,CAAC,EAC3E,OAAO,EAAE,aAAa,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,gBAAgB,CAAC,EAC7D,kBAAkB,wBACb,KAAK,CAAC,kBAAkB,KAC3B,gBAAgB,EAAE,aAAa,CAAC,KAAK,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,kBAAkB,CAAC,MAEzE,CAAC;AAC5B,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,gBAAgB,CAAC,SAAoB,EAAE,kBAA0B;IAC/E,IAAM,GAAG,GAAG;QACV;YACE,IAAI,EAAE,OAAO;YACb,UAAU,EAAE;gBACV,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE;gBACtC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE;gBACtC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,kBAAkB,EAAE;gBAC7C,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,YAAY,EAAE;gBACvC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,EAAE;gBACxC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,EAAE;gBACxC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,cAAc,EAAE;gBACzC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,eAAe,EAAE;gBAC1C,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE;gBACtC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,cAAc,EAAE;gBACxC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,qBAAqB,EAAE;gBAC/C,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;aACnC;SACF;QACD,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,oBAAoB,EAAE;KAChD,CAAC;IAEF,IAAM,UAAU,yBACX,SAAS,KACZ,SAAS,EAAE,SAAS,CAAC,SAAS,CAAC,SAAS,EAAE,EAC1C,SAAS,EAAE,SAAS,CAAC,SAAS,CAAC,SAAS,EAAE,EAC1C,UAAU,EAAE,SAAS,CAAC,UAAU,CAAC,SAAS,EAAE,EAC5C,WAAW,EAAE,SAAS,CAAC,WAAW,CAAC,SAAS,EAAE,EAC9C,gBAAgB,EAAE,SAAS,CAAC,gBAAgB,CAAC,SAAS,EAAE,GACzD,CAAC;IACF,IAAI,UAAU,CAAC,kBAAkB,CAAC,EAAE,CAAC;QACnC,IAAM,WAAW,GAAG,cAAc,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACtD,OAAO,GAAG,CAAC,gBAAgB,uBAAM,SAAS,KAAE,WAAW,aAAA,KAAI,kBAAkB,CAAC,CAAC;IACjF,CAAC;IACD,OAAO,SAAS,CAAC,mBAAmB,CAAC,GAAG,EAAE,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAC;AAC/E,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,CAA6C;IACjF,OAAO,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,kBAAkB,CAAC,CAAC;AACnD,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,SAAoB;IACpD,0GAA0G;IAC1G,mHAAmH;IACnH,gHAAgH;IAChH,oGAAoG;IACpG,eAAe;IACf,IAAM,gBAAgB,GAAG,SAAS,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IAC7D,OAAO,gBAAgB,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,OAAe;IAC5C,OAAO,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,OAAc,CAAC,CAAC;AAC1E,CAAC;AAED,MAAM,UAAgB,gBAAgB,CAAC,gBAEtC;;;;;;;oBACO,YAAY,GAAkB,EAAE,CAAC;0BAGsB,EAA/B,KAAA,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC;;;yBAA/B,CAAA,cAA+B,CAAA;oBAAlD,eAAe;oBAElB,KAAK,GAAG,eAAe,CAAC,QAAQ,EAAE,CAAC;oBAGhB,qBAAM,OAAO,CAAC,GAAG,CACxC,KAAK,CAAC,GAAG,CAAC,UAAO,IAAI;;;;;;wCACnB,qCAAqC;wCACrC,IAAI,iBAAiB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;4CACtC,sBAAO,IAAI,EAAC,CAAC,kCAAkC;wCACjD,CAAC;wCAGqB,qBAAM,CAAA,MAAA,gBAAgB,CAAC,IAAI,CAAC,aAAa,CAAC,0CAAE,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA,EAAA;;wCAAvF,aAAa,GAAG,SAAuE;wCAE7F,8BAA8B;wCAC9B,IAAI,CAAC,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,KAAK,CAAA,EAAE,CAAC;4CAC1B,sBAAO;oDACL,IAAI,MAAA;oDACJ,OAAO,EAAE,IAAI;oDACb,MAAM,EAAE,aAAM,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,qCAA2B,IAAI,CAAC,SAAS,WAAQ;iDAClG,EAAC;wCACJ,CAAC;wCAGK,gBAAgB,GAAG,sBAAsB,CAAC,IAAI,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;wCAC7E,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC;4CAC5B,sBAAO;oDACL,IAAI,MAAA;oDACJ,OAAO,EAAE,aAAa,CAAC,OAAO;oDAC9B,MAAM,EAAE,gBAAgB,CAAC,MAAM;iDAChC,EAAC;wCACJ,CAAC;wCAED,sDAAsD;wCACtD,sBAAO,IAAI,EAAC;;;6BACb,CAAC,CACH,EAAA;;oBAhCK,gBAAgB,GAAG,SAgCxB;oBAED,WAAmC,EAAhB,qCAAgB,EAAhB,8BAAgB,EAAhB,IAAgB,EAAE,CAAC;wBAA3B,IAAI;wBACb,IAAI,IAAI,EAAE,CAAC;4BACT,YAAY,CAAC,IAAI,CAAC;gCAChB,IAAI,EAAE,IAAI,CAAC,IAAI;gCACf,MAAM,EAAE,IAAI,CAAC,MAAM;gCACnB,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,SAAS;6BACnC,CAAC,CAAC;wBACL,CAAC;oBACH,CAAC;;;oBA/C2B,IAA+B,CAAA;;wBAkD7D,sBAAO,YAAY,EAAC;;;;CACrB"}
|
|
@@ -21,5 +21,6 @@ export declare class EVMSpokePoolClient extends SpokePoolClient {
|
|
|
21
21
|
getTimeAt(blockNumber: number): Promise<number>;
|
|
22
22
|
findDeposit(depositId: BigNumber): Promise<DepositSearchResult>;
|
|
23
23
|
getTimestampForBlock(blockNumber: number): Promise<number>;
|
|
24
|
+
private queryDepositEvents;
|
|
24
25
|
}
|
|
25
26
|
//# sourceMappingURL=EVMSpokePoolClient.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EVMSpokePoolClient.d.ts","sourceRoot":"","sources":["../../../../src/clients/SpokePoolClient/EVMSpokePoolClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAe,MAAM,QAAQ,CAAC;AAS/C,OAAO,EAAoB,UAAU,
|
|
1
|
+
{"version":3,"file":"EVMSpokePoolClient.d.ts","sourceRoot":"","sources":["../../../../src/clients/SpokePoolClient/EVMSpokePoolClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAe,MAAM,QAAQ,CAAC;AAS/C,OAAO,EAAoB,UAAU,EAAO,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAChF,OAAO,EACL,SAAS,EACT,mBAAmB,EAGnB,YAAY,EAIb,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,iBAAiB,EAKlB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAmB,eAAe,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACtF,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD;;GAEG;AACH,qBAAa,kBAAmB,SAAQ,eAAe;aAInC,SAAS,EAAE,QAAQ;IAHrC,QAAQ,CAAC,IAAI,SAA8B;gBAEzC,MAAM,EAAE,OAAO,CAAC,MAAM,EACN,SAAS,EAAE,QAAQ,EACnC,aAAa,EAAE,aAAa,GAAG,IAAI,EACnC,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,MAAM,EACvB,iBAAiB,GAAE,YAAY,CAAC,iBAAiB,EAAE,IAAI,CAA+B;IAMxE,eAAe,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAI7E,eAAe,CAAC,SAAS,EAAE,SAAS,EAAE,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,UAAU,GAAG,SAAS,CAAC,EAAE,CAAC;IAI/F,yBAAyB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIhG,OAAO,CAAC,uBAAuB;IAQf,oBAAoB,IAAI,MAAM,EAAE;cAIvB,OAAO,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC;IAwEnE,SAAS,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIzC,WAAW,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAsCrE,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;YAI5D,kBAAkB;CA8CjC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SVMSpokePoolClient.d.ts","sourceRoot":"","sources":["../../../../src/clients/SpokePoolClient/SVMSpokePoolClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AACpF,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAML,kBAAkB,EAInB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,UAAU,EAAE,wBAAwB,EAAiB,MAAM,kBAAkB,CAAC;AACvF,OAAO,EACL,SAAS,EACT,mBAAmB,EACnB,iBAAiB,EAIjB,YAAY,EAGb,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAmB,eAAe,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGtF;;;GAGG;AACH,qBAAa,kBAAmB,SAAQ,eAAe;IAW5C,eAAe,EAAE,kBAAkB;IAC1C,SAAS,CAAC,SAAS,EAAE,OAAO;IAC5B,SAAS,CAAC,QAAQ,EAAE,OAAO;IAZ7B,QAAQ,CAAC,IAAI,SAA8B;IAC3C;;OAEG;gBAED,MAAM,EAAE,OAAO,CAAC,MAAM,EACtB,aAAa,EAAE,aAAa,GAAG,IAAI,EACnC,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,EAAE,6CAA6C;IACrE,iBAAiB,EAAE,YAAY,CAAC,iBAAiB,EAAE,IAAI,CAAC,EACjD,eAAe,EAAE,kBAAkB,EAChC,SAAS,EAAE,OAAO,EAClB,QAAQ,EAAE,OAAO;IAO7B;;OAEG;WACiB,MAAM,CACxB,MAAM,EAAE,OAAO,CAAC,MAAM,EACtB,aAAa,EAAE,aAAa,GAAG,IAAI,EACnC,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,EACtB,iBAAiB,EAAE,YAAY,CAAC,iBAAiB,EAAE,IAAI,CAAC,YAA8B,EAAE,kBAAkB;IAC1G,GAAG,EAAE,GAAG,CAAC,yBAAyB,CAAC,YAAY,CAAC,CAAC,GAChD,OAAO,CAAC,kBAAkB,CAAC;IAgB9B;;OAEG;WACiB,6BAA6B,CAC/C,MAAM,EAAE,OAAO,CAAC,MAAM,EACtB,aAAa,EAAE,aAAa,GAAG,IAAI,EACnC,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,EACtB,iBAAiB,EAAE,YAAY,CAAC,iBAAiB,EAAE,IAAI,CAAC,YAA8B,EAAE,kBAAkB;IAC1G,WAAW,EAAE,kBAAkB;IAgB1B,oBAAoB,IAAI,MAAM,EAAE;IAQvC;;OAEG;cACa,OAAO,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC;IAmE1E;;;OAGG;IACa,yBAAyB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIhG;;OAEG;IACmB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAazE;;;;OAIG;IACI,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAI/C;;OAEG;IACU,WAAW,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"SVMSpokePoolClient.d.ts","sourceRoot":"","sources":["../../../../src/clients/SpokePoolClient/SVMSpokePoolClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AACpF,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAML,kBAAkB,EAInB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,UAAU,EAAE,wBAAwB,EAAiB,MAAM,kBAAkB,CAAC;AACvF,OAAO,EACL,SAAS,EACT,mBAAmB,EACnB,iBAAiB,EAIjB,YAAY,EAGb,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAmB,eAAe,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGtF;;;GAGG;AACH,qBAAa,kBAAmB,SAAQ,eAAe;IAW5C,eAAe,EAAE,kBAAkB;IAC1C,SAAS,CAAC,SAAS,EAAE,OAAO;IAC5B,SAAS,CAAC,QAAQ,EAAE,OAAO;IAZ7B,QAAQ,CAAC,IAAI,SAA8B;IAC3C;;OAEG;gBAED,MAAM,EAAE,OAAO,CAAC,MAAM,EACtB,aAAa,EAAE,aAAa,GAAG,IAAI,EACnC,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,EAAE,6CAA6C;IACrE,iBAAiB,EAAE,YAAY,CAAC,iBAAiB,EAAE,IAAI,CAAC,EACjD,eAAe,EAAE,kBAAkB,EAChC,SAAS,EAAE,OAAO,EAClB,QAAQ,EAAE,OAAO;IAO7B;;OAEG;WACiB,MAAM,CACxB,MAAM,EAAE,OAAO,CAAC,MAAM,EACtB,aAAa,EAAE,aAAa,GAAG,IAAI,EACnC,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,EACtB,iBAAiB,EAAE,YAAY,CAAC,iBAAiB,EAAE,IAAI,CAAC,YAA8B,EAAE,kBAAkB;IAC1G,GAAG,EAAE,GAAG,CAAC,yBAAyB,CAAC,YAAY,CAAC,CAAC,GAChD,OAAO,CAAC,kBAAkB,CAAC;IAgB9B;;OAEG;WACiB,6BAA6B,CAC/C,MAAM,EAAE,OAAO,CAAC,MAAM,EACtB,aAAa,EAAE,aAAa,GAAG,IAAI,EACnC,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,EACtB,iBAAiB,EAAE,YAAY,CAAC,iBAAiB,EAAE,IAAI,CAAC,YAA8B,EAAE,kBAAkB;IAC1G,WAAW,EAAE,kBAAkB;IAgB1B,oBAAoB,IAAI,MAAM,EAAE;IAQvC;;OAEG;cACa,OAAO,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC;IAmE1E;;;OAGG;IACa,yBAAyB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIhG;;OAEG;IACmB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAazE;;;;OAIG;IACI,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAI/C;;OAEG;IACU,WAAW,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,mBAAmB,CAAC;IA8B5E;;OAEG;IACa,eAAe,CAAC,SAAS,EAAE,wBAAwB,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAI5G;;;;;OAKG;IACI,eAAe,CACpB,SAAS,EAAE,wBAAwB,EAAE,EACrC,QAAQ,CAAC,EAAE,MAAM,EACjB,kBAAkB,CAAC,EAAE,MAAM,GAC1B,OAAO,CAAC,CAAC,UAAU,GAAG,SAAS,CAAC,EAAE,CAAC;CAKvC"}
|
|
@@ -150,4 +150,9 @@ export interface SpokePoolClientsByChain {
|
|
|
150
150
|
export interface RelayDataWithMessageHash extends RelayData {
|
|
151
151
|
messageHash?: string;
|
|
152
152
|
}
|
|
153
|
+
export interface InvalidFill {
|
|
154
|
+
fill: FillWithBlock;
|
|
155
|
+
reason: string;
|
|
156
|
+
deposit?: DepositWithBlock;
|
|
157
|
+
}
|
|
153
158
|
//# sourceMappingURL=SpokePool.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SpokePool.d.ts","sourceRoot":"","sources":["../../../src/interfaces/SpokePool.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"SpokePool.d.ts","sourceRoot":"","sources":["../../../src/interfaces/SpokePool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import { DepositWithBlock, Fill, FillWithBlock, RelayData, SlowFillLeaf, SortableEvent } from "../interfaces";
|
|
1
|
+
import { DepositWithBlock, Fill, FillWithBlock, InvalidFill, RelayData, SlowFillLeaf, SortableEvent } from "../interfaces";
|
|
2
2
|
import { BigNumber } from "./BigNumberUtils";
|
|
3
|
+
import { SpokePoolClient } from "../clients";
|
|
3
4
|
export declare function isSlowFill(fill: Fill): boolean;
|
|
4
5
|
export declare function getSlowFillLeafLpFeePct(leaf: SlowFillLeaf): BigNumber;
|
|
5
6
|
/**
|
|
@@ -29,4 +30,7 @@ export declare function getRelayHashFromEvent(e: RelayData & {
|
|
|
29
30
|
}): string;
|
|
30
31
|
export declare function isUnsafeDepositId(depositId: BigNumber): boolean;
|
|
31
32
|
export declare function getMessageHash(message: string): string;
|
|
33
|
+
export declare function findInvalidFills(spokePoolClients: {
|
|
34
|
+
[chainId: number]: SpokePoolClient;
|
|
35
|
+
}): Promise<InvalidFill[]>;
|
|
32
36
|
//# sourceMappingURL=SpokeUtils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SpokeUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/SpokeUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,gBAAgB,EAChB,IAAI,EACJ,aAAa,EAEb,SAAS,EAET,YAAY,EACZ,aAAa,EACd,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"SpokeUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/SpokeUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,gBAAgB,EAChB,IAAI,EACJ,aAAa,EAEb,WAAW,EACX,SAAS,EAET,YAAY,EACZ,aAAa,EACd,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAI7C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,wBAAgB,UAAU,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAE9C;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,YAAY,GAAG,SAAS,CAGrE;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,aAAa,EACvB,aAAa,EAAE,MAAM,GACpB,IAAI,CAAC,gBAAgB,EAAE,kBAAkB,GAAG,eAAe,GAAG,aAAa,CAAC,CA8B9E;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,GAAG,aAAa,CAmClG;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAmCzF;AAED,wBAAgB,qBAAqB,CAAC,CAAC,EAAE,SAAS,GAAG;IAAE,kBAAkB,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAE3F;AAED,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAQ/D;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED,wBAAsB,gBAAgB,CAAC,gBAAgB,EAAE;IACvD,CAAC,OAAO,EAAE,MAAM,GAAG,eAAe,CAAC;CACpC,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAuDzB"}
|
package/package.json
CHANGED
|
@@ -7,7 +7,7 @@ import {
|
|
|
7
7
|
relayFillStatus,
|
|
8
8
|
getTimestampForBlock as _getTimestampForBlock,
|
|
9
9
|
} from "../../arch/evm";
|
|
10
|
-
import { DepositWithBlock, FillStatus, RelayData } from "../../interfaces";
|
|
10
|
+
import { DepositWithBlock, FillStatus, Log, RelayData } from "../../interfaces";
|
|
11
11
|
import {
|
|
12
12
|
BigNumber,
|
|
13
13
|
DepositSearchResult,
|
|
@@ -155,45 +155,14 @@ export class EVMSpokePoolClient extends SpokePoolClient {
|
|
|
155
155
|
}
|
|
156
156
|
|
|
157
157
|
// No deposit found; revert to searching for it.
|
|
158
|
-
const
|
|
159
|
-
const from = await findDepositBlock(this.spokePool, depositId, this.deploymentBlock, upperBound);
|
|
160
|
-
const chain = getNetworkName(this.chainId);
|
|
161
|
-
if (!from) {
|
|
162
|
-
const reason =
|
|
163
|
-
`Unable to find ${chain} depositId ${depositId}` +
|
|
164
|
-
` within blocks [${this.deploymentBlock}, ${upperBound ?? "latest"}].`;
|
|
165
|
-
return { found: false, code: InvalidFill.DepositIdNotFound, reason };
|
|
166
|
-
}
|
|
158
|
+
const result = await this.queryDepositEvents(depositId);
|
|
167
159
|
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
// Check both V3FundsDeposited and FundsDeposited events to look for a specified depositId.
|
|
171
|
-
const { maxLookBack } = this.eventSearchConfig;
|
|
172
|
-
const query = (
|
|
173
|
-
await Promise.all([
|
|
174
|
-
paginatedEventQuery(
|
|
175
|
-
this.spokePool,
|
|
176
|
-
this.spokePool.filters.V3FundsDeposited(null, null, null, null, null, depositId),
|
|
177
|
-
{ from, to, maxLookBack }
|
|
178
|
-
),
|
|
179
|
-
paginatedEventQuery(
|
|
180
|
-
this.spokePool,
|
|
181
|
-
this.spokePool.filters.FundsDeposited(null, null, null, null, null, depositId),
|
|
182
|
-
{ from, to, maxLookBack }
|
|
183
|
-
),
|
|
184
|
-
])
|
|
185
|
-
).flat();
|
|
186
|
-
const tStop = Date.now();
|
|
187
|
-
|
|
188
|
-
const event = query.find(({ args }) => args["depositId"].eq(depositId));
|
|
189
|
-
if (event === undefined) {
|
|
190
|
-
return {
|
|
191
|
-
found: false,
|
|
192
|
-
code: InvalidFill.DepositIdNotFound,
|
|
193
|
-
reason: `${chain} depositId ${depositId} not found at block ${from}.`,
|
|
194
|
-
};
|
|
160
|
+
if ("reason" in result) {
|
|
161
|
+
return { found: false, code: InvalidFill.DepositIdNotFound, reason: result.reason };
|
|
195
162
|
}
|
|
196
163
|
|
|
164
|
+
const { event, elapsedMs } = result;
|
|
165
|
+
|
|
197
166
|
const partialDeposit = unpackDepositEvent(spreadEventWithBlockNumber(event), this.chainId);
|
|
198
167
|
const quoteBlockNumber = await this.getBlockNumber(partialDeposit.quoteTimestamp);
|
|
199
168
|
const outputToken = partialDeposit.outputToken.isZeroAddress()
|
|
@@ -212,13 +181,59 @@ export class EVMSpokePoolClient extends SpokePoolClient {
|
|
|
212
181
|
at: "SpokePoolClient#findDeposit",
|
|
213
182
|
message: "Located deposit outside of SpokePoolClient's search range",
|
|
214
183
|
deposit,
|
|
215
|
-
elapsedMs
|
|
184
|
+
elapsedMs,
|
|
216
185
|
});
|
|
217
|
-
|
|
218
186
|
return { found: true, deposit };
|
|
219
187
|
}
|
|
220
188
|
|
|
221
189
|
public override getTimestampForBlock(blockNumber: number): Promise<number> {
|
|
222
190
|
return _getTimestampForBlock(this.spokePool.provider, blockNumber);
|
|
223
191
|
}
|
|
192
|
+
|
|
193
|
+
private async queryDepositEvents(
|
|
194
|
+
depositId: BigNumber
|
|
195
|
+
): Promise<{ event: Log; elapsedMs: number } | { reason: string }> {
|
|
196
|
+
const tStart = Date.now();
|
|
197
|
+
const upperBound = this.latestHeightSearched || undefined;
|
|
198
|
+
const from = await findDepositBlock(this.spokePool, depositId, this.deploymentBlock, upperBound);
|
|
199
|
+
const chain = getNetworkName(this.chainId);
|
|
200
|
+
|
|
201
|
+
if (!from) {
|
|
202
|
+
return {
|
|
203
|
+
reason: `Unable to find ${chain} depositId ${depositId} within blocks [${this.deploymentBlock}, ${
|
|
204
|
+
upperBound ?? "latest"
|
|
205
|
+
}].`,
|
|
206
|
+
};
|
|
207
|
+
}
|
|
208
|
+
|
|
209
|
+
const to = from;
|
|
210
|
+
|
|
211
|
+
const { maxLookBack } = this.eventSearchConfig;
|
|
212
|
+
const events = (
|
|
213
|
+
await Promise.all([
|
|
214
|
+
paginatedEventQuery(
|
|
215
|
+
this.spokePool,
|
|
216
|
+
this.spokePool.filters.V3FundsDeposited(null, null, null, null, null, depositId),
|
|
217
|
+
{ from, to, maxLookBack }
|
|
218
|
+
),
|
|
219
|
+
paginatedEventQuery(
|
|
220
|
+
this.spokePool,
|
|
221
|
+
this.spokePool.filters.FundsDeposited(null, null, null, null, null, depositId),
|
|
222
|
+
{ from, to, maxLookBack }
|
|
223
|
+
),
|
|
224
|
+
])
|
|
225
|
+
)
|
|
226
|
+
.flat()
|
|
227
|
+
.filter(({ args }) => args["depositId"].eq(depositId));
|
|
228
|
+
|
|
229
|
+
const tStop = Date.now();
|
|
230
|
+
const [event] = events;
|
|
231
|
+
if (!event) {
|
|
232
|
+
return {
|
|
233
|
+
reason: `Unable to find ${chain} depositId ${depositId} within blocks [${from}, ${upperBound ?? "latest"}].`,
|
|
234
|
+
};
|
|
235
|
+
}
|
|
236
|
+
|
|
237
|
+
return { event, elapsedMs: tStop - tStart };
|
|
238
|
+
}
|
|
224
239
|
}
|
|
@@ -218,6 +218,11 @@ export class SVMSpokePoolClient extends SpokePoolClient {
|
|
|
218
218
|
* Finds a deposit based on its deposit ID on the SVM chain.
|
|
219
219
|
*/
|
|
220
220
|
public async findDeposit(depositId: BigNumber): Promise<DepositSearchResult> {
|
|
221
|
+
// First check memory for deposits
|
|
222
|
+
const memoryDeposit = this.getDeposit(depositId);
|
|
223
|
+
if (memoryDeposit) {
|
|
224
|
+
return { found: true, deposit: memoryDeposit };
|
|
225
|
+
}
|
|
221
226
|
const deposit = await findDeposit(this.svmEventsClient, depositId, this.logger);
|
|
222
227
|
if (!deposit) {
|
|
223
228
|
return {
|
|
@@ -175,3 +175,9 @@ export interface SpokePoolClientsByChain {
|
|
|
175
175
|
export interface RelayDataWithMessageHash extends RelayData {
|
|
176
176
|
messageHash?: string;
|
|
177
177
|
}
|
|
178
|
+
|
|
179
|
+
export interface InvalidFill {
|
|
180
|
+
fill: FillWithBlock;
|
|
181
|
+
reason: string;
|
|
182
|
+
deposit?: DepositWithBlock;
|
|
183
|
+
}
|
package/src/utils/SpokeUtils.ts
CHANGED
|
@@ -6,6 +6,7 @@ import {
|
|
|
6
6
|
Fill,
|
|
7
7
|
FillWithBlock,
|
|
8
8
|
FillType,
|
|
9
|
+
InvalidFill,
|
|
9
10
|
RelayData,
|
|
10
11
|
RelayExecutionEventInfo,
|
|
11
12
|
SlowFillLeaf,
|
|
@@ -13,9 +14,10 @@ import {
|
|
|
13
14
|
} from "../interfaces";
|
|
14
15
|
import { svm } from "../arch";
|
|
15
16
|
import { BigNumber } from "./BigNumberUtils";
|
|
16
|
-
import { isMessageEmpty } from "./DepositUtils";
|
|
17
|
-
import { chainIsSvm } from "./NetworkUtils";
|
|
17
|
+
import { isMessageEmpty, validateFillForDeposit } from "./DepositUtils";
|
|
18
|
+
import { chainIsSvm, getNetworkName } from "./NetworkUtils";
|
|
18
19
|
import { toAddressType } from "./AddressUtils";
|
|
20
|
+
import { SpokePoolClient } from "../clients";
|
|
19
21
|
|
|
20
22
|
export function isSlowFill(fill: Fill): boolean {
|
|
21
23
|
return fill.relayExecutionInfo.fillType === FillType.SlowFill;
|
|
@@ -171,3 +173,62 @@ export function isUnsafeDepositId(depositId: BigNumber): boolean {
|
|
|
171
173
|
export function getMessageHash(message: string): string {
|
|
172
174
|
return isMessageEmpty(message) ? ZERO_BYTES : keccak256(message as Hex);
|
|
173
175
|
}
|
|
176
|
+
|
|
177
|
+
export async function findInvalidFills(spokePoolClients: {
|
|
178
|
+
[chainId: number]: SpokePoolClient;
|
|
179
|
+
}): Promise<InvalidFill[]> {
|
|
180
|
+
const invalidFills: InvalidFill[] = [];
|
|
181
|
+
|
|
182
|
+
// Iterate through each spoke pool client
|
|
183
|
+
for (const spokePoolClient of Object.values(spokePoolClients)) {
|
|
184
|
+
// Get all fills for this client
|
|
185
|
+
const fills = spokePoolClient.getFills();
|
|
186
|
+
|
|
187
|
+
// Process fills in parallel for this client
|
|
188
|
+
const fillDepositPairs = await Promise.all(
|
|
189
|
+
fills.map(async (fill) => {
|
|
190
|
+
// Skip fills with unsafe deposit IDs
|
|
191
|
+
if (isUnsafeDepositId(fill.depositId)) {
|
|
192
|
+
return null; // Return null for unsafe deposits
|
|
193
|
+
}
|
|
194
|
+
|
|
195
|
+
// Get all deposits (including duplicates) for this fill's depositId, both in memory and on-chain
|
|
196
|
+
const depositResult = await spokePoolClients[fill.originChainId]?.findDeposit(fill.depositId);
|
|
197
|
+
|
|
198
|
+
// If no deposits found at all
|
|
199
|
+
if (!depositResult?.found) {
|
|
200
|
+
return {
|
|
201
|
+
fill,
|
|
202
|
+
deposit: null,
|
|
203
|
+
reason: `No ${getNetworkName(fill.originChainId)} deposit with depositId ${fill.depositId} found`,
|
|
204
|
+
};
|
|
205
|
+
}
|
|
206
|
+
|
|
207
|
+
// Check if fill is valid for deposit
|
|
208
|
+
const validationResult = validateFillForDeposit(fill, depositResult.deposit);
|
|
209
|
+
if (!validationResult.valid) {
|
|
210
|
+
return {
|
|
211
|
+
fill,
|
|
212
|
+
deposit: depositResult.deposit,
|
|
213
|
+
reason: validationResult.reason,
|
|
214
|
+
};
|
|
215
|
+
}
|
|
216
|
+
|
|
217
|
+
// Valid fill with deposit - return null to filter out
|
|
218
|
+
return null;
|
|
219
|
+
})
|
|
220
|
+
);
|
|
221
|
+
|
|
222
|
+
for (const pair of fillDepositPairs) {
|
|
223
|
+
if (pair) {
|
|
224
|
+
invalidFills.push({
|
|
225
|
+
fill: pair.fill,
|
|
226
|
+
reason: pair.reason,
|
|
227
|
+
deposit: pair.deposit || undefined,
|
|
228
|
+
});
|
|
229
|
+
}
|
|
230
|
+
}
|
|
231
|
+
}
|
|
232
|
+
|
|
233
|
+
return invalidFills;
|
|
234
|
+
}
|