@across-protocol/sdk 4.3.17 → 4.3.18-alpha.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/utils/DataworkerUtils.d.ts +5 -2
- package/dist/cjs/clients/BundleDataClient/utils/DataworkerUtils.js +110 -75
- package/dist/cjs/clients/BundleDataClient/utils/DataworkerUtils.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/utils/SuperstructUtils.d.ts +2 -2
- package/dist/cjs/clients/SpokePoolClient/SpokePoolClient.js +3 -2
- package/dist/cjs/clients/SpokePoolClient/SpokePoolClient.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/utils/DataworkerUtils.d.ts +5 -2
- package/dist/esm/clients/BundleDataClient/utils/DataworkerUtils.js +150 -125
- package/dist/esm/clients/BundleDataClient/utils/DataworkerUtils.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.d.ts +2 -2
- package/dist/esm/clients/SpokePoolClient/SpokePoolClient.js +8 -6
- package/dist/esm/clients/SpokePoolClient/SpokePoolClient.js.map +1 -1
- package/dist/types/clients/BundleDataClient/utils/DataworkerUtils.d.ts +5 -2
- package/dist/types/clients/BundleDataClient/utils/DataworkerUtils.d.ts.map +1 -1
- package/dist/types/clients/BundleDataClient/utils/SuperstructUtils.d.ts +2 -2
- package/dist/types/clients/SpokePoolClient/SpokePoolClient.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/clients/BundleDataClient/utils/DataworkerUtils.ts +68 -6
- package/src/clients/SpokePoolClient/SpokePoolClient.ts +7 -5
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import { BundleDepositsV3, BundleExcessSlowFills, BundleFillsV3, BundleSlowFills, CombinedRefunds, ExpiredDepositsToRefundV3 } from "../../../interfaces";
|
|
1
|
+
import { BundleDepositsV3, BundleExcessSlowFills, BundleFillsV3, BundleSlowFills, CombinedRefunds, ExpiredDepositsToRefundV3, SpokePoolClientsByChain } from "../../../interfaces";
|
|
2
2
|
import { AnyObject } from "../../../utils";
|
|
3
3
|
import { PoolRebalanceRoot } from "./PoolRebalanceUtils";
|
|
4
4
|
import { AcrossConfigStoreClient } from "../../AcrossConfigStoreClient";
|
|
5
5
|
import { HubPoolClient } from "../../HubPoolClient";
|
|
6
|
+
import { BundleDataClient } from "../../BundleDataClient";
|
|
6
7
|
export declare function getRefundsFromBundle(bundleFillsV3: BundleFillsV3, expiredDepositsToRefundV3: ExpiredDepositsToRefundV3): CombinedRefunds;
|
|
7
8
|
export declare function prettyPrintV3SpokePoolEvents(bundleDepositsV3: BundleDepositsV3, bundleFillsV3: BundleFillsV3, bundleSlowFillsV3: BundleSlowFills, expiredDepositsToRefundV3: ExpiredDepositsToRefundV3, unexecutableSlowFills: BundleExcessSlowFills): AnyObject;
|
|
8
9
|
export declare function getEndBlockBuffers(chainIdListForBundleEvaluationBlockNumbers: number[], blockRangeEndBlockBuffer: {
|
|
@@ -11,4 +12,6 @@ export declare function getEndBlockBuffers(chainIdListForBundleEvaluationBlockNu
|
|
|
11
12
|
export declare function _buildPoolRebalanceRoot(latestMainnetBlock: number, mainnetBundleEndBlock: number, bundleV3Deposits: BundleDepositsV3, bundleFillsV3: BundleFillsV3, bundleSlowFillsV3: BundleSlowFills, unexecutableSlowFills: BundleExcessSlowFills, expiredDepositsToRefundV3: ExpiredDepositsToRefundV3, clients: {
|
|
12
13
|
hubPoolClient: HubPoolClient;
|
|
13
14
|
configStoreClient: AcrossConfigStoreClient;
|
|
14
|
-
|
|
15
|
+
bundleDataClient: BundleDataClient;
|
|
16
|
+
spokePoolClients: SpokePoolClientsByChain;
|
|
17
|
+
}, maxL1TokenCountOverride?: number): Promise<PoolRebalanceRoot>;
|
|
@@ -62,84 +62,119 @@ function getEndBlockBuffers(chainIdListForBundleEvaluationBlockNumbers, blockRan
|
|
|
62
62
|
}
|
|
63
63
|
exports.getEndBlockBuffers = getEndBlockBuffers;
|
|
64
64
|
function _buildPoolRebalanceRoot(latestMainnetBlock, mainnetBundleEndBlock, bundleV3Deposits, bundleFillsV3, bundleSlowFillsV3, unexecutableSlowFills, expiredDepositsToRefundV3, clients, maxL1TokenCountOverride) {
|
|
65
|
-
var
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
65
|
+
var _a;
|
|
66
|
+
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
67
|
+
var runningBalances, realizedLpFees, chainWithRefundsOnly, mostRecentProposedRootBundle, blockRangesForChains, prevRootBundleData, prevPoolRebalanceRoot, prevRunningBalances_1, leaves;
|
|
68
|
+
return tslib_1.__generator(this, function (_b) {
|
|
69
|
+
switch (_b.label) {
|
|
70
|
+
case 0:
|
|
71
|
+
runningBalances = {};
|
|
72
|
+
realizedLpFees = {};
|
|
73
|
+
chainWithRefundsOnly = new Set();
|
|
74
|
+
Object.entries(bundleFillsV3).forEach(function (_a) {
|
|
75
|
+
var _repaymentChainId = _a[0], fillsForChain = _a[1];
|
|
76
|
+
var repaymentChainId = Number(_repaymentChainId);
|
|
77
|
+
Object.entries(fillsForChain).forEach(function (_a) {
|
|
78
|
+
var l2TokenAddress = _a[0], _b = _a[1], totalRealizedLpFee = _b.realizedLpFees, totalRefundAmount = _b.totalRefundAmount;
|
|
79
|
+
if (!clients.hubPoolClient.l2TokenHasPoolRebalanceRoute((0, utils_1.toAddressType)(l2TokenAddress, repaymentChainId), repaymentChainId, mainnetBundleEndBlock)) {
|
|
80
|
+
chainWithRefundsOnly.add(repaymentChainId);
|
|
81
|
+
return;
|
|
82
|
+
}
|
|
83
|
+
var l1Token = clients.hubPoolClient.getL1TokenForL2TokenAtBlock((0, utils_1.toAddressType)(l2TokenAddress, repaymentChainId), repaymentChainId, mainnetBundleEndBlock);
|
|
84
|
+
var l1TokenAddr = l1Token.toNative();
|
|
85
|
+
(0, assert_1.default)(l1Token.isEVM(), "Expected an EVM address: ".concat(l1TokenAddr));
|
|
86
|
+
(0, PoolRebalanceUtils_1.updateRunningBalance)(runningBalances, repaymentChainId, l1TokenAddr, totalRefundAmount);
|
|
87
|
+
(0, PoolRebalanceUtils_1.updateRunningBalance)(realizedLpFees, repaymentChainId, l1TokenAddr, totalRealizedLpFee);
|
|
88
|
+
});
|
|
89
|
+
});
|
|
90
|
+
Object.entries(bundleSlowFillsV3).forEach(function (_a) {
|
|
91
|
+
var _destinationChainId = _a[0], depositsForChain = _a[1];
|
|
92
|
+
var destinationChainId = Number(_destinationChainId);
|
|
93
|
+
Object.entries(depositsForChain).forEach(function (_a) {
|
|
94
|
+
var outputToken = _a[0], deposits = _a[1];
|
|
95
|
+
deposits.forEach(function (deposit) {
|
|
96
|
+
var l1TokenCounterpart = clients.hubPoolClient.getL1TokenForL2TokenAtBlock((0, utils_1.toAddressType)(outputToken, destinationChainId), destinationChainId, mainnetBundleEndBlock);
|
|
97
|
+
var lpFee = deposit.lpFeePct.mul(deposit.inputAmount).div(utils_1.fixedPointAdjustment);
|
|
98
|
+
(0, PoolRebalanceUtils_1.updateRunningBalance)(runningBalances, destinationChainId, l1TokenCounterpart.toEvmAddress(), deposit.inputAmount.sub(lpFee));
|
|
99
|
+
});
|
|
100
|
+
});
|
|
101
|
+
});
|
|
102
|
+
Object.entries(unexecutableSlowFills).forEach(function (_a) {
|
|
103
|
+
var _destinationChainId = _a[0], slowFilledDepositsForChain = _a[1];
|
|
104
|
+
var destinationChainId = Number(_destinationChainId);
|
|
105
|
+
Object.entries(slowFilledDepositsForChain).forEach(function (_a) {
|
|
106
|
+
var outputToken = _a[0], slowFilledDeposits = _a[1];
|
|
107
|
+
slowFilledDeposits.forEach(function (deposit) {
|
|
108
|
+
var l1TokenCounterpart = clients.hubPoolClient.getL1TokenForL2TokenAtBlock((0, utils_1.toAddressType)(outputToken, destinationChainId), destinationChainId, mainnetBundleEndBlock);
|
|
109
|
+
var lpFee = deposit.lpFeePct.mul(deposit.inputAmount).div(utils_1.fixedPointAdjustment);
|
|
110
|
+
(0, PoolRebalanceUtils_1.updateRunningBalance)(runningBalances, destinationChainId, l1TokenCounterpart.toEvmAddress(), lpFee.sub(deposit.inputAmount));
|
|
111
|
+
});
|
|
112
|
+
});
|
|
113
|
+
});
|
|
114
|
+
Object.entries(bundleV3Deposits).forEach(function (_a) {
|
|
115
|
+
var depositsForChain = _a[1];
|
|
116
|
+
Object.entries(depositsForChain).forEach(function (_a) {
|
|
117
|
+
var deposits = _a[1];
|
|
118
|
+
deposits.forEach(function (deposit) {
|
|
119
|
+
if (!clients.hubPoolClient.l2TokenHasPoolRebalanceRoute(deposit.inputToken, deposit.originChainId, mainnetBundleEndBlock)) {
|
|
120
|
+
return;
|
|
121
|
+
}
|
|
122
|
+
(0, PoolRebalanceUtils_1.updateRunningBalanceForDeposit)(runningBalances, clients.hubPoolClient, deposit, deposit.inputAmount.mul(-1), mainnetBundleEndBlock);
|
|
123
|
+
});
|
|
124
|
+
});
|
|
125
|
+
});
|
|
126
|
+
Object.entries(expiredDepositsToRefundV3).forEach(function (_a) {
|
|
127
|
+
var _originChainId = _a[0], depositsForChain = _a[1];
|
|
128
|
+
var originChainId = Number(_originChainId);
|
|
129
|
+
Object.entries(depositsForChain).forEach(function (_a) {
|
|
130
|
+
var inputToken = _a[0], deposits = _a[1];
|
|
131
|
+
deposits.forEach(function (deposit) {
|
|
132
|
+
if (!clients.hubPoolClient.l2TokenHasPoolRebalanceRoute(deposit.inputToken, deposit.originChainId, mainnetBundleEndBlock)) {
|
|
133
|
+
chainWithRefundsOnly.add(deposit.originChainId);
|
|
134
|
+
return;
|
|
135
|
+
}
|
|
136
|
+
var l1TokenCounterpart = clients.hubPoolClient.getL1TokenForL2TokenAtBlock((0, utils_1.toAddressType)(inputToken, originChainId), originChainId, mainnetBundleEndBlock);
|
|
137
|
+
(0, PoolRebalanceUtils_1.updateRunningBalance)(runningBalances, originChainId, l1TokenCounterpart.toEvmAddress(), deposit.inputAmount);
|
|
138
|
+
});
|
|
139
|
+
});
|
|
140
|
+
});
|
|
141
|
+
if (!(((_a = clients.hubPoolClient.getPendingRootBundle()) === null || _a === void 0 ? void 0 : _a.bundleEvaluationBlockNumbers[0]) === mainnetBundleEndBlock ||
|
|
142
|
+
!clients.hubPoolClient.hasPendingProposal() ||
|
|
143
|
+
clients.hubPoolClient
|
|
144
|
+
.getValidatedRootBundles(latestMainnetBlock)
|
|
145
|
+
.some(function (bundle) { return bundle.bundleEvaluationBlockNumbers[0].toNumber() === mainnetBundleEndBlock; }))) return [3, 1];
|
|
146
|
+
(0, PoolRebalanceUtils_1.addLastRunningBalance)(latestMainnetBlock, runningBalances, clients.hubPoolClient);
|
|
147
|
+
return [3, 4];
|
|
148
|
+
case 1:
|
|
149
|
+
mostRecentProposedRootBundle = clients.hubPoolClient.getLatestProposedRootBundle();
|
|
150
|
+
blockRangesForChains = (0, utils_1.getImpliedBundleBlockRanges)(clients.hubPoolClient, clients.configStoreClient, mostRecentProposedRootBundle);
|
|
151
|
+
return [4, clients.bundleDataClient.loadData(blockRangesForChains, clients.spokePoolClients, true)];
|
|
152
|
+
case 2:
|
|
153
|
+
prevRootBundleData = _b.sent();
|
|
154
|
+
return [4, _buildPoolRebalanceRoot(latestMainnetBlock, blockRangesForChains[0][1], prevRootBundleData.bundleDepositsV3, prevRootBundleData.bundleFillsV3, prevRootBundleData.bundleSlowFillsV3, prevRootBundleData.unexecutableSlowFills, prevRootBundleData.expiredDepositsToRefundV3, clients, maxL1TokenCountOverride)];
|
|
155
|
+
case 3:
|
|
156
|
+
prevPoolRebalanceRoot = _b.sent();
|
|
157
|
+
prevRunningBalances_1 = prevPoolRebalanceRoot.runningBalances;
|
|
158
|
+
Object.keys(runningBalances).forEach(function (repaymentChainId) {
|
|
159
|
+
Object.keys(runningBalances[Number(repaymentChainId)]).forEach(function (l1TokenAddress) {
|
|
160
|
+
var _a;
|
|
161
|
+
var updateRunningBalanceAmount = (_a = prevRunningBalances_1[Number(repaymentChainId)]) === null || _a === void 0 ? void 0 : _a[l1TokenAddress];
|
|
162
|
+
var fallbackRunningBalance = clients.hubPoolClient.getRunningBalanceBeforeBlockForChain(latestMainnetBlock, Number(repaymentChainId), utils_1.EvmAddress.from(l1TokenAddress)).runningBalance;
|
|
163
|
+
(0, PoolRebalanceUtils_1.updateRunningBalance)(runningBalances, Number(repaymentChainId), l1TokenAddress, updateRunningBalanceAmount !== null && updateRunningBalanceAmount !== void 0 ? updateRunningBalanceAmount : fallbackRunningBalance);
|
|
164
|
+
});
|
|
165
|
+
});
|
|
166
|
+
_b.label = 4;
|
|
167
|
+
case 4:
|
|
168
|
+
leaves = (0, PoolRebalanceUtils_1.constructPoolRebalanceLeaves)(mainnetBundleEndBlock, runningBalances, realizedLpFees, Array.from(chainWithRefundsOnly).filter(function (chainId) { return !Object.keys(runningBalances).includes(chainId.toString()); }), clients.configStoreClient, maxL1TokenCountOverride);
|
|
169
|
+
return [2, {
|
|
170
|
+
runningBalances: runningBalances,
|
|
171
|
+
realizedLpFees: realizedLpFees,
|
|
172
|
+
leaves: leaves,
|
|
173
|
+
tree: (0, MerkleTreeUtils_1.buildPoolRebalanceLeafTree)(leaves),
|
|
174
|
+
}];
|
|
76
175
|
}
|
|
77
|
-
var l1Token = clients.hubPoolClient.getL1TokenForL2TokenAtBlock((0, utils_1.toAddressType)(l2TokenAddress, repaymentChainId), repaymentChainId, mainnetBundleEndBlock);
|
|
78
|
-
var l1TokenAddr = l1Token.toNative();
|
|
79
|
-
(0, assert_1.default)(l1Token.isEVM(), "Expected an EVM address: ".concat(l1TokenAddr));
|
|
80
|
-
(0, PoolRebalanceUtils_1.updateRunningBalance)(runningBalances, repaymentChainId, l1TokenAddr, totalRefundAmount);
|
|
81
|
-
(0, PoolRebalanceUtils_1.updateRunningBalance)(realizedLpFees, repaymentChainId, l1TokenAddr, totalRealizedLpFee);
|
|
82
|
-
});
|
|
83
|
-
});
|
|
84
|
-
Object.entries(bundleSlowFillsV3).forEach(function (_a) {
|
|
85
|
-
var _destinationChainId = _a[0], depositsForChain = _a[1];
|
|
86
|
-
var destinationChainId = Number(_destinationChainId);
|
|
87
|
-
Object.entries(depositsForChain).forEach(function (_a) {
|
|
88
|
-
var outputToken = _a[0], deposits = _a[1];
|
|
89
|
-
deposits.forEach(function (deposit) {
|
|
90
|
-
var l1TokenCounterpart = clients.hubPoolClient.getL1TokenForL2TokenAtBlock((0, utils_1.toAddressType)(outputToken, destinationChainId), destinationChainId, mainnetBundleEndBlock);
|
|
91
|
-
var lpFee = deposit.lpFeePct.mul(deposit.inputAmount).div(utils_1.fixedPointAdjustment);
|
|
92
|
-
(0, PoolRebalanceUtils_1.updateRunningBalance)(runningBalances, destinationChainId, l1TokenCounterpart.toEvmAddress(), deposit.inputAmount.sub(lpFee));
|
|
93
|
-
});
|
|
94
|
-
});
|
|
95
|
-
});
|
|
96
|
-
Object.entries(unexecutableSlowFills).forEach(function (_a) {
|
|
97
|
-
var _destinationChainId = _a[0], slowFilledDepositsForChain = _a[1];
|
|
98
|
-
var destinationChainId = Number(_destinationChainId);
|
|
99
|
-
Object.entries(slowFilledDepositsForChain).forEach(function (_a) {
|
|
100
|
-
var outputToken = _a[0], slowFilledDeposits = _a[1];
|
|
101
|
-
slowFilledDeposits.forEach(function (deposit) {
|
|
102
|
-
var l1TokenCounterpart = clients.hubPoolClient.getL1TokenForL2TokenAtBlock((0, utils_1.toAddressType)(outputToken, destinationChainId), destinationChainId, mainnetBundleEndBlock);
|
|
103
|
-
var lpFee = deposit.lpFeePct.mul(deposit.inputAmount).div(utils_1.fixedPointAdjustment);
|
|
104
|
-
(0, PoolRebalanceUtils_1.updateRunningBalance)(runningBalances, destinationChainId, l1TokenCounterpart.toEvmAddress(), lpFee.sub(deposit.inputAmount));
|
|
105
|
-
});
|
|
106
|
-
});
|
|
107
|
-
});
|
|
108
|
-
Object.entries(bundleV3Deposits).forEach(function (_a) {
|
|
109
|
-
var depositsForChain = _a[1];
|
|
110
|
-
Object.entries(depositsForChain).forEach(function (_a) {
|
|
111
|
-
var deposits = _a[1];
|
|
112
|
-
deposits.forEach(function (deposit) {
|
|
113
|
-
if (!clients.hubPoolClient.l2TokenHasPoolRebalanceRoute(deposit.inputToken, deposit.originChainId, mainnetBundleEndBlock)) {
|
|
114
|
-
return;
|
|
115
|
-
}
|
|
116
|
-
(0, PoolRebalanceUtils_1.updateRunningBalanceForDeposit)(runningBalances, clients.hubPoolClient, deposit, deposit.inputAmount.mul(-1), mainnetBundleEndBlock);
|
|
117
|
-
});
|
|
118
176
|
});
|
|
119
177
|
});
|
|
120
|
-
Object.entries(expiredDepositsToRefundV3).forEach(function (_a) {
|
|
121
|
-
var _originChainId = _a[0], depositsForChain = _a[1];
|
|
122
|
-
var originChainId = Number(_originChainId);
|
|
123
|
-
Object.entries(depositsForChain).forEach(function (_a) {
|
|
124
|
-
var inputToken = _a[0], deposits = _a[1];
|
|
125
|
-
deposits.forEach(function (deposit) {
|
|
126
|
-
if (!clients.hubPoolClient.l2TokenHasPoolRebalanceRoute(deposit.inputToken, deposit.originChainId, mainnetBundleEndBlock)) {
|
|
127
|
-
chainWithRefundsOnly.add(deposit.originChainId);
|
|
128
|
-
return;
|
|
129
|
-
}
|
|
130
|
-
var l1TokenCounterpart = clients.hubPoolClient.getL1TokenForL2TokenAtBlock((0, utils_1.toAddressType)(inputToken, originChainId), originChainId, mainnetBundleEndBlock);
|
|
131
|
-
(0, PoolRebalanceUtils_1.updateRunningBalance)(runningBalances, originChainId, l1TokenCounterpart.toEvmAddress(), deposit.inputAmount);
|
|
132
|
-
});
|
|
133
|
-
});
|
|
134
|
-
});
|
|
135
|
-
(0, PoolRebalanceUtils_1.addLastRunningBalance)(latestMainnetBlock, runningBalances, clients.hubPoolClient);
|
|
136
|
-
var leaves = (0, PoolRebalanceUtils_1.constructPoolRebalanceLeaves)(mainnetBundleEndBlock, runningBalances, realizedLpFees, Array.from(chainWithRefundsOnly).filter(function (chainId) { return !Object.keys(runningBalances).includes(chainId.toString()); }), clients.configStoreClient, maxL1TokenCountOverride);
|
|
137
|
-
return {
|
|
138
|
-
runningBalances: runningBalances,
|
|
139
|
-
realizedLpFees: realizedLpFees,
|
|
140
|
-
leaves: leaves,
|
|
141
|
-
tree: (0, MerkleTreeUtils_1.buildPoolRebalanceLeafTree)(leaves),
|
|
142
|
-
};
|
|
143
178
|
}
|
|
144
179
|
exports._buildPoolRebalanceRoot = _buildPoolRebalanceRoot;
|
|
145
180
|
//# sourceMappingURL=DataworkerUtils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataworkerUtils.js","sourceRoot":"","sources":["../../../../../src/clients/BundleDataClient/utils/DataworkerUtils.ts"],"names":[],"mappings":";;;;AACA,0DAA4B;
|
|
1
|
+
{"version":3,"file":"DataworkerUtils.js","sourceRoot":"","sources":["../../../../../src/clients/BundleDataClient/utils/DataworkerUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -74,8 +74,8 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
74
74
|
transactionHash?: string | undefined;
|
|
75
75
|
transactionIndex?: number | undefined;
|
|
76
76
|
}[];
|
|
77
|
-
refunds: Record<string, BigNumber>;
|
|
78
77
|
realizedLpFees: BigNumber;
|
|
78
|
+
refunds: Record<string, BigNumber>;
|
|
79
79
|
totalRefundAmount: BigNumber;
|
|
80
80
|
}>>;
|
|
81
81
|
bundleSlowFillsV3: Record<string, Record<string, {
|
|
@@ -334,8 +334,8 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
334
334
|
transactionHash?: string | undefined;
|
|
335
335
|
transactionIndex?: number | undefined;
|
|
336
336
|
}[];
|
|
337
|
-
refunds: Record<string, BigNumber>;
|
|
338
337
|
realizedLpFees: BigNumber;
|
|
338
|
+
refunds: Record<string, BigNumber>;
|
|
339
339
|
totalRefundAmount: BigNumber;
|
|
340
340
|
}>>, null>;
|
|
341
341
|
}>;
|
|
@@ -157,7 +157,8 @@ var SpokePoolClient = (function (_super) {
|
|
|
157
157
|
return match.valid ? deposit : undefined;
|
|
158
158
|
};
|
|
159
159
|
SpokePoolClient.prototype.getFillsForDeposit = function (deposit) {
|
|
160
|
-
|
|
160
|
+
var _a;
|
|
161
|
+
return (_a = this.depositHashesToFills[this.getDepositHash(deposit)]) !== null && _a !== void 0 ? _a : [];
|
|
161
162
|
};
|
|
162
163
|
SpokePoolClient.prototype.isDepositFilled = function (deposit) {
|
|
163
164
|
var _a;
|
|
@@ -325,7 +326,7 @@ var SpokePoolClient = (function (_super) {
|
|
|
325
326
|
var speedUp = tslib_1.__assign(tslib_1.__assign({}, event_9), { originChainId: _this.chainId });
|
|
326
327
|
(0, utils_1.assign)(_this.speedUps, [speedUp.depositor.toEvmAddress(), speedUp.depositId.toString()], [speedUp]);
|
|
327
328
|
var deposit = _this.getDeposit(speedUp.depositId);
|
|
328
|
-
if ((0, utils_1.isDefined)(deposit)) {
|
|
329
|
+
if ((0, utils_1.isDefined)(deposit) && (0, utils_1.chainIsEvm)(deposit.destinationChainId) && deposit.depositor.eq(speedUp.depositor)) {
|
|
329
330
|
var eventKey = (0, utils_1.getRelayEventKey)(deposit);
|
|
330
331
|
_this.depositHashes[eventKey] = _this.appendMaxSpeedUpSignatureToDeposit(deposit);
|
|
331
332
|
}
|
|
@@ -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,8 +1,9 @@
|
|
|
1
|
-
import { BundleDepositsV3, BundleExcessSlowFills, BundleFillsV3, BundleSlowFills, CombinedRefunds, ExpiredDepositsToRefundV3 } from "../../../interfaces";
|
|
1
|
+
import { BundleDepositsV3, BundleExcessSlowFills, BundleFillsV3, BundleSlowFills, CombinedRefunds, ExpiredDepositsToRefundV3, SpokePoolClientsByChain } from "../../../interfaces";
|
|
2
2
|
import { AnyObject } from "../../../utils";
|
|
3
3
|
import { PoolRebalanceRoot } from "./PoolRebalanceUtils";
|
|
4
4
|
import { AcrossConfigStoreClient } from "../../AcrossConfigStoreClient";
|
|
5
5
|
import { HubPoolClient } from "../../HubPoolClient";
|
|
6
|
+
import { BundleDataClient } from "../../BundleDataClient";
|
|
6
7
|
export declare function getRefundsFromBundle(bundleFillsV3: BundleFillsV3, expiredDepositsToRefundV3: ExpiredDepositsToRefundV3): CombinedRefunds;
|
|
7
8
|
export declare function prettyPrintV3SpokePoolEvents(bundleDepositsV3: BundleDepositsV3, bundleFillsV3: BundleFillsV3, bundleSlowFillsV3: BundleSlowFills, expiredDepositsToRefundV3: ExpiredDepositsToRefundV3, unexecutableSlowFills: BundleExcessSlowFills): AnyObject;
|
|
8
9
|
export declare function getEndBlockBuffers(chainIdListForBundleEvaluationBlockNumbers: number[], blockRangeEndBlockBuffer: {
|
|
@@ -11,4 +12,6 @@ export declare function getEndBlockBuffers(chainIdListForBundleEvaluationBlockNu
|
|
|
11
12
|
export declare function _buildPoolRebalanceRoot(latestMainnetBlock: number, mainnetBundleEndBlock: number, bundleV3Deposits: BundleDepositsV3, bundleFillsV3: BundleFillsV3, bundleSlowFillsV3: BundleSlowFills, unexecutableSlowFills: BundleExcessSlowFills, expiredDepositsToRefundV3: ExpiredDepositsToRefundV3, clients: {
|
|
12
13
|
hubPoolClient: HubPoolClient;
|
|
13
14
|
configStoreClient: AcrossConfigStoreClient;
|
|
14
|
-
|
|
15
|
+
bundleDataClient: BundleDataClient;
|
|
16
|
+
spokePoolClients: SpokePoolClientsByChain;
|
|
17
|
+
}, maxL1TokenCountOverride?: number): Promise<PoolRebalanceRoot>;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { __assign } from "tslib";
|
|
1
|
+
import { __assign, __awaiter, __generator } from "tslib";
|
|
2
2
|
// Create a combined `refunds` object containing refunds for V2 + V3 fills
|
|
3
3
|
import assert from "assert";
|
|
4
|
-
import { bnZero, fixedPointAdjustment, count2DDictionaryValues, count3DDictionaryValues, toAddressType, } from "../../../utils";
|
|
4
|
+
import { bnZero, fixedPointAdjustment, count2DDictionaryValues, count3DDictionaryValues, toAddressType, getImpliedBundleBlockRanges, EvmAddress, } from "../../../utils";
|
|
5
5
|
import { addLastRunningBalance, constructPoolRebalanceLeaves, updateRunningBalance, updateRunningBalanceForDeposit, } from "./PoolRebalanceUtils";
|
|
6
6
|
import { buildPoolRebalanceLeafTree } from "./MerkleTreeUtils";
|
|
7
7
|
// and expired deposits.
|
|
@@ -74,131 +74,156 @@ export function getEndBlockBuffers(chainIdListForBundleEvaluationBlockNumbers, b
|
|
|
74
74
|
return chainIdListForBundleEvaluationBlockNumbers.map(function (chainId) { var _a; return (_a = blockRangeEndBlockBuffer[chainId]) !== null && _a !== void 0 ? _a : 0; });
|
|
75
75
|
}
|
|
76
76
|
export function _buildPoolRebalanceRoot(latestMainnetBlock, mainnetBundleEndBlock, bundleV3Deposits, bundleFillsV3, bundleSlowFillsV3, unexecutableSlowFills, expiredDepositsToRefundV3, clients, maxL1TokenCountOverride) {
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
77
|
+
var _a;
|
|
78
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
79
|
+
var runningBalances, realizedLpFees, chainWithRefundsOnly, mostRecentProposedRootBundle, blockRangesForChains, prevRootBundleData, prevPoolRebalanceRoot, prevRunningBalances_1, leaves;
|
|
80
|
+
return __generator(this, function (_b) {
|
|
81
|
+
switch (_b.label) {
|
|
82
|
+
case 0:
|
|
83
|
+
runningBalances = {};
|
|
84
|
+
realizedLpFees = {};
|
|
85
|
+
chainWithRefundsOnly = new Set();
|
|
86
|
+
/**
|
|
87
|
+
* REFUNDS FOR FAST FILLS
|
|
88
|
+
*/
|
|
89
|
+
// Add running balances and lp fees for v3 relayer refunds using BundleDataClient.bundleFillsV3. Refunds
|
|
90
|
+
// should be equal to inputAmount - lpFees so that relayers get to keep the relayer fee. Add the refund amount
|
|
91
|
+
// to the running balance for the repayment chain.
|
|
92
|
+
Object.entries(bundleFillsV3).forEach(function (_a) {
|
|
93
|
+
var _repaymentChainId = _a[0], fillsForChain = _a[1];
|
|
94
|
+
var repaymentChainId = Number(_repaymentChainId);
|
|
95
|
+
Object.entries(fillsForChain).forEach(function (_a) {
|
|
96
|
+
var l2TokenAddress = _a[0], _b = _a[1], totalRealizedLpFee = _b.realizedLpFees, totalRefundAmount = _b.totalRefundAmount;
|
|
97
|
+
// If the repayment token and repayment chain ID do not map to a PoolRebalanceRoute graph, then
|
|
98
|
+
// there are no relevant L1 running balances.
|
|
99
|
+
if (!clients.hubPoolClient.l2TokenHasPoolRebalanceRoute(toAddressType(l2TokenAddress, repaymentChainId), repaymentChainId, mainnetBundleEndBlock)) {
|
|
100
|
+
chainWithRefundsOnly.add(repaymentChainId);
|
|
101
|
+
return;
|
|
102
|
+
}
|
|
103
|
+
var l1Token = clients.hubPoolClient.getL1TokenForL2TokenAtBlock(toAddressType(l2TokenAddress, repaymentChainId), repaymentChainId, mainnetBundleEndBlock);
|
|
104
|
+
var l1TokenAddr = l1Token.toNative();
|
|
105
|
+
assert(l1Token.isEVM(), "Expected an EVM address: ".concat(l1TokenAddr));
|
|
106
|
+
updateRunningBalance(runningBalances, repaymentChainId, l1TokenAddr, totalRefundAmount);
|
|
107
|
+
updateRunningBalance(realizedLpFees, repaymentChainId, l1TokenAddr, totalRealizedLpFee);
|
|
108
|
+
});
|
|
109
|
+
});
|
|
110
|
+
/**
|
|
111
|
+
* PAYMENTS SLOW FILLS
|
|
112
|
+
*/
|
|
113
|
+
// Add running balances and lp fees for v3 slow fills using BundleDataClient.bundleSlowFillsV3.
|
|
114
|
+
// Slow fills should still increment bundleLpFees and updatedOutputAmount should be equal to inputAmount - lpFees.
|
|
115
|
+
// Increment the updatedOutputAmount to the destination chain.
|
|
116
|
+
Object.entries(bundleSlowFillsV3).forEach(function (_a) {
|
|
117
|
+
var _destinationChainId = _a[0], depositsForChain = _a[1];
|
|
118
|
+
var destinationChainId = Number(_destinationChainId);
|
|
119
|
+
Object.entries(depositsForChain).forEach(function (_a) {
|
|
120
|
+
var outputToken = _a[0], deposits = _a[1];
|
|
121
|
+
deposits.forEach(function (deposit) {
|
|
122
|
+
var l1TokenCounterpart = clients.hubPoolClient.getL1TokenForL2TokenAtBlock(toAddressType(outputToken, destinationChainId), destinationChainId, mainnetBundleEndBlock);
|
|
123
|
+
var lpFee = deposit.lpFeePct.mul(deposit.inputAmount).div(fixedPointAdjustment);
|
|
124
|
+
updateRunningBalance(runningBalances, destinationChainId, l1TokenCounterpart.toEvmAddress(), deposit.inputAmount.sub(lpFee));
|
|
125
|
+
// Slow fill LP fees are accounted for when the slow fill executes and a V3FilledRelay is emitted. i.e. when
|
|
126
|
+
// the slow fill execution is included in bundleFillsV3.
|
|
127
|
+
});
|
|
128
|
+
});
|
|
129
|
+
});
|
|
130
|
+
/**
|
|
131
|
+
* EXCESSES FROM UNEXECUTABLE SLOW FILLS
|
|
132
|
+
*/
|
|
133
|
+
// Subtract destination chain running balances for BundleDataClient.unexecutableSlowFills.
|
|
134
|
+
// These are all slow fills that are impossible to execute and therefore the amount to return would be
|
|
135
|
+
// the updatedOutputAmount = inputAmount - lpFees.
|
|
136
|
+
Object.entries(unexecutableSlowFills).forEach(function (_a) {
|
|
137
|
+
var _destinationChainId = _a[0], slowFilledDepositsForChain = _a[1];
|
|
138
|
+
var destinationChainId = Number(_destinationChainId);
|
|
139
|
+
Object.entries(slowFilledDepositsForChain).forEach(function (_a) {
|
|
140
|
+
var outputToken = _a[0], slowFilledDeposits = _a[1];
|
|
141
|
+
slowFilledDeposits.forEach(function (deposit) {
|
|
142
|
+
var l1TokenCounterpart = clients.hubPoolClient.getL1TokenForL2TokenAtBlock(toAddressType(outputToken, destinationChainId), destinationChainId, mainnetBundleEndBlock);
|
|
143
|
+
var lpFee = deposit.lpFeePct.mul(deposit.inputAmount).div(fixedPointAdjustment);
|
|
144
|
+
updateRunningBalance(runningBalances, destinationChainId, l1TokenCounterpart.toEvmAddress(), lpFee.sub(deposit.inputAmount));
|
|
145
|
+
// Slow fills don't add to lpFees, only when the slow fill is executed and a V3FilledRelay is emitted, so
|
|
146
|
+
// we don't need to subtract it here. Moreover, the HubPoole expects bundleLpFees to be > 0.
|
|
147
|
+
});
|
|
148
|
+
});
|
|
149
|
+
});
|
|
150
|
+
/**
|
|
151
|
+
* DEPOSITS
|
|
152
|
+
*/
|
|
153
|
+
// Handle v3Deposits. These decrement running balances from the origin chain equal to the inputAmount.
|
|
154
|
+
// There should not be early deposits in v3.
|
|
155
|
+
Object.entries(bundleV3Deposits).forEach(function (_a) {
|
|
156
|
+
var depositsForChain = _a[1];
|
|
157
|
+
Object.entries(depositsForChain).forEach(function (_a) {
|
|
158
|
+
var deposits = _a[1];
|
|
159
|
+
deposits.forEach(function (deposit) {
|
|
160
|
+
// If the repayment token and repayment chain ID do not map to a PoolRebalanceRoute graph, then
|
|
161
|
+
// there are no relevant L1 running balances.
|
|
162
|
+
if (!clients.hubPoolClient.l2TokenHasPoolRebalanceRoute(deposit.inputToken, deposit.originChainId, mainnetBundleEndBlock)) {
|
|
163
|
+
return;
|
|
164
|
+
}
|
|
165
|
+
updateRunningBalanceForDeposit(runningBalances, clients.hubPoolClient, deposit, deposit.inputAmount.mul(-1), mainnetBundleEndBlock);
|
|
166
|
+
});
|
|
167
|
+
});
|
|
168
|
+
});
|
|
169
|
+
/**
|
|
170
|
+
* REFUNDS FOR EXPIRED DEPOSITS
|
|
171
|
+
*/
|
|
172
|
+
// Add origin chain running balance for expired v3 deposits. These should refund the inputAmount.
|
|
173
|
+
Object.entries(expiredDepositsToRefundV3).forEach(function (_a) {
|
|
174
|
+
var _originChainId = _a[0], depositsForChain = _a[1];
|
|
175
|
+
var originChainId = Number(_originChainId);
|
|
176
|
+
Object.entries(depositsForChain).forEach(function (_a) {
|
|
177
|
+
var inputToken = _a[0], deposits = _a[1];
|
|
178
|
+
deposits.forEach(function (deposit) {
|
|
179
|
+
// If the repayment token and repayment chain ID do not map to a PoolRebalanceRoute graph, then
|
|
180
|
+
// there are no relevant L1 running balances.
|
|
181
|
+
if (!clients.hubPoolClient.l2TokenHasPoolRebalanceRoute(deposit.inputToken, deposit.originChainId, mainnetBundleEndBlock)) {
|
|
182
|
+
chainWithRefundsOnly.add(deposit.originChainId);
|
|
183
|
+
return;
|
|
184
|
+
}
|
|
185
|
+
var l1TokenCounterpart = clients.hubPoolClient.getL1TokenForL2TokenAtBlock(toAddressType(inputToken, originChainId), originChainId, mainnetBundleEndBlock);
|
|
186
|
+
updateRunningBalance(runningBalances, originChainId, l1TokenCounterpart.toEvmAddress(), deposit.inputAmount);
|
|
187
|
+
});
|
|
188
|
+
});
|
|
189
|
+
});
|
|
190
|
+
if (!(((_a = clients.hubPoolClient.getPendingRootBundle()) === null || _a === void 0 ? void 0 : _a.bundleEvaluationBlockNumbers[0]) === mainnetBundleEndBlock ||
|
|
191
|
+
!clients.hubPoolClient.hasPendingProposal() ||
|
|
192
|
+
clients.hubPoolClient
|
|
193
|
+
.getValidatedRootBundles(latestMainnetBlock)
|
|
194
|
+
.some(function (bundle) { return bundle.bundleEvaluationBlockNumbers[0].toNumber() === mainnetBundleEndBlock; }))) return [3 /*break*/, 1];
|
|
195
|
+
addLastRunningBalance(latestMainnetBlock, runningBalances, clients.hubPoolClient);
|
|
196
|
+
return [3 /*break*/, 4];
|
|
197
|
+
case 1:
|
|
198
|
+
mostRecentProposedRootBundle = clients.hubPoolClient.getLatestProposedRootBundle();
|
|
199
|
+
blockRangesForChains = getImpliedBundleBlockRanges(clients.hubPoolClient, clients.configStoreClient, mostRecentProposedRootBundle);
|
|
200
|
+
return [4 /*yield*/, clients.bundleDataClient.loadData(blockRangesForChains, clients.spokePoolClients, true)];
|
|
201
|
+
case 2:
|
|
202
|
+
prevRootBundleData = _b.sent();
|
|
203
|
+
return [4 /*yield*/, _buildPoolRebalanceRoot(latestMainnetBlock, blockRangesForChains[0][1], prevRootBundleData.bundleDepositsV3, prevRootBundleData.bundleFillsV3, prevRootBundleData.bundleSlowFillsV3, prevRootBundleData.unexecutableSlowFills, prevRootBundleData.expiredDepositsToRefundV3, clients, maxL1TokenCountOverride)];
|
|
204
|
+
case 3:
|
|
205
|
+
prevPoolRebalanceRoot = _b.sent();
|
|
206
|
+
prevRunningBalances_1 = prevPoolRebalanceRoot.runningBalances;
|
|
207
|
+
Object.keys(runningBalances).forEach(function (repaymentChainId) {
|
|
208
|
+
Object.keys(runningBalances[Number(repaymentChainId)]).forEach(function (l1TokenAddress) {
|
|
209
|
+
var _a;
|
|
210
|
+
var updateRunningBalanceAmount = (_a = prevRunningBalances_1[Number(repaymentChainId)]) === null || _a === void 0 ? void 0 : _a[l1TokenAddress];
|
|
211
|
+
// If the pending root bundle didn't have a running balance, fall back to the last running balance for that token and chain pair.
|
|
212
|
+
var fallbackRunningBalance = clients.hubPoolClient.getRunningBalanceBeforeBlockForChain(latestMainnetBlock, Number(repaymentChainId), EvmAddress.from(l1TokenAddress)).runningBalance;
|
|
213
|
+
updateRunningBalance(runningBalances, Number(repaymentChainId), l1TokenAddress, updateRunningBalanceAmount !== null && updateRunningBalanceAmount !== void 0 ? updateRunningBalanceAmount : fallbackRunningBalance);
|
|
214
|
+
});
|
|
215
|
+
});
|
|
216
|
+
_b.label = 4;
|
|
217
|
+
case 4:
|
|
218
|
+
leaves = constructPoolRebalanceLeaves(mainnetBundleEndBlock, runningBalances, realizedLpFees, Array.from(chainWithRefundsOnly).filter(function (chainId) { return !Object.keys(runningBalances).includes(chainId.toString()); }), clients.configStoreClient, maxL1TokenCountOverride);
|
|
219
|
+
return [2 /*return*/, {
|
|
220
|
+
runningBalances: runningBalances,
|
|
221
|
+
realizedLpFees: realizedLpFees,
|
|
222
|
+
leaves: leaves,
|
|
223
|
+
tree: buildPoolRebalanceLeafTree(leaves),
|
|
224
|
+
}];
|
|
105
225
|
}
|
|
106
|
-
var l1Token = clients.hubPoolClient.getL1TokenForL2TokenAtBlock(toAddressType(l2TokenAddress, repaymentChainId), repaymentChainId, mainnetBundleEndBlock);
|
|
107
|
-
var l1TokenAddr = l1Token.toNative();
|
|
108
|
-
assert(l1Token.isEVM(), "Expected an EVM address: ".concat(l1TokenAddr));
|
|
109
|
-
updateRunningBalance(runningBalances, repaymentChainId, l1TokenAddr, totalRefundAmount);
|
|
110
|
-
updateRunningBalance(realizedLpFees, repaymentChainId, l1TokenAddr, totalRealizedLpFee);
|
|
111
|
-
});
|
|
112
|
-
});
|
|
113
|
-
/**
|
|
114
|
-
* PAYMENTS SLOW FILLS
|
|
115
|
-
*/
|
|
116
|
-
// Add running balances and lp fees for v3 slow fills using BundleDataClient.bundleSlowFillsV3.
|
|
117
|
-
// Slow fills should still increment bundleLpFees and updatedOutputAmount should be equal to inputAmount - lpFees.
|
|
118
|
-
// Increment the updatedOutputAmount to the destination chain.
|
|
119
|
-
Object.entries(bundleSlowFillsV3).forEach(function (_a) {
|
|
120
|
-
var _destinationChainId = _a[0], depositsForChain = _a[1];
|
|
121
|
-
var destinationChainId = Number(_destinationChainId);
|
|
122
|
-
Object.entries(depositsForChain).forEach(function (_a) {
|
|
123
|
-
var outputToken = _a[0], deposits = _a[1];
|
|
124
|
-
deposits.forEach(function (deposit) {
|
|
125
|
-
var l1TokenCounterpart = clients.hubPoolClient.getL1TokenForL2TokenAtBlock(toAddressType(outputToken, destinationChainId), destinationChainId, mainnetBundleEndBlock);
|
|
126
|
-
var lpFee = deposit.lpFeePct.mul(deposit.inputAmount).div(fixedPointAdjustment);
|
|
127
|
-
updateRunningBalance(runningBalances, destinationChainId, l1TokenCounterpart.toEvmAddress(), deposit.inputAmount.sub(lpFee));
|
|
128
|
-
// Slow fill LP fees are accounted for when the slow fill executes and a V3FilledRelay is emitted. i.e. when
|
|
129
|
-
// the slow fill execution is included in bundleFillsV3.
|
|
130
|
-
});
|
|
131
|
-
});
|
|
132
|
-
});
|
|
133
|
-
/**
|
|
134
|
-
* EXCESSES FROM UNEXECUTABLE SLOW FILLS
|
|
135
|
-
*/
|
|
136
|
-
// Subtract destination chain running balances for BundleDataClient.unexecutableSlowFills.
|
|
137
|
-
// These are all slow fills that are impossible to execute and therefore the amount to return would be
|
|
138
|
-
// the updatedOutputAmount = inputAmount - lpFees.
|
|
139
|
-
Object.entries(unexecutableSlowFills).forEach(function (_a) {
|
|
140
|
-
var _destinationChainId = _a[0], slowFilledDepositsForChain = _a[1];
|
|
141
|
-
var destinationChainId = Number(_destinationChainId);
|
|
142
|
-
Object.entries(slowFilledDepositsForChain).forEach(function (_a) {
|
|
143
|
-
var outputToken = _a[0], slowFilledDeposits = _a[1];
|
|
144
|
-
slowFilledDeposits.forEach(function (deposit) {
|
|
145
|
-
var l1TokenCounterpart = clients.hubPoolClient.getL1TokenForL2TokenAtBlock(toAddressType(outputToken, destinationChainId), destinationChainId, mainnetBundleEndBlock);
|
|
146
|
-
var lpFee = deposit.lpFeePct.mul(deposit.inputAmount).div(fixedPointAdjustment);
|
|
147
|
-
updateRunningBalance(runningBalances, destinationChainId, l1TokenCounterpart.toEvmAddress(), lpFee.sub(deposit.inputAmount));
|
|
148
|
-
// Slow fills don't add to lpFees, only when the slow fill is executed and a V3FilledRelay is emitted, so
|
|
149
|
-
// we don't need to subtract it here. Moreover, the HubPoole expects bundleLpFees to be > 0.
|
|
150
|
-
});
|
|
151
|
-
});
|
|
152
|
-
});
|
|
153
|
-
/**
|
|
154
|
-
* DEPOSITS
|
|
155
|
-
*/
|
|
156
|
-
// Handle v3Deposits. These decrement running balances from the origin chain equal to the inputAmount.
|
|
157
|
-
// There should not be early deposits in v3.
|
|
158
|
-
Object.entries(bundleV3Deposits).forEach(function (_a) {
|
|
159
|
-
var depositsForChain = _a[1];
|
|
160
|
-
Object.entries(depositsForChain).forEach(function (_a) {
|
|
161
|
-
var deposits = _a[1];
|
|
162
|
-
deposits.forEach(function (deposit) {
|
|
163
|
-
// If the repayment token and repayment chain ID do not map to a PoolRebalanceRoute graph, then
|
|
164
|
-
// there are no relevant L1 running balances.
|
|
165
|
-
if (!clients.hubPoolClient.l2TokenHasPoolRebalanceRoute(deposit.inputToken, deposit.originChainId, mainnetBundleEndBlock)) {
|
|
166
|
-
return;
|
|
167
|
-
}
|
|
168
|
-
updateRunningBalanceForDeposit(runningBalances, clients.hubPoolClient, deposit, deposit.inputAmount.mul(-1), mainnetBundleEndBlock);
|
|
169
|
-
});
|
|
170
226
|
});
|
|
171
227
|
});
|
|
172
|
-
/**
|
|
173
|
-
* REFUNDS FOR EXPIRED DEPOSITS
|
|
174
|
-
*/
|
|
175
|
-
// Add origin chain running balance for expired v3 deposits. These should refund the inputAmount.
|
|
176
|
-
Object.entries(expiredDepositsToRefundV3).forEach(function (_a) {
|
|
177
|
-
var _originChainId = _a[0], depositsForChain = _a[1];
|
|
178
|
-
var originChainId = Number(_originChainId);
|
|
179
|
-
Object.entries(depositsForChain).forEach(function (_a) {
|
|
180
|
-
var inputToken = _a[0], deposits = _a[1];
|
|
181
|
-
deposits.forEach(function (deposit) {
|
|
182
|
-
// If the repayment token and repayment chain ID do not map to a PoolRebalanceRoute graph, then
|
|
183
|
-
// there are no relevant L1 running balances.
|
|
184
|
-
if (!clients.hubPoolClient.l2TokenHasPoolRebalanceRoute(deposit.inputToken, deposit.originChainId, mainnetBundleEndBlock)) {
|
|
185
|
-
chainWithRefundsOnly.add(deposit.originChainId);
|
|
186
|
-
return;
|
|
187
|
-
}
|
|
188
|
-
var l1TokenCounterpart = clients.hubPoolClient.getL1TokenForL2TokenAtBlock(toAddressType(inputToken, originChainId), originChainId, mainnetBundleEndBlock);
|
|
189
|
-
updateRunningBalance(runningBalances, originChainId, l1TokenCounterpart.toEvmAddress(), deposit.inputAmount);
|
|
190
|
-
});
|
|
191
|
-
});
|
|
192
|
-
});
|
|
193
|
-
// Add to the running balance value from the last valid root bundle proposal for {chainId, l1Token}
|
|
194
|
-
// combination if found.
|
|
195
|
-
addLastRunningBalance(latestMainnetBlock, runningBalances, clients.hubPoolClient);
|
|
196
|
-
var leaves = constructPoolRebalanceLeaves(mainnetBundleEndBlock, runningBalances, realizedLpFees, Array.from(chainWithRefundsOnly).filter(function (chainId) { return !Object.keys(runningBalances).includes(chainId.toString()); }), clients.configStoreClient, maxL1TokenCountOverride);
|
|
197
|
-
return {
|
|
198
|
-
runningBalances: runningBalances,
|
|
199
|
-
realizedLpFees: realizedLpFees,
|
|
200
|
-
leaves: leaves,
|
|
201
|
-
tree: buildPoolRebalanceLeafTree(leaves),
|
|
202
|
-
};
|
|
203
228
|
}
|
|
204
229
|
//# sourceMappingURL=DataworkerUtils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataworkerUtils.js","sourceRoot":"","sources":["../../../../../src/clients/BundleDataClient/utils/DataworkerUtils.ts"],"names":[],"mappings":";AAAA,0EAA0E;AAC1E,OAAO,MAAM,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"DataworkerUtils.js","sourceRoot":"","sources":["../../../../../src/clients/BundleDataClient/utils/DataworkerUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -74,8 +74,8 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
74
74
|
transactionHash?: string | undefined;
|
|
75
75
|
transactionIndex?: number | undefined;
|
|
76
76
|
}[];
|
|
77
|
-
refunds: Record<string, BigNumber>;
|
|
78
77
|
realizedLpFees: BigNumber;
|
|
78
|
+
refunds: Record<string, BigNumber>;
|
|
79
79
|
totalRefundAmount: BigNumber;
|
|
80
80
|
}>>;
|
|
81
81
|
bundleSlowFillsV3: Record<string, Record<string, {
|
|
@@ -334,8 +334,8 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
334
334
|
transactionHash?: string | undefined;
|
|
335
335
|
transactionIndex?: number | undefined;
|
|
336
336
|
}[];
|
|
337
|
-
refunds: Record<string, BigNumber>;
|
|
338
337
|
realizedLpFees: BigNumber;
|
|
338
|
+
refunds: Record<string, BigNumber>;
|
|
339
339
|
totalRefundAmount: BigNumber;
|
|
340
340
|
}>>, null>;
|
|
341
341
|
}>;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { __assign, __awaiter, __extends, __generator } from "tslib";
|
|
2
2
|
import { utils as ethersUtils } from "ethers";
|
|
3
|
-
import { bnZero, EvmAddress, MAX_BIG_INT, assign, getRelayEventKey, isDefined, getMessageHash, isSlowFill, validateFillForDeposit, chainIsProd, toAddressType, } from "../../utils";
|
|
3
|
+
import { bnZero, EvmAddress, MAX_BIG_INT, assign, getRelayEventKey, isDefined, getMessageHash, isSlowFill, validateFillForDeposit, chainIsEvm, chainIsProd, toAddressType, } from "../../utils";
|
|
4
4
|
import { duplicateEvent, sortEventsAscendingInPlace } from "../../utils/EventUtils";
|
|
5
5
|
import { CHAIN_IDs, ZERO_ADDRESS } from "../../constants";
|
|
6
6
|
import { BaseAbstractClient } from "../BaseAbstractClient";
|
|
@@ -279,7 +279,8 @@ var SpokePoolClient = /** @class */ (function (_super) {
|
|
|
279
279
|
return match.valid ? deposit : undefined;
|
|
280
280
|
};
|
|
281
281
|
SpokePoolClient.prototype.getFillsForDeposit = function (deposit) {
|
|
282
|
-
|
|
282
|
+
var _a;
|
|
283
|
+
return (_a = this.depositHashesToFills[this.getDepositHash(deposit)]) !== null && _a !== void 0 ? _a : [];
|
|
283
284
|
};
|
|
284
285
|
SpokePoolClient.prototype.isDepositFilled = function (deposit) {
|
|
285
286
|
var _a;
|
|
@@ -484,11 +485,12 @@ var SpokePoolClient = /** @class */ (function (_super) {
|
|
|
484
485
|
var speedUp = __assign(__assign({}, event_9), { originChainId: _this.chainId });
|
|
485
486
|
assign(_this.speedUps, [speedUp.depositor.toEvmAddress(), speedUp.depositId.toString()], [speedUp]);
|
|
486
487
|
// Find deposit hash matching this speed up event and update the deposit data associated with the hash,
|
|
487
|
-
// if the hash+data exists.
|
|
488
|
+
// if the hash+data exists. nb. Relying on depositId alone can produce collisions on deterministic deposit IDs.
|
|
488
489
|
var deposit = _this.getDeposit(speedUp.depositId);
|
|
489
|
-
//
|
|
490
|
-
|
|
491
|
-
|
|
490
|
+
// SpeedUp requests are only supported EVM -> EVM.
|
|
491
|
+
if (isDefined(deposit) && chainIsEvm(deposit.destinationChainId) && deposit.depositor.eq(speedUp.depositor)) {
|
|
492
|
+
// We can assume all deposits in this lookback window are loaded in-memory already so if the depositHash
|
|
493
|
+
// is not mapped to a deposit, then we can throw away the speedup as it can't be applied to anything.
|
|
492
494
|
var eventKey = getRelayEventKey(deposit);
|
|
493
495
|
_this.depositHashes[eventKey] = _this.appendMaxSpeedUpSignatureToDeposit(deposit);
|
|
494
496
|
}
|
|
@@ -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":";AACA,OAAO,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAGL,MAAM,EAIN,UAAU,EACV,WAAW,EAEX,MAAM,EACN,gBAAgB,EAChB,SAAS,EACT,cAAc,EACd,UAAU,EACV,sBAAsB,EACtB,UAAU,EACV,WAAW,EAEX,aAAa,GACd,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,cAAc,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AACpF,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAmB1D,OAAO,EAAE,kBAAkB,EAAuB,MAAM,uBAAuB,CAAC;AAEhF,OAAO,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AAenE,MAAM,CAAC,IAAM,eAAe,GAAG;IAC7B,qBAAqB;IACrB,eAAe;IACf,mBAAmB;IACnB,2BAA2B;IAC3B,kBAAkB;IAClB,gBAAgB;IAChB,2BAA2B;IAC3B,yBAAyB;IACzB,qBAAqB;IACrB,mBAAmB;IACnB,eAAe;IACf,aAAa;IACb,kBAAkB;IAClB,sBAAsB;CACvB,CAAC;AAEF;;;GAGG;AACH;IAA8C,mCAAkB;IAmB9D;;;;;;;OAOG;IACH,yBACW,MAAsB;IAC/B,0DAA0D;IACjD,aAAmC,EACnC,OAAe,EACjB,eAAuB,EAC9B,iBAAsF;QAAtF,kCAAA,EAAA,sBAA6D,IAAI,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE;QANxF,YAQE,kBAAM,iBAAiB,CAAC,SAIzB;QAXU,YAAM,GAAN,MAAM,CAAgB;QAEtB,mBAAa,GAAb,aAAa,CAAsB;QACnC,aAAO,GAAP,OAAO,CAAQ;QACjB,qBAAe,GAAf,eAAe,CAAQ;QA9BtB,iBAAW,GAAG,CAAC,CAAC;QAChB,4BAAsB,GAAkD,EAAE,CAAC;QAC3E,0BAAoB,GAA+C,EAAE,CAAC;QACtE,cAAQ,GAAgF,EAAE,CAAC;QAC3F,sBAAgB,GAA0D,EAAE,CAAC;QAC7E,mBAAa,GAAyE,EAAE,CAAC;QACzF,mBAAa,GAAoB,EAAE,CAAC;QACpC,sBAAgB,GAA+B,EAAE,CAAC;QAClD,6BAAuB,GAAsC,EAAE,CAAC;QAChE,2BAAqB,GAAoC,EAAE,CAAC;QAC5D,sBAAgB,GAAgC,EAAE,CAAC;QAEnD,kBAAY,GAAgB,IAAI,GAAG,EAAE,CAAC;QAChC,mBAAa,GAAgD,EAAE,CAAC;QAEzE,WAAK,GAAiD,EAAE,CAAC;QAmB9D,KAAI,CAAC,mBAAmB,GAAG,iBAAiB,CAAC,IAAI,CAAC;QAClD,KAAI,CAAC,oBAAoB,GAAG,CAAC,CAAC;QAC9B,KAAI,CAAC,iBAAiB,GAAG,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,iBAAiB,CAAC;;IAC5D,CAAC;IAED;;;;OAIG;IACI,wDAA8B,GAArC,UAAsC,kBAA0B;QAC9D,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,UAAC,OAAO,IAAK,OAAA,OAAO,CAAC,kBAAkB,KAAK,kBAAkB,EAAjD,CAAiD,CAAC,CAAC;IAClH,CAAC;IAED;;;;;;OAMG;IACK,+CAAqB,GAA7B,UAA8B,OAAyB;;QACrD,IAAM,WAAW,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAC9C,OAAO,MAAA,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,mCAAI,EAAE,CAAC;IACxD,CAAC;IAED;;;;;;OAMG;IACI,sEAA4C,GAAnD,UAAoD,kBAA0B;QAA9E,iBAOC;QANC,IAAM,QAAQ,GAAG,IAAI,CAAC,8BAA8B,CAAC,kBAAkB,CAAC,CAAC;QACzE,IAAM,iBAAiB,GAAG,QAAQ,CAAC,MAAM,CAAC,UAAC,GAAG,EAAE,OAAO;YACrD,IAAM,UAAU,GAAG,KAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;YACvD,OAAO,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAChC,CAAC,EAAE,EAAwB,CAAC,CAAC;QAC7B,OAAO,0BAA0B,CAAC,QAAQ,CAAC,MAAM,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAC/E,CAAC;IAED;;;;OAIG;IACI,qCAAW,GAAlB,UAAmB,MAA+C;QAChE,IAAI,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACjD,IAAI,SAAS,CAAC,MAAM,CAAC,EAAE;YACb,IAAA,WAAS,GAAc,MAAM,UAApB,EAAE,SAAO,GAAK,MAAM,QAAX,CAAY;YACtC,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,UAAC,EAAe;oBAAb,WAAW,iBAAA;gBAAO,OAAA,WAAW,IAAI,WAAS,IAAI,SAAO,IAAI,WAAW;YAAlD,CAAkD,CAAC,CAAC;SACrG;QAED,OAAO,0BAA0B,CAAC,QAAQ,CAAC,CAAC;IAC9C,CAAC;IAED;;;OAGG;IACI,0CAAgB,GAAvB;QACE,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED;;;OAGG;IACI,0CAAgB,GAAvB;QACE,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED;;;OAGG;IACI,kCAAQ,GAAf;QACE,OAAO,0BAA0B,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IACtE,CAAC;IAED;;;;OAIG;IACI,gDAAsB,GAA7B,UAA8B,aAAqB;QACjD,OAAO,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;IACzC,CAAC;IAED;;;;OAIG;IACI,4CAAkB,GAAzB,UAA0B,OAAgB;QACxC,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,UAAC,IAAI,IAAK,OAAA,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,EAAxB,CAAwB,CAAC,CAAC;IACpE,CAAC;IAED;;;;;OAKG;IACI,kDAAwB,GAA/B,UAAgC,aAAqB,EAAE,WAAmB;QACxE,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,UAAC,IAAI,IAAK,OAAA,IAAI,CAAC,WAAW,IAAI,aAAa,IAAI,IAAI,CAAC,WAAW,IAAI,WAAW,EAApE,CAAoE,CAAC,CAAC;IAChH,CAAC;IAED;;;OAGG;IACI,6CAAmB,GAA1B;QACE,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IAED;;;OAGG;IACI,+CAAqB,GAA5B;;QACE,OAAO,IAAI,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC;YACrC,CAAC,CAAC,CAAA,MAAA,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC,0CAAE,YAAY,IAAG,CAAC;YAC3E,CAAC,CAAC,CAAC,CAAC;IACR,CAAC;IAED;;;OAGG;IACI,oDAA0B,GAAjC;QACE,OAAO,IAAI,CAAC,uBAAuB,CAAC;IACtC,CAAC;IAED;;;OAGG;IACI,kDAAwB,GAA/B;QACE,OAAO,IAAI,CAAC,qBAAqB,CAAC;IACpC,CAAC;IAED;;;OAGG;IACI,mDAAyB,GAAhC;QACE,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IAED;;;;OAIG;IACI,4DAAkC,GAAzC,UAA0C,OAAyB;;QACzD,IAAA,SAAS,GAAgB,OAAO,UAAvB,EAAE,SAAS,GAAK,OAAO,UAAZ,CAAa;QAEzC,8FAA8F;QAC9F,4DAA4D;QAC5D,IAAM,QAAQ,GAAG,MAAA,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC,0CAAG,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;QACjF,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;YACjD,OAAO,OAAO,CAAC;SAChB;QAED,IAAM,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAC,UAAC,IAAI,EAAE,OAAO;YAC/C,OAAA,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO;QAAzE,CAAyE,CAC1E,CAAC;QAEF,uGAAuG;QACvG,iGAAiG;QACjG,IAAI,UAAU,CAAC,mBAAmB,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;YAC5D,OAAO,OAAO,CAAC;SAChB;QAED,6FAA6F;QAC7F,IAAM,cAAc,yBACf,OAAO,KACV,gBAAgB,EAAE,UAAU,CAAC,kBAAkB,EAC/C,mBAAmB,EAAE,UAAU,CAAC,mBAAmB,EACnD,gBAAgB,EAAE,UAAU,CAAC,gBAAgB,EAC7C,cAAc,EAAE,UAAU,CAAC,cAAc,GAC1C,CAAC;QAEF,OAAO,cAAc,CAAC;IACxB,CAAC;IAED;;;;;OAKG;IACI,oCAAU,GAAjB,UAAkB,SAAoB;QACpC,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,UAAC,EAAyB;gBAAZ,UAAU,eAAA;YAAO,OAAA,UAAU,CAAC,EAAE,CAAC,SAAS,CAAC;QAAxB,CAAwB,CAAC,CAAC;IACzG,CAAC;IAED;;;OAGG;IACI,6CAAmB,GAA1B;QACE,OAAO,0BAA0B,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC;IAC1E,CAAC;IAED;;;;OAIG;IACI,4CAAkB,GAAzB,UACE,SAA+D;QAE/D,IAAM,IAAI,GAAG,gBAAgB,uBAAM,SAAS,KAAE,kBAAkB,EAAE,IAAI,CAAC,OAAO,IAAG,CAAC;QAClF,OAAO,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;IAED;;;;OAIG;IACI,2DAAiC,GAAxC,UAAyC,aAAqB;QAC5D,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,aAAa,KAAK,aAAa,EAAjC,CAAiC,CAAC,CAAC;IAC/F,CAAC;IAED;;;OAGG;IACI,qCAAW,GAAlB;QACE,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED;;;;OAIG;IACI,2CAAiB,GAAxB,UAAyB,IAAU;QACjC,IAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3D,IAAM,KAAK,GAAG,sBAAsB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACpD,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IAC3C,CAAC;IAEM,4CAAkB,GAAzB,UAA0B,OAAgB;;QACxC,OAAO,MAAA,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,mCAAI,EAAE,CAAC;IACvE,CAAC;IAEM,yCAAe,GAAtB,UAAuB,OAAgB;;QACrC,IAAM,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QACjD,IAAM,KAAK,GAAG,MAAA,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,mCAAI,EAAE,CAAC;QAE3D,OAAO,KAAK,CAAC,IAAI,CAAC,UAAC,IAAI,IAAK,OAAA,sBAAsB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,KAAK,EAA3C,CAA2C,CAAC,CAAC;IAC3E,CAAC;IAED,4DAA4D;IAC5D;;;;;;OAMG;IACI,0DAAgC,GAAvC,UAAwC,OAAgB;QAAxD,iBAsEC;QAjES,IAAA,YAAY,GAAoB,OAAO,aAA3B,EAAE,aAAa,GAAK,OAAO,cAAZ,CAAa;QAChD,IAAM,eAAe,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;QAChF,iDAAiD;QACjD,IAAI,eAAe,KAAK,SAAS,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE;YACjE,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC;SACzE;QAEK,IAAA,KAAiD,eAAe,CAAC,MAAM,CAC3E,UACE,YAA+G,EAC/G,IAAmB;YAEnB,IAAI,sBAAsB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,KAAK,EAAE;gBAC/C,IAAM,iBAAiB,yBAClB,IAAI,KACP,aAAa,EAAE,OAAO,CAAC,aAAa,GACrC,CAAC;gBACM,IAAqB,gBAAgB,GAAK,4BAA4B,CAC5E,iBAAiB,EACjB,KAAI,CAAC,aAAc,EACnB,KAAI,CAAC,aAAc,CAAC,oBAAoB,CACzC,oBAJ4C,CAI3C;gBACF,sGAAsG;gBACtG,2FAA2F;gBAC3F,wGAAwG;gBACxG,+GAA+G;gBAC/G,uGAAuG;gBACvG,2GAA2G;gBAC3G,IAAI,KAAI,CAAC,aAAa,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,gBAAgB,CAAC,EAAE;oBACxF,YAAY,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBAC1C;gBACD,gGAAgG;gBAChG,uDAAuD;gBACvD,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACpC;iBAAM;gBACL,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACtC;YACD,OAAO,YAAY,CAAC;QACtB,CAAC,EACD,EAAE,UAAU,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,gBAAgB,EAAE,EAAE,EAAE,CAC3D,EAjCO,UAAU,gBAAA,EAAE,YAAY,kBAAA,EAAE,gBAAgB,sBAiCjD,CAAC;QAEF,IAAM,QAAQ,GAAG,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;QAC/D,IAAM,0BAA0B,GAAG,gBAAgB,CAAC,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,EAAjC,CAAiC,CAAC,CAAC;QACrG,IAAI,0BAA0B,CAAC,MAAM,GAAG,CAAC,EAAE;YACzC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBACpB,EAAE,EAAE,iBAAiB;gBACrB,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,OAAO,EAAE,gFAAgF;gBACzF,OAAO,SAAA;gBACP,gBAAgB,EAAE,MAAM,CAAC,WAAW,CAAC,0BAA0B,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,EAAzB,CAAyB,CAAC,CAAC;gBACtG,gBAAgB,EAAE,0BAA0B;aAC7C,CAAC,CAAC;SACJ;QAED,0DAA0D;QAC1D,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;YAC3B,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC,EAAE,YAAY,cAAA,EAAE,CAAC;SACrE;QAED,OAAO;YACL,cAAc,EAAE,MAAM;YACtB,SAAS,EAAE,UAAU,CAAC,MAAM;YAC5B,YAAY,cAAA;SACb,CAAC;IACJ,CAAC;IAED;;;;;;OAMG;IACI,wCAAc,GAArB,UAAsB,KAAsD;QAC1E,OAAO,UAAG,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE,cAAI,KAAK,CAAC,aAAa,CAAE,CAAC;IAChE,CAAC;IAES,0DAAgC,GAA1C,UAA2C,OAAyB;;QAClE,IACE,CAAC,CAAA,MAAA,IAAI,CAAC,aAAa,0CAAE,4BAA4B,CAC/C,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,aAAa,EACrB,OAAO,CAAC,gBAAgB,CACzB,CAAA,EACD;YACA,OAAO,KAAK,CAAC;SACd;aAAM;YACL,IAAM,OAAO,GAAG,MAAA,IAAI,CAAC,aAAa,0CAAE,2BAA2B,CAC7D,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,aAAa,EACrB,OAAO,CAAC,gBAAgB,CACzB,CAAC;YACF,OAAO,IAAI,CAAC,aAAa,CAAC,+BAA+B,CACvD,OAAO,EACP,OAAO,CAAC,kBAAkB,EAC1B,OAAO,CAAC,gBAAgB,CACzB,CAAC;SACH;IACH,CAAC;IAED;;;;;;;OAOG;IACU,gCAAM,GAAnB,UAAoB,aAA2C;;QAA3C,8BAAA,EAAA,gBAAgB,IAAI,CAAC,oBAAoB,EAAE;;;;;;;wBACvD,eAAe,GAAoB,EAAE,CAAC;wBAC5C,IAAI,IAAI,CAAC,aAAa,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE;4BAChE,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;yBAC9C;wBAEc,qBAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,EAAA;;wBAA1C,MAAM,GAAG,SAAiC;wBAChD,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;4BACnB,sBAAO;yBACR;wBACe,YAAY,GAAkC,MAAM,OAAxC,EAAE,WAAW,GAAqB,MAAM,YAA3B,EAAE,cAAc,GAAK,MAAM,eAAX,CAAY;wBAErE,IAAI,aAAa,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE;4BAC3C,WAAyE,EAApD,KAAA,YAAY,CAAC,aAAa,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,EAApD,cAAoD,EAApD,IAAoD,EAAE;gCAAhE,MAAM;gCACT,UAAQ,MAEb,CAAC;gCACF,IAAI,CAAC,aAAa,CAAC,IAAI,uBAClB,OAAK,KACR,cAAc,EAAE,aAAa,CAAC,OAAK,CAAC,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,IACjE,CAAC;6BACJ;yBACF;wBAGK,kBAAkB,GAAG,UAAO,SAAiB;;;;;;;wCAC3C,aAAa,GAAG,CAAC,MAAA,YAAY,CAAC,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,mCAAI,EAAE,CAAC,CAAC,GAAG,CAAC,UAAC,MAAM;4CACtF,IAAM,KAAK,GAAG,MAMb,CAAC;4CACF,OAAO,sBACF,KAAK,KACR,SAAS,EAAE,aAAa,CAAC,KAAK,CAAC,SAAS,EAAE,KAAI,CAAC,OAAO,CAAC,EACvD,SAAS,EAAE,aAAa,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,kBAAkB,CAAC,EACnE,UAAU,EAAE,aAAa,CAAC,KAAK,CAAC,UAAU,EAAE,KAAI,CAAC,OAAO,CAAC,EACzD,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,GAC9D,CAAC;wCACxB,CAAC,CAAC,CAAC;wCACH,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;4CAC5B,IAAI,CAAC,GAAG,CACN,OAAO,EACP,gBAAS,aAAa,CAAC,MAAM,4BAAkB,SAAS,uCAA6B,IAAI,CAAC,OAAO,CAAE,EACnG;gDACE,aAAa,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,WAAW;6CAC5C,CACF,CAAC;yCACH;wCAIyB,qBAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,cAAc,EAAhB,CAAgB,CAAC,CAAC,EAAA;;wCAA1F,iBAAiB,GAAG,SAAsE;4DACrF,OAAK;4CACd,IAAM,gBAAgB,GAAG,iBAAiB,CAAC,MAAM,CAAC,OAAK,CAAC,cAAc,CAAC,CAAC,CAAC;4CAEzE,kFAAkF;4CAClF,IAAM,OAAO,yBACR,OAAK,KACR,WAAW,EAAE,cAAc,CAAC,OAAK,CAAC,OAAO,CAAC,EAC1C,gBAAgB,kBAAA,EAChB,aAAa,EAAE,OAAK,OAAO;gDAC3B,uEAAuE;gDACvE,aAAa,EAAE,IAAI,EACnB,WAAW,EAAE,IAAI,GAClB,CAAC;4CAEF,OAAO,CAAC,aAAa,GAAG,OAAK,iBAAiB,CAAC,OAAO,CAAC,CAAC;4CACxD,OAAO,CAAC,WAAW,GAAG,OAAK,sBAAsB,CAAC,OAAO,CAAC,CAAC;4CAE3D,IAAI,OAAO,CAAC,WAAW,CAAC,aAAa,EAAE,EAAE;gDACvC,OAAO,CAAC,WAAW,GAAG,OAAK,6BAA6B,CAAC,OAAO,CAAC,CAAC;6CACnE;4CAED,IAAI,OAAK,aAAa,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,KAAK,SAAS,EAAE;gDAC/D,mGAAmG;gDACnG,IAAM,WAAW,GAAG,OAAK,qBAAqB,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,OAAK,aAAa,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;gDAC9G,IAAI,WAAW,CAAC,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,EAA1B,CAA0B,CAAC,EAAE;oDACvD,eAAe,CAAC,IAAI,CAAC,OAAK,CAAC,CAAC;;iDAE7B;gDACD,MAAM,CAAC,OAAK,sBAAsB,EAAE,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;;6CAE7E;4CACD,MAAM,CAAC,OAAK,aAAa,EAAE,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;;;wCA/BnE,WAAiC,EAAb,+BAAa,EAAb,2BAAa,EAAb,IAAa;4CAA5B;oDAAM,OAAK;yCAgCf;;;;6BACF,CAAC;8BAEoC,EAAlB,MAAC,gBAAgB,CAAC;;;6BAAlB,CAAA,cAAkB,CAAA;wBAAjC;6BACC,aAAa,CAAC,QAAQ,CAAC,OAAK,CAAC,EAA7B,wBAA6B;wBAC/B,qBAAM,kBAAkB,CAAC,OAAK,CAAC,EAAA;;wBAA/B,SAA+B,CAAC;;;wBAFhB,IAAkB,CAAA;;;wBAOhC,yBAAyB,GAAG,UAAC,SAAiB;;4BAClD,IAAM,aAAa,GAAG,CAAC,MAAA,YAAY,CAAC,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,mCAAI,EAAE,CAAC;iCACzE,GAAG,CAAC,UAAC,MAAM;gCACV,IAAM,KAAK,GAAG,MAA4E,CAAC;gCAE3F,IAAM,OAAO,GAAG,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAC5D,UAAC,IAAI,IAAK,OAAA,CAAC,UAAU,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAhD,CAAgD,CAC3D,CAAC;gCACF,IAAI,OAAO,EAAE;oCACX,OAAO;iCACR;gCAED,OAAO,sBACF,KAAK,KACR,SAAS,EAAE,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,EAC3C,gBAAgB,EAAE,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,GACtC,CAAC;4BACxB,CAAC,CAAC;iCACD,MAAM,CAAC,SAAS,CAAC,CAAC;4BAErB,KAAoB,UAAa,EAAb,+BAAa,EAAb,2BAAa,EAAb,IAAa,EAAE;gCAA9B,IAAM,OAAK,sBAAA;gCACd,IAAM,OAAO,yBACR,OAAK,KACR,aAAa,EAAE,KAAI,CAAC,OAAO,GAC5B,CAAC;gCACF,MAAM,CAAC,KAAI,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,YAAY,EAAE,EAAE,OAAO,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;gCAEnG,uGAAuG;gCACvG,+GAA+G;gCAC/G,IAAM,OAAO,GAAG,KAAI,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;gCAEnD,kDAAkD;gCAClD,IAAI,SAAS,CAAC,OAAO,CAAC,IAAI,UAAU,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;oCAC3G,wGAAwG;oCACxG,qGAAqG;oCACrG,IAAM,QAAQ,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;oCAC3C,KAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,KAAI,CAAC,kCAAkC,CAAC,OAAO,CAAC,CAAC;iCACjF;6BACF;wBACH,CAAC,CAAC;wBAEF,yDAAyD;wBACzD,CAAC,yBAAyB,CAAC,CAAC,OAAO,CAAC,UAAC,KAAK;4BACxC,IAAI,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;gCACjC,yBAAyB,CAAC,KAAK,CAAC,CAAC;6BAClC;wBACH,CAAC,CAAC,CAAC;wBAGG,4BAA4B,GAAG,UAAC,SAAiB;;;4BACrD,IAAM,gBAAgB,GAAG,CAAC,MAAA,YAAY,CAAC,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,mCAAI,EAAE,CAAC,CAAC,GAAG,CAAC,UAAC,MAAM;gCACzF,IAAM,KAAK,GAAG,MAMb,CAAC;gCACF,OAAO,sBACF,KAAK,KACR,SAAS,EAAE,aAAa,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,aAAa,CAAC,EAC9D,SAAS,EAAE,aAAa,CAAC,KAAK,CAAC,SAAS,EAAE,KAAI,CAAC,OAAO,CAAC,EACvD,UAAU,EAAE,aAAa,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,aAAa,CAAC,EAChE,WAAW,EAAE,aAAa,CAAC,KAAK,CAAC,WAAW,EAAE,KAAI,CAAC,OAAO,CAAC,EAC3D,gBAAgB,EAAE,aAAa,CAAC,KAAK,CAAC,gBAAgB,EAAE,KAAI,CAAC,OAAO,CAAC,GAC1C,CAAC;4BAChC,CAAC,CAAC,CAAC;4BACH,KAAoB,UAAgB,EAAhB,qCAAgB,EAAhB,8BAAgB,EAAhB,IAAgB,EAAE;gCAAjC,IAAM,QAAK,yBAAA;gCACd,IAAM,eAAe,yBAChB,QAAK,KACR,kBAAkB,EAAE,KAAI,CAAC,OAAO,GACjC,CAAC;gCAEF,IAAM,WAAW,GAAG,gBAAgB,uBAAM,eAAe,KAAE,kBAAkB,EAAE,KAAI,CAAC,OAAO,IAAG,CAAC;gCAE/F,mDAAmD;gCACnD,IAAI,KAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,KAAK,SAAS,EAAE;oCACpD,eAAe,CAAC,IAAI,CAAC,QAAK,CAAC,CAAC;oCAC5B,SAAS;iCACV;gCAED,YAAA,KAAI,CAAC,gBAAgB,EAAC,WAAW,wCAAX,WAAW,IAAM,eAAe,EAAC;6BACxD;wBACH,CAAC,CAAC;wBAEF,CAAC,mBAAmB,CAAC,CAAC,OAAO,CAAC,UAAC,KAAK;4BAClC,IAAI,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;gCACjC,4BAA4B,CAAC,KAAK,CAAC,CAAC;6BACrC;wBACH,CAAC,CAAC,CAAC;wBAGG,sBAAsB,GAAG,UAAC,SAAiB;;4BAC/C,IAAM,UAAU,GAAG,CAAC,MAAA,YAAY,CAAC,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,mCAAI,EAAE,CAAC,CAAC,GAAG,CAAC,UAAC,MAAM;gCACnF,IAAM,KAAK,GAAG,MAQb,CAAC;gCACF,OAAO,sBACF,KAAK,KACR,SAAS,EAAE,aAAa,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,aAAa,CAAC,EAC9D,SAAS,EAAE,aAAa,CAAC,KAAK,CAAC,SAAS,EAAE,KAAI,CAAC,OAAO,CAAC,EACvD,UAAU,EAAE,aAAa,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,aAAa,CAAC,EAChE,WAAW,EAAE,aAAa,CAAC,KAAK,CAAC,WAAW,EAAE,KAAI,CAAC,OAAO,CAAC,EAC3D,gBAAgB,EAAE,aAAa,CAAC,KAAK,CAAC,gBAAgB,EAAE,KAAI,CAAC,OAAO,CAAC,EACrE,OAAO,EAAE,aAAa,CAAC,KAAK,CAAC,OAAO,EAAE,KAAI,CAAC,OAAO,CAAC,EACnD,kBAAkB,wBACb,KAAK,CAAC,kBAAkB,KAC3B,gBAAgB,EAAE,aAAa,CAAC,KAAK,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,KAAI,CAAC,OAAO,CAAC,MAE1E,CAAC;4BACrB,CAAC,CAAC,CAAC;4BAEH,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;gCACzB,KAAI,CAAC,GAAG,CAAC,OAAO,EAAE,gBAAS,UAAU,CAAC,MAAM,4BAAkB,SAAS,+BAAqB,KAAI,CAAC,OAAO,CAAE,EAAE;oCAC1G,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,WAAW;iCACzC,CAAC,CAAC;6BACJ;oDAIU,QAAK;gCACd,IAAM,IAAI,yBACL,QAAK,KACR,kBAAkB,EAAE,KAAI,CAAC,OAAO,GACjC,CAAC;gCAEF,mDAAmD;gCACnD,IAAM,aAAa,GAAG,MAAA,KAAI,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,0CAAE,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,cAAc,CAAC,IAAI,EAAE,CAAC,CAAC,EAAvB,CAAuB,CAAC,CAAC;gCAC3F,IAAI,aAAa,EAAE;oCACjB,eAAe,CAAC,IAAI,CAAC,QAAK,CAAC,CAAC;;iCAE7B;gCAED,MAAM,CAAC,KAAI,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;gCACjD,MAAM,CAAC,KAAI,CAAC,oBAAoB,EAAE,CAAC,KAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;;4BAhBzE,+GAA+G;4BAC/G,iHAAiH;4BACjH,KAAoB,UAAU,EAAV,yBAAU,EAAV,wBAAU,EAAV,IAAU;gCAAzB,IAAM,QAAK,mBAAA;wCAAL,QAAK;6BAef;wBACH,CAAC,CAAC;wBAEF,kDAAkD;wBAClD,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,UAAC,KAAK;4BAC5B,IAAI,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;gCACjC,sBAAsB,CAAC,KAAK,CAAC,CAAC;6BAC/B;wBACH,CAAC,CAAC,CAAC;wBAEH,IAAI,aAAa,CAAC,QAAQ,CAAC,qBAAqB,CAAC,EAAE;4BAE3C,oBAAoB,GAAG,YAAY,CAAC,aAAa,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC,CAAC,GAAG,CAAC,UAAC,KAAU,IAAK,OAAA,uBACvG,KAAK,KACR,WAAW,EAAE,aAAa,CAAC,KAAK,CAAC,WAAW,EAAE,SAAS,CAAC,OAAO,CAAC,IAChE,EAH0G,CAG1G,CAAmC,CAAC;4BAEtC,WAAwC,EAApB,6CAAoB,EAApB,kCAAoB,EAApB,IAAoB,EAAE;gCAArC;gCACH,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,OAAK,CAAC,WAAW,CAAC,SAAS,EAAE,EAAE,OAAK,CAAC,kBAAkB,CAAC,EAAE,OAAK,CAAC,OAAO,CAAC,CAAC;6BACtG;yBACF;wBAED,IAAI,aAAa,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE;4BACzC,uBAAuB,GAAG,YAAY,CAC1C,aAAa,CAAC,OAAO,CAAC,mBAAmB,CAAC,CACb,CAAC;4BAChC,WAA2C,EAAvB,mDAAuB,EAAvB,qCAAuB,EAAvB,IAAuB,EAAE;gCAAxC;gCACH,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,OAAK,CAAC,CAAC;6BACnC;yBACF;wBAED,IAAI,aAAa,CAAC,QAAQ,CAAC,2BAA2B,CAAC,EAAE;4BACjD,YAAY,GAAG,YAAY,CAAC,aAAa,CAAC,OAAO,CAAC,2BAA2B,CAAC,CAAC,CAAC;4BACtF,WAAiC,EAAZ,6BAAY,EAAZ,0BAAY,EAAZ,IAAY,EAAE;gCAAxB,MAAM;gCACT,UAAQ,MAAiG,CAAC;gCAChH,IAAI,CAAC,uBAAuB,CAAC,IAAI,uBAC5B,OAAK,KACR,cAAc,EAAE,aAAa,CAAC,OAAK,CAAC,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,EACjE,eAAe,EAAE,OAAK,CAAC,eAAe,CAAC,GAAG,CAAC,UAAC,IAAI,IAAK,OAAA,aAAa,CAAC,IAAI,EAAE,KAAI,CAAC,OAAO,CAAC,EAAjC,CAAiC,CAAC,IACvF,CAAC;6BACJ;yBACF;wBAED,IAAI,aAAa,CAAC,QAAQ,CAAC,sBAAsB,CAAC,EAAE;4BAC5C,0BAA0B,GAAG,CAAC,MAAA,YAAY,CAAC,aAAa,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC,mCAC7F,EAAE,CAAoE,CAAC;4BACzE,WAA8C,EAA1B,yDAA0B,EAA1B,wCAA0B,EAA1B,IAA0B,EAAE;gCAA3C;gCACH,IAAI,CAAC,qBAAqB,CAAC,IAAI,uBAC1B,OAAK,KACR,MAAM,EAAE,OAAK,CAAC,MAAM,IAAI,OAAK,CAAC,WAAW,IACzC,CAAC;6BACJ;yBACF;wBAED,IAAI,aAAa,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE;4BACxC,sBAAsB,GAAG,CAAC,MAAA,YAAY,CAAC,aAAa,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,mCACrF,EAAE,CAA2D,CAAC;4BAChE,WAA0C,EAAtB,iDAAsB,EAAtB,oCAAsB,EAAtB,IAAsB,EAAE;gCAAvC;gCACH,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,OAAK,CAAC,CAAC;6BACnC;yBACF;wBAED,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;4BAC9B,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,yBAAyB,EAAE;gCAC3C,eAAe,iBAAA;6BAChB,CAAC,CAAC;4BACH,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,6CAA6C,CAAC,CAAC;yBAClE;wBAED,6DAA6D;wBAC7D,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;wBAC/B,IAAI,CAAC,oBAAoB,GAAG,cAAc,CAAC;wBAC3C,IAAI,CAAC,mBAAmB,GAAG,cAAc,GAAG,CAAC,CAAC;wBAC9C,IAAI,CAAC,iBAAiB,CAAC,EAAE,GAAG,SAAS,CAAC,CAAC,uDAAuD;wBAC9F,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;wBACtB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,qCAA8B,IAAI,CAAC,OAAO,cAAW,EAAE;4BACvE,uBAAuB,EAAE,IAAI,CAAC,mBAAmB;yBAClD,CAAC,CAAC;;;;;KACJ;IAED;;;;OAIG;IACO,wCAAc,GAAxB,UAAyB,SAAiB;;QACxC,OAAO,MAAA,MAAA,IAAI,CAAC,aAAa,0CAAE,cAAc,CAAC,SAAS,CAAC,mCAAI,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC;IAClG,CAAC;IAED;;;;OAIG;IACO,yCAAe,GAAzB,UAA0B,UAAoB;;QAC5C,OAAO,CACL,MAAA,MAAA,IAAI,CAAC,aAAa,0CAAE,eAAe,CAAC,UAAU,CAAC,mCAC/C,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,UAAC,SAAS,IAAK,OAAA,CAAC,SAAS,EAAE,WAAW,CAAC,QAAQ,EAAE,CAAC,EAAnC,CAAmC,CAAC,CAAC,CAAC,CACxG,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACO,uDAA6B,GAAvC,UAAwC,OAAyB;QAC/D,IAAI,CAAC,IAAI,CAAC,gCAAgC,CAAC,OAAO,CAAC,EAAE;YACnD,OAAO,aAAa,CAAC,YAAY,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;SACvD;QACD,8CAA8C;QAC9C,IAAM,OAAO,GAAG,IAAI,CAAC,aAAc,CAAC,2BAA2B,CAC7D,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,aAAa,EACrB,OAAO,CAAC,gBAAgB,CACxB,CAAC;QACH,IAAM,gBAAgB,GAAG,IAAI,CAAC,aAAc,CAAC,2BAA2B,CACtE,OAAO,EACP,OAAO,CAAC,kBAAkB,EAC1B,OAAO,CAAC,gBAAgB,CACzB,CAAC;QACF,OAAO,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,GAAI,aAAa,CAAC,YAAY,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;IAC5E,CAAC;IAED;;;;;OAKG;IACO,6BAAG,GAAb,UAAc,KAAuB,EAAE,OAAe,EAAE,IAAgB;QACtE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,YAAG,EAAE,EAAE,iBAAiB,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,SAAA,IAAK,IAAI,EAAG,CAAC;IACzF,CAAC;IAED;;;OAGG;IACI,wCAAc,GAArB;QACE,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED;;;;;OAKG;IACO,2CAAiB,GAA3B,UAA4B,OAAyB;;QACnD,OAAO,MAAA,MAAA,IAAI,CAAC,iBAAiB,0CAAE,2BAA2B,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,cAAc,CAAC,mCAAI,KAAK,CAAC;IACrH,CAAC;IAED;;;;;OAKG;IACO,gDAAsB,GAAhC,UAAiC,OAAyB;;QACxD,OAAO,CACL,MAAA,MAAA,IAAI,CAAC,iBAAiB,0CAAE,2BAA2B,CAAC,OAAO,CAAC,kBAAkB,EAAE,OAAO,CAAC,cAAc,CAAC,mCAAI,KAAK,CACjH,CAAC;IACJ,CAAC;IAuEH,sBAAC;AAAD,CAAC,AAv3BD,CAA8C,kBAAkB,GAu3B/D"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import { BundleDepositsV3, BundleExcessSlowFills, BundleFillsV3, BundleSlowFills, CombinedRefunds, ExpiredDepositsToRefundV3 } from "../../../interfaces";
|
|
1
|
+
import { BundleDepositsV3, BundleExcessSlowFills, BundleFillsV3, BundleSlowFills, CombinedRefunds, ExpiredDepositsToRefundV3, SpokePoolClientsByChain } from "../../../interfaces";
|
|
2
2
|
import { AnyObject } from "../../../utils";
|
|
3
3
|
import { PoolRebalanceRoot } from "./PoolRebalanceUtils";
|
|
4
4
|
import { AcrossConfigStoreClient } from "../../AcrossConfigStoreClient";
|
|
5
5
|
import { HubPoolClient } from "../../HubPoolClient";
|
|
6
|
+
import { BundleDataClient } from "../../BundleDataClient";
|
|
6
7
|
export declare function getRefundsFromBundle(bundleFillsV3: BundleFillsV3, expiredDepositsToRefundV3: ExpiredDepositsToRefundV3): CombinedRefunds;
|
|
7
8
|
export declare function prettyPrintV3SpokePoolEvents(bundleDepositsV3: BundleDepositsV3, bundleFillsV3: BundleFillsV3, bundleSlowFillsV3: BundleSlowFills, expiredDepositsToRefundV3: ExpiredDepositsToRefundV3, unexecutableSlowFills: BundleExcessSlowFills): AnyObject;
|
|
8
9
|
export declare function getEndBlockBuffers(chainIdListForBundleEvaluationBlockNumbers: number[], blockRangeEndBlockBuffer: {
|
|
@@ -11,5 +12,7 @@ export declare function getEndBlockBuffers(chainIdListForBundleEvaluationBlockNu
|
|
|
11
12
|
export declare function _buildPoolRebalanceRoot(latestMainnetBlock: number, mainnetBundleEndBlock: number, bundleV3Deposits: BundleDepositsV3, bundleFillsV3: BundleFillsV3, bundleSlowFillsV3: BundleSlowFills, unexecutableSlowFills: BundleExcessSlowFills, expiredDepositsToRefundV3: ExpiredDepositsToRefundV3, clients: {
|
|
12
13
|
hubPoolClient: HubPoolClient;
|
|
13
14
|
configStoreClient: AcrossConfigStoreClient;
|
|
14
|
-
|
|
15
|
+
bundleDataClient: BundleDataClient;
|
|
16
|
+
spokePoolClients: SpokePoolClientsByChain;
|
|
17
|
+
}, maxL1TokenCountOverride?: number): Promise<PoolRebalanceRoot>;
|
|
15
18
|
//# sourceMappingURL=DataworkerUtils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataworkerUtils.d.ts","sourceRoot":"","sources":["../../../../../src/clients/BundleDataClient/utils/DataworkerUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,gBAAgB,EAChB,qBAAqB,EACrB,aAAa,EACb,eAAe,EACf,eAAe,EACf,yBAAyB,
|
|
1
|
+
{"version":3,"file":"DataworkerUtils.d.ts","sourceRoot":"","sources":["../../../../../src/clients/BundleDataClient/utils/DataworkerUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,gBAAgB,EAChB,qBAAqB,EACrB,aAAa,EACb,eAAe,EACf,eAAe,EACf,yBAAyB,EAIzB,uBAAuB,EACxB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,SAAS,EAOV,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAGL,iBAAiB,EAGlB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAI1D,wBAAgB,oBAAoB,CAClC,aAAa,EAAE,aAAa,EAC5B,yBAAyB,EAAE,yBAAyB,GACnD,eAAe,CA2CjB;AAED,wBAAgB,4BAA4B,CAC1C,gBAAgB,EAAE,gBAAgB,EAClC,aAAa,EAAE,aAAa,EAC5B,iBAAiB,EAAE,eAAe,EAClC,yBAAyB,EAAE,yBAAyB,EACpD,qBAAqB,EAAE,qBAAqB,GAC3C,SAAS,CAQX;AAED,wBAAgB,kBAAkB,CAChC,0CAA0C,EAAE,MAAM,EAAE,EACpD,wBAAwB,EAAE;IAAE,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GACtD,MAAM,EAAE,CAcV;AAED,wBAAsB,uBAAuB,CAC3C,kBAAkB,EAAE,MAAM,EAC1B,qBAAqB,EAAE,MAAM,EAC7B,gBAAgB,EAAE,gBAAgB,EAClC,aAAa,EAAE,aAAa,EAC5B,iBAAiB,EAAE,eAAe,EAClC,qBAAqB,EAAE,qBAAqB,EAC5C,yBAAyB,EAAE,yBAAyB,EACpD,OAAO,EAAE;IACP,aAAa,EAAE,aAAa,CAAC;IAC7B,iBAAiB,EAAE,uBAAuB,CAAC;IAC3C,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,gBAAgB,EAAE,uBAAuB,CAAC;CAC3C,EACD,uBAAuB,CAAC,EAAE,MAAM,GAC/B,OAAO,CAAC,iBAAiB,CAAC,CAqP5B"}
|
|
@@ -74,8 +74,8 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
74
74
|
transactionHash?: string | undefined;
|
|
75
75
|
transactionIndex?: number | undefined;
|
|
76
76
|
}[];
|
|
77
|
-
refunds: Record<string, BigNumber>;
|
|
78
77
|
realizedLpFees: BigNumber;
|
|
78
|
+
refunds: Record<string, BigNumber>;
|
|
79
79
|
totalRefundAmount: BigNumber;
|
|
80
80
|
}>>;
|
|
81
81
|
bundleSlowFillsV3: Record<string, Record<string, {
|
|
@@ -334,8 +334,8 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
334
334
|
transactionHash?: string | undefined;
|
|
335
335
|
transactionIndex?: number | undefined;
|
|
336
336
|
}[];
|
|
337
|
-
refunds: Record<string, BigNumber>;
|
|
338
337
|
realizedLpFees: BigNumber;
|
|
338
|
+
refunds: Record<string, BigNumber>;
|
|
339
339
|
totalRefundAmount: BigNumber;
|
|
340
340
|
}>>, null>;
|
|
341
341
|
}>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SpokePoolClient.d.ts","sourceRoot":"","sources":["../../../../src/clients/SpokePoolClient/SpokePoolClient.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,EACL,SAAS,EACT,SAAS,EAET,gBAAgB,EAChB,mBAAmB,EACnB,iBAAiB,EAGjB,YAAY,
|
|
1
|
+
{"version":3,"file":"SpokePoolClient.d.ts","sourceRoot":"","sources":["../../../../src/clients/SpokePoolClient/SpokePoolClient.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,EACL,SAAS,EACT,SAAS,EAET,gBAAgB,EAChB,mBAAmB,EACnB,iBAAiB,EAGjB,YAAY,EASZ,OAAO,EAER,MAAM,aAAa,CAAC;AAGrB,OAAO,EACL,yBAAyB,EACzB,6BAA6B,EAC7B,OAAO,EACP,gBAAgB,EAEhB,IAAI,EACJ,UAAU,EACV,aAAa,EACb,SAAS,EACT,+BAA+B,EAC/B,wBAAwB,EACxB,wBAAwB,EACxB,aAAa,EACb,gBAAgB,EAChB,aAAa,EAEd,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAChF,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAErE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,MAAM,MAAM,sBAAsB,GAAG;IACnC,OAAO,EAAE,IAAI,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,aAAa,EAAE,EAAE,CAAC;IAC1B,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AACF,MAAM,MAAM,sBAAsB,GAAG;IACnC,OAAO,EAAE,KAAK,CAAC;IACf,MAAM,EAAE,mBAAmB,CAAC;CAC7B,CAAC;AACF,MAAM,MAAM,eAAe,GAAG,sBAAsB,GAAG,sBAAsB,CAAC;AAE9E,eAAO,MAAM,eAAe,UAe3B,CAAC;AAEF;;;GAGG;AACH,8BAAsB,eAAgB,SAAQ,kBAAkB;IA4B5D,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM;IAE/B,QAAQ,CAAC,aAAa,EAAE,aAAa,GAAG,IAAI;IAC5C,QAAQ,CAAC,OAAO,EAAE,MAAM;IACjB,eAAe,EAAE,MAAM;IA/BhC,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAC/B,SAAS,CAAC,WAAW,SAAK;IAC1B,SAAS,CAAC,sBAAsB,EAAE;QAAE,CAAC,WAAW,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAAA;KAAE,CAAM;IACrF,SAAS,CAAC,oBAAoB,EAAE;QAAE,CAAC,WAAW,EAAE,MAAM,GAAG,aAAa,EAAE,CAAA;KAAE,CAAM;IAChF,SAAS,CAAC,QAAQ,EAAE;QAAE,CAAC,gBAAgB,EAAE,MAAM,GAAG;YAAE,CAAC,SAAS,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAAA;SAAE,CAAA;KAAE,CAAM;IACrG,SAAS,CAAC,gBAAgB,EAAE;QAAE,CAAC,aAAa,EAAE,MAAM,GAAG,wBAAwB,CAAA;KAAE,CAAM;IACvF,SAAS,CAAC,aAAa,EAAE;QAAE,CAAC,WAAW,EAAE,MAAM,GAAG;YAAE,CAAC,kBAAkB,EAAE,MAAM,GAAG,OAAO,CAAA;SAAE,CAAA;KAAE,CAAM;IACnG,SAAS,CAAC,aAAa,EAAE,aAAa,EAAE,CAAM;IAC9C,SAAS,CAAC,gBAAgB,EAAE,wBAAwB,EAAE,CAAM;IAC5D,SAAS,CAAC,uBAAuB,EAAE,+BAA+B,EAAE,CAAM;IAC1E,SAAS,CAAC,qBAAqB,EAAE,6BAA6B,EAAE,CAAM;IACtE,SAAS,CAAC,gBAAgB,EAAE,yBAAyB,EAAE,CAAM;IAC7D,SAAS,CAAC,iBAAiB,EAAE,uBAAuB,GAAG,SAAS,CAAC;IACjE,SAAS,CAAC,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,CAAa;IAChD,SAAgB,aAAa,EAAE;QAAE,CAAC,WAAW,EAAE,MAAM,GAAG,gBAAgB,CAAA;KAAE,CAAM;IACzE,gBAAgB,EAAE,OAAO,GAAG,SAAS,CAAC;IACtC,KAAK,EAAE;QAAE,CAAC,aAAa,EAAE,MAAM,GAAG,aAAa,EAAE,CAAA;KAAE,CAAM;IAEhE;;;;;;;OAOG;IACH,SAAS,aACE,MAAM,EAAE,OAAO,CAAC,MAAM,EAEtB,aAAa,EAAE,aAAa,GAAG,IAAI,EACnC,OAAO,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,EAC9B,iBAAiB,GAAE,YAAY,CAAC,iBAAiB,EAAE,IAAI,CAA+B;IAQxF;;;;OAIG;IACI,8BAA8B,CAAC,kBAAkB,EAAE,MAAM,GAAG,gBAAgB,EAAE;IAIrF;;;;;;OAMG;IACH,OAAO,CAAC,qBAAqB;IAK7B;;;;;;OAMG;IACI,4CAA4C,CAAC,kBAAkB,EAAE,MAAM,GAAG,gBAAgB,EAAE;IASnG;;;;OAIG;IACI,WAAW,CAAC,MAAM,CAAC,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,gBAAgB,EAAE;IAUvF;;;OAGG;IACI,gBAAgB,IAAI,aAAa,EAAE;IAI1C;;;OAGG;IACI,gBAAgB,IAAI;QAAE,CAAC,WAAW,EAAE,MAAM,GAAG;YAAE,CAAC,kBAAkB,EAAE,MAAM,GAAG,OAAO,CAAA;SAAE,CAAA;KAAE;IAI/F;;;OAGG;IACI,QAAQ,IAAI,aAAa,EAAE;IAIlC;;;;OAIG;IACI,sBAAsB,CAAC,aAAa,EAAE,MAAM,GAAG,aAAa,EAAE;IAIrE;;;;OAIG;IACI,kBAAkB,CAAC,OAAO,EAAE,OAAO,GAAG,aAAa,EAAE;IAI5D;;;;;OAKG;IACI,wBAAwB,CAAC,aAAa,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,aAAa,EAAE;IAI5F;;;OAGG;IACI,mBAAmB,IAAI,wBAAwB,EAAE;IAIxD;;;OAGG;IACI,qBAAqB,IAAI,MAAM;IAMtC;;;OAGG;IACI,0BAA0B,IAAI,+BAA+B,EAAE;IAItE;;;OAGG;IACI,wBAAwB,IAAI,6BAA6B,EAAE;IAIlE;;;OAGG;IACI,yBAAyB,IAAI,yBAAyB,EAAE;IAI/D;;;;OAIG;IACI,kCAAkC,CAAC,OAAO,EAAE,gBAAgB,GAAG,gBAAgB;IAgCtF;;;;;OAKG;IACI,UAAU,CAAC,SAAS,EAAE,SAAS,GAAG,gBAAgB,GAAG,SAAS;IAIrE;;;OAGG;IACI,mBAAmB,IAAI,wBAAwB,EAAE;IAIxD;;;;OAIG;IACI,kBAAkB,CACvB,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,GAAG;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE,GAC9D,wBAAwB,GAAG,SAAS;IAKvC;;;;OAIG;IACI,iCAAiC,CAAC,aAAa,EAAE,MAAM,GAAG,wBAAwB,EAAE;IAI3F;;;OAGG;IACI,WAAW,IAAI;QAAE,CAAC,gBAAgB,EAAE,MAAM,GAAG;YAAE,CAAC,SAAS,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAAA;SAAE,CAAA;KAAE;IAIjG;;;;OAIG;IACI,iBAAiB,CAAC,IAAI,EAAE,IAAI,GAAG,gBAAgB,GAAG,SAAS;IAM3D,kBAAkB,CAAC,OAAO,EAAE,OAAO,GAAG,aAAa,EAAE;IAIrD,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO;IAQjD;;;;;;OAMG;IACI,gCAAgC,CAAC,OAAO,EAAE,OAAO,GAAG;QACzD,cAAc,EAAE,SAAS,CAAC;QAC1B,SAAS,EAAE,MAAM,CAAC;QAClB,YAAY,EAAE,aAAa,EAAE,CAAC;KAC/B;IAoED;;;;;;OAMG;IACI,cAAc,CAAC,KAAK,EAAE;QAAE,SAAS,EAAE,SAAS,CAAC;QAAC,aAAa,EAAE,MAAM,CAAA;KAAE,GAAG,MAAM;IAIrF,SAAS,CAAC,gCAAgC,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO;IAuB9E;;;;;;;OAOG;IACU,MAAM,CAAC,aAAa,WAA8B,GAAG,OAAO,CAAC,IAAI,CAAC;IA+T/E;;;;OAIG;IACH,SAAS,CAAC,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAI5D;;;;OAIG;IACH,SAAS,CAAC,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QAAE,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAO9F;;;;OAIG;IACH,SAAS,CAAC,6BAA6B,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO;IAkB3E;;;;;OAKG;IACH,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,SAAS;IAIxE;;;OAGG;IACI,cAAc,IAAI,MAAM;IAI/B;;;;;OAKG;IACH,SAAS,CAAC,iBAAiB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO;IAI/D;;;;;OAKG;IACH,SAAS,CAAC,sBAAsB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO;IAUpE;;;OAGG;aACa,oBAAoB,IAAI,MAAM,EAAE;IAEhD;;;;;OAKG;IACH,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC;IAE7E;;;;;;;;;;;;OAYG;aACa,yBAAyB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAEhG;;;;OAIG;aACa,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAEvE;;;OAGG;aACa,SAAS,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAE/D;;;;;OAKG;aACa,WAAW,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAE/E;;;;;OAKG;aACa,eAAe,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAE7F;;;;;OAKG;aACa,eAAe,CAAC,SAAS,EAAE,SAAS,EAAE,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,UAAU,GAAG,SAAS,CAAC,EAAE,CAAC;CAChH"}
|
package/package.json
CHANGED
|
@@ -10,6 +10,7 @@ import {
|
|
|
10
10
|
PoolRebalanceLeaf,
|
|
11
11
|
Refund,
|
|
12
12
|
RunningBalances,
|
|
13
|
+
SpokePoolClientsByChain,
|
|
13
14
|
} from "../../../interfaces";
|
|
14
15
|
import {
|
|
15
16
|
bnZero,
|
|
@@ -18,6 +19,8 @@ import {
|
|
|
18
19
|
count2DDictionaryValues,
|
|
19
20
|
count3DDictionaryValues,
|
|
20
21
|
toAddressType,
|
|
22
|
+
getImpliedBundleBlockRanges,
|
|
23
|
+
EvmAddress,
|
|
21
24
|
} from "../../../utils";
|
|
22
25
|
import {
|
|
23
26
|
addLastRunningBalance,
|
|
@@ -28,6 +31,7 @@ import {
|
|
|
28
31
|
} from "./PoolRebalanceUtils";
|
|
29
32
|
import { AcrossConfigStoreClient } from "../../AcrossConfigStoreClient";
|
|
30
33
|
import { HubPoolClient } from "../../HubPoolClient";
|
|
34
|
+
import { BundleDataClient } from "../../BundleDataClient";
|
|
31
35
|
import { buildPoolRebalanceLeafTree } from "./MerkleTreeUtils";
|
|
32
36
|
|
|
33
37
|
// and expired deposits.
|
|
@@ -114,7 +118,7 @@ export function getEndBlockBuffers(
|
|
|
114
118
|
return chainIdListForBundleEvaluationBlockNumbers.map((chainId: number) => blockRangeEndBlockBuffer[chainId] ?? 0);
|
|
115
119
|
}
|
|
116
120
|
|
|
117
|
-
export function _buildPoolRebalanceRoot(
|
|
121
|
+
export async function _buildPoolRebalanceRoot(
|
|
118
122
|
latestMainnetBlock: number,
|
|
119
123
|
mainnetBundleEndBlock: number,
|
|
120
124
|
bundleV3Deposits: BundleDepositsV3,
|
|
@@ -122,9 +126,14 @@ export function _buildPoolRebalanceRoot(
|
|
|
122
126
|
bundleSlowFillsV3: BundleSlowFills,
|
|
123
127
|
unexecutableSlowFills: BundleExcessSlowFills,
|
|
124
128
|
expiredDepositsToRefundV3: ExpiredDepositsToRefundV3,
|
|
125
|
-
clients: {
|
|
129
|
+
clients: {
|
|
130
|
+
hubPoolClient: HubPoolClient;
|
|
131
|
+
configStoreClient: AcrossConfigStoreClient;
|
|
132
|
+
bundleDataClient: BundleDataClient;
|
|
133
|
+
spokePoolClients: SpokePoolClientsByChain;
|
|
134
|
+
},
|
|
126
135
|
maxL1TokenCountOverride?: number
|
|
127
|
-
): PoolRebalanceRoot {
|
|
136
|
+
): Promise<PoolRebalanceRoot> {
|
|
128
137
|
// Running balances are the amount of tokens that we need to send to each SpokePool to pay for all instant and
|
|
129
138
|
// slow relay refunds. They are decreased by the amount of funds already held by the SpokePool. Balances are keyed
|
|
130
139
|
// by the SpokePool's network and L1 token equivalent of the L2 token to refund.
|
|
@@ -297,9 +306,62 @@ export function _buildPoolRebalanceRoot(
|
|
|
297
306
|
});
|
|
298
307
|
});
|
|
299
308
|
|
|
300
|
-
// Add to the running balance value from the last valid root bundle proposal
|
|
301
|
-
//
|
|
302
|
-
|
|
309
|
+
// Add to the running balance value from the last valid root bundle proposal. A root bundle proposal which is still in liveness and has not yet been executed counts as a valid proposal.
|
|
310
|
+
// If the mainnetBundleEndBlock for this pool rebalance root corresponds to the pending root bundle or some root bundle before the pending root bundle, then we can fetch running balances directly from `ExecutedRootBundle` events.
|
|
311
|
+
if (
|
|
312
|
+
clients.hubPoolClient.getPendingRootBundle()?.bundleEvaluationBlockNumbers[0] === mainnetBundleEndBlock ||
|
|
313
|
+
!clients.hubPoolClient.hasPendingProposal() ||
|
|
314
|
+
clients.hubPoolClient
|
|
315
|
+
.getValidatedRootBundles(latestMainnetBlock)
|
|
316
|
+
.some((bundle) => bundle.bundleEvaluationBlockNumbers[0].toNumber() === mainnetBundleEndBlock)
|
|
317
|
+
) {
|
|
318
|
+
addLastRunningBalance(latestMainnetBlock, runningBalances, clients.hubPoolClient);
|
|
319
|
+
} else {
|
|
320
|
+
// Otherwise, the pool rebalance root for this root bundle must be for an optimistic proposal, so we need to reconstruct the pool rebalance root for the pending root bundle to obtain the running balances.
|
|
321
|
+
// @dev It is safe to index the hub pool client's proposed root bundles here since there is guaranteed to be a pending proposal in this code block.
|
|
322
|
+
const mostRecentProposedRootBundle = clients.hubPoolClient.getLatestProposedRootBundle();
|
|
323
|
+
const blockRangesForChains = getImpliedBundleBlockRanges(
|
|
324
|
+
clients.hubPoolClient,
|
|
325
|
+
clients.configStoreClient,
|
|
326
|
+
mostRecentProposedRootBundle
|
|
327
|
+
);
|
|
328
|
+
// We are loading data from a pending root bundle, so we want to use arweave if possible.
|
|
329
|
+
const prevRootBundleData = await clients.bundleDataClient.loadData(
|
|
330
|
+
blockRangesForChains,
|
|
331
|
+
clients.spokePoolClients,
|
|
332
|
+
true
|
|
333
|
+
);
|
|
334
|
+
const prevPoolRebalanceRoot = await _buildPoolRebalanceRoot(
|
|
335
|
+
latestMainnetBlock,
|
|
336
|
+
blockRangesForChains[0][1],
|
|
337
|
+
prevRootBundleData.bundleDepositsV3,
|
|
338
|
+
prevRootBundleData.bundleFillsV3,
|
|
339
|
+
prevRootBundleData.bundleSlowFillsV3,
|
|
340
|
+
prevRootBundleData.unexecutableSlowFills,
|
|
341
|
+
prevRootBundleData.expiredDepositsToRefundV3,
|
|
342
|
+
clients,
|
|
343
|
+
maxL1TokenCountOverride
|
|
344
|
+
);
|
|
345
|
+
// Update the running balances by adding the pending root bundle's running balance amounts to this bundle's running balances.
|
|
346
|
+
const { runningBalances: prevRunningBalances } = prevPoolRebalanceRoot;
|
|
347
|
+
Object.keys(runningBalances).forEach((repaymentChainId) => {
|
|
348
|
+
Object.keys(runningBalances[Number(repaymentChainId)]).forEach((l1TokenAddress) => {
|
|
349
|
+
const updateRunningBalanceAmount = prevRunningBalances[Number(repaymentChainId)]?.[l1TokenAddress];
|
|
350
|
+
// If the pending root bundle didn't have a running balance, fall back to the last running balance for that token and chain pair.
|
|
351
|
+
const { runningBalance: fallbackRunningBalance } = clients.hubPoolClient.getRunningBalanceBeforeBlockForChain(
|
|
352
|
+
latestMainnetBlock,
|
|
353
|
+
Number(repaymentChainId),
|
|
354
|
+
EvmAddress.from(l1TokenAddress)
|
|
355
|
+
);
|
|
356
|
+
updateRunningBalance(
|
|
357
|
+
runningBalances,
|
|
358
|
+
Number(repaymentChainId),
|
|
359
|
+
l1TokenAddress,
|
|
360
|
+
updateRunningBalanceAmount ?? fallbackRunningBalance
|
|
361
|
+
);
|
|
362
|
+
});
|
|
363
|
+
});
|
|
364
|
+
}
|
|
303
365
|
|
|
304
366
|
const leaves: PoolRebalanceLeaf[] = constructPoolRebalanceLeaves(
|
|
305
367
|
mainnetBundleEndBlock,
|
|
@@ -16,6 +16,7 @@ import {
|
|
|
16
16
|
getMessageHash,
|
|
17
17
|
isSlowFill,
|
|
18
18
|
validateFillForDeposit,
|
|
19
|
+
chainIsEvm,
|
|
19
20
|
chainIsProd,
|
|
20
21
|
Address,
|
|
21
22
|
toAddressType,
|
|
@@ -361,7 +362,7 @@ export abstract class SpokePoolClient extends BaseAbstractClient {
|
|
|
361
362
|
}
|
|
362
363
|
|
|
363
364
|
public getFillsForDeposit(deposit: Deposit): FillWithBlock[] {
|
|
364
|
-
return this.depositHashesToFills[this.getDepositHash(deposit)];
|
|
365
|
+
return this.depositHashesToFills[this.getDepositHash(deposit)] ?? [];
|
|
365
366
|
}
|
|
366
367
|
|
|
367
368
|
public isDepositFilled(deposit: Deposit): boolean {
|
|
@@ -619,12 +620,13 @@ export abstract class SpokePoolClient extends BaseAbstractClient {
|
|
|
619
620
|
assign(this.speedUps, [speedUp.depositor.toEvmAddress(), speedUp.depositId.toString()], [speedUp]);
|
|
620
621
|
|
|
621
622
|
// Find deposit hash matching this speed up event and update the deposit data associated with the hash,
|
|
622
|
-
// if the hash+data exists.
|
|
623
|
+
// if the hash+data exists. nb. Relying on depositId alone can produce collisions on deterministic deposit IDs.
|
|
623
624
|
const deposit = this.getDeposit(speedUp.depositId);
|
|
624
625
|
|
|
625
|
-
//
|
|
626
|
-
|
|
627
|
-
|
|
626
|
+
// SpeedUp requests are only supported EVM -> EVM.
|
|
627
|
+
if (isDefined(deposit) && chainIsEvm(deposit.destinationChainId) && deposit.depositor.eq(speedUp.depositor)) {
|
|
628
|
+
// We can assume all deposits in this lookback window are loaded in-memory already so if the depositHash
|
|
629
|
+
// is not mapped to a deposit, then we can throw away the speedup as it can't be applied to anything.
|
|
628
630
|
const eventKey = getRelayEventKey(deposit);
|
|
629
631
|
this.depositHashes[eventKey] = this.appendMaxSpeedUpSignatureToDeposit(deposit);
|
|
630
632
|
}
|