@across-protocol/sdk 4.2.16 → 4.3.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/arch/evm/SpokeUtils.d.ts +8 -3
- package/dist/cjs/arch/evm/SpokeUtils.js +26 -11
- package/dist/cjs/arch/evm/SpokeUtils.js.map +1 -1
- package/dist/cjs/arch/svm/SpokeUtils.d.ts +8 -2
- package/dist/cjs/arch/svm/SpokeUtils.js +41 -50
- package/dist/cjs/arch/svm/SpokeUtils.js.map +1 -1
- package/dist/cjs/arch/svm/eventsClient.js +4 -2
- package/dist/cjs/arch/svm/eventsClient.js.map +1 -1
- package/dist/cjs/arch/svm/utils.d.ts +3 -3
- package/dist/cjs/arch/svm/utils.js +16 -14
- package/dist/cjs/arch/svm/utils.js.map +1 -1
- package/dist/cjs/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.d.ts +3 -3
- package/dist/cjs/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.js +4 -2
- package/dist/cjs/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/BundleDataClient.d.ts +4 -4
- package/dist/cjs/clients/BundleDataClient/BundleDataClient.js +60 -56
- package/dist/cjs/clients/BundleDataClient/BundleDataClient.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/utils/DataworkerUtils.js +13 -13
- package/dist/cjs/clients/BundleDataClient/utils/DataworkerUtils.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/utils/FillUtils.d.ts +2 -1
- package/dist/cjs/clients/BundleDataClient/utils/FillUtils.js +3 -2
- package/dist/cjs/clients/BundleDataClient/utils/FillUtils.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/utils/MerkleTreeUtils.js +5 -1
- package/dist/cjs/clients/BundleDataClient/utils/MerkleTreeUtils.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/utils/PoolRebalanceUtils.js +3 -3
- package/dist/cjs/clients/BundleDataClient/utils/PoolRebalanceUtils.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/utils/SuperstructUtils.d.ts +71 -71
- package/dist/cjs/clients/BundleDataClient/utils/SuperstructUtils.js +13 -8
- package/dist/cjs/clients/BundleDataClient/utils/SuperstructUtils.js.map +1 -1
- package/dist/cjs/clients/HubPoolClient.d.ts +21 -21
- package/dist/cjs/clients/HubPoolClient.js +85 -58
- package/dist/cjs/clients/HubPoolClient.js.map +1 -1
- package/dist/cjs/clients/SpokePoolClient/EVMSpokePoolClient.js +1 -1
- package/dist/cjs/clients/SpokePoolClient/EVMSpokePoolClient.js.map +1 -1
- package/dist/cjs/clients/SpokePoolClient/SpokePoolClient.d.ts +2 -2
- package/dist/cjs/clients/SpokePoolClient/SpokePoolClient.js +65 -45
- package/dist/cjs/clients/SpokePoolClient/SpokePoolClient.js.map +1 -1
- package/dist/cjs/clients/mocks/MockHubPoolClient.d.ts +9 -9
- package/dist/cjs/clients/mocks/MockHubPoolClient.js +15 -9
- package/dist/cjs/clients/mocks/MockHubPoolClient.js.map +1 -1
- package/dist/cjs/clients/mocks/MockSpokePoolClient.d.ts +5 -3
- package/dist/cjs/clients/mocks/MockSpokePoolClient.js +40 -36
- package/dist/cjs/clients/mocks/MockSpokePoolClient.js.map +1 -1
- package/dist/cjs/clients/mocks/MockSvmCpiEventsClient.d.ts +1 -1
- package/dist/cjs/clients/mocks/MockSvmCpiEventsClient.js +6 -4
- package/dist/cjs/clients/mocks/MockSvmCpiEventsClient.js.map +1 -1
- package/dist/cjs/clients/mocks/MockSvmSpokePoolClient.d.ts +2 -2
- package/dist/cjs/clients/mocks/MockSvmSpokePoolClient.js +2 -2
- package/dist/cjs/clients/mocks/MockSvmSpokePoolClient.js.map +1 -1
- package/dist/cjs/interfaces/HubPool.d.ts +19 -14
- package/dist/cjs/interfaces/SpokePool.d.ts +18 -19
- package/dist/cjs/interfaces/SpokePool.js.map +1 -1
- package/dist/cjs/relayFeeCalculator/chain-queries/baseQuery.d.ts +15 -7
- package/dist/cjs/relayFeeCalculator/chain-queries/baseQuery.js +24 -15
- package/dist/cjs/relayFeeCalculator/chain-queries/baseQuery.js.map +1 -1
- package/dist/cjs/relayFeeCalculator/chain-queries/factory.js +1 -1
- package/dist/cjs/relayFeeCalculator/chain-queries/factory.js.map +1 -1
- package/dist/cjs/relayFeeCalculator/chain-queries/svmQuery.d.ts +12 -4
- package/dist/cjs/relayFeeCalculator/chain-queries/svmQuery.js +46 -44
- package/dist/cjs/relayFeeCalculator/chain-queries/svmQuery.js.map +1 -1
- package/dist/cjs/relayFeeCalculator/relayFeeCalculator.d.ts +6 -6
- package/dist/cjs/relayFeeCalculator/relayFeeCalculator.js +10 -10
- package/dist/cjs/relayFeeCalculator/relayFeeCalculator.js.map +1 -1
- package/dist/cjs/utils/AddressUtils.d.ts +12 -8
- package/dist/cjs/utils/AddressUtils.js +33 -36
- package/dist/cjs/utils/AddressUtils.js.map +1 -1
- package/dist/cjs/utils/SpokeUtils.d.ts +3 -3
- package/dist/cjs/utils/SpokeUtils.js +4 -22
- package/dist/cjs/utils/SpokeUtils.js.map +1 -1
- package/dist/cjs/utils/TokenUtils.d.ts +4 -4
- package/dist/cjs/utils/TokenUtils.js +5 -3
- package/dist/cjs/utils/TokenUtils.js.map +1 -1
- package/dist/esm/arch/evm/SpokeUtils.d.ts +9 -4
- package/dist/esm/arch/evm/SpokeUtils.js +29 -14
- package/dist/esm/arch/evm/SpokeUtils.js.map +1 -1
- package/dist/esm/arch/svm/SpokeUtils.d.ts +9 -3
- package/dist/esm/arch/svm/SpokeUtils.js +42 -55
- package/dist/esm/arch/svm/SpokeUtils.js.map +1 -1
- package/dist/esm/arch/svm/eventsClient.js +5 -3
- package/dist/esm/arch/svm/eventsClient.js.map +1 -1
- package/dist/esm/arch/svm/utils.d.ts +3 -3
- package/dist/esm/arch/svm/utils.js +17 -15
- package/dist/esm/arch/svm/utils.js.map +1 -1
- package/dist/esm/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.d.ts +3 -3
- package/dist/esm/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.js +4 -2
- package/dist/esm/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/BundleDataClient.d.ts +4 -4
- package/dist/esm/clients/BundleDataClient/BundleDataClient.js +61 -57
- package/dist/esm/clients/BundleDataClient/BundleDataClient.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/utils/DataworkerUtils.js +14 -14
- package/dist/esm/clients/BundleDataClient/utils/DataworkerUtils.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/utils/FillUtils.d.ts +2 -1
- package/dist/esm/clients/BundleDataClient/utils/FillUtils.js +7 -7
- package/dist/esm/clients/BundleDataClient/utils/FillUtils.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/utils/MerkleTreeUtils.js +5 -1
- package/dist/esm/clients/BundleDataClient/utils/MerkleTreeUtils.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/utils/PoolRebalanceUtils.js +4 -4
- package/dist/esm/clients/BundleDataClient/utils/PoolRebalanceUtils.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.d.ts +71 -71
- package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.js +20 -10
- package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.js.map +1 -1
- package/dist/esm/clients/HubPoolClient.d.ts +22 -22
- package/dist/esm/clients/HubPoolClient.js +91 -62
- package/dist/esm/clients/HubPoolClient.js.map +1 -1
- package/dist/esm/clients/SpokePoolClient/EVMSpokePoolClient.js +2 -2
- package/dist/esm/clients/SpokePoolClient/EVMSpokePoolClient.js.map +1 -1
- package/dist/esm/clients/SpokePoolClient/SpokePoolClient.d.ts +2 -2
- package/dist/esm/clients/SpokePoolClient/SpokePoolClient.js +68 -47
- package/dist/esm/clients/SpokePoolClient/SpokePoolClient.js.map +1 -1
- package/dist/esm/clients/mocks/MockHubPoolClient.d.ts +9 -9
- package/dist/esm/clients/mocks/MockHubPoolClient.js +16 -10
- package/dist/esm/clients/mocks/MockHubPoolClient.js.map +1 -1
- package/dist/esm/clients/mocks/MockSpokePoolClient.d.ts +5 -3
- package/dist/esm/clients/mocks/MockSpokePoolClient.js +42 -38
- package/dist/esm/clients/mocks/MockSpokePoolClient.js.map +1 -1
- package/dist/esm/clients/mocks/MockSvmCpiEventsClient.d.ts +1 -1
- package/dist/esm/clients/mocks/MockSvmCpiEventsClient.js +7 -5
- package/dist/esm/clients/mocks/MockSvmCpiEventsClient.js.map +1 -1
- package/dist/esm/clients/mocks/MockSvmSpokePoolClient.d.ts +2 -2
- package/dist/esm/clients/mocks/MockSvmSpokePoolClient.js +3 -3
- package/dist/esm/clients/mocks/MockSvmSpokePoolClient.js.map +1 -1
- package/dist/esm/interfaces/HubPool.d.ts +19 -14
- package/dist/esm/interfaces/SpokePool.d.ts +18 -19
- package/dist/esm/interfaces/SpokePool.js.map +1 -1
- package/dist/esm/relayFeeCalculator/chain-queries/baseQuery.d.ts +18 -10
- package/dist/esm/relayFeeCalculator/chain-queries/baseQuery.js +29 -20
- package/dist/esm/relayFeeCalculator/chain-queries/baseQuery.js.map +1 -1
- package/dist/esm/relayFeeCalculator/chain-queries/factory.js +2 -2
- package/dist/esm/relayFeeCalculator/chain-queries/factory.js.map +1 -1
- package/dist/esm/relayFeeCalculator/chain-queries/svmQuery.d.ts +14 -6
- package/dist/esm/relayFeeCalculator/chain-queries/svmQuery.js +51 -48
- package/dist/esm/relayFeeCalculator/chain-queries/svmQuery.js.map +1 -1
- package/dist/esm/relayFeeCalculator/relayFeeCalculator.d.ts +6 -6
- package/dist/esm/relayFeeCalculator/relayFeeCalculator.js +9 -9
- package/dist/esm/relayFeeCalculator/relayFeeCalculator.js.map +1 -1
- package/dist/esm/utils/AddressUtils.d.ts +12 -8
- package/dist/esm/utils/AddressUtils.js +36 -38
- package/dist/esm/utils/AddressUtils.js.map +1 -1
- package/dist/esm/utils/SpokeUtils.d.ts +3 -8
- package/dist/esm/utils/SpokeUtils.js +4 -26
- package/dist/esm/utils/SpokeUtils.js.map +1 -1
- package/dist/esm/utils/TokenUtils.d.ts +22 -18
- package/dist/esm/utils/TokenUtils.js +6 -4
- package/dist/esm/utils/TokenUtils.js.map +1 -1
- package/dist/types/arch/evm/SpokeUtils.d.ts +9 -4
- package/dist/types/arch/evm/SpokeUtils.d.ts.map +1 -1
- package/dist/types/arch/svm/SpokeUtils.d.ts +9 -3
- package/dist/types/arch/svm/SpokeUtils.d.ts.map +1 -1
- package/dist/types/arch/svm/eventsClient.d.ts.map +1 -1
- package/dist/types/arch/svm/utils.d.ts +3 -3
- package/dist/types/arch/svm/utils.d.ts.map +1 -1
- package/dist/types/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.d.ts +3 -3
- package/dist/types/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.d.ts.map +1 -1
- package/dist/types/clients/BundleDataClient/BundleDataClient.d.ts +4 -4
- package/dist/types/clients/BundleDataClient/BundleDataClient.d.ts.map +1 -1
- package/dist/types/clients/BundleDataClient/utils/DataworkerUtils.d.ts.map +1 -1
- package/dist/types/clients/BundleDataClient/utils/FillUtils.d.ts +2 -1
- package/dist/types/clients/BundleDataClient/utils/FillUtils.d.ts.map +1 -1
- package/dist/types/clients/BundleDataClient/utils/MerkleTreeUtils.d.ts.map +1 -1
- package/dist/types/clients/BundleDataClient/utils/PoolRebalanceUtils.d.ts.map +1 -1
- package/dist/types/clients/BundleDataClient/utils/SuperstructUtils.d.ts +71 -71
- package/dist/types/clients/BundleDataClient/utils/SuperstructUtils.d.ts.map +1 -1
- package/dist/types/clients/HubPoolClient.d.ts +22 -22
- package/dist/types/clients/HubPoolClient.d.ts.map +1 -1
- package/dist/types/clients/SpokePoolClient/EVMSpokePoolClient.d.ts.map +1 -1
- package/dist/types/clients/SpokePoolClient/SpokePoolClient.d.ts +2 -2
- package/dist/types/clients/SpokePoolClient/SpokePoolClient.d.ts.map +1 -1
- package/dist/types/clients/mocks/MockHubPoolClient.d.ts +9 -9
- package/dist/types/clients/mocks/MockHubPoolClient.d.ts.map +1 -1
- package/dist/types/clients/mocks/MockSpokePoolClient.d.ts +5 -3
- package/dist/types/clients/mocks/MockSpokePoolClient.d.ts.map +1 -1
- package/dist/types/clients/mocks/MockSvmCpiEventsClient.d.ts +1 -1
- package/dist/types/clients/mocks/MockSvmCpiEventsClient.d.ts.map +1 -1
- package/dist/types/clients/mocks/MockSvmSpokePoolClient.d.ts +2 -2
- package/dist/types/clients/mocks/MockSvmSpokePoolClient.d.ts.map +1 -1
- package/dist/types/interfaces/HubPool.d.ts +19 -14
- package/dist/types/interfaces/HubPool.d.ts.map +1 -1
- package/dist/types/interfaces/SpokePool.d.ts +18 -19
- package/dist/types/interfaces/SpokePool.d.ts.map +1 -1
- package/dist/types/relayFeeCalculator/chain-queries/baseQuery.d.ts +18 -10
- package/dist/types/relayFeeCalculator/chain-queries/baseQuery.d.ts.map +1 -1
- package/dist/types/relayFeeCalculator/chain-queries/factory.d.ts.map +1 -1
- package/dist/types/relayFeeCalculator/chain-queries/svmQuery.d.ts +14 -6
- package/dist/types/relayFeeCalculator/chain-queries/svmQuery.d.ts.map +1 -1
- package/dist/types/relayFeeCalculator/relayFeeCalculator.d.ts +6 -6
- package/dist/types/relayFeeCalculator/relayFeeCalculator.d.ts.map +1 -1
- package/dist/types/utils/AddressUtils.d.ts +12 -8
- package/dist/types/utils/AddressUtils.d.ts.map +1 -1
- package/dist/types/utils/SpokeUtils.d.ts +3 -8
- package/dist/types/utils/SpokeUtils.d.ts.map +1 -1
- package/dist/types/utils/TokenUtils.d.ts +22 -18
- package/dist/types/utils/TokenUtils.d.ts.map +1 -1
- package/package.json +1 -2
- package/src/arch/evm/SpokeUtils.ts +72 -22
- package/src/arch/svm/SpokeUtils.ts +67 -53
- package/src/arch/svm/eventsClient.ts +40 -8
- package/src/arch/svm/utils.ts +6 -6
- package/src/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.ts +7 -4
- package/src/clients/BundleDataClient/BundleDataClient.ts +57 -53
- package/src/clients/BundleDataClient/utils/DataworkerUtils.ts +28 -13
- package/src/clients/BundleDataClient/utils/FillUtils.ts +12 -8
- package/src/clients/BundleDataClient/utils/MerkleTreeUtils.ts +7 -1
- package/src/clients/BundleDataClient/utils/PoolRebalanceUtils.ts +4 -4
- package/src/clients/BundleDataClient/utils/SuperstructUtils.ts +22 -10
- package/src/clients/HubPoolClient.ts +123 -82
- package/src/clients/SpokePoolClient/EVMSpokePoolClient.ts +6 -0
- package/src/clients/SpokePoolClient/SpokePoolClient.ts +121 -35
- package/src/clients/mocks/MockHubPoolClient.ts +24 -19
- package/src/clients/mocks/MockSpokePoolClient.ts +39 -27
- package/src/clients/mocks/MockSvmCpiEventsClient.ts +8 -5
- package/src/clients/mocks/MockSvmSpokePoolClient.ts +12 -3
- package/src/interfaces/HubPool.ts +20 -14
- package/src/interfaces/SpokePool.ts +19 -19
- package/src/relayFeeCalculator/chain-queries/baseQuery.ts +39 -20
- package/src/relayFeeCalculator/chain-queries/factory.ts +2 -2
- package/src/relayFeeCalculator/chain-queries/svmQuery.ts +57 -56
- package/src/relayFeeCalculator/relayFeeCalculator.ts +15 -13
- package/src/utils/AddressUtils.ts +39 -51
- package/src/utils/SpokeUtils.ts +11 -33
- package/src/utils/TokenUtils.ts +10 -8
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EVMSpokePoolClient.js","sourceRoot":"","sources":["../../../../src/clients/SpokePoolClient/EVMSpokePoolClient.ts"],"names":[],"mappings":";;;;AACA,sCAOwB;AAExB,
|
|
1
|
+
{"version":3,"file":"EVMSpokePoolClient.js","sourceRoot":"","sources":["../../../../src/clients/SpokePoolClient/EVMSpokePoolClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -71,7 +71,7 @@ export declare abstract class SpokePoolClient extends BaseAbstractClient {
|
|
|
71
71
|
};
|
|
72
72
|
getFills(): FillWithBlock[];
|
|
73
73
|
getFillsForOriginChain(originChainId: number): FillWithBlock[];
|
|
74
|
-
getFillsForRelayer(relayer:
|
|
74
|
+
getFillsForRelayer(relayer: Address): FillWithBlock[];
|
|
75
75
|
getFillsWithBlockInRange(startingBlock: number, endingBlock: number): FillWithBlock[];
|
|
76
76
|
getRootBundleRelays(): RootBundleRelayWithBlock[];
|
|
77
77
|
getLatestRootBundleId(): number;
|
|
@@ -107,7 +107,7 @@ export declare abstract class SpokePoolClient extends BaseAbstractClient {
|
|
|
107
107
|
protected getBlockNumbers(timestamps: number[]): Promise<{
|
|
108
108
|
[quoteTimestamp: number]: number;
|
|
109
109
|
}>;
|
|
110
|
-
protected getDestinationTokenForDeposit(deposit: DepositWithBlock):
|
|
110
|
+
protected getDestinationTokenForDeposit(deposit: DepositWithBlock): Address;
|
|
111
111
|
protected log(level: DefaultLogLevels, message: string, data?: AnyObject): void;
|
|
112
112
|
getCurrentTime(): number;
|
|
113
113
|
protected isOriginLiteChain(deposit: DepositWithBlock): boolean;
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.SpokePoolClient = exports.knownEventNames = void 0;
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
|
+
var ethers_1 = require("ethers");
|
|
5
6
|
var utils_1 = require("../../utils");
|
|
6
7
|
var EventUtils_1 = require("../../utils/EventUtils");
|
|
7
8
|
var constants_1 = require("../../constants");
|
|
@@ -92,7 +93,7 @@ var SpokePoolClient = (function (_super) {
|
|
|
92
93
|
return this.fills[originChainId] || [];
|
|
93
94
|
};
|
|
94
95
|
SpokePoolClient.prototype.getFillsForRelayer = function (relayer) {
|
|
95
|
-
return this.getFills().filter(function (fill) { return fill.relayer
|
|
96
|
+
return this.getFills().filter(function (fill) { return fill.relayer.eq(relayer); });
|
|
96
97
|
};
|
|
97
98
|
SpokePoolClient.prototype.getFillsWithBlockInRange = function (startingBlock, endingBlock) {
|
|
98
99
|
return this.getFills().filter(function (fill) { return fill.blockNumber >= startingBlock && fill.blockNumber <= endingBlock; });
|
|
@@ -118,7 +119,7 @@ var SpokePoolClient = (function (_super) {
|
|
|
118
119
|
SpokePoolClient.prototype.appendMaxSpeedUpSignatureToDeposit = function (deposit) {
|
|
119
120
|
var _a;
|
|
120
121
|
var depositId = deposit.depositId, depositor = deposit.depositor;
|
|
121
|
-
var speedups = (_a = this.speedUps[
|
|
122
|
+
var speedups = (_a = this.speedUps[depositor.toEvmAddress()]) === null || _a === void 0 ? void 0 : _a[depositId.toString()];
|
|
122
123
|
if (!(0, utils_1.isDefined)(speedups) || speedups.length === 0) {
|
|
123
124
|
return deposit;
|
|
124
125
|
}
|
|
@@ -169,9 +170,7 @@ var SpokePoolClient = (function (_super) {
|
|
|
169
170
|
if ((0, utils_1.validateFillForDeposit)(fill, deposit).valid) {
|
|
170
171
|
var fillRepaymentData = tslib_1.__assign(tslib_1.__assign({}, fill), { fromLiteChain: deposit.fromLiteChain });
|
|
171
172
|
var repaymentChainId = (0, BundleDataClient_1.getRefundInformationFromFill)(fillRepaymentData, _this.hubPoolClient, _this.hubPoolClient.latestHeightSearched).chainToSendRefundTo;
|
|
172
|
-
if (_this.hubPoolClient &&
|
|
173
|
-
!(0, utils_1.isSlowFill)(fill) &&
|
|
174
|
-
(!(0, utils_1.chainIsEvm)(repaymentChainId) || !(0, utils_1.isValidEvmAddress)(fill.relayer))) {
|
|
173
|
+
if (_this.hubPoolClient && !(0, utils_1.isSlowFill)(fill) && !fill.relayer.isValidOn(repaymentChainId)) {
|
|
175
174
|
groupedFills.unrepayableFills.push(fill);
|
|
176
175
|
}
|
|
177
176
|
groupedFills.validFills.push(fill);
|
|
@@ -189,7 +188,7 @@ var SpokePoolClient = (function (_super) {
|
|
|
189
188
|
chainId: this.chainId,
|
|
190
189
|
message: "Unrepayable fills found where we need to switch repayment address and or chain",
|
|
191
190
|
deposit: deposit,
|
|
192
|
-
unrepayableFills: Object.fromEntries(unrepayableFillsForDeposit.map(function (x) { return [x.relayer, x]; })),
|
|
191
|
+
unrepayableFills: Object.fromEntries(unrepayableFillsForDeposit.map(function (x) { return [x.relayer.toNative(), x]; })),
|
|
193
192
|
notificationPath: "across-unrepayable-fills",
|
|
194
193
|
});
|
|
195
194
|
}
|
|
@@ -216,13 +215,13 @@ var SpokePoolClient = (function (_super) {
|
|
|
216
215
|
}
|
|
217
216
|
};
|
|
218
217
|
SpokePoolClient.prototype.update = function (eventsToQuery) {
|
|
219
|
-
var _a, _b
|
|
218
|
+
var _a, _b;
|
|
220
219
|
if (eventsToQuery === void 0) { eventsToQuery = this._queryableEventNames(); }
|
|
221
220
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
222
|
-
var duplicateEvents, update, queryResults, currentTime, searchEndBlock, _i,
|
|
221
|
+
var duplicateEvents, update, queryResults, currentTime, searchEndBlock, _i, _c, _event, event_1, queryDepositEvents, _d, _e, event_2, querySpeedUpDepositEvents, queryRequestedSlowFillEvents, queryFilledRelayEvents, enableDepositsEvents, _f, enableDepositsEvents_1, event_3, relayedRootBundleEvents, _g, relayedRootBundleEvents_1, event_4, refundEvents, _h, refundEvents_1, _event, event_5, claimedRelayerRefundEvents, _j, claimedRelayerRefundEvents_1, event_6, bridgedToHubPoolEvents, _k, bridgedToHubPoolEvents_1, event_7;
|
|
223
222
|
var _this = this;
|
|
224
|
-
return tslib_1.__generator(this, function (
|
|
225
|
-
switch (
|
|
223
|
+
return tslib_1.__generator(this, function (_l) {
|
|
224
|
+
switch (_l.label) {
|
|
226
225
|
case 0:
|
|
227
226
|
duplicateEvents = [];
|
|
228
227
|
if (this.hubPoolClient !== null && !this.hubPoolClient.isUpdated) {
|
|
@@ -230,24 +229,29 @@ var SpokePoolClient = (function (_super) {
|
|
|
230
229
|
}
|
|
231
230
|
return [4, this._update(eventsToQuery)];
|
|
232
231
|
case 1:
|
|
233
|
-
update =
|
|
232
|
+
update = _l.sent();
|
|
234
233
|
if (!update.success) {
|
|
235
234
|
return [2];
|
|
236
235
|
}
|
|
237
236
|
queryResults = update.events, currentTime = update.currentTime, searchEndBlock = update.searchEndBlock;
|
|
238
237
|
if (eventsToQuery.includes("TokensBridged")) {
|
|
239
|
-
for (_i = 0,
|
|
240
|
-
|
|
241
|
-
|
|
238
|
+
for (_i = 0, _c = queryResults[eventsToQuery.indexOf("TokensBridged")]; _i < _c.length; _i++) {
|
|
239
|
+
_event = _c[_i];
|
|
240
|
+
event_1 = _event;
|
|
241
|
+
this.tokensBridged.push(tslib_1.__assign(tslib_1.__assign({}, event_1), { l2TokenAddress: (0, utils_1.toAddressType)(event_1.l2TokenAddress, this.chainId) }));
|
|
242
242
|
}
|
|
243
243
|
}
|
|
244
244
|
queryDepositEvents = function (eventName) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
|
|
245
245
|
var depositEvents, quoteBlockNumbers, _loop_1, this_1, _i, depositEvents_1, event_8;
|
|
246
|
+
var _this = this;
|
|
246
247
|
var _a;
|
|
247
248
|
return tslib_1.__generator(this, function (_b) {
|
|
248
249
|
switch (_b.label) {
|
|
249
250
|
case 0:
|
|
250
|
-
depositEvents = ((_a = queryResults[eventsToQuery.indexOf(eventName)]) !== null && _a !== void 0 ? _a : [])
|
|
251
|
+
depositEvents = ((_a = queryResults[eventsToQuery.indexOf(eventName)]) !== null && _a !== void 0 ? _a : []).map(function (_event) {
|
|
252
|
+
var event = _event;
|
|
253
|
+
return tslib_1.__assign(tslib_1.__assign({}, event), { depositor: (0, utils_1.toAddressType)(event.depositor, _this.chainId), recipient: (0, utils_1.toAddressType)(event.recipient, event.destinationChainId), inputToken: (0, utils_1.toAddressType)(event.inputToken, _this.chainId), outputToken: (0, utils_1.toAddressType)(event.outputToken, event.destinationChainId), exclusiveRelayer: (0, utils_1.toAddressType)(event.exclusiveRelayer, event.destinationChainId) });
|
|
254
|
+
});
|
|
251
255
|
if (depositEvents.length > 0) {
|
|
252
256
|
this.log("debug", "Using ".concat(depositEvents.length, " newly queried ").concat(eventName, " deposit events for chain ").concat(this.chainId), {
|
|
253
257
|
earliestEvent: depositEvents[0].blockNumber,
|
|
@@ -284,27 +288,36 @@ var SpokePoolClient = (function (_super) {
|
|
|
284
288
|
}
|
|
285
289
|
});
|
|
286
290
|
}); };
|
|
287
|
-
|
|
288
|
-
|
|
291
|
+
_d = 0, _e = ["FundsDeposited"];
|
|
292
|
+
_l.label = 2;
|
|
289
293
|
case 2:
|
|
290
|
-
if (!(
|
|
291
|
-
event_2 =
|
|
294
|
+
if (!(_d < _e.length)) return [3, 5];
|
|
295
|
+
event_2 = _e[_d];
|
|
292
296
|
if (!eventsToQuery.includes(event_2)) return [3, 4];
|
|
293
297
|
return [4, queryDepositEvents(event_2)];
|
|
294
298
|
case 3:
|
|
295
|
-
|
|
296
|
-
|
|
299
|
+
_l.sent();
|
|
300
|
+
_l.label = 4;
|
|
297
301
|
case 4:
|
|
298
|
-
|
|
302
|
+
_d++;
|
|
299
303
|
return [3, 2];
|
|
300
304
|
case 5:
|
|
301
305
|
querySpeedUpDepositEvents = function (eventName) {
|
|
302
306
|
var _a;
|
|
303
|
-
var speedUpEvents = ((_a = queryResults[eventsToQuery.indexOf(eventName)]) !== null && _a !== void 0 ? _a : [])
|
|
307
|
+
var speedUpEvents = ((_a = queryResults[eventsToQuery.indexOf(eventName)]) !== null && _a !== void 0 ? _a : [])
|
|
308
|
+
.map(function (_event) {
|
|
309
|
+
var event = _event;
|
|
310
|
+
var invalid = [event.depositor, event.updatedRecipient].some(function (addr) { return !utils_1.EvmAddress.validate(ethers_1.utils.arrayify(addr)); });
|
|
311
|
+
if (invalid) {
|
|
312
|
+
return;
|
|
313
|
+
}
|
|
314
|
+
return tslib_1.__assign(tslib_1.__assign({}, event), { depositor: utils_1.EvmAddress.from(event.depositor), updatedRecipient: utils_1.EvmAddress.from(event.updatedRecipient) });
|
|
315
|
+
})
|
|
316
|
+
.filter(utils_1.isDefined);
|
|
304
317
|
for (var _i = 0, speedUpEvents_1 = speedUpEvents; _i < speedUpEvents_1.length; _i++) {
|
|
305
318
|
var event_9 = speedUpEvents_1[_i];
|
|
306
319
|
var speedUp = tslib_1.__assign(tslib_1.__assign({}, event_9), { originChainId: _this.chainId });
|
|
307
|
-
(0, utils_1.assign)(_this.speedUps, [speedUp.depositor, speedUp.depositId.toString()], [speedUp]);
|
|
320
|
+
(0, utils_1.assign)(_this.speedUps, [speedUp.depositor.toEvmAddress(), speedUp.depositId.toString()], [speedUp]);
|
|
308
321
|
var deposit = _this.getDeposit(speedUp.depositId);
|
|
309
322
|
if ((0, utils_1.isDefined)(deposit)) {
|
|
310
323
|
var eventKey = (0, utils_1.getRelayEventKey)(deposit);
|
|
@@ -320,7 +333,10 @@ var SpokePoolClient = (function (_super) {
|
|
|
320
333
|
queryRequestedSlowFillEvents = function (eventName) {
|
|
321
334
|
var _a, _b;
|
|
322
335
|
var _c;
|
|
323
|
-
var slowFillRequests = ((_a = queryResults[eventsToQuery.indexOf(eventName)]) !== null && _a !== void 0 ? _a : [])
|
|
336
|
+
var slowFillRequests = ((_a = queryResults[eventsToQuery.indexOf(eventName)]) !== null && _a !== void 0 ? _a : []).map(function (_event) {
|
|
337
|
+
var event = _event;
|
|
338
|
+
return tslib_1.__assign(tslib_1.__assign({}, event), { depositor: (0, utils_1.toAddressType)(event.depositor, event.originChainId), recipient: (0, utils_1.toAddressType)(event.recipient, _this.chainId), inputToken: (0, utils_1.toAddressType)(event.inputToken, event.originChainId), outputToken: (0, utils_1.toAddressType)(event.outputToken, _this.chainId), exclusiveRelayer: (0, utils_1.toAddressType)(event.exclusiveRelayer, _this.chainId) });
|
|
339
|
+
});
|
|
324
340
|
for (var _i = 0, slowFillRequests_1 = slowFillRequests; _i < slowFillRequests_1.length; _i++) {
|
|
325
341
|
var event_10 = slowFillRequests_1[_i];
|
|
326
342
|
var slowFillRequest = tslib_1.__assign(tslib_1.__assign({}, event_10), { destinationChainId: _this.chainId });
|
|
@@ -339,7 +355,10 @@ var SpokePoolClient = (function (_super) {
|
|
|
339
355
|
});
|
|
340
356
|
queryFilledRelayEvents = function (eventName) {
|
|
341
357
|
var _a, _b;
|
|
342
|
-
var fillEvents = ((_a = queryResults[eventsToQuery.indexOf(eventName)]) !== null && _a !== void 0 ? _a : [])
|
|
358
|
+
var fillEvents = ((_a = queryResults[eventsToQuery.indexOf(eventName)]) !== null && _a !== void 0 ? _a : []).map(function (_event) {
|
|
359
|
+
var event = _event;
|
|
360
|
+
return tslib_1.__assign(tslib_1.__assign({}, event), { depositor: (0, utils_1.toAddressType)(event.depositor, event.originChainId), recipient: (0, utils_1.toAddressType)(event.recipient, _this.chainId), inputToken: (0, utils_1.toAddressType)(event.inputToken, event.originChainId), outputToken: (0, utils_1.toAddressType)(event.outputToken, _this.chainId), exclusiveRelayer: (0, utils_1.toAddressType)(event.exclusiveRelayer, _this.chainId), relayer: (0, utils_1.toAddressType)(event.relayer, _this.chainId), relayExecutionInfo: tslib_1.__assign(tslib_1.__assign({}, event.relayExecutionInfo), { updatedRecipient: (0, utils_1.toAddressType)(event.relayExecutionInfo.updatedRecipient, _this.chainId) }) });
|
|
361
|
+
});
|
|
343
362
|
if (fillEvents.length > 0) {
|
|
344
363
|
_this.log("debug", "Using ".concat(fillEvents.length, " newly queried ").concat(eventName, " events for chain ").concat(_this.chainId), {
|
|
345
364
|
earliestEvent: fillEvents[0].blockNumber,
|
|
@@ -366,37 +385,38 @@ var SpokePoolClient = (function (_super) {
|
|
|
366
385
|
}
|
|
367
386
|
});
|
|
368
387
|
if (eventsToQuery.includes("EnabledDepositRoute")) {
|
|
369
|
-
enableDepositsEvents =
|
|
370
|
-
for (
|
|
371
|
-
event_3 = enableDepositsEvents_1[
|
|
388
|
+
enableDepositsEvents = queryResults[eventsToQuery.indexOf("EnabledDepositRoute")];
|
|
389
|
+
for (_f = 0, enableDepositsEvents_1 = enableDepositsEvents; _f < enableDepositsEvents_1.length; _f++) {
|
|
390
|
+
event_3 = enableDepositsEvents_1[_f];
|
|
372
391
|
(0, utils_1.assign)(this.depositRoutes, [event_3.originToken, event_3.destinationChainId], event_3.enabled);
|
|
373
392
|
}
|
|
374
393
|
}
|
|
375
394
|
if (eventsToQuery.includes("RelayedRootBundle")) {
|
|
376
|
-
relayedRootBundleEvents =
|
|
377
|
-
for (
|
|
378
|
-
event_4 = relayedRootBundleEvents_1[
|
|
395
|
+
relayedRootBundleEvents = queryResults[eventsToQuery.indexOf("RelayedRootBundle")];
|
|
396
|
+
for (_g = 0, relayedRootBundleEvents_1 = relayedRootBundleEvents; _g < relayedRootBundleEvents_1.length; _g++) {
|
|
397
|
+
event_4 = relayedRootBundleEvents_1[_g];
|
|
379
398
|
this.rootBundleRelays.push(event_4);
|
|
380
399
|
}
|
|
381
400
|
}
|
|
382
401
|
if (eventsToQuery.includes("ExecutedRelayerRefundRoot")) {
|
|
383
|
-
refundEvents =
|
|
384
|
-
for (
|
|
385
|
-
|
|
386
|
-
|
|
402
|
+
refundEvents = queryResults[eventsToQuery.indexOf("ExecutedRelayerRefundRoot")];
|
|
403
|
+
for (_h = 0, refundEvents_1 = refundEvents; _h < refundEvents_1.length; _h++) {
|
|
404
|
+
_event = refundEvents_1[_h];
|
|
405
|
+
event_5 = _event;
|
|
406
|
+
this.relayerRefundExecutions.push(tslib_1.__assign(tslib_1.__assign({}, event_5), { l2TokenAddress: (0, utils_1.toAddressType)(event_5.l2TokenAddress, this.chainId), refundAddresses: event_5.refundAddresses.map(function (addr) { return (0, utils_1.toAddressType)(addr, _this.chainId); }) }));
|
|
387
407
|
}
|
|
388
408
|
}
|
|
389
409
|
if (eventsToQuery.includes("ClaimedRelayerRefund")) {
|
|
390
|
-
claimedRelayerRefundEvents = ((
|
|
391
|
-
for (
|
|
392
|
-
event_6 = claimedRelayerRefundEvents_1[
|
|
410
|
+
claimedRelayerRefundEvents = ((_a = queryResults[eventsToQuery.indexOf("ClaimedRelayerRefund")]) !== null && _a !== void 0 ? _a : []);
|
|
411
|
+
for (_j = 0, claimedRelayerRefundEvents_1 = claimedRelayerRefundEvents; _j < claimedRelayerRefundEvents_1.length; _j++) {
|
|
412
|
+
event_6 = claimedRelayerRefundEvents_1[_j];
|
|
393
413
|
this.claimedRelayerRefunds.push(tslib_1.__assign(tslib_1.__assign({}, event_6), { amount: event_6.amount || event_6.claimAmount }));
|
|
394
414
|
}
|
|
395
415
|
}
|
|
396
416
|
if (eventsToQuery.includes("BridgedToHubPool")) {
|
|
397
|
-
bridgedToHubPoolEvents = ((
|
|
398
|
-
for (
|
|
399
|
-
event_7 = bridgedToHubPoolEvents_1[
|
|
417
|
+
bridgedToHubPoolEvents = ((_b = queryResults[eventsToQuery.indexOf("BridgedToHubPool")]) !== null && _b !== void 0 ? _b : []);
|
|
418
|
+
for (_k = 0, bridgedToHubPoolEvents_1 = bridgedToHubPoolEvents; _k < bridgedToHubPoolEvents_1.length; _k++) {
|
|
419
|
+
event_7 = bridgedToHubPoolEvents_1[_k];
|
|
400
420
|
this.bridgedToHubPool.push(event_7);
|
|
401
421
|
}
|
|
402
422
|
}
|
|
@@ -428,12 +448,12 @@ var SpokePoolClient = (function (_super) {
|
|
|
428
448
|
return ((_b = (_a = this.hubPoolClient) === null || _a === void 0 ? void 0 : _a.getBlockNumbers(timestamps)) !== null && _b !== void 0 ? _b : Promise.resolve(Object.fromEntries(timestamps.map(function (timestamp) { return [timestamp, utils_1.MAX_BIG_INT.toNumber()]; }))));
|
|
429
449
|
};
|
|
430
450
|
SpokePoolClient.prototype.getDestinationTokenForDeposit = function (deposit) {
|
|
431
|
-
var _a;
|
|
432
451
|
if (!this.canResolveZeroAddressOutputToken(deposit)) {
|
|
433
|
-
return constants_1.ZERO_ADDRESS;
|
|
452
|
+
return (0, utils_1.toAddressType)(constants_1.ZERO_ADDRESS, constants_1.CHAIN_IDs.MAINNET);
|
|
434
453
|
}
|
|
435
454
|
var l1Token = this.hubPoolClient.getL1TokenForL2TokenAtBlock(deposit.inputToken, deposit.originChainId, deposit.quoteBlockNumber);
|
|
436
|
-
|
|
455
|
+
var counterpartToken = this.hubPoolClient.getL2TokenForL1TokenAtBlock(l1Token, deposit.destinationChainId, deposit.quoteBlockNumber);
|
|
456
|
+
return counterpartToken !== null && counterpartToken !== void 0 ? counterpartToken : (0, utils_1.toAddressType)(constants_1.ZERO_ADDRESS, constants_1.CHAIN_IDs.MAINNET);
|
|
437
457
|
};
|
|
438
458
|
SpokePoolClient.prototype.log = function (level, message, data) {
|
|
439
459
|
this.logger[level](tslib_1.__assign({ at: "SpokePoolClient", chainId: this.chainId, message: message }, data));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SpokePoolClient.js","sourceRoot":"","sources":["../../../../src/clients/SpokePoolClient/SpokePoolClient.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"SpokePoolClient.js","sourceRoot":"","sources":["../../../../src/clients/SpokePoolClient/SpokePoolClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import winston from "winston";
|
|
2
2
|
import { Contract } from "ethers";
|
|
3
|
-
import { BigNumber } from "../../utils";
|
|
4
|
-
import {
|
|
3
|
+
import { BigNumber, EvmAddress, Address } from "../../utils";
|
|
4
|
+
import { Log, PendingRootBundle, RealizedLpFee, L1TokenInfo } from "../../interfaces";
|
|
5
5
|
import { AcrossConfigStoreClient as ConfigStoreClient } from "../AcrossConfigStoreClient";
|
|
6
6
|
import { HubPoolClient, HubPoolUpdate, LpFeeRequest } from "../HubPoolClient";
|
|
7
7
|
import { EventOverrides } from "./MockEvents";
|
|
@@ -19,15 +19,15 @@ export declare class MockHubPoolClient extends HubPoolClient {
|
|
|
19
19
|
batchComputeRealizedLpFeePct(_deposits: LpFeeRequest[]): Promise<RealizedLpFee[]>;
|
|
20
20
|
setCrossChainContracts(chainId: number, contract: string, blockNumber?: number): void;
|
|
21
21
|
setLatestBlockNumber(blockNumber: number): void;
|
|
22
|
-
addL1Token(l1Token:
|
|
23
|
-
getL1Tokens():
|
|
22
|
+
addL1Token(l1Token: L1TokenInfo): void;
|
|
23
|
+
getL1Tokens(): L1TokenInfo[];
|
|
24
24
|
setTokenMapping(l1Token: string, chainId: number, l2Token: string): void;
|
|
25
|
-
l2TokenEnabledForL1TokenAtBlock(l1Token:
|
|
26
|
-
l2TokenHasPoolRebalanceRoute(l2Token:
|
|
25
|
+
l2TokenEnabledForL1TokenAtBlock(l1Token: EvmAddress, destinationChainId: number, hubBlockNumber: number): boolean;
|
|
26
|
+
l2TokenHasPoolRebalanceRoute(l2Token: Address, chainId: number, hubPoolBlock: number): boolean;
|
|
27
27
|
deleteTokenMapping(l1Token: string, chainId: number): void;
|
|
28
|
-
getL1TokenForL2TokenAtBlock(l2Token:
|
|
29
|
-
getL2TokenForL1TokenAtBlock(l1Token:
|
|
30
|
-
getTokenInfoForL1Token(l1Token:
|
|
28
|
+
getL1TokenForL2TokenAtBlock(l2Token: Address, chainId: number, blockNumber: number): EvmAddress;
|
|
29
|
+
getL2TokenForL1TokenAtBlock(l1Token: EvmAddress, chainId: number, blockNumber: number): Address;
|
|
30
|
+
getTokenInfoForL1Token(l1Token: EvmAddress): L1TokenInfo | undefined;
|
|
31
31
|
_update(eventNames: string[]): Promise<HubPoolUpdate>;
|
|
32
32
|
readonly eventSignatures: Record<string, string>;
|
|
33
33
|
setCrossChainContractsEvent(l2ChainId: number, adapter: string, spokePool: string, overrides?: EventOverrides): Log;
|
|
@@ -5,11 +5,12 @@ var tslib_1 = require("tslib");
|
|
|
5
5
|
var utils_1 = require("../../utils");
|
|
6
6
|
var HubPoolClient_1 = require("../HubPoolClient");
|
|
7
7
|
var MockEvents_1 = require("./MockEvents");
|
|
8
|
+
var constants_1 = require("../../constants");
|
|
8
9
|
var emptyRootBundle = {
|
|
9
10
|
poolRebalanceRoot: "",
|
|
10
11
|
relayerRefundRoot: "",
|
|
11
12
|
slowRelayRoot: "",
|
|
12
|
-
proposer:
|
|
13
|
+
proposer: utils_1.EvmAddress.from(constants_1.ZERO_ADDRESS),
|
|
13
14
|
unclaimedPoolRebalanceLeafCount: 0,
|
|
14
15
|
challengePeriodEndTimestamp: 0,
|
|
15
16
|
bundleEvaluationBlockNumbers: [],
|
|
@@ -86,7 +87,7 @@ var MockHubPoolClient = (function (_super) {
|
|
|
86
87
|
if (blockNumber === void 0) { blockNumber = 0; }
|
|
87
88
|
(0, utils_1.assign)(this.crossChainContracts, [chainId], [
|
|
88
89
|
{
|
|
89
|
-
spokePool: contract,
|
|
90
|
+
spokePool: (0, utils_1.toAddressType)(contract, this.chainId),
|
|
90
91
|
blockNumber: blockNumber,
|
|
91
92
|
transactionIndex: 0,
|
|
92
93
|
logIndex: 0,
|
|
@@ -106,11 +107,11 @@ var MockHubPoolClient = (function (_super) {
|
|
|
106
107
|
var _a;
|
|
107
108
|
var _b;
|
|
108
109
|
(_a = (_b = this.spokePoolTokens)[l1Token]) !== null && _a !== void 0 ? _a : (_b[l1Token] = {});
|
|
109
|
-
this.spokePoolTokens[l1Token][chainId] = l2Token;
|
|
110
|
+
this.spokePoolTokens[l1Token][chainId] = (0, utils_1.toAddressType)(l2Token, chainId);
|
|
110
111
|
};
|
|
111
112
|
MockHubPoolClient.prototype.l2TokenEnabledForL1TokenAtBlock = function (l1Token, destinationChainId, hubBlockNumber) {
|
|
112
113
|
var _a;
|
|
113
|
-
if ((_a = this.spokePoolTokens[l1Token]) === null || _a === void 0 ? void 0 : _a[destinationChainId]) {
|
|
114
|
+
if ((_a = this.spokePoolTokens[l1Token.toEvmAddress()]) === null || _a === void 0 ? void 0 : _a[destinationChainId]) {
|
|
114
115
|
return true;
|
|
115
116
|
}
|
|
116
117
|
else {
|
|
@@ -119,7 +120,7 @@ var MockHubPoolClient = (function (_super) {
|
|
|
119
120
|
};
|
|
120
121
|
MockHubPoolClient.prototype.l2TokenHasPoolRebalanceRoute = function (l2Token, chainId, hubPoolBlock) {
|
|
121
122
|
var _this = this;
|
|
122
|
-
var l1Token = Object.keys(this.spokePoolTokens).find(function (l1Token) { var _a; return ((_a = _this.spokePoolTokens[l1Token]) === null || _a === void 0 ? void 0 : _a[chainId]) === l2Token; });
|
|
123
|
+
var l1Token = Object.keys(this.spokePoolTokens).find(function (l1Token) { var _a, _b; return (_b = (_a = _this.spokePoolTokens[l1Token]) === null || _a === void 0 ? void 0 : _a[chainId]) === null || _b === void 0 ? void 0 : _b.eq(l2Token); });
|
|
123
124
|
if (!l1Token) {
|
|
124
125
|
return _super.prototype.l2TokenHasPoolRebalanceRoute.call(this, l2Token, chainId, hubPoolBlock);
|
|
125
126
|
}
|
|
@@ -132,16 +133,21 @@ var MockHubPoolClient = (function (_super) {
|
|
|
132
133
|
};
|
|
133
134
|
MockHubPoolClient.prototype.getL1TokenForL2TokenAtBlock = function (l2Token, chainId, blockNumber) {
|
|
134
135
|
var _this = this;
|
|
135
|
-
var l1Token = Object.keys(this.spokePoolTokens).find(function (l1Token) { var _a; return (
|
|
136
|
-
|
|
136
|
+
var l1Token = Object.keys(this.spokePoolTokens).find(function (l1Token) { var _a; return (_a = _this.spokePoolTokens[l1Token]) === null || _a === void 0 ? void 0 : _a[chainId].eq(l2Token); });
|
|
137
|
+
if ((0, utils_1.isDefined)(l1Token)) {
|
|
138
|
+
return utils_1.EvmAddress.from(l1Token);
|
|
139
|
+
}
|
|
140
|
+
else {
|
|
141
|
+
return _super.prototype.getL1TokenForL2TokenAtBlock.call(this, l2Token, chainId, blockNumber);
|
|
142
|
+
}
|
|
137
143
|
};
|
|
138
144
|
MockHubPoolClient.prototype.getL2TokenForL1TokenAtBlock = function (l1Token, chainId, blockNumber) {
|
|
139
145
|
var _a;
|
|
140
|
-
var l2Token = (_a = this.spokePoolTokens[l1Token]) === null || _a === void 0 ? void 0 : _a[chainId];
|
|
146
|
+
var l2Token = (_a = this.spokePoolTokens[l1Token.toEvmAddress()]) === null || _a === void 0 ? void 0 : _a[chainId];
|
|
141
147
|
return l2Token !== null && l2Token !== void 0 ? l2Token : _super.prototype.getL2TokenForL1TokenAtBlock.call(this, l1Token, chainId, blockNumber);
|
|
142
148
|
};
|
|
143
149
|
MockHubPoolClient.prototype.getTokenInfoForL1Token = function (l1Token) {
|
|
144
|
-
return this.l1TokensMock.find(function (token) { return token.address
|
|
150
|
+
return this.l1TokensMock.find(function (token) { return token.address.eq(l1Token); });
|
|
145
151
|
};
|
|
146
152
|
MockHubPoolClient.prototype._update = function (eventNames) {
|
|
147
153
|
var latestBlockSearched = this.eventManager.blockNumber;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MockHubPoolClient.js","sourceRoot":"","sources":["../../../../src/clients/mocks/MockHubPoolClient.ts"],"names":[],"mappings":";;;;AAEA,
|
|
1
|
+
{"version":3,"file":"MockHubPoolClient.js","sourceRoot":"","sources":["../../../../src/clients/mocks/MockHubPoolClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Contract } from "ethers";
|
|
2
2
|
import winston from "winston";
|
|
3
3
|
import { Log, Deposit, DepositWithBlock, RelayerRefundExecution, SlowFillRequest, SortableEvent, Fill, SlowFillLeaf, SpeedUp, TokensBridged } from "../../interfaces";
|
|
4
|
-
import { BigNumber } from "../../utils";
|
|
4
|
+
import { BigNumber, Address } from "../../utils";
|
|
5
5
|
import { EVMSpokePoolClient, SpokePoolUpdate } from "../SpokePoolClient";
|
|
6
6
|
import { HubPoolClient } from "../HubPoolClient";
|
|
7
7
|
import { EventManager, EventOverrides } from "./MockEvents";
|
|
@@ -16,14 +16,16 @@ export declare class MockSpokePoolClient extends EVMSpokePoolClient {
|
|
|
16
16
|
});
|
|
17
17
|
setConfigStoreClient(configStore?: AcrossConfigStoreClient): void;
|
|
18
18
|
setDestinationTokenForChain(chainId: number, token: string): void;
|
|
19
|
-
getDestinationTokenForDeposit(deposit: DepositWithBlock):
|
|
19
|
+
getDestinationTokenForDeposit(deposit: DepositWithBlock): Address;
|
|
20
20
|
setLatestBlockNumber(blockNumber: number): void;
|
|
21
21
|
setDepositIds(_depositIds: BigNumber[]): void;
|
|
22
22
|
_getDepositIdAtBlock(blockTag: number): Promise<BigNumber>;
|
|
23
23
|
_update(eventsToQuery: string[]): Promise<SpokePoolUpdate>;
|
|
24
24
|
readonly eventSignatures: Record<string, string>;
|
|
25
25
|
deposit(deposit: Omit<Deposit, "messageHash"> & Partial<SortableEvent>): Log;
|
|
26
|
-
protected _deposit(event: string, deposit: Omit<Deposit, "messageHash"> &
|
|
26
|
+
protected _deposit(event: string, deposit: Omit<Deposit, "messageHash"> & {
|
|
27
|
+
message?: string;
|
|
28
|
+
} & Partial<SortableEvent>): Log;
|
|
27
29
|
fillRelay(fill: Omit<Fill, "messageHash"> & {
|
|
28
30
|
message?: string;
|
|
29
31
|
} & Partial<SortableEvent>): Log;
|