@across-protocol/sdk 3.4.19 → 4.0.0-beta.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/clients/BundleDataClient/BundleDataClient.d.ts +1 -1
- package/dist/cjs/clients/BundleDataClient/BundleDataClient.js +215 -253
- package/dist/cjs/clients/BundleDataClient/BundleDataClient.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/utils/DataworkerUtils.d.ts +2 -1
- package/dist/cjs/clients/BundleDataClient/utils/DataworkerUtils.js +2 -1
- package/dist/cjs/clients/BundleDataClient/utils/DataworkerUtils.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/utils/FillUtils.d.ts +1 -3
- package/dist/cjs/clients/BundleDataClient/utils/FillUtils.js +1 -33
- package/dist/cjs/clients/BundleDataClient/utils/FillUtils.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/utils/SuperstructUtils.d.ts +12 -14
- 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 +16 -12
- package/dist/cjs/clients/SpokePoolClient.js +25 -20
- package/dist/cjs/clients/SpokePoolClient.js.map +1 -1
- package/dist/cjs/clients/mocks/MockSpokePoolClient.d.ts +5 -7
- package/dist/cjs/clients/mocks/MockSpokePoolClient.js +6 -18
- 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/providers/index.d.ts +0 -1
- package/dist/cjs/providers/index.js +0 -2
- package/dist/cjs/providers/index.js.map +1 -1
- package/dist/cjs/utils/AddressUtils.d.ts +0 -2
- package/dist/cjs/utils/AddressUtils.js +1 -19
- package/dist/cjs/utils/AddressUtils.js.map +1 -1
- package/dist/cjs/utils/BigNumberUtils.d.ts +0 -1
- package/dist/cjs/utils/BigNumberUtils.js +1 -5
- package/dist/cjs/utils/BigNumberUtils.js.map +1 -1
- package/dist/cjs/utils/CachingUtils.js +1 -1
- package/dist/cjs/utils/CachingUtils.js.map +1 -1
- package/dist/cjs/utils/DepositUtils.d.ts +1 -2
- package/dist/cjs/utils/DepositUtils.js +5 -14
- package/dist/cjs/utils/DepositUtils.js.map +1 -1
- package/dist/cjs/utils/EventUtils.js +0 -20
- package/dist/cjs/utils/EventUtils.js.map +1 -1
- package/dist/cjs/utils/NetworkUtils.d.ts +0 -1
- package/dist/cjs/utils/NetworkUtils.js +1 -6
- package/dist/cjs/utils/NetworkUtils.js.map +1 -1
- package/dist/cjs/utils/SpokeUtils.d.ts +5 -7
- package/dist/cjs/utils/SpokeUtils.js +59 -32
- 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/cjs/utils/common.d.ts +0 -1
- package/dist/cjs/utils/common.js +1 -2
- package/dist/cjs/utils/common.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/BundleDataClient.d.ts +1 -1
- package/dist/esm/clients/BundleDataClient/BundleDataClient.js +276 -323
- package/dist/esm/clients/BundleDataClient/BundleDataClient.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/utils/DataworkerUtils.d.ts +2 -1
- package/dist/esm/clients/BundleDataClient/utils/DataworkerUtils.js +3 -2
- package/dist/esm/clients/BundleDataClient/utils/DataworkerUtils.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/utils/FillUtils.d.ts +1 -3
- package/dist/esm/clients/BundleDataClient/utils/FillUtils.js +1 -42
- package/dist/esm/clients/BundleDataClient/utils/FillUtils.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.d.ts +12 -14
- 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 +24 -13
- package/dist/esm/clients/SpokePoolClient.js +34 -22
- package/dist/esm/clients/SpokePoolClient.js.map +1 -1
- package/dist/esm/clients/mocks/MockSpokePoolClient.d.ts +5 -7
- package/dist/esm/clients/mocks/MockSpokePoolClient.js +7 -19
- 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/providers/index.d.ts +0 -1
- package/dist/esm/providers/index.js +0 -2
- package/dist/esm/providers/index.js.map +1 -1
- package/dist/esm/utils/AddressUtils.d.ts +0 -2
- package/dist/esm/utils/AddressUtils.js +0 -25
- package/dist/esm/utils/AddressUtils.js.map +1 -1
- package/dist/esm/utils/BigNumberUtils.d.ts +0 -8
- package/dist/esm/utils/BigNumberUtils.js +0 -10
- package/dist/esm/utils/BigNumberUtils.js.map +1 -1
- package/dist/esm/utils/CachingUtils.js +1 -1
- package/dist/esm/utils/CachingUtils.js.map +1 -1
- package/dist/esm/utils/DepositUtils.d.ts +1 -2
- package/dist/esm/utils/DepositUtils.js +5 -14
- package/dist/esm/utils/DepositUtils.js.map +1 -1
- package/dist/esm/utils/EventUtils.js +0 -30
- package/dist/esm/utils/EventUtils.js.map +1 -1
- package/dist/esm/utils/NetworkUtils.d.ts +0 -6
- package/dist/esm/utils/NetworkUtils.js +0 -10
- package/dist/esm/utils/NetworkUtils.js.map +1 -1
- package/dist/esm/utils/SpokeUtils.d.ts +5 -7
- package/dist/esm/utils/SpokeUtils.js +61 -34
- 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/esm/utils/abi/typechain/Multicall3.d.ts +1 -4
- package/dist/esm/utils/abi/typechain/factories/Multicall3__factory.js.map +1 -1
- package/dist/esm/utils/common.d.ts +0 -1
- package/dist/esm/utils/common.js +0 -1
- package/dist/esm/utils/common.js.map +1 -1
- package/dist/types/clients/BundleDataClient/BundleDataClient.d.ts +1 -1
- package/dist/types/clients/BundleDataClient/BundleDataClient.d.ts.map +1 -1
- package/dist/types/clients/BundleDataClient/utils/DataworkerUtils.d.ts +2 -1
- package/dist/types/clients/BundleDataClient/utils/DataworkerUtils.d.ts.map +1 -1
- package/dist/types/clients/BundleDataClient/utils/FillUtils.d.ts +1 -3
- package/dist/types/clients/BundleDataClient/utils/FillUtils.d.ts.map +1 -1
- package/dist/types/clients/BundleDataClient/utils/SuperstructUtils.d.ts +12 -14
- package/dist/types/clients/BundleDataClient/utils/SuperstructUtils.d.ts.map +1 -1
- package/dist/types/clients/SpokePoolClient.d.ts +24 -13
- package/dist/types/clients/SpokePoolClient.d.ts.map +1 -1
- package/dist/types/clients/mocks/MockSpokePoolClient.d.ts +5 -7
- 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/providers/index.d.ts +0 -1
- package/dist/types/providers/index.d.ts.map +1 -1
- package/dist/types/utils/AddressUtils.d.ts +0 -2
- package/dist/types/utils/AddressUtils.d.ts.map +1 -1
- package/dist/types/utils/BigNumberUtils.d.ts +0 -8
- package/dist/types/utils/BigNumberUtils.d.ts.map +1 -1
- package/dist/types/utils/DepositUtils.d.ts +1 -2
- package/dist/types/utils/DepositUtils.d.ts.map +1 -1
- package/dist/types/utils/EventUtils.d.ts.map +1 -1
- package/dist/types/utils/NetworkUtils.d.ts +0 -6
- package/dist/types/utils/NetworkUtils.d.ts.map +1 -1
- package/dist/types/utils/SpokeUtils.d.ts +5 -7
- package/dist/types/utils/SpokeUtils.d.ts.map +1 -1
- package/dist/types/utils/abi/typechain/Multicall3.d.ts +1 -4
- package/dist/types/utils/abi/typechain/Multicall3.d.ts.map +1 -1
- package/dist/types/utils/abi/typechain/common.d.ts.map +1 -1
- package/dist/types/utils/abi/typechain/factories/Multicall3__factory.d.ts.map +1 -1
- package/dist/types/utils/common.d.ts +0 -1
- package/dist/types/utils/common.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/clients/BundleDataClient/BundleDataClient.ts +238 -309
- package/src/clients/BundleDataClient/utils/DataworkerUtils.ts +8 -0
- package/src/clients/BundleDataClient/utils/FillUtils.ts +2 -47
- package/src/clients/BundleDataClient/utils/SuperstructUtils.ts +2 -4
- package/src/clients/SpokePoolClient.ts +44 -31
- package/src/clients/mocks/MockSpokePoolClient.ts +10 -25
- package/src/constants.ts +2 -2
- package/src/interfaces/SpokePool.ts +2 -2
- package/src/providers/index.ts +0 -1
- package/src/utils/AddressUtils.ts +0 -26
- package/src/utils/BigNumberUtils.ts +0 -11
- package/src/utils/CachingUtils.ts +1 -1
- package/src/utils/DepositUtils.ts +5 -14
- package/src/utils/EventUtils.ts +0 -31
- package/src/utils/NetworkUtils.ts +0 -11
- package/src/utils/SpokeUtils.ts +60 -52
- package/src/utils/ValidatorUtils.ts +1 -1
- package/src/utils/common.ts +0 -2
- package/dist/cjs/providers/mockProvider.d.ts +0 -19
- package/dist/cjs/providers/mockProvider.js +0 -70
- package/dist/cjs/providers/mockProvider.js.map +0 -1
- package/dist/esm/providers/mockProvider.d.ts +0 -23
- package/dist/esm/providers/mockProvider.js +0 -73
- package/dist/esm/providers/mockProvider.js.map +0 -1
- package/dist/types/providers/mockProvider.d.ts +0 -24
- package/dist/types/providers/mockProvider.d.ts.map +0 -1
- package/src/providers/mockProvider.ts +0 -77
|
@@ -7,7 +7,6 @@ var constants_1 = require("../constants");
|
|
|
7
7
|
var NetworkUtils_1 = require("./NetworkUtils");
|
|
8
8
|
var CachingUtils_1 = require("./CachingUtils");
|
|
9
9
|
var FlowUtils_1 = require("./FlowUtils");
|
|
10
|
-
var SpokeUtils_1 = require("./SpokeUtils");
|
|
11
10
|
var TimeUtils_1 = require("./TimeUtils");
|
|
12
11
|
var TypeGuards_1 = require("./TypeGuards");
|
|
13
12
|
var ValidatorUtils_1 = require("./ValidatorUtils");
|
|
@@ -16,7 +15,6 @@ var InvalidFill;
|
|
|
16
15
|
InvalidFill[InvalidFill["DepositIdInvalid"] = 0] = "DepositIdInvalid";
|
|
17
16
|
InvalidFill[InvalidFill["DepositIdNotFound"] = 1] = "DepositIdNotFound";
|
|
18
17
|
InvalidFill[InvalidFill["FillMismatch"] = 2] = "FillMismatch";
|
|
19
|
-
InvalidFill[InvalidFill["DepositIdOutOfRange"] = 3] = "DepositIdOutOfRange";
|
|
20
18
|
})(InvalidFill || (exports.InvalidFill = InvalidFill = {}));
|
|
21
19
|
function queryHistoricalDepositForFill(spokePoolClient, fill, cache) {
|
|
22
20
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
@@ -24,13 +22,6 @@ function queryHistoricalDepositForFill(spokePoolClient, fill, cache) {
|
|
|
24
22
|
return tslib_1.__generator(this, function (_a) {
|
|
25
23
|
switch (_a.label) {
|
|
26
24
|
case 0:
|
|
27
|
-
if ((0, SpokeUtils_1.isUnsafeDepositId)(fill.depositId)) {
|
|
28
|
-
return [2, {
|
|
29
|
-
found: false,
|
|
30
|
-
code: InvalidFill.DepositIdOutOfRange,
|
|
31
|
-
reason: "Cannot find historical deposit for fill with unsafe deposit ID ".concat(fill.depositId, "."),
|
|
32
|
-
}];
|
|
33
|
-
}
|
|
34
25
|
if (fill.originChainId !== spokePoolClient.chainId) {
|
|
35
26
|
throw new Error("OriginChainId mismatch (".concat(fill.originChainId, " != ").concat(spokePoolClient.chainId, ")"));
|
|
36
27
|
}
|
|
@@ -39,15 +30,15 @@ function queryHistoricalDepositForFill(spokePoolClient, fill, cache) {
|
|
|
39
30
|
}
|
|
40
31
|
depositId = fill.depositId;
|
|
41
32
|
lowId = spokePoolClient.firstDepositIdForSpokePool, highId = spokePoolClient.lastDepositIdForSpokePool;
|
|
42
|
-
if (depositId
|
|
33
|
+
if (depositId < lowId || depositId > highId) {
|
|
43
34
|
return [2, {
|
|
44
35
|
found: false,
|
|
45
36
|
code: InvalidFill.DepositIdInvalid,
|
|
46
|
-
reason: "Deposit ID ".concat(depositId
|
|
37
|
+
reason: "Deposit ID ".concat(depositId, " is outside of SpokePool bounds [").concat(lowId, ",").concat(highId, "]."),
|
|
47
38
|
}];
|
|
48
39
|
}
|
|
49
40
|
(lowId = spokePoolClient.earliestDepositIdQueried, highId = spokePoolClient.latestDepositIdQueried);
|
|
50
|
-
if (depositId
|
|
41
|
+
if (depositId >= lowId && depositId <= highId) {
|
|
51
42
|
originChain = (0, NetworkUtils_1.getNetworkName)(fill.originChainId);
|
|
52
43
|
deposit_1 = spokePoolClient.getDeposit(depositId);
|
|
53
44
|
if ((0, TypeGuards_1.isDefined)(deposit_1)) {
|
|
@@ -58,13 +49,13 @@ function queryHistoricalDepositForFill(spokePoolClient, fill, cache) {
|
|
|
58
49
|
return [2, {
|
|
59
50
|
found: false,
|
|
60
51
|
code: InvalidFill.FillMismatch,
|
|
61
|
-
reason: "Fill for ".concat(originChain, " deposit ID ").concat(depositId
|
|
52
|
+
reason: "Fill for ".concat(originChain, " deposit ID ").concat(depositId, " is invalid (").concat(match_1.reason, ")."),
|
|
62
53
|
}];
|
|
63
54
|
}
|
|
64
55
|
return [2, {
|
|
65
56
|
found: false,
|
|
66
57
|
code: InvalidFill.DepositIdNotFound,
|
|
67
|
-
reason: "".concat(originChain, " deposit ID ").concat(depositId
|
|
58
|
+
reason: "".concat(originChain, " deposit ID ").concat(depositId, " not found in SpokePoolClient event buffer."),
|
|
68
59
|
}];
|
|
69
60
|
}
|
|
70
61
|
if (!cache) return [3, 2];
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"DepositUtils.js","sourceRoot":"","sources":["../../../src/utils/DepositUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,19 +3,8 @@ 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("./");
|
|
7
6
|
var maxRetries = 3;
|
|
8
7
|
var retrySleepTime = 10;
|
|
9
|
-
var knownExtendedAddressFields = [
|
|
10
|
-
"l2TokenAddress",
|
|
11
|
-
"inputToken",
|
|
12
|
-
"outputToken",
|
|
13
|
-
"depositor",
|
|
14
|
-
"recipient",
|
|
15
|
-
"exclusiveRelayer",
|
|
16
|
-
"relayer",
|
|
17
|
-
"updatedRecipient",
|
|
18
|
-
];
|
|
19
8
|
function spreadEvent(args) {
|
|
20
9
|
var keys = Object.keys(args).filter(function (key) { return isNaN(+key); });
|
|
21
10
|
var returnedObject = {};
|
|
@@ -63,15 +52,6 @@ function spreadEvent(args) {
|
|
|
63
52
|
if (returnedObject.rootBundleId) {
|
|
64
53
|
returnedObject.rootBundleId = Number(returnedObject.rootBundleId);
|
|
65
54
|
}
|
|
66
|
-
if ((0, _1.isDefined)(returnedObject.depositId)) {
|
|
67
|
-
returnedObject.depositId = (0, _1.toBN)(returnedObject.depositId);
|
|
68
|
-
}
|
|
69
|
-
for (var _i = 0, knownExtendedAddressFields_1 = knownExtendedAddressFields; _i < knownExtendedAddressFields_1.length; _i++) {
|
|
70
|
-
var field = knownExtendedAddressFields_1[_i];
|
|
71
|
-
if ((0, _1.isDefined)(returnedObject[field])) {
|
|
72
|
-
returnedObject[field] = (0, _1.toAddress)(String(returnedObject[field]));
|
|
73
|
-
}
|
|
74
|
-
}
|
|
75
55
|
return returnedObject;
|
|
76
56
|
}
|
|
77
57
|
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":";;;;AAIA,mCAAiC;AAEjC,IAAM,UAAU,GAAG,CAAC,CAAC;AACrB,IAAM,cAAc,GAAG,EAAE,CAAC;AAG1B,SAAgB,WAAW,CAAC,IAAsC;IAChE,IAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,UAAC,GAAW,IAAK,OAAA,KAAK,CAAC,CAAC,GAAG,CAAC,EAAX,CAAW,CAAC,CAAC;IAGpE,IAAM,cAAc,GAA+B,EAAE,CAAC;IACtD,IAAI,CAAC,OAAO,CAAC,UAAC,GAAW;QACvB,QAAQ,OAAO,IAAI,CAAC,GAAG,CAAC,EAAE;YACxB,KAAK,SAAS,CAAC;YACf,KAAK,QAAQ,CAAC;YACd,KAAK,QAAQ;gBACX,cAAc,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;gBAChC,MAAM;YACR,KAAK,QAAQ;gBACX,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE;oBAC5B,cAAc,CAAC,GAAG,CAAC;wBACjB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,UAAC,GAAW,IAAK,OAAA,KAAK,CAAC,CAAC,GAAG,CAAC,EAAX,CAAW,CAAC,CAAC,MAAM,GAAG,CAAC;4BACpE,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;4BACxB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;iBACjB;qBAAM;oBACL,cAAc,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;iBACjC;gBACD,MAAM;SACT;IACH,CAAC,CAAC,CAAC;IAGH,IAAI,cAAc,CAAC,UAAU,EAAE;QAC7B,cAAc,CAAC,UAAU,GAAG,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;KAC/D;IACD,IAAI,cAAc,CAAC,MAAM,EAAE;QACzB,cAAc,CAAC,MAAM,GAAG,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;KACvD;IACD,IAAI,cAAc,CAAC,OAAO,EAAE;QAC1B,cAAc,CAAC,OAAO,GAAG,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;KACzD;IACD,IAAI,cAAc,CAAC,kBAAkB,EAAE;QACrC,cAAc,CAAC,kBAAkB,GAAG,MAAM,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC;KAC/E;IACD,IAAI,cAAc,CAAC,aAAa,EAAE;QAChC,cAAc,CAAC,aAAa,GAAG,MAAM,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;KACrE;IACD,IAAI,cAAc,CAAC,gBAAgB,EAAE;QACnC,cAAc,CAAC,gBAAgB,GAAG,MAAM,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC;KAC3E;IACD,IAAI,cAAc,CAAC,SAAS,EAAE;QAC5B,cAAc,CAAC,SAAS,GAAG,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;KAC7D;IACD,IAAI,cAAc,CAAC,YAAY,EAAE;QAC/B,cAAc,CAAC,YAAY,GAAG,MAAM,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;KACnE;IAED,OAAO,cAAc,CAAC;AACxB,CAAC;AApDD,kCAoDC;AAQM,IAAM,UAAU,GAAG,UAAC,KAAY,IAAU,OAAA,uCAAM,KAAK,KAAE,KAAK,EAAE,KAAK,CAAC,KAAM,EAAE,IAAI,EAAE,WAAW,CAAC,KAAK,CAAC,IAAK,CAAC,IAAG,EAAnE,CAAmE,CAAC;AAAxG,QAAA,UAAU,cAA8F;AAErH,SAAsB,mBAAmB,CACvC,QAAkB,EAClB,MAAmB,EACnB,YAA+B,EAC/B,UAAc;IAAd,2BAAA,EAAA,cAAc;;;;;;yBAGV,CAAA,YAAY,CAAC,gBAAgB,KAAK,CAAC,CAAA,EAAnC,cAAmC;oBACtB,WAAM,QAAQ,CAAC,WAAW,CAAC,MAAM,EAAE,YAAY,CAAC,SAAS,EAAE,YAAY,CAAC,OAAO,CAAC,EAAA;;oBAAzF,MAAM,GAAG,SAAgF;oBAC/F,WAAO,MAAM,CAAC,GAAG,CAAC,kBAAU,CAAC,EAAC;;oBAM1B,eAAe,GAAG,uBAAuB,CAAC,YAAY,CAAC,CAAC;;;;oBAKxD,WAAM,OAAO,CAAC,GAAG,CACf,eAAe,CAAC,GAAG,CAAC,UAAC,EAAoB;gCAAnB,SAAS,QAAA,EAAE,OAAO,QAAA;4BAAM,OAAA,QAAQ,CAAC,WAAW,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC;wBAAhD,CAAgD,CAAC,CAChG,EAAA;wBAJL,WAAO,CACL,CACE,SAEC,CACF;yBACE,IAAI,EAAE;yBAEN,MAAM,CAAC,UAAC,KAAK,IAAK,OAAA,KAAK,CAAC,WAAW,IAAI,YAAY,CAAC,SAAS,IAAI,KAAK,CAAC,WAAW,IAAI,YAAY,CAAC,OAAO,EAAxF,CAAwF,CAAC;yBAC3G,GAAG,CAAC,kBAAU,CAAC,CACnB,EAAC;;;yBAEE,CAAA,UAAU,GAAG,UAAU,CAAA,EAAvB,cAAuB;oBACzB,WAAM,IAAA,cAAK,EAAC,cAAc,CAAC,EAAA;;oBAA3B,SAA2B,CAAC;oBACrB,WAAM,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,UAAU,GAAG,CAAC,CAAC,EAAA;wBAAhF,WAAO,SAAyE,EAAC;wBAEjF,MAAM,OAAK,CAAC;;;;;;CAGjB;AArCD,kDAqCC;AAgBD,SAAgB,uBAAuB,CAAC,EAIpB;QAHlB,SAAS,eAAA,EACT,OAAO,aAAA,EACP,gBAAgB,sBAAA;IAGhB,IAAI,gBAAgB,KAAK,SAAS,EAAE;QAClC,OAAO,CAAC,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC;KAC/B;IAGD,IAAI,SAAS,GAAG,OAAO,EAAE;QACvB,OAAO,EAAE,CAAC;KACX;IAGD,IAAI,gBAAgB,IAAI,CAAC,EAAE;QACzB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;KACrD;IAOD,IAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,gBAAgB,CAAC,GAAG,gBAAgB,CAAC;IAGtF,IAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,GAAG,CAAC,GAAG,iBAAiB,CAAC,GAAG,gBAAgB,CAAC,CAAC;IAEnF,IAAM,MAAM,GAAuB,EAAE,CAAC;IACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,EAAE,CAAC,EAAE,EAAE;QAEnC,IAAM,cAAc,GAAG,iBAAiB,GAAG,gBAAgB,GAAG,CAAC,CAAC;QAKhE,IAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,cAAc,GAAG,gBAAgB,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC;QAC9E,MAAM,CAAC,IAAI,CAAC,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC,CAAC;KAC7C;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AA3CD,0DA2CC;AAED,SAAgB,0BAA0B,CAAC,KAAU;IACnD,6CACK,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,KAC1B,WAAW,EAAE,KAAK,CAAC,WAAW,EAC9B,gBAAgB,EAAE,KAAK,CAAC,gBAAgB,EACxC,QAAQ,EAAE,KAAK,CAAC,QAAQ,EACxB,eAAe,EAAE,KAAK,CAAC,eAAe,IACtC;AACJ,CAAC;AARD,gEAQC;AAGD,SAAgB,mBAAmB,CAA0B,MAAW;IACtE,OAAO,0BAA0B,2BAAK,MAAM,QAAE,CAAC;AACjD,CAAC;AAFD,kDAEC;AAID,SAAgB,0BAA0B,CAA0B,MAAW;IAC7E,OAAO,MAAM,CAAC,IAAI,CAAC,UAAC,EAAE,EAAE,EAAE;QACxB,IAAI,EAAE,CAAC,WAAW,KAAK,EAAE,CAAC,WAAW,EAAE;YACrC,OAAO,EAAE,CAAC,WAAW,GAAG,EAAE,CAAC,WAAW,CAAC;SACxC;QACD,IAAI,EAAE,CAAC,gBAAgB,KAAK,EAAE,CAAC,gBAAgB,EAAE;YAC/C,OAAO,EAAE,CAAC,gBAAgB,GAAG,EAAE,CAAC,gBAAgB,CAAC;SAClD;QACD,OAAO,EAAE,CAAC,QAAQ,GAAG,EAAE,CAAC,QAAQ,CAAC;IACnC,CAAC,CAAC,CAAC;AACL,CAAC;AAVD,gEAUC;AAGD,SAAgB,oBAAoB,CAA0B,MAAW;IACvE,OAAO,2BAA2B,2BAAK,MAAM,QAAE,CAAC;AAClD,CAAC;AAFD,oDAEC;AAID,SAAgB,2BAA2B,CAA0B,MAAW;IAC9E,OAAO,MAAM,CAAC,IAAI,CAAC,UAAC,EAAE,EAAE,EAAE;QACxB,IAAI,EAAE,CAAC,WAAW,KAAK,EAAE,CAAC,WAAW,EAAE;YACrC,OAAO,EAAE,CAAC,WAAW,GAAG,EAAE,CAAC,WAAW,CAAC;SACxC;QACD,IAAI,EAAE,CAAC,gBAAgB,KAAK,EAAE,CAAC,gBAAgB,EAAE;YAC/C,OAAO,EAAE,CAAC,gBAAgB,GAAG,EAAE,CAAC,gBAAgB,CAAC;SAClD;QACD,OAAO,EAAE,CAAC,QAAQ,GAAG,EAAE,CAAC,QAAQ,CAAC;IACnC,CAAC,CAAC,CAAC;AACL,CAAC;AAVD,kEAUC;AAGD,SAAgB,YAAY,CAA0B,EAAK,EAAE,EAAK;IAChE,IAAI,EAAE,CAAC,WAAW,KAAK,EAAE,CAAC,WAAW,EAAE;QACrC,OAAO,EAAE,CAAC,WAAW,GAAG,EAAE,CAAC,WAAW,CAAC;KACxC;IACD,IAAI,EAAE,CAAC,gBAAgB,KAAK,EAAE,CAAC,gBAAgB,EAAE;QAC/C,OAAO,EAAE,CAAC,gBAAgB,GAAG,EAAE,CAAC,gBAAgB,CAAC;KAClD;IACD,OAAO,EAAE,CAAC,QAAQ,GAAG,EAAE,CAAC,QAAQ,CAAC;AACnC,CAAC;AARD,oCAQC;AAED,SAAgB,oBAAoB,CAAC,MAAuB;IAC1D,iCAAW,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,eAAe,EAAjB,CAAiB,CAAC,CAAC,CAAC,QAAE;AACxE,CAAC;AAFD,oDAEC"}
|
|
@@ -11,7 +11,6 @@ export declare function chainIsAlephZero(chainId: number): boolean;
|
|
|
11
11
|
export declare function chainIsLens(chainId: number): boolean;
|
|
12
12
|
export declare function chainIsLinea(chainId: number): boolean;
|
|
13
13
|
export declare function chainIsL1(chainId: number): boolean;
|
|
14
|
-
export declare function chainIsEvm(chainId: number): boolean;
|
|
15
14
|
export declare function chainIsCCTPEnabled(chainId: number): boolean;
|
|
16
15
|
export declare function chainRequiresL1ToL2Finalization(chainId: number): boolean;
|
|
17
16
|
export declare function getOriginFromURL(url: string): string;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getOriginFromURL = exports.chainRequiresL1ToL2Finalization = exports.chainIsCCTPEnabled = exports.
|
|
3
|
+
exports.getOriginFromURL = exports.chainRequiresL1ToL2Finalization = exports.chainIsCCTPEnabled = exports.chainIsL1 = exports.chainIsLinea = exports.chainIsLens = exports.chainIsAlephZero = exports.chainIsArbitrum = exports.chainIsOrbit = exports.chainIsZkStack = exports.chainIsOPStack = exports.chainIsMatic = exports.chainIsTestnet = exports.chainIsProd = exports.getNativeTokenSymbol = exports.getNetworkName = void 0;
|
|
4
4
|
var constants_1 = require("../constants");
|
|
5
5
|
var hreNetworks = {
|
|
6
6
|
666: "Hardhat1",
|
|
@@ -64,11 +64,6 @@ function chainIsL1(chainId) {
|
|
|
64
64
|
return [constants_1.CHAIN_IDs.MAINNET, constants_1.CHAIN_IDs.SEPOLIA].includes(chainId);
|
|
65
65
|
}
|
|
66
66
|
exports.chainIsL1 = chainIsL1;
|
|
67
|
-
function chainIsEvm(chainId) {
|
|
68
|
-
chainId;
|
|
69
|
-
return true;
|
|
70
|
-
}
|
|
71
|
-
exports.chainIsEvm = chainIsEvm;
|
|
72
67
|
function chainIsCCTPEnabled(chainId) {
|
|
73
68
|
return [
|
|
74
69
|
constants_1.CHAIN_IDs.BASE,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NetworkUtils.js","sourceRoot":"","sources":["../../../src/utils/NetworkUtils.ts"],"names":[],"mappings":";;;AAAA,0CAA6G;AAE7G,IAAM,WAAW,GAA2B;IAC1C,GAAG,EAAE,UAAU;IACf,IAAI,EAAE,UAAU;CACjB,CAAC;AAOF,SAAgB,cAAc,CAAC,SAA0B;;IACvD,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;IAC9B,OAAO,MAAA,MAAA,MAAA,2BAAe,CAAC,SAAS,CAAC,0CAAE,IAAI,mCAAI,WAAW,CAAC,SAAS,CAAC,mCAAI,SAAS,CAAC;AACjF,CAAC;AAHD,wCAGC;AAOD,SAAgB,oBAAoB,CAAC,OAAwB;;IAC3D,OAAO,MAAA,MAAA,2BAAe,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,0CAAE,WAAW,mCAAI,KAAK,CAAC;AAChE,CAAC;AAFD,oDAEC;AAOD,SAAgB,WAAW,CAAC,OAAe;IACzC,OAAO,MAAM,CAAC,MAAM,CAAC,6BAAiB,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AAC5D,CAAC;AAFD,kCAEC;AAOD,SAAgB,cAAc,CAAC,OAAe;IAC5C,OAAO,MAAM,CAAC,MAAM,CAAC,6BAAiB,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AAC5D,CAAC;AAFD,wCAEC;AAOD,SAAgB,YAAY,CAAC,OAAe;IAC1C,OAAO,CAAC,qBAAS,CAAC,OAAO,EAAE,qBAAS,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AACvE,CAAC;AAFD,oCAEC;AAOD,SAAgB,cAAc,CAAC,OAAe;;IAC5C,OAAO,CAAA,MAAA,2BAAe,CAAC,OAAO,CAAC,0CAAE,MAAM,MAAK,uBAAW,CAAC,QAAQ,CAAC;AACnE,CAAC;AAFD,wCAEC;AAOD,SAAgB,cAAc,CAAC,OAAe;;IAC5C,OAAO,CAAA,MAAA,2BAAe,CAAC,OAAO,CAAC,0CAAE,MAAM,MAAK,uBAAW,CAAC,QAAQ,CAAC;AACnE,CAAC;AAFD,wCAEC;AAOD,SAAgB,YAAY,CAAC,OAAe;;IAC1C,OAAO,CAAA,MAAA,2BAAe,CAAC,OAAO,CAAC,0CAAE,MAAM,MAAK,uBAAW,CAAC,KAAK,CAAC;AAChE,CAAC;AAFD,oCAEC;AAOD,SAAgB,eAAe,CAAC,OAAe;IAC7C,OAAO,CAAC,qBAAS,CAAC,QAAQ,EAAE,qBAAS,CAAC,gBAAgB,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AAC5E,CAAC;AAFD,0CAEC;AAOD,SAAgB,gBAAgB,CAAC,OAAe;IAC9C,OAAO,CAAC,qBAAS,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AAClD,CAAC;AAFD,4CAEC;AAOD,SAAgB,WAAW,CAAC,OAAe;IACzC,OAAO,CAAC,qBAAS,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AACpD,CAAC;AAFD,kCAEC;AAOD,SAAgB,YAAY,CAAC,OAAe;IAC1C,OAAO,CAAC,qBAAS,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AAC7C,CAAC;AAFD,oCAEC;AAOD,SAAgB,SAAS,CAAC,OAAe;IACvC,OAAO,CAAC,qBAAS,CAAC,OAAO,EAAE,qBAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AAClE,CAAC;AAFD,8BAEC;AAOD,SAAgB,
|
|
1
|
+
{"version":3,"file":"NetworkUtils.js","sourceRoot":"","sources":["../../../src/utils/NetworkUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,20 +1,18 @@
|
|
|
1
1
|
import { Contract, PopulatedTransaction, providers } from "ethers";
|
|
2
|
-
import { Deposit, Fill, FillStatus, RelayData, SlowFillRequest } from "../interfaces";
|
|
2
|
+
import { Deposit, Fill, FillStatus, FillWithBlock, RelayData, SlowFillRequest } from "../interfaces";
|
|
3
3
|
import { SpokePoolClient } from "../clients";
|
|
4
|
-
import { BigNumber } from "./BigNumberUtils";
|
|
5
4
|
type BlockTag = providers.BlockTag;
|
|
6
5
|
export declare function populateV3Relay(spokePool: Contract, deposit: Deposit, relayer: string, repaymentChainId?: number): Promise<PopulatedTransaction>;
|
|
7
|
-
export declare function getBlockRangeForDepositId(targetDepositId:
|
|
6
|
+
export declare function getBlockRangeForDepositId(targetDepositId: number, initLow: number, initHigh: number, maxSearches: number, spokePool: SpokePoolClient): Promise<{
|
|
8
7
|
low: number;
|
|
9
8
|
high: number;
|
|
10
9
|
}>;
|
|
11
|
-
export declare function getDepositIdAtBlock(contract: Contract, blockTag: number): Promise<
|
|
10
|
+
export declare function getDepositIdAtBlock(contract: Contract, blockTag: number): Promise<number>;
|
|
12
11
|
export declare function getRelayDataHash(relayData: RelayData, destinationChainId: number): string;
|
|
13
12
|
export declare function getRelayHashFromEvent(e: Deposit | Fill | SlowFillRequest): string;
|
|
14
|
-
export declare function isUnsafeDepositId(depositId:
|
|
13
|
+
export declare function isUnsafeDepositId(depositId: number): boolean;
|
|
15
14
|
export declare function relayFillStatus(spokePool: Contract, relayData: RelayData, blockTag?: number | "latest", destinationChainId?: number): Promise<FillStatus>;
|
|
16
15
|
export declare function fillStatusArray(spokePool: Contract, relayData: RelayData[], blockTag?: BlockTag): Promise<(FillStatus | undefined)[]>;
|
|
17
16
|
export declare function findFillBlock(spokePool: Contract, relayData: RelayData, lowBlockNumber: number, highBlockNumber?: number): Promise<number | undefined>;
|
|
18
|
-
export declare function
|
|
19
|
-
export declare function getMessageHash(message: string): string;
|
|
17
|
+
export declare function findFillEvent(spokePool: Contract, relayData: RelayData, lowBlockNumber: number, highBlockNumber?: number): Promise<FillWithBlock | undefined>;
|
|
20
18
|
export {};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.findFillEvent = exports.findFillBlock = exports.fillStatusArray = exports.relayFillStatus = exports.isUnsafeDepositId = exports.getRelayHashFromEvent = exports.getRelayDataHash = exports.getDepositIdAtBlock = exports.getBlockRangeForDepositId = exports.populateV3Relay = void 0;
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
5
|
var assert_1 = tslib_1.__importDefault(require("assert"));
|
|
6
6
|
var ethers_1 = require("ethers");
|
|
@@ -8,10 +8,9 @@ var constants_1 = require("../constants");
|
|
|
8
8
|
var interfaces_1 = require("../interfaces");
|
|
9
9
|
var ArrayUtils_1 = require("./ArrayUtils");
|
|
10
10
|
var BigNumberUtils_1 = require("./BigNumberUtils");
|
|
11
|
-
var common_1 = require("./common");
|
|
12
|
-
var DepositUtils_1 = require("./DepositUtils");
|
|
13
11
|
var TypeGuards_1 = require("./TypeGuards");
|
|
14
12
|
var NetworkUtils_1 = require("./NetworkUtils");
|
|
13
|
+
var EventUtils_1 = require("./EventUtils");
|
|
15
14
|
function populateV3Relay(spokePool, deposit, relayer, repaymentChainId) {
|
|
16
15
|
if (repaymentChainId === void 0) { repaymentChainId = deposit.destinationChainId; }
|
|
17
16
|
var v3RelayData = {
|
|
@@ -44,8 +43,6 @@ function getBlockRangeForDepositId(targetDepositId, initLow, initHigh, maxSearch
|
|
|
44
43
|
return tslib_1.__generator(this, function (_b) {
|
|
45
44
|
switch (_b.label) {
|
|
46
45
|
case 0:
|
|
47
|
-
if (isUnsafeDepositId(targetDepositId))
|
|
48
|
-
throw new Error("Target deposit ID ".concat(targetDepositId, " is deterministic and therefore unresolvable via a binary search."));
|
|
49
46
|
deploymentBlock = spokePool.deploymentBlock;
|
|
50
47
|
initHigh = Math.min(initHigh, spokePool.latestBlockSearched);
|
|
51
48
|
[
|
|
@@ -89,11 +86,11 @@ function getBlockRangeForDepositId(targetDepositId, initLow, initHigh, maxSearch
|
|
|
89
86
|
])];
|
|
90
87
|
case 1:
|
|
91
88
|
_a = _b.sent(), highestDepositIdInRange = _a[0], lowestDepositIdInRange = _a[1];
|
|
92
|
-
if (highestDepositIdInRange
|
|
89
|
+
if (highestDepositIdInRange <= targetDepositId) {
|
|
93
90
|
throw new Error("Target depositId is greater than the initial high block (".concat(targetDepositId, " > ").concat(highestDepositIdInRange, ")"));
|
|
94
91
|
}
|
|
95
|
-
if (lowestDepositIdInRange
|
|
96
|
-
throw new Error("Target depositId is less than the initial low block (".concat(targetDepositId
|
|
92
|
+
if (lowestDepositIdInRange > targetDepositId) {
|
|
93
|
+
throw new Error("Target depositId is less than the initial low block (".concat(targetDepositId, " > ").concat(lowestDepositIdInRange, ")"));
|
|
97
94
|
}
|
|
98
95
|
low = initLow;
|
|
99
96
|
high = initHigh;
|
|
@@ -104,8 +101,8 @@ function getBlockRangeForDepositId(targetDepositId, initLow, initHigh, maxSearch
|
|
|
104
101
|
return [4, _getDepositIdAtBlock(mid)];
|
|
105
102
|
case 3:
|
|
106
103
|
midDepositId = _b.sent();
|
|
107
|
-
accountedIdByMidBlock = midDepositId
|
|
108
|
-
if (targetDepositId
|
|
104
|
+
accountedIdByMidBlock = midDepositId - 1;
|
|
105
|
+
if (targetDepositId <= accountedIdByMidBlock) {
|
|
109
106
|
high = mid;
|
|
110
107
|
}
|
|
111
108
|
else {
|
|
@@ -127,14 +124,13 @@ function getBlockRangeForDepositId(targetDepositId, initLow, initHigh, maxSearch
|
|
|
127
124
|
exports.getBlockRangeForDepositId = getBlockRangeForDepositId;
|
|
128
125
|
function getDepositIdAtBlock(contract, blockTag) {
|
|
129
126
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
130
|
-
var
|
|
127
|
+
var depositIdAtBlock;
|
|
131
128
|
return tslib_1.__generator(this, function (_a) {
|
|
132
129
|
switch (_a.label) {
|
|
133
130
|
case 0: return [4, contract.numberOfDeposits({ blockTag: blockTag })];
|
|
134
131
|
case 1:
|
|
135
|
-
|
|
136
|
-
depositIdAtBlock
|
|
137
|
-
if (depositIdAtBlock.lt(BigNumberUtils_1.bnZero)) {
|
|
132
|
+
depositIdAtBlock = _a.sent();
|
|
133
|
+
if (!Number.isInteger(depositIdAtBlock) || depositIdAtBlock < 0) {
|
|
138
134
|
throw new Error("Invalid deposit count");
|
|
139
135
|
}
|
|
140
136
|
return [2, depositIdAtBlock];
|
|
@@ -144,24 +140,23 @@ function getDepositIdAtBlock(contract, blockTag) {
|
|
|
144
140
|
}
|
|
145
141
|
exports.getDepositIdAtBlock = getDepositIdAtBlock;
|
|
146
142
|
function getRelayDataHash(relayData, destinationChainId) {
|
|
147
|
-
var _relayData = tslib_1.__assign(tslib_1.__assign({}, relayData), { depositor: ethers_1.utils.hexZeroPad(relayData.depositor, 32), recipient: ethers_1.utils.hexZeroPad(relayData.recipient, 32), inputToken: ethers_1.utils.hexZeroPad(relayData.inputToken, 32), outputToken: ethers_1.utils.hexZeroPad(relayData.outputToken, 32), exclusiveRelayer: ethers_1.utils.hexZeroPad(relayData.exclusiveRelayer, 32) });
|
|
148
143
|
return ethers_1.utils.keccak256(ethers_1.utils.defaultAbiCoder.encode([
|
|
149
144
|
"tuple(" +
|
|
150
|
-
"
|
|
151
|
-
"
|
|
152
|
-
"
|
|
153
|
-
"
|
|
154
|
-
"
|
|
145
|
+
"address depositor," +
|
|
146
|
+
"address recipient," +
|
|
147
|
+
"address exclusiveRelayer," +
|
|
148
|
+
"address inputToken," +
|
|
149
|
+
"address outputToken," +
|
|
155
150
|
"uint256 inputAmount," +
|
|
156
151
|
"uint256 outputAmount," +
|
|
157
152
|
"uint256 originChainId," +
|
|
158
|
-
"
|
|
153
|
+
"uint32 depositId," +
|
|
159
154
|
"uint32 fillDeadline," +
|
|
160
155
|
"uint32 exclusivityDeadline," +
|
|
161
156
|
"bytes message" +
|
|
162
157
|
")",
|
|
163
158
|
"uint256 destinationChainId",
|
|
164
|
-
], [
|
|
159
|
+
], [relayData, destinationChainId]));
|
|
165
160
|
}
|
|
166
161
|
exports.getRelayDataHash = getRelayDataHash;
|
|
167
162
|
function getRelayHashFromEvent(e) {
|
|
@@ -195,7 +190,7 @@ function relayFillStatus(spokePool, relayData, blockTag, destinationChainId) {
|
|
|
195
190
|
fillStatus = Number(_fillStatus);
|
|
196
191
|
if (![interfaces_1.FillStatus.Unfilled, interfaces_1.FillStatus.RequestedSlowFill, interfaces_1.FillStatus.Filled].includes(fillStatus)) {
|
|
197
192
|
originChainId = relayData.originChainId, depositId = relayData.depositId;
|
|
198
|
-
throw new Error("relayFillStatus: Unexpected fillStatus for ".concat(originChainId, " deposit ").concat(depositId
|
|
193
|
+
throw new Error("relayFillStatus: Unexpected fillStatus for ".concat(originChainId, " deposit ").concat(depositId, " (").concat(fillStatus, ")"));
|
|
199
194
|
}
|
|
200
195
|
return [2, fillStatus];
|
|
201
196
|
}
|
|
@@ -256,7 +251,7 @@ function findFillBlock(spokePool, relayData, lowBlockNumber, highBlockNumber) {
|
|
|
256
251
|
_f.label = 3;
|
|
257
252
|
case 3:
|
|
258
253
|
_a;
|
|
259
|
-
(0, assert_1.default)(highBlockNumber > lowBlockNumber, "Block numbers out of range (".concat(lowBlockNumber, "
|
|
254
|
+
(0, assert_1.default)(highBlockNumber > lowBlockNumber, "Block numbers out of range (".concat(lowBlockNumber, " >= ").concat(highBlockNumber, ")"));
|
|
260
255
|
if (!Object.values(constants_1.CHAIN_IDs).includes(relayData.originChainId)) return [3, 5];
|
|
261
256
|
return [4, provider.getNetwork()];
|
|
262
257
|
case 4:
|
|
@@ -283,7 +278,7 @@ function findFillBlock(spokePool, relayData, lowBlockNumber, highBlockNumber) {
|
|
|
283
278
|
if (initialFillStatus === interfaces_1.FillStatus.Filled) {
|
|
284
279
|
depositId = relayData.depositId, originChainId = relayData.originChainId;
|
|
285
280
|
_e = [(0, NetworkUtils_1.getNetworkName)(originChainId), (0, NetworkUtils_1.getNetworkName)(destinationChainId)], srcChain = _e[0], dstChain = _e[1];
|
|
286
|
-
throw new Error("".concat(srcChain, " deposit ").concat(depositId
|
|
281
|
+
throw new Error("".concat(srcChain, " deposit ").concat(depositId, " filled on ").concat(dstChain, " before block ").concat(lowBlockNumber));
|
|
287
282
|
}
|
|
288
283
|
_f.label = 9;
|
|
289
284
|
case 9:
|
|
@@ -307,12 +302,44 @@ function findFillBlock(spokePool, relayData, lowBlockNumber, highBlockNumber) {
|
|
|
307
302
|
});
|
|
308
303
|
}
|
|
309
304
|
exports.findFillBlock = findFillBlock;
|
|
310
|
-
function
|
|
311
|
-
return
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
305
|
+
function findFillEvent(spokePool, relayData, lowBlockNumber, highBlockNumber) {
|
|
306
|
+
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
307
|
+
var blockNumber, query, event, destinationChainId, _a, _b, fill;
|
|
308
|
+
return tslib_1.__generator(this, function (_c) {
|
|
309
|
+
switch (_c.label) {
|
|
310
|
+
case 0: return [4, findFillBlock(spokePool, relayData, lowBlockNumber, highBlockNumber)];
|
|
311
|
+
case 1:
|
|
312
|
+
blockNumber = _c.sent();
|
|
313
|
+
if (!blockNumber)
|
|
314
|
+
return [2, undefined];
|
|
315
|
+
return [4, (0, EventUtils_1.paginatedEventQuery)(spokePool, spokePool.filters.FilledV3Relay(null, null, null, null, null, relayData.originChainId, relayData.depositId), {
|
|
316
|
+
fromBlock: blockNumber,
|
|
317
|
+
toBlock: blockNumber,
|
|
318
|
+
maxBlockLookBack: 0,
|
|
319
|
+
})];
|
|
320
|
+
case 2:
|
|
321
|
+
query = _c.sent();
|
|
322
|
+
if (query.length === 0)
|
|
323
|
+
throw new Error("Failed to find fill event at block ".concat(blockNumber));
|
|
324
|
+
event = query[0];
|
|
325
|
+
if (!Object.values(constants_1.CHAIN_IDs).includes(relayData.originChainId)) return [3, 4];
|
|
326
|
+
return [4, spokePool.provider.getNetwork()];
|
|
327
|
+
case 3:
|
|
328
|
+
_a = (_c.sent()).chainId;
|
|
329
|
+
return [3, 6];
|
|
330
|
+
case 4:
|
|
331
|
+
_b = Number;
|
|
332
|
+
return [4, spokePool.chainId()];
|
|
333
|
+
case 5:
|
|
334
|
+
_a = _b.apply(void 0, [_c.sent()]);
|
|
335
|
+
_c.label = 6;
|
|
336
|
+
case 6:
|
|
337
|
+
destinationChainId = _a;
|
|
338
|
+
fill = tslib_1.__assign(tslib_1.__assign({}, (0, EventUtils_1.spreadEventWithBlockNumber)(event)), { destinationChainId: destinationChainId });
|
|
339
|
+
return [2, fill];
|
|
340
|
+
}
|
|
341
|
+
});
|
|
342
|
+
});
|
|
316
343
|
}
|
|
317
|
-
exports.
|
|
344
|
+
exports.findFillEvent = findFillEvent;
|
|
318
345
|
//# 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: (0, superstruct_1.min)((0, superstruct_1.integer)(), 0),
|
|
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,IAAA,iBAAG,EAAC,IAAA,qBAAO,GAAE,EAAE,CAAC,CAAC;IAC5B,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"}
|
|
@@ -4,7 +4,6 @@ import { BigNumber, BigNumberish, BN } from "./BigNumberUtils";
|
|
|
4
4
|
export type Decimalish = string | number | Decimal;
|
|
5
5
|
export declare const AddressZero = "0x0000000000000000000000000000000000000000";
|
|
6
6
|
export declare const MAX_BIG_INT: ethers.BigNumber;
|
|
7
|
-
export declare const keccak256: typeof ethers.utils.keccak256;
|
|
8
7
|
export declare const toBNWei: (num: BigNumberish, decimals?: number) => BN;
|
|
9
8
|
export declare const fromWei: (num: BigNumberish, decimals?: number) => string;
|
|
10
9
|
export declare function min(a: BigNumberish, b: BigNumberish): BN;
|
package/dist/cjs/utils/common.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.randomAddress = exports.retry = exports.delay = exports.getSamplesBetween = exports.calcApr = exports.calcPeriodicCompoundInterest = exports.calcContinuousCompoundInterest = exports.percent = exports.calculateGasFees = exports.gasCost = exports.nativeToToken = exports.fixedPointAdjustment = exports.max = exports.min = exports.fromWei = exports.toBNWei = exports.
|
|
3
|
+
exports.randomAddress = exports.retry = exports.delay = exports.getSamplesBetween = exports.calcApr = exports.calcPeriodicCompoundInterest = exports.calcContinuousCompoundInterest = exports.percent = exports.calculateGasFees = exports.gasCost = exports.nativeToToken = exports.fixedPointAdjustment = exports.max = exports.min = exports.fromWei = exports.toBNWei = exports.MAX_BIG_INT = exports.AddressZero = void 0;
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
5
|
var decimal_js_1 = tslib_1.__importDefault(require("decimal.js"));
|
|
6
6
|
var ethers_1 = require("ethers");
|
|
@@ -8,7 +8,6 @@ var BigNumberUtils_1 = require("./BigNumberUtils");
|
|
|
8
8
|
var FormattingUtils_1 = require("./FormattingUtils");
|
|
9
9
|
exports.AddressZero = ethers_1.ethers.constants.AddressZero;
|
|
10
10
|
exports.MAX_BIG_INT = BigNumberUtils_1.BigNumber.from(Number.MAX_SAFE_INTEGER.toString());
|
|
11
|
-
exports.keccak256 = ethers_1.ethers.utils.keccak256;
|
|
12
11
|
var toBNWei = function (num, decimals) { return (0, BigNumberUtils_1.parseUnits)(num.toString(), decimals); };
|
|
13
12
|
exports.toBNWei = toBNWei;
|
|
14
13
|
var fromWei = function (num, decimals) { return (0, BigNumberUtils_1.formatUnits)(num.toString(), decimals); };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/utils/common.ts"],"names":[],"mappings":";;;;AAAA,kEAAiC;AACjC,iCAAgC;AAChC,mDAA8F;AAC9F,qDAAoD;AAGvC,QAAA,WAAW,GAAG,eAAM,CAAC,SAAS,CAAC,WAAW,CAAC;AAC3C,QAAA,WAAW,GAAG,0BAAS,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/utils/common.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,7 +35,7 @@ export declare class BundleDataClient {
|
|
|
35
35
|
private loadPersistedDataFromArweave;
|
|
36
36
|
getPendingRefundsFromValidBundles(): Promise<CombinedRefunds[]>;
|
|
37
37
|
getPendingRefundsFromBundle(bundle: ProposedRootBundle): Promise<CombinedRefunds>;
|
|
38
|
-
getApproximateRefundsForBlockRange(chainIds: number[], blockRanges: number[][]):
|
|
38
|
+
getApproximateRefundsForBlockRange(chainIds: number[], blockRanges: number[][]): CombinedRefunds;
|
|
39
39
|
getUpcomingDepositAmount(chainId: number, l2Token: string, latestBlockToSearch: number): BigNumber;
|
|
40
40
|
private getLatestProposedBundleData;
|
|
41
41
|
getLatestPoolRebalanceRoot(): Promise<{
|