@across-protocol/sdk 4.2.13 → 4.2.14-alpha.1

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.
Files changed (194) hide show
  1. package/dist/cjs/arch/evm/SpokeUtils.d.ts +5 -2
  2. package/dist/cjs/arch/evm/SpokeUtils.js +22 -5
  3. package/dist/cjs/arch/evm/SpokeUtils.js.map +1 -1
  4. package/dist/cjs/arch/svm/SpokeUtils.js +14 -11
  5. package/dist/cjs/arch/svm/SpokeUtils.js.map +1 -1
  6. package/dist/cjs/arch/svm/utils.d.ts +1 -1
  7. package/dist/cjs/arch/svm/utils.js +15 -13
  8. package/dist/cjs/arch/svm/utils.js.map +1 -1
  9. package/dist/cjs/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.d.ts +3 -3
  10. package/dist/cjs/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.js +4 -2
  11. package/dist/cjs/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.js.map +1 -1
  12. package/dist/cjs/clients/BundleDataClient/BundleDataClient.d.ts +4 -4
  13. package/dist/cjs/clients/BundleDataClient/BundleDataClient.js +60 -56
  14. package/dist/cjs/clients/BundleDataClient/BundleDataClient.js.map +1 -1
  15. package/dist/cjs/clients/BundleDataClient/utils/DataworkerUtils.js +13 -13
  16. package/dist/cjs/clients/BundleDataClient/utils/DataworkerUtils.js.map +1 -1
  17. package/dist/cjs/clients/BundleDataClient/utils/FillUtils.d.ts +2 -1
  18. package/dist/cjs/clients/BundleDataClient/utils/FillUtils.js +3 -2
  19. package/dist/cjs/clients/BundleDataClient/utils/FillUtils.js.map +1 -1
  20. package/dist/cjs/clients/BundleDataClient/utils/MerkleTreeUtils.js +5 -1
  21. package/dist/cjs/clients/BundleDataClient/utils/MerkleTreeUtils.js.map +1 -1
  22. package/dist/cjs/clients/BundleDataClient/utils/PoolRebalanceUtils.js +3 -3
  23. package/dist/cjs/clients/BundleDataClient/utils/PoolRebalanceUtils.js.map +1 -1
  24. package/dist/cjs/clients/BundleDataClient/utils/SuperstructUtils.d.ts +63 -63
  25. package/dist/cjs/clients/BundleDataClient/utils/SuperstructUtils.js +11 -8
  26. package/dist/cjs/clients/BundleDataClient/utils/SuperstructUtils.js.map +1 -1
  27. package/dist/cjs/clients/HubPoolClient.d.ts +21 -21
  28. package/dist/cjs/clients/HubPoolClient.js +84 -60
  29. package/dist/cjs/clients/HubPoolClient.js.map +1 -1
  30. package/dist/cjs/clients/SpokePoolClient/EVMSpokePoolClient.js +1 -1
  31. package/dist/cjs/clients/SpokePoolClient/EVMSpokePoolClient.js.map +1 -1
  32. package/dist/cjs/clients/SpokePoolClient/SpokePoolClient.d.ts +2 -2
  33. package/dist/cjs/clients/SpokePoolClient/SpokePoolClient.js +52 -37
  34. package/dist/cjs/clients/SpokePoolClient/SpokePoolClient.js.map +1 -1
  35. package/dist/cjs/clients/mocks/MockHubPoolClient.d.ts +9 -9
  36. package/dist/cjs/clients/mocks/MockHubPoolClient.js +15 -9
  37. package/dist/cjs/clients/mocks/MockHubPoolClient.js.map +1 -1
  38. package/dist/cjs/clients/mocks/MockSpokePoolClient.d.ts +5 -3
  39. package/dist/cjs/clients/mocks/MockSpokePoolClient.js +39 -36
  40. package/dist/cjs/clients/mocks/MockSpokePoolClient.js.map +1 -1
  41. package/dist/cjs/clients/mocks/MockSvmSpokePoolClient.d.ts +2 -2
  42. package/dist/cjs/clients/mocks/MockSvmSpokePoolClient.js +2 -2
  43. package/dist/cjs/clients/mocks/MockSvmSpokePoolClient.js.map +1 -1
  44. package/dist/cjs/interfaces/HubPool.d.ts +19 -14
  45. package/dist/cjs/interfaces/SpokePool.d.ts +13 -13
  46. package/dist/cjs/relayFeeCalculator/chain-queries/baseQuery.d.ts +6 -6
  47. package/dist/cjs/relayFeeCalculator/chain-queries/baseQuery.js +7 -7
  48. package/dist/cjs/relayFeeCalculator/chain-queries/baseQuery.js.map +1 -1
  49. package/dist/cjs/relayFeeCalculator/chain-queries/svmQuery.d.ts +4 -4
  50. package/dist/cjs/relayFeeCalculator/chain-queries/svmQuery.js +14 -15
  51. package/dist/cjs/relayFeeCalculator/chain-queries/svmQuery.js.map +1 -1
  52. package/dist/cjs/relayFeeCalculator/relayFeeCalculator.d.ts +5 -5
  53. package/dist/cjs/relayFeeCalculator/relayFeeCalculator.js +7 -7
  54. package/dist/cjs/relayFeeCalculator/relayFeeCalculator.js.map +1 -1
  55. package/dist/cjs/utils/AddressUtils.d.ts +6 -3
  56. package/dist/cjs/utils/AddressUtils.js +42 -14
  57. package/dist/cjs/utils/AddressUtils.js.map +1 -1
  58. package/dist/cjs/utils/SpokeUtils.d.ts +3 -3
  59. package/dist/cjs/utils/SpokeUtils.js +4 -22
  60. package/dist/cjs/utils/SpokeUtils.js.map +1 -1
  61. package/dist/cjs/utils/TokenUtils.d.ts +4 -4
  62. package/dist/cjs/utils/TokenUtils.js +3 -3
  63. package/dist/cjs/utils/TokenUtils.js.map +1 -1
  64. package/dist/esm/arch/evm/SpokeUtils.d.ts +5 -2
  65. package/dist/esm/arch/evm/SpokeUtils.js +23 -6
  66. package/dist/esm/arch/evm/SpokeUtils.js.map +1 -1
  67. package/dist/esm/arch/svm/SpokeUtils.js +15 -12
  68. package/dist/esm/arch/svm/SpokeUtils.js.map +1 -1
  69. package/dist/esm/arch/svm/utils.d.ts +1 -1
  70. package/dist/esm/arch/svm/utils.js +15 -13
  71. package/dist/esm/arch/svm/utils.js.map +1 -1
  72. package/dist/esm/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.d.ts +3 -3
  73. package/dist/esm/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.js +4 -2
  74. package/dist/esm/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.js.map +1 -1
  75. package/dist/esm/clients/BundleDataClient/BundleDataClient.d.ts +4 -4
  76. package/dist/esm/clients/BundleDataClient/BundleDataClient.js +61 -57
  77. package/dist/esm/clients/BundleDataClient/BundleDataClient.js.map +1 -1
  78. package/dist/esm/clients/BundleDataClient/utils/DataworkerUtils.js +14 -14
  79. package/dist/esm/clients/BundleDataClient/utils/DataworkerUtils.js.map +1 -1
  80. package/dist/esm/clients/BundleDataClient/utils/FillUtils.d.ts +2 -1
  81. package/dist/esm/clients/BundleDataClient/utils/FillUtils.js +4 -3
  82. package/dist/esm/clients/BundleDataClient/utils/FillUtils.js.map +1 -1
  83. package/dist/esm/clients/BundleDataClient/utils/MerkleTreeUtils.js +5 -1
  84. package/dist/esm/clients/BundleDataClient/utils/MerkleTreeUtils.js.map +1 -1
  85. package/dist/esm/clients/BundleDataClient/utils/PoolRebalanceUtils.js +4 -4
  86. package/dist/esm/clients/BundleDataClient/utils/PoolRebalanceUtils.js.map +1 -1
  87. package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.d.ts +63 -63
  88. package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.js +12 -9
  89. package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.js.map +1 -1
  90. package/dist/esm/clients/HubPoolClient.d.ts +23 -22
  91. package/dist/esm/clients/HubPoolClient.js +97 -64
  92. package/dist/esm/clients/HubPoolClient.js.map +1 -1
  93. package/dist/esm/clients/SpokePoolClient/EVMSpokePoolClient.js +2 -2
  94. package/dist/esm/clients/SpokePoolClient/EVMSpokePoolClient.js.map +1 -1
  95. package/dist/esm/clients/SpokePoolClient/SpokePoolClient.d.ts +2 -2
  96. package/dist/esm/clients/SpokePoolClient/SpokePoolClient.js +54 -38
  97. package/dist/esm/clients/SpokePoolClient/SpokePoolClient.js.map +1 -1
  98. package/dist/esm/clients/mocks/MockHubPoolClient.d.ts +9 -9
  99. package/dist/esm/clients/mocks/MockHubPoolClient.js +16 -10
  100. package/dist/esm/clients/mocks/MockHubPoolClient.js.map +1 -1
  101. package/dist/esm/clients/mocks/MockSpokePoolClient.d.ts +5 -3
  102. package/dist/esm/clients/mocks/MockSpokePoolClient.js +41 -38
  103. package/dist/esm/clients/mocks/MockSpokePoolClient.js.map +1 -1
  104. package/dist/esm/clients/mocks/MockSvmSpokePoolClient.d.ts +2 -2
  105. package/dist/esm/clients/mocks/MockSvmSpokePoolClient.js +3 -3
  106. package/dist/esm/clients/mocks/MockSvmSpokePoolClient.js.map +1 -1
  107. package/dist/esm/interfaces/HubPool.d.ts +19 -14
  108. package/dist/esm/interfaces/SpokePool.d.ts +13 -13
  109. package/dist/esm/relayFeeCalculator/chain-queries/baseQuery.d.ts +6 -6
  110. package/dist/esm/relayFeeCalculator/chain-queries/baseQuery.js +8 -8
  111. package/dist/esm/relayFeeCalculator/chain-queries/baseQuery.js.map +1 -1
  112. package/dist/esm/relayFeeCalculator/chain-queries/svmQuery.d.ts +4 -4
  113. package/dist/esm/relayFeeCalculator/chain-queries/svmQuery.js +15 -16
  114. package/dist/esm/relayFeeCalculator/chain-queries/svmQuery.js.map +1 -1
  115. package/dist/esm/relayFeeCalculator/relayFeeCalculator.d.ts +5 -5
  116. package/dist/esm/relayFeeCalculator/relayFeeCalculator.js +8 -8
  117. package/dist/esm/relayFeeCalculator/relayFeeCalculator.js.map +1 -1
  118. package/dist/esm/utils/AddressUtils.d.ts +7 -3
  119. package/dist/esm/utils/AddressUtils.js +52 -19
  120. package/dist/esm/utils/AddressUtils.js.map +1 -1
  121. package/dist/esm/utils/SpokeUtils.d.ts +3 -8
  122. package/dist/esm/utils/SpokeUtils.js +4 -26
  123. package/dist/esm/utils/SpokeUtils.js.map +1 -1
  124. package/dist/esm/utils/TokenUtils.d.ts +18 -16
  125. package/dist/esm/utils/TokenUtils.js +3 -3
  126. package/dist/esm/utils/TokenUtils.js.map +1 -1
  127. package/dist/types/arch/evm/SpokeUtils.d.ts +5 -2
  128. package/dist/types/arch/evm/SpokeUtils.d.ts.map +1 -1
  129. package/dist/types/arch/svm/SpokeUtils.d.ts.map +1 -1
  130. package/dist/types/arch/svm/utils.d.ts +1 -1
  131. package/dist/types/arch/svm/utils.d.ts.map +1 -1
  132. package/dist/types/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.d.ts +3 -3
  133. package/dist/types/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.d.ts.map +1 -1
  134. package/dist/types/clients/BundleDataClient/BundleDataClient.d.ts +4 -4
  135. package/dist/types/clients/BundleDataClient/BundleDataClient.d.ts.map +1 -1
  136. package/dist/types/clients/BundleDataClient/utils/DataworkerUtils.d.ts.map +1 -1
  137. package/dist/types/clients/BundleDataClient/utils/FillUtils.d.ts +2 -1
  138. package/dist/types/clients/BundleDataClient/utils/FillUtils.d.ts.map +1 -1
  139. package/dist/types/clients/BundleDataClient/utils/MerkleTreeUtils.d.ts.map +1 -1
  140. package/dist/types/clients/BundleDataClient/utils/PoolRebalanceUtils.d.ts.map +1 -1
  141. package/dist/types/clients/BundleDataClient/utils/SuperstructUtils.d.ts +63 -63
  142. package/dist/types/clients/BundleDataClient/utils/SuperstructUtils.d.ts.map +1 -1
  143. package/dist/types/clients/HubPoolClient.d.ts +23 -22
  144. package/dist/types/clients/HubPoolClient.d.ts.map +1 -1
  145. package/dist/types/clients/SpokePoolClient/EVMSpokePoolClient.d.ts.map +1 -1
  146. package/dist/types/clients/SpokePoolClient/SpokePoolClient.d.ts +2 -2
  147. package/dist/types/clients/SpokePoolClient/SpokePoolClient.d.ts.map +1 -1
  148. package/dist/types/clients/mocks/MockHubPoolClient.d.ts +9 -9
  149. package/dist/types/clients/mocks/MockHubPoolClient.d.ts.map +1 -1
  150. package/dist/types/clients/mocks/MockSpokePoolClient.d.ts +5 -3
  151. package/dist/types/clients/mocks/MockSpokePoolClient.d.ts.map +1 -1
  152. package/dist/types/clients/mocks/MockSvmSpokePoolClient.d.ts +2 -2
  153. package/dist/types/clients/mocks/MockSvmSpokePoolClient.d.ts.map +1 -1
  154. package/dist/types/interfaces/HubPool.d.ts +19 -14
  155. package/dist/types/interfaces/HubPool.d.ts.map +1 -1
  156. package/dist/types/interfaces/SpokePool.d.ts +13 -13
  157. package/dist/types/interfaces/SpokePool.d.ts.map +1 -1
  158. package/dist/types/relayFeeCalculator/chain-queries/baseQuery.d.ts +6 -6
  159. package/dist/types/relayFeeCalculator/chain-queries/baseQuery.d.ts.map +1 -1
  160. package/dist/types/relayFeeCalculator/chain-queries/svmQuery.d.ts +4 -4
  161. package/dist/types/relayFeeCalculator/chain-queries/svmQuery.d.ts.map +1 -1
  162. package/dist/types/relayFeeCalculator/relayFeeCalculator.d.ts +5 -5
  163. package/dist/types/relayFeeCalculator/relayFeeCalculator.d.ts.map +1 -1
  164. package/dist/types/utils/AddressUtils.d.ts +7 -3
  165. package/dist/types/utils/AddressUtils.d.ts.map +1 -1
  166. package/dist/types/utils/SpokeUtils.d.ts +3 -8
  167. package/dist/types/utils/SpokeUtils.d.ts.map +1 -1
  168. package/dist/types/utils/TokenUtils.d.ts +18 -16
  169. package/dist/types/utils/TokenUtils.d.ts.map +1 -1
  170. package/package.json +2 -3
  171. package/src/arch/evm/SpokeUtils.ts +53 -11
  172. package/src/arch/svm/SpokeUtils.ts +44 -11
  173. package/src/arch/svm/utils.ts +3 -3
  174. package/src/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.ts +7 -4
  175. package/src/clients/BundleDataClient/BundleDataClient.ts +54 -52
  176. package/src/clients/BundleDataClient/utils/DataworkerUtils.ts +28 -13
  177. package/src/clients/BundleDataClient/utils/FillUtils.ts +6 -4
  178. package/src/clients/BundleDataClient/utils/MerkleTreeUtils.ts +7 -1
  179. package/src/clients/BundleDataClient/utils/PoolRebalanceUtils.ts +4 -4
  180. package/src/clients/BundleDataClient/utils/SuperstructUtils.ts +13 -9
  181. package/src/clients/HubPoolClient.ts +126 -83
  182. package/src/clients/SpokePoolClient/EVMSpokePoolClient.ts +6 -0
  183. package/src/clients/SpokePoolClient/SpokePoolClient.ts +109 -28
  184. package/src/clients/mocks/MockHubPoolClient.ts +24 -19
  185. package/src/clients/mocks/MockSpokePoolClient.ts +37 -26
  186. package/src/clients/mocks/MockSvmSpokePoolClient.ts +12 -3
  187. package/src/interfaces/HubPool.ts +23 -14
  188. package/src/interfaces/SpokePool.ts +13 -13
  189. package/src/relayFeeCalculator/chain-queries/baseQuery.ts +10 -8
  190. package/src/relayFeeCalculator/chain-queries/svmQuery.ts +16 -21
  191. package/src/relayFeeCalculator/relayFeeCalculator.ts +20 -12
  192. package/src/utils/AddressUtils.ts +56 -21
  193. package/src/utils/SpokeUtils.ts +11 -33
  194. package/src/utils/TokenUtils.ts +7 -7
@@ -127,7 +127,7 @@ export declare abstract class SpokePoolClient extends BaseAbstractClient {
127
127
  * @param relayer The relayer address.
128
128
  * @returns A list of fills.
129
129
  */
130
- getFillsForRelayer(relayer: string): FillWithBlock[];
130
+ getFillsForRelayer(relayer: Address): FillWithBlock[];
131
131
  /**
132
132
  * Retrieves a list of fills from a given block range.
133
133
  * @param startingBlock The starting block number.
@@ -250,7 +250,7 @@ export declare abstract class SpokePoolClient extends BaseAbstractClient {
250
250
  * @param deposit The deposit to retrieve the destination token for.
251
251
  * @returns The destination token.
252
252
  */
253
- protected getDestinationTokenForDeposit(deposit: DepositWithBlock): string;
253
+ protected getDestinationTokenForDeposit(deposit: DepositWithBlock): Address;
254
254
  /**
255
255
  * Performs a log for a specific level, message and data.
256
256
  * @param level The log level.
@@ -1,5 +1,5 @@
1
1
  import { __assign, __awaiter, __extends, __generator } from "tslib";
2
- import { bnZero, MAX_BIG_INT, assign, getRelayEventKey, isDefined, getMessageHash, isSlowFill, isValidEvmAddress, isZeroAddress, toAddress, validateFillForDeposit, chainIsEvm, chainIsProd, } from "../../utils";
2
+ import { bnZero, MAX_BIG_INT, assign, getRelayEventKey, isDefined, getMessageHash, isSlowFill, isZeroAddress, validateFillForDeposit, chainIsEvm, chainIsProd, toAddressType, } from "../../utils";
3
3
  import { duplicateEvent, sortEventsAscendingInPlace } from "../../utils/EventUtils";
4
4
  import { ZERO_ADDRESS } from "../../constants";
5
5
  import { BaseAbstractClient } from "../BaseAbstractClient";
@@ -145,7 +145,7 @@ var SpokePoolClient = /** @class */ (function (_super) {
145
145
  * @returns A list of fills.
146
146
  */
147
147
  SpokePoolClient.prototype.getFillsForRelayer = function (relayer) {
148
- return this.getFills().filter(function (fill) { return fill.relayer === relayer; });
148
+ return this.getFills().filter(function (fill) { return fill.relayer.eq(relayer); });
149
149
  };
150
150
  /**
151
151
  * Retrieves a list of fills from a given block range.
@@ -189,7 +189,8 @@ var SpokePoolClient = /** @class */ (function (_super) {
189
189
  var _a;
190
190
  var depositId = deposit.depositId, depositor = deposit.depositor;
191
191
  // Note: we know depositor cannot be more than 20 bytes since this is guaranteed by contracts.
192
- var speedups = (_a = this.speedUps[toAddress(depositor)]) === null || _a === void 0 ? void 0 : _a[depositId.toString()];
192
+ // Additionally, speed ups can only be done on EVM networks.
193
+ var speedups = (_a = this.speedUps[depositor.toEvmAddress()]) === null || _a === void 0 ? void 0 : _a[depositId.toString()];
193
194
  if (!isDefined(speedups) || speedups.length === 0) {
194
195
  return deposit;
195
196
  }
@@ -288,7 +289,8 @@ var SpokePoolClient = /** @class */ (function (_super) {
288
289
  // functioon synchronous, we can't make that decision now. So this function might log some false positives.
289
290
  if (_this.hubPoolClient &&
290
291
  !isSlowFill(fill) &&
291
- (!chainIsEvm(repaymentChainId) || !isValidEvmAddress(fill.relayer))) {
292
+ chainIsEvm(repaymentChainId) &&
293
+ !fill.relayer.isValidEvmAddress()) {
292
294
  groupedFills.unrepayableFills.push(fill);
293
295
  }
294
296
  // This fill is still valid and means that the deposit cannot be filled on-chain anymore, but it
@@ -308,7 +310,7 @@ var SpokePoolClient = /** @class */ (function (_super) {
308
310
  chainId: this.chainId,
309
311
  message: "Unrepayable fills found where we need to switch repayment address and or chain",
310
312
  deposit: deposit,
311
- unrepayableFills: Object.fromEntries(unrepayableFillsForDeposit.map(function (x) { return [x.relayer, x]; })),
313
+ unrepayableFills: Object.fromEntries(unrepayableFillsForDeposit.map(function (x) { return [x.relayer.toAddress(), x]; })),
312
314
  notificationPath: "across-unrepayable-fills",
313
315
  });
314
316
  }
@@ -351,13 +353,12 @@ var SpokePoolClient = /** @class */ (function (_super) {
351
353
  * @see _update
352
354
  */
353
355
  SpokePoolClient.prototype.update = function (eventsToQuery) {
354
- var _a, _b, _c;
355
356
  if (eventsToQuery === void 0) { eventsToQuery = this._queryableEventNames(); }
356
357
  return __awaiter(this, void 0, void 0, function () {
357
- var duplicateEvents, update, queryResults, currentTime, searchEndBlock, _i, _d, event_1, queryDepositEvents, _e, _f, event_2, querySpeedUpDepositEvents, queryRequestedSlowFillEvents, queryFilledRelayEvents, enableDepositsEvents, _g, enableDepositsEvents_1, event_3, relayedRootBundleEvents, _h, relayedRootBundleEvents_1, event_4, refundEvents, _j, refundEvents_1, event_5;
358
+ var duplicateEvents, update, queryResults, currentTime, searchEndBlock, _i, _a, _event, event_1, queryDepositEvents, _b, _c, event_2, querySpeedUpDepositEvents, queryRequestedSlowFillEvents, queryFilledRelayEvents, enableDepositsEvents, _d, enableDepositsEvents_1, event_3, relayedRootBundleEvents, _e, relayedRootBundleEvents_1, event_4, refundEvents, _f, refundEvents_1, _event, event_5;
358
359
  var _this = this;
359
- return __generator(this, function (_k) {
360
- switch (_k.label) {
360
+ return __generator(this, function (_g) {
361
+ switch (_g.label) {
361
362
  case 0:
362
363
  duplicateEvents = [];
363
364
  if (this.hubPoolClient !== null && !this.hubPoolClient.isUpdated) {
@@ -365,24 +366,29 @@ var SpokePoolClient = /** @class */ (function (_super) {
365
366
  }
366
367
  return [4 /*yield*/, this._update(eventsToQuery)];
367
368
  case 1:
368
- update = _k.sent();
369
+ update = _g.sent();
369
370
  if (!update.success) {
370
371
  return [2 /*return*/];
371
372
  }
372
373
  queryResults = update.events, currentTime = update.currentTime, searchEndBlock = update.searchEndBlock;
373
374
  if (eventsToQuery.includes("TokensBridged")) {
374
- for (_i = 0, _d = queryResults[eventsToQuery.indexOf("TokensBridged")]; _i < _d.length; _i++) {
375
- event_1 = _d[_i];
376
- this.tokensBridged.push(event_1);
375
+ for (_i = 0, _a = queryResults[eventsToQuery.indexOf("TokensBridged")]; _i < _a.length; _i++) {
376
+ _event = _a[_i];
377
+ event_1 = _event;
378
+ this.tokensBridged.push(__assign(__assign({}, event_1), { l2TokenAddress: toAddressType(event_1.l2TokenAddress, this.chainId) }));
377
379
  }
378
380
  }
379
381
  queryDepositEvents = function (eventName) { return __awaiter(_this, void 0, void 0, function () {
380
382
  var depositEvents, quoteBlockNumbers, _loop_1, this_1, _i, depositEvents_1, event_6;
383
+ var _this = this;
381
384
  var _a;
382
385
  return __generator(this, function (_b) {
383
386
  switch (_b.label) {
384
387
  case 0:
385
- depositEvents = ((_a = queryResults[eventsToQuery.indexOf(eventName)]) !== null && _a !== void 0 ? _a : []);
388
+ depositEvents = ((_a = queryResults[eventsToQuery.indexOf(eventName)]) !== null && _a !== void 0 ? _a : []).map(function (_event) {
389
+ var event = _event;
390
+ return __assign(__assign({}, event), { depositor: toAddressType(event.depositor, _this.chainId), recipient: toAddressType(event.recipient, event.destinationChainId), inputToken: toAddressType(event.inputToken, _this.chainId), outputToken: toAddressType(event.outputToken, event.destinationChainId), exclusiveRelayer: toAddressType(event.exclusiveRelayer, event.destinationChainId) });
391
+ });
386
392
  if (depositEvents.length > 0) {
387
393
  this.log("debug", "Using ".concat(depositEvents.length, " newly queried ").concat(eventName, " deposit events for chain ").concat(this.chainId), {
388
394
  earliestEvent: depositEvents[0].blockNumber,
@@ -423,27 +429,30 @@ var SpokePoolClient = /** @class */ (function (_super) {
423
429
  }
424
430
  });
425
431
  }); };
426
- _e = 0, _f = ["FundsDeposited"];
427
- _k.label = 2;
432
+ _b = 0, _c = ["FundsDeposited"];
433
+ _g.label = 2;
428
434
  case 2:
429
- if (!(_e < _f.length)) return [3 /*break*/, 5];
430
- event_2 = _f[_e];
435
+ if (!(_b < _c.length)) return [3 /*break*/, 5];
436
+ event_2 = _c[_b];
431
437
  if (!eventsToQuery.includes(event_2)) return [3 /*break*/, 4];
432
438
  return [4 /*yield*/, queryDepositEvents(event_2)];
433
439
  case 3:
434
- _k.sent();
435
- _k.label = 4;
440
+ _g.sent();
441
+ _g.label = 4;
436
442
  case 4:
437
- _e++;
443
+ _b++;
438
444
  return [3 /*break*/, 2];
439
445
  case 5:
440
446
  querySpeedUpDepositEvents = function (eventName) {
441
447
  var _a;
442
- var speedUpEvents = ((_a = queryResults[eventsToQuery.indexOf(eventName)]) !== null && _a !== void 0 ? _a : []);
448
+ var speedUpEvents = ((_a = queryResults[eventsToQuery.indexOf(eventName)]) !== null && _a !== void 0 ? _a : []).map(function (_event) {
449
+ var event = _event;
450
+ return __assign(__assign({}, event), { depositor: toAddressType(event.depositor, _this.chainId), updatedRecipient: toAddressType(event.updatedRecipient) });
451
+ });
443
452
  for (var _i = 0, speedUpEvents_1 = speedUpEvents; _i < speedUpEvents_1.length; _i++) {
444
453
  var event_7 = speedUpEvents_1[_i];
445
454
  var speedUp = __assign(__assign({}, event_7), { originChainId: _this.chainId });
446
- assign(_this.speedUps, [speedUp.depositor, speedUp.depositId.toString()], [speedUp]);
455
+ assign(_this.speedUps, [speedUp.depositor.toAddress(), speedUp.depositId.toString()], [speedUp]);
447
456
  // Find deposit hash matching this speed up event and update the deposit data associated with the hash,
448
457
  // if the hash+data exists.
449
458
  var deposit = _this.getDeposit(speedUp.depositId);
@@ -464,7 +473,10 @@ var SpokePoolClient = /** @class */ (function (_super) {
464
473
  queryRequestedSlowFillEvents = function (eventName) {
465
474
  var _a, _b;
466
475
  var _c;
467
- var slowFillRequests = ((_a = queryResults[eventsToQuery.indexOf(eventName)]) !== null && _a !== void 0 ? _a : []);
476
+ var slowFillRequests = ((_a = queryResults[eventsToQuery.indexOf(eventName)]) !== null && _a !== void 0 ? _a : []).map(function (_event) {
477
+ var event = _event;
478
+ return __assign(__assign({}, event), { depositor: toAddressType(event.depositor, event.originChainId), recipient: toAddressType(event.recipient, _this.chainId), inputToken: toAddressType(event.inputToken, event.originChainId), outputToken: toAddressType(event.outputToken, _this.chainId), exclusiveRelayer: toAddressType(event.exclusiveRelayer, _this.chainId) });
479
+ });
468
480
  for (var _i = 0, slowFillRequests_1 = slowFillRequests; _i < slowFillRequests_1.length; _i++) {
469
481
  var event_8 = slowFillRequests_1[_i];
470
482
  var slowFillRequest = __assign(__assign({}, event_8), { destinationChainId: _this.chainId });
@@ -484,7 +496,10 @@ var SpokePoolClient = /** @class */ (function (_super) {
484
496
  });
485
497
  queryFilledRelayEvents = function (eventName) {
486
498
  var _a, _b;
487
- var fillEvents = ((_a = queryResults[eventsToQuery.indexOf(eventName)]) !== null && _a !== void 0 ? _a : []);
499
+ var fillEvents = ((_a = queryResults[eventsToQuery.indexOf(eventName)]) !== null && _a !== void 0 ? _a : []).map(function (_event) {
500
+ var event = _event;
501
+ return __assign(__assign({}, event), { depositor: toAddressType(event.depositor, event.originChainId), recipient: toAddressType(event.recipient, _this.chainId), inputToken: toAddressType(event.inputToken, event.originChainId), outputToken: toAddressType(event.outputToken, _this.chainId), exclusiveRelayer: toAddressType(event.exclusiveRelayer, _this.chainId), relayer: toAddressType(event.relayer, _this.chainId), relayExecutionInfo: __assign(__assign({}, event.relayExecutionInfo), { updatedRecipient: toAddressType(event.relayExecutionInfo.updatedRecipient, _this.chainId) }) });
502
+ });
488
503
  if (fillEvents.length > 0) {
489
504
  _this.log("debug", "Using ".concat(fillEvents.length, " newly queried ").concat(eventName, " events for chain ").concat(_this.chainId), {
490
505
  earliestEvent: fillEvents[0].blockNumber,
@@ -515,24 +530,25 @@ var SpokePoolClient = /** @class */ (function (_super) {
515
530
  }
516
531
  });
517
532
  if (eventsToQuery.includes("EnabledDepositRoute")) {
518
- enableDepositsEvents = ((_a = queryResults[eventsToQuery.indexOf("EnabledDepositRoute")]) !== null && _a !== void 0 ? _a : []);
519
- for (_g = 0, enableDepositsEvents_1 = enableDepositsEvents; _g < enableDepositsEvents_1.length; _g++) {
520
- event_3 = enableDepositsEvents_1[_g];
533
+ enableDepositsEvents = queryResults[eventsToQuery.indexOf("EnabledDepositRoute")];
534
+ for (_d = 0, enableDepositsEvents_1 = enableDepositsEvents; _d < enableDepositsEvents_1.length; _d++) {
535
+ event_3 = enableDepositsEvents_1[_d];
521
536
  assign(this.depositRoutes, [event_3.originToken, event_3.destinationChainId], event_3.enabled);
522
537
  }
523
538
  }
524
539
  if (eventsToQuery.includes("RelayedRootBundle")) {
525
- relayedRootBundleEvents = ((_b = queryResults[eventsToQuery.indexOf("RelayedRootBundle")]) !== null && _b !== void 0 ? _b : []);
526
- for (_h = 0, relayedRootBundleEvents_1 = relayedRootBundleEvents; _h < relayedRootBundleEvents_1.length; _h++) {
527
- event_4 = relayedRootBundleEvents_1[_h];
540
+ relayedRootBundleEvents = queryResults[eventsToQuery.indexOf("RelayedRootBundle")];
541
+ for (_e = 0, relayedRootBundleEvents_1 = relayedRootBundleEvents; _e < relayedRootBundleEvents_1.length; _e++) {
542
+ event_4 = relayedRootBundleEvents_1[_e];
528
543
  this.rootBundleRelays.push(event_4);
529
544
  }
530
545
  }
531
546
  if (eventsToQuery.includes("ExecutedRelayerRefundRoot")) {
532
- refundEvents = ((_c = queryResults[eventsToQuery.indexOf("ExecutedRelayerRefundRoot")]) !== null && _c !== void 0 ? _c : []);
533
- for (_j = 0, refundEvents_1 = refundEvents; _j < refundEvents_1.length; _j++) {
534
- event_5 = refundEvents_1[_j];
535
- this.relayerRefundExecutions.push(event_5);
547
+ refundEvents = queryResults[eventsToQuery.indexOf("ExecutedRelayerRefundRoot")];
548
+ for (_f = 0, refundEvents_1 = refundEvents; _f < refundEvents_1.length; _f++) {
549
+ _event = refundEvents_1[_f];
550
+ event_5 = _event;
551
+ this.relayerRefundExecutions.push(__assign(__assign({}, event_5), { l2TokenAddress: toAddressType(event_5.l2TokenAddress, this.chainId), refundAddresses: event_5.refundAddresses.map(function (addr) { return toAddressType(addr, _this.chainId); }) }));
536
552
  }
537
553
  }
538
554
  if (duplicateEvents.length > 0) {
@@ -579,13 +595,13 @@ var SpokePoolClient = /** @class */ (function (_super) {
579
595
  * @returns The destination token.
580
596
  */
581
597
  SpokePoolClient.prototype.getDestinationTokenForDeposit = function (deposit) {
582
- var _a;
583
598
  if (!this.canResolveZeroAddressOutputToken(deposit)) {
584
- return ZERO_ADDRESS;
599
+ return toAddressType(ZERO_ADDRESS);
585
600
  }
586
601
  // L1 token should be resolved if we get here:
587
602
  var l1Token = this.hubPoolClient.getL1TokenForL2TokenAtBlock(deposit.inputToken, deposit.originChainId, deposit.quoteBlockNumber);
588
- return ((_a = this.hubPoolClient.getL2TokenForL1TokenAtBlock(l1Token, deposit.destinationChainId, deposit.quoteBlockNumber)) !== null && _a !== void 0 ? _a : ZERO_ADDRESS);
603
+ var counterpartToken = this.hubPoolClient.getL2TokenForL1TokenAtBlock(l1Token, deposit.destinationChainId, deposit.quoteBlockNumber);
604
+ return counterpartToken !== null && counterpartToken !== void 0 ? counterpartToken : toAddressType(ZERO_ADDRESS);
589
605
  };
590
606
  /**
591
607
  * Performs a log for a specific level, message and 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 { L1Token, Log, PendingRootBundle, RealizedLpFee } from "../../interfaces";
3
+ import { BigNumber, EvmAddress, Address } from "../../utils";
4
+ import { TokenInfo, 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: L1Token): void;
23
- getL1Tokens(): L1Token[];
22
+ addL1Token(l1Token: TokenInfo): void;
23
+ getL1Tokens(): L1TokenInfo[];
24
24
  setTokenMapping(l1Token: string, chainId: number, l2Token: string): void;
25
- l2TokenEnabledForL1TokenAtBlock(l1Token: string, destinationChainId: number, hubBlockNumber: number): boolean;
26
- l2TokenHasPoolRebalanceRoute(l2Token: string, chainId: number, hubPoolBlock: number): boolean;
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: string, chainId: number, blockNumber: number): string;
29
- getL2TokenForL1TokenAtBlock(l1Token: string, chainId: number, blockNumber: number): string;
30
- getTokenInfoForL1Token(l1Token: string): L1Token | undefined;
28
+ getL1TokenForL2TokenAtBlock(l2Token: Address, chainId: number, blockNumber: number): EvmAddress;
29
+ getL2TokenForL1TokenAtBlock(l1Token: EvmAddress, chainId: number, blockNumber: number): Address;
30
+ getTokenInfoForL1Token(l1Token: EvmAddress): TokenInfo | 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;
@@ -1,12 +1,13 @@
1
1
  import { __awaiter, __extends, __generator } from "tslib";
2
- import { randomAddress, assign, bnZero } from "../../utils";
2
+ import { randomAddress, assign, bnZero, toAddressType, EvmAddress, isDefined } from "../../utils";
3
3
  import { HubPoolClient } from "../HubPoolClient";
4
4
  import { getEventManager } from "./MockEvents";
5
+ import { ZERO_ADDRESS } from "../../constants";
5
6
  var emptyRootBundle = {
6
7
  poolRebalanceRoot: "",
7
8
  relayerRefundRoot: "",
8
9
  slowRelayRoot: "",
9
- proposer: "",
10
+ proposer: EvmAddress.from(ZERO_ADDRESS),
10
11
  unclaimedPoolRebalanceLeafCount: 0,
11
12
  challengePeriodEndTimestamp: 0,
12
13
  bundleEvaluationBlockNumbers: [],
@@ -83,7 +84,7 @@ var MockHubPoolClient = /** @class */ (function (_super) {
83
84
  if (blockNumber === void 0) { blockNumber = 0; }
84
85
  assign(this.crossChainContracts, [chainId], [
85
86
  {
86
- spokePool: contract,
87
+ spokePool: toAddressType(contract),
87
88
  blockNumber: blockNumber,
88
89
  transactionIndex: 0,
89
90
  logIndex: 0,
@@ -103,11 +104,11 @@ var MockHubPoolClient = /** @class */ (function (_super) {
103
104
  var _a;
104
105
  var _b;
105
106
  (_a = (_b = this.spokePoolTokens)[l1Token]) !== null && _a !== void 0 ? _a : (_b[l1Token] = {});
106
- this.spokePoolTokens[l1Token][chainId] = l2Token;
107
+ this.spokePoolTokens[l1Token][chainId] = toAddressType(l2Token);
107
108
  };
108
109
  MockHubPoolClient.prototype.l2TokenEnabledForL1TokenAtBlock = function (l1Token, destinationChainId, hubBlockNumber) {
109
110
  var _a;
110
- if ((_a = this.spokePoolTokens[l1Token]) === null || _a === void 0 ? void 0 : _a[destinationChainId]) {
111
+ if ((_a = this.spokePoolTokens[l1Token.toEvmAddress()]) === null || _a === void 0 ? void 0 : _a[destinationChainId]) {
111
112
  return true;
112
113
  }
113
114
  else {
@@ -116,7 +117,7 @@ var MockHubPoolClient = /** @class */ (function (_super) {
116
117
  };
117
118
  MockHubPoolClient.prototype.l2TokenHasPoolRebalanceRoute = function (l2Token, chainId, hubPoolBlock) {
118
119
  var _this = this;
119
- 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; });
120
+ 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); });
120
121
  if (!l1Token) {
121
122
  return _super.prototype.l2TokenHasPoolRebalanceRoute.call(this, l2Token, chainId, hubPoolBlock);
122
123
  }
@@ -129,16 +130,21 @@ var MockHubPoolClient = /** @class */ (function (_super) {
129
130
  };
130
131
  MockHubPoolClient.prototype.getL1TokenForL2TokenAtBlock = function (l2Token, chainId, blockNumber) {
131
132
  var _this = this;
132
- 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; });
133
- return l1Token !== null && l1Token !== void 0 ? l1Token : _super.prototype.getL1TokenForL2TokenAtBlock.call(this, l2Token, chainId, blockNumber);
133
+ 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); });
134
+ if (isDefined(l1Token)) {
135
+ return EvmAddress.from(l1Token);
136
+ }
137
+ else {
138
+ return _super.prototype.getL1TokenForL2TokenAtBlock.call(this, l2Token, chainId, blockNumber);
139
+ }
134
140
  };
135
141
  MockHubPoolClient.prototype.getL2TokenForL1TokenAtBlock = function (l1Token, chainId, blockNumber) {
136
142
  var _a;
137
- var l2Token = (_a = this.spokePoolTokens[l1Token]) === null || _a === void 0 ? void 0 : _a[chainId];
143
+ var l2Token = (_a = this.spokePoolTokens[l1Token.toEvmAddress()]) === null || _a === void 0 ? void 0 : _a[chainId];
138
144
  return l2Token !== null && l2Token !== void 0 ? l2Token : _super.prototype.getL2TokenForL1TokenAtBlock.call(this, l1Token, chainId, blockNumber);
139
145
  };
140
146
  MockHubPoolClient.prototype.getTokenInfoForL1Token = function (l1Token) {
141
- return this.l1TokensMock.find(function (token) { return token.address === l1Token; });
147
+ return this.l1TokensMock.find(function (token) { return token.address.eq(l1Token); });
142
148
  };
143
149
  MockHubPoolClient.prototype._update = function (eventNames) {
144
150
  // Generate new "on chain" responses.
@@ -1 +1 @@
1
- {"version":3,"file":"MockHubPoolClient.js","sourceRoot":"","sources":["../../../../src/clients/mocks/MockHubPoolClient.ts"],"names":[],"mappings":"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"}
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): string;
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"> & Partial<SortableEvent>): Log;
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;