@across-protocol/sdk 4.2.7 → 4.2.9-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.
Files changed (190) hide show
  1. package/dist/cjs/arch/evm/SpokeUtils.d.ts +2 -2
  2. package/dist/cjs/arch/evm/SpokeUtils.js +18 -3
  3. package/dist/cjs/arch/evm/SpokeUtils.js.map +1 -1
  4. package/dist/cjs/arch/svm/SpokeUtils.js +7 -7
  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 +2 -2
  13. package/dist/cjs/clients/BundleDataClient/BundleDataClient.js +57 -53
  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/PoolRebalanceUtils.js +3 -3
  21. package/dist/cjs/clients/BundleDataClient/utils/PoolRebalanceUtils.js.map +1 -1
  22. package/dist/cjs/clients/BundleDataClient/utils/SuperstructUtils.d.ts +63 -63
  23. package/dist/cjs/clients/BundleDataClient/utils/SuperstructUtils.js +11 -8
  24. package/dist/cjs/clients/BundleDataClient/utils/SuperstructUtils.js.map +1 -1
  25. package/dist/cjs/clients/HubPoolClient.d.ts +20 -20
  26. package/dist/cjs/clients/HubPoolClient.js +78 -57
  27. package/dist/cjs/clients/HubPoolClient.js.map +1 -1
  28. package/dist/cjs/clients/SpokePoolClient/EVMSpokePoolClient.js +2 -2
  29. package/dist/cjs/clients/SpokePoolClient/EVMSpokePoolClient.js.map +1 -1
  30. package/dist/cjs/clients/SpokePoolClient/SpokePoolClient.d.ts +5 -3
  31. package/dist/cjs/clients/SpokePoolClient/SpokePoolClient.js +35 -29
  32. package/dist/cjs/clients/SpokePoolClient/SpokePoolClient.js.map +1 -1
  33. package/dist/cjs/clients/mocks/MockHubPoolClient.d.ts +9 -9
  34. package/dist/cjs/clients/mocks/MockHubPoolClient.js +15 -9
  35. package/dist/cjs/clients/mocks/MockHubPoolClient.js.map +1 -1
  36. package/dist/cjs/clients/mocks/MockSpokePoolClient.d.ts +9 -13
  37. package/dist/cjs/clients/mocks/MockSpokePoolClient.js +40 -56
  38. package/dist/cjs/clients/mocks/MockSpokePoolClient.js.map +1 -1
  39. package/dist/cjs/clients/mocks/MockSvmSpokePoolClient.d.ts +2 -2
  40. package/dist/cjs/clients/mocks/MockSvmSpokePoolClient.js +2 -2
  41. package/dist/cjs/clients/mocks/MockSvmSpokePoolClient.js.map +1 -1
  42. package/dist/cjs/interfaces/HubPool.d.ts +18 -13
  43. package/dist/cjs/interfaces/SpokePool.d.ts +14 -16
  44. package/dist/cjs/interfaces/SpokePool.js.map +1 -1
  45. package/dist/cjs/relayFeeCalculator/chain-queries/baseQuery.d.ts +6 -6
  46. package/dist/cjs/relayFeeCalculator/chain-queries/baseQuery.js +7 -7
  47. package/dist/cjs/relayFeeCalculator/chain-queries/baseQuery.js.map +1 -1
  48. package/dist/cjs/relayFeeCalculator/chain-queries/svmQuery.d.ts +3 -3
  49. package/dist/cjs/relayFeeCalculator/chain-queries/svmQuery.js +10 -10
  50. package/dist/cjs/relayFeeCalculator/chain-queries/svmQuery.js.map +1 -1
  51. package/dist/cjs/relayFeeCalculator/relayFeeCalculator.d.ts +5 -5
  52. package/dist/cjs/relayFeeCalculator/relayFeeCalculator.js +7 -7
  53. package/dist/cjs/relayFeeCalculator/relayFeeCalculator.js.map +1 -1
  54. package/dist/cjs/utils/AddressUtils.d.ts +7 -4
  55. package/dist/cjs/utils/AddressUtils.js +21 -8
  56. package/dist/cjs/utils/AddressUtils.js.map +1 -1
  57. package/dist/cjs/utils/SpokeUtils.d.ts +3 -3
  58. package/dist/cjs/utils/SpokeUtils.js +4 -22
  59. package/dist/cjs/utils/SpokeUtils.js.map +1 -1
  60. package/dist/cjs/utils/TokenUtils.d.ts +4 -4
  61. package/dist/cjs/utils/TokenUtils.js +3 -3
  62. package/dist/cjs/utils/TokenUtils.js.map +1 -1
  63. package/dist/esm/arch/evm/SpokeUtils.d.ts +2 -2
  64. package/dist/esm/arch/evm/SpokeUtils.js +19 -4
  65. package/dist/esm/arch/evm/SpokeUtils.js.map +1 -1
  66. package/dist/esm/arch/svm/SpokeUtils.js +8 -8
  67. package/dist/esm/arch/svm/SpokeUtils.js.map +1 -1
  68. package/dist/esm/arch/svm/utils.d.ts +1 -1
  69. package/dist/esm/arch/svm/utils.js +15 -13
  70. package/dist/esm/arch/svm/utils.js.map +1 -1
  71. package/dist/esm/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.d.ts +3 -3
  72. package/dist/esm/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.js +4 -2
  73. package/dist/esm/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.js.map +1 -1
  74. package/dist/esm/clients/BundleDataClient/BundleDataClient.d.ts +2 -2
  75. package/dist/esm/clients/BundleDataClient/BundleDataClient.js +58 -54
  76. package/dist/esm/clients/BundleDataClient/BundleDataClient.js.map +1 -1
  77. package/dist/esm/clients/BundleDataClient/utils/DataworkerUtils.js +14 -14
  78. package/dist/esm/clients/BundleDataClient/utils/DataworkerUtils.js.map +1 -1
  79. package/dist/esm/clients/BundleDataClient/utils/FillUtils.d.ts +2 -1
  80. package/dist/esm/clients/BundleDataClient/utils/FillUtils.js +4 -3
  81. package/dist/esm/clients/BundleDataClient/utils/FillUtils.js.map +1 -1
  82. package/dist/esm/clients/BundleDataClient/utils/PoolRebalanceUtils.js +4 -4
  83. package/dist/esm/clients/BundleDataClient/utils/PoolRebalanceUtils.js.map +1 -1
  84. package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.d.ts +63 -63
  85. package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.js +12 -9
  86. package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.js.map +1 -1
  87. package/dist/esm/clients/HubPoolClient.d.ts +22 -21
  88. package/dist/esm/clients/HubPoolClient.js +91 -61
  89. package/dist/esm/clients/HubPoolClient.js.map +1 -1
  90. package/dist/esm/clients/SpokePoolClient/EVMSpokePoolClient.js +3 -3
  91. package/dist/esm/clients/SpokePoolClient/EVMSpokePoolClient.js.map +1 -1
  92. package/dist/esm/clients/SpokePoolClient/SpokePoolClient.d.ts +5 -3
  93. package/dist/esm/clients/SpokePoolClient/SpokePoolClient.js +37 -30
  94. package/dist/esm/clients/SpokePoolClient/SpokePoolClient.js.map +1 -1
  95. package/dist/esm/clients/mocks/MockHubPoolClient.d.ts +9 -9
  96. package/dist/esm/clients/mocks/MockHubPoolClient.js +16 -10
  97. package/dist/esm/clients/mocks/MockHubPoolClient.js.map +1 -1
  98. package/dist/esm/clients/mocks/MockSpokePoolClient.d.ts +9 -13
  99. package/dist/esm/clients/mocks/MockSpokePoolClient.js +44 -60
  100. package/dist/esm/clients/mocks/MockSpokePoolClient.js.map +1 -1
  101. package/dist/esm/clients/mocks/MockSvmSpokePoolClient.d.ts +2 -2
  102. package/dist/esm/clients/mocks/MockSvmSpokePoolClient.js +3 -3
  103. package/dist/esm/clients/mocks/MockSvmSpokePoolClient.js.map +1 -1
  104. package/dist/esm/interfaces/HubPool.d.ts +18 -13
  105. package/dist/esm/interfaces/SpokePool.d.ts +14 -16
  106. package/dist/esm/interfaces/SpokePool.js.map +1 -1
  107. package/dist/esm/relayFeeCalculator/chain-queries/baseQuery.d.ts +6 -6
  108. package/dist/esm/relayFeeCalculator/chain-queries/baseQuery.js +8 -8
  109. package/dist/esm/relayFeeCalculator/chain-queries/baseQuery.js.map +1 -1
  110. package/dist/esm/relayFeeCalculator/chain-queries/svmQuery.d.ts +3 -3
  111. package/dist/esm/relayFeeCalculator/chain-queries/svmQuery.js +10 -10
  112. package/dist/esm/relayFeeCalculator/chain-queries/svmQuery.js.map +1 -1
  113. package/dist/esm/relayFeeCalculator/relayFeeCalculator.d.ts +5 -5
  114. package/dist/esm/relayFeeCalculator/relayFeeCalculator.js +8 -8
  115. package/dist/esm/relayFeeCalculator/relayFeeCalculator.js.map +1 -1
  116. package/dist/esm/utils/AddressUtils.d.ts +7 -4
  117. package/dist/esm/utils/AddressUtils.js +25 -10
  118. package/dist/esm/utils/AddressUtils.js.map +1 -1
  119. package/dist/esm/utils/SpokeUtils.d.ts +3 -8
  120. package/dist/esm/utils/SpokeUtils.js +4 -26
  121. package/dist/esm/utils/SpokeUtils.js.map +1 -1
  122. package/dist/esm/utils/TokenUtils.d.ts +4 -16
  123. package/dist/esm/utils/TokenUtils.js +3 -3
  124. package/dist/esm/utils/TokenUtils.js.map +1 -1
  125. package/dist/types/arch/evm/SpokeUtils.d.ts +2 -2
  126. package/dist/types/arch/evm/SpokeUtils.d.ts.map +1 -1
  127. package/dist/types/arch/svm/SpokeUtils.d.ts.map +1 -1
  128. package/dist/types/arch/svm/utils.d.ts +1 -1
  129. package/dist/types/arch/svm/utils.d.ts.map +1 -1
  130. package/dist/types/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.d.ts +3 -3
  131. package/dist/types/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.d.ts.map +1 -1
  132. package/dist/types/clients/BundleDataClient/BundleDataClient.d.ts +2 -2
  133. package/dist/types/clients/BundleDataClient/BundleDataClient.d.ts.map +1 -1
  134. package/dist/types/clients/BundleDataClient/utils/DataworkerUtils.d.ts.map +1 -1
  135. package/dist/types/clients/BundleDataClient/utils/FillUtils.d.ts +2 -1
  136. package/dist/types/clients/BundleDataClient/utils/FillUtils.d.ts.map +1 -1
  137. package/dist/types/clients/BundleDataClient/utils/PoolRebalanceUtils.d.ts.map +1 -1
  138. package/dist/types/clients/BundleDataClient/utils/SuperstructUtils.d.ts +63 -63
  139. package/dist/types/clients/BundleDataClient/utils/SuperstructUtils.d.ts.map +1 -1
  140. package/dist/types/clients/HubPoolClient.d.ts +22 -21
  141. package/dist/types/clients/HubPoolClient.d.ts.map +1 -1
  142. package/dist/types/clients/SpokePoolClient/EVMSpokePoolClient.d.ts.map +1 -1
  143. package/dist/types/clients/SpokePoolClient/SpokePoolClient.d.ts +5 -3
  144. package/dist/types/clients/SpokePoolClient/SpokePoolClient.d.ts.map +1 -1
  145. package/dist/types/clients/mocks/MockHubPoolClient.d.ts +9 -9
  146. package/dist/types/clients/mocks/MockHubPoolClient.d.ts.map +1 -1
  147. package/dist/types/clients/mocks/MockSpokePoolClient.d.ts +9 -13
  148. package/dist/types/clients/mocks/MockSpokePoolClient.d.ts.map +1 -1
  149. package/dist/types/clients/mocks/MockSvmSpokePoolClient.d.ts +2 -2
  150. package/dist/types/clients/mocks/MockSvmSpokePoolClient.d.ts.map +1 -1
  151. package/dist/types/interfaces/HubPool.d.ts +18 -13
  152. package/dist/types/interfaces/HubPool.d.ts.map +1 -1
  153. package/dist/types/interfaces/SpokePool.d.ts +14 -16
  154. package/dist/types/interfaces/SpokePool.d.ts.map +1 -1
  155. package/dist/types/relayFeeCalculator/chain-queries/baseQuery.d.ts +6 -6
  156. package/dist/types/relayFeeCalculator/chain-queries/baseQuery.d.ts.map +1 -1
  157. package/dist/types/relayFeeCalculator/chain-queries/svmQuery.d.ts +3 -3
  158. package/dist/types/relayFeeCalculator/chain-queries/svmQuery.d.ts.map +1 -1
  159. package/dist/types/relayFeeCalculator/relayFeeCalculator.d.ts +5 -5
  160. package/dist/types/relayFeeCalculator/relayFeeCalculator.d.ts.map +1 -1
  161. package/dist/types/utils/AddressUtils.d.ts +7 -4
  162. package/dist/types/utils/AddressUtils.d.ts.map +1 -1
  163. package/dist/types/utils/SpokeUtils.d.ts +3 -8
  164. package/dist/types/utils/SpokeUtils.d.ts.map +1 -1
  165. package/dist/types/utils/TokenUtils.d.ts +4 -16
  166. package/dist/types/utils/TokenUtils.d.ts.map +1 -1
  167. package/package.json +1 -1
  168. package/src/arch/evm/SpokeUtils.ts +22 -8
  169. package/src/arch/svm/SpokeUtils.ts +7 -8
  170. package/src/arch/svm/utils.ts +3 -3
  171. package/src/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.ts +7 -4
  172. package/src/clients/BundleDataClient/BundleDataClient.ts +49 -47
  173. package/src/clients/BundleDataClient/utils/DataworkerUtils.ts +28 -13
  174. package/src/clients/BundleDataClient/utils/FillUtils.ts +6 -4
  175. package/src/clients/BundleDataClient/utils/PoolRebalanceUtils.ts +4 -4
  176. package/src/clients/BundleDataClient/utils/SuperstructUtils.ts +13 -9
  177. package/src/clients/HubPoolClient.ts +113 -79
  178. package/src/clients/SpokePoolClient/EVMSpokePoolClient.ts +7 -1
  179. package/src/clients/SpokePoolClient/SpokePoolClient.ts +104 -37
  180. package/src/clients/mocks/MockHubPoolClient.ts +24 -19
  181. package/src/clients/mocks/MockSpokePoolClient.ts +53 -74
  182. package/src/clients/mocks/MockSvmSpokePoolClient.ts +12 -3
  183. package/src/interfaces/HubPool.ts +22 -13
  184. package/src/interfaces/SpokePool.ts +14 -17
  185. package/src/relayFeeCalculator/chain-queries/baseQuery.ts +10 -8
  186. package/src/relayFeeCalculator/chain-queries/svmQuery.ts +10 -10
  187. package/src/relayFeeCalculator/relayFeeCalculator.ts +11 -9
  188. package/src/utils/AddressUtils.ts +32 -14
  189. package/src/utils/SpokeUtils.ts +11 -33
  190. package/src/utils/TokenUtils.ts +7 -7
@@ -31,8 +31,8 @@ var MockSpokePoolClient = (function (_super) {
31
31
  this.destinationTokenForChainOverride[chainId] = token;
32
32
  };
33
33
  MockSpokePoolClient.prototype.getDestinationTokenForDeposit = function (deposit) {
34
- var _a;
35
- return (_a = this.destinationTokenForChainOverride[deposit.originChainId]) !== null && _a !== void 0 ? _a : _super.prototype.getDestinationTokenForDeposit.call(this, deposit);
34
+ var override = this.destinationTokenForChainOverride[deposit.originChainId];
35
+ return (0, utils_1.isDefined)(override) ? (0, utils_1.toAddressType)(override) : _super.prototype.getDestinationTokenForDeposit.call(this, deposit);
36
36
  };
37
37
  MockSpokePoolClient.prototype.setLatestBlockNumber = function (blockNumber) {
38
38
  this.latestHeightSearched = blockNumber;
@@ -81,30 +81,26 @@ var MockSpokePoolClient = (function (_super) {
81
81
  MockSpokePoolClient.prototype.deposit = function (deposit) {
82
82
  return this._deposit("FundsDeposited", deposit);
83
83
  };
84
- MockSpokePoolClient.prototype.depositV3 = function (deposit) {
85
- return this._deposit("V3FundsDeposited", deposit);
86
- };
87
84
  MockSpokePoolClient.prototype._deposit = function (event, deposit) {
88
- var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
85
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
89
86
  var blockNumber = deposit.blockNumber, txnIndex = deposit.txnIndex;
90
87
  var depositId = deposit.depositId, destinationChainId = deposit.destinationChainId, inputAmount = deposit.inputAmount, outputAmount = deposit.outputAmount;
91
88
  depositId !== null && depositId !== void 0 ? depositId : (depositId = this.numberOfDeposits);
92
89
  this.numberOfDeposits = depositId.add(utils_1.bnOne);
93
90
  destinationChainId !== null && destinationChainId !== void 0 ? destinationChainId : (destinationChainId = (0, lodash_1.random)(1, 42161, false));
94
- var addressModifier = event === "FundsDeposited" ? utils_1.toBytes32 : utils_1.toAddress;
95
- var depositor = addressModifier((_a = deposit.depositor) !== null && _a !== void 0 ? _a : (0, utils_1.randomAddress)());
96
- var recipient = addressModifier((_b = deposit.recipient) !== null && _b !== void 0 ? _b : depositor);
97
- var inputToken = addressModifier((_c = deposit.inputToken) !== null && _c !== void 0 ? _c : (0, utils_1.randomAddress)());
98
- var outputToken = addressModifier((_d = deposit.outputToken) !== null && _d !== void 0 ? _d : inputToken);
99
- var exclusiveRelayer = addressModifier((_e = deposit.exclusiveRelayer) !== null && _e !== void 0 ? _e : constants_1.ZERO_ADDRESS);
91
+ var depositor = (_b = (_a = deposit.depositor) === null || _a === void 0 ? void 0 : _a.toBytes32()) !== null && _b !== void 0 ? _b : (0, utils_1.toBytes32)((0, utils_1.randomAddress)());
92
+ var recipient = (_d = (_c = deposit.recipient) === null || _c === void 0 ? void 0 : _c.toBytes32()) !== null && _d !== void 0 ? _d : (0, utils_1.toBytes32)(depositor);
93
+ var inputToken = (_f = (_e = deposit.inputToken) === null || _e === void 0 ? void 0 : _e.toBytes32()) !== null && _f !== void 0 ? _f : (0, utils_1.toBytes32)((0, utils_1.randomAddress)());
94
+ var outputToken = (_h = (_g = deposit.outputToken) === null || _g === void 0 ? void 0 : _g.toBytes32()) !== null && _h !== void 0 ? _h : inputToken;
95
+ var exclusiveRelayer = (_k = (_j = deposit.exclusiveRelayer) === null || _j === void 0 ? void 0 : _j.toBytes32()) !== null && _k !== void 0 ? _k : (0, utils_1.toBytes32)(constants_1.ZERO_ADDRESS);
100
96
  inputAmount !== null && inputAmount !== void 0 ? inputAmount : (inputAmount = (0, utils_1.toBNWei)((0, lodash_1.random)(1, 1000, false)));
101
97
  outputAmount !== null && outputAmount !== void 0 ? outputAmount : (outputAmount = inputAmount.mul((0, utils_1.toBN)("0.95")));
102
- var message = (_f = deposit["message"]) !== null && _f !== void 0 ? _f : "0x";
98
+ var message = (_l = deposit.message) !== null && _l !== void 0 ? _l : "0x";
103
99
  var topics = [destinationChainId, depositId, depositor];
104
- var quoteTimestamp = (_g = deposit.quoteTimestamp) !== null && _g !== void 0 ? _g : (0, utils_1.getCurrentTime)();
100
+ var quoteTimestamp = (_m = deposit.quoteTimestamp) !== null && _m !== void 0 ? _m : (0, utils_1.getCurrentTime)();
105
101
  var args = {
106
102
  depositId: depositId,
107
- originChainId: (_h = deposit.originChainId) !== null && _h !== void 0 ? _h : this.chainId,
103
+ originChainId: (_o = deposit.originChainId) !== null && _o !== void 0 ? _o : this.chainId,
108
104
  destinationChainId: destinationChainId,
109
105
  depositor: depositor,
110
106
  recipient: recipient,
@@ -113,9 +109,9 @@ var MockSpokePoolClient = (function (_super) {
113
109
  outputToken: outputToken,
114
110
  outputAmount: outputAmount,
115
111
  quoteTimestamp: quoteTimestamp,
116
- fillDeadline: (_j = deposit.fillDeadline) !== null && _j !== void 0 ? _j : quoteTimestamp + 3600,
112
+ fillDeadline: (_p = deposit.fillDeadline) !== null && _p !== void 0 ? _p : quoteTimestamp + 3600,
117
113
  exclusiveRelayer: exclusiveRelayer,
118
- exclusivityDeadline: (_k = deposit.exclusivityDeadline) !== null && _k !== void 0 ? _k : quoteTimestamp + 600,
114
+ exclusivityDeadline: (_q = deposit.exclusivityDeadline) !== null && _q !== void 0 ? _q : quoteTimestamp + 600,
119
115
  message: message,
120
116
  };
121
117
  return this.eventManager.generateEvent({
@@ -127,14 +123,11 @@ var MockSpokePoolClient = (function (_super) {
127
123
  transactionIndex: txnIndex,
128
124
  });
129
125
  };
130
- MockSpokePoolClient.prototype.fillV3Relay = function (fill) {
131
- return this._fillRelay("FilledV3Relay", fill);
132
- };
133
126
  MockSpokePoolClient.prototype.fillRelay = function (fill) {
134
127
  return this._fillRelay("FilledRelay", fill);
135
128
  };
136
129
  MockSpokePoolClient.prototype._fillRelay = function (event, fill) {
137
- var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
130
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2;
138
131
  var blockNumber = fill.blockNumber, txnIndex = fill.txnIndex;
139
132
  var originChainId = fill.originChainId, depositId = fill.depositId, inputAmount = fill.inputAmount, outputAmount = fill.outputAmount, fillDeadline = fill.fillDeadline;
140
133
  originChainId !== null && originChainId !== void 0 ? originChainId : (originChainId = (0, lodash_1.random)(1, 42161, false));
@@ -142,43 +135,42 @@ var MockSpokePoolClient = (function (_super) {
142
135
  inputAmount !== null && inputAmount !== void 0 ? inputAmount : (inputAmount = (0, utils_1.toBNWei)((0, lodash_1.random)(1, 1000, false)));
143
136
  outputAmount !== null && outputAmount !== void 0 ? outputAmount : (outputAmount = inputAmount);
144
137
  fillDeadline !== null && fillDeadline !== void 0 ? fillDeadline : (fillDeadline = (0, utils_1.getCurrentTime)() + 60);
145
- var addressModifier = event === "FilledRelay" ? utils_1.toBytes32 : utils_1.toAddress;
146
- var depositor = addressModifier((_a = fill.depositor) !== null && _a !== void 0 ? _a : (0, utils_1.randomAddress)());
147
- var recipient = addressModifier((_b = fill.recipient) !== null && _b !== void 0 ? _b : depositor);
148
- var inputToken = addressModifier((_c = fill.inputToken) !== null && _c !== void 0 ? _c : (0, utils_1.randomAddress)());
149
- var outputToken = addressModifier((_d = fill.outputToken) !== null && _d !== void 0 ? _d : constants_1.ZERO_ADDRESS);
150
- var exclusiveRelayer = addressModifier((_e = fill.exclusiveRelayer) !== null && _e !== void 0 ? _e : constants_1.ZERO_ADDRESS);
151
- var relayer = addressModifier((_f = fill.relayer) !== null && _f !== void 0 ? _f : (0, utils_1.randomAddress)());
138
+ var depositor = (_b = (_a = fill.depositor) === null || _a === void 0 ? void 0 : _a.toBytes32()) !== null && _b !== void 0 ? _b : (0, utils_1.toBytes32)((0, utils_1.randomAddress)());
139
+ var recipient = (_d = (_c = fill.recipient) === null || _c === void 0 ? void 0 : _c.toBytes32()) !== null && _d !== void 0 ? _d : (0, utils_1.toBytes32)(depositor);
140
+ var inputToken = (_f = (_e = fill.inputToken) === null || _e === void 0 ? void 0 : _e.toBytes32()) !== null && _f !== void 0 ? _f : (0, utils_1.toBytes32)((0, utils_1.randomAddress)());
141
+ var outputToken = (_h = (_g = fill.outputToken) === null || _g === void 0 ? void 0 : _g.toBytes32()) !== null && _h !== void 0 ? _h : (0, utils_1.toBytes32)(constants_1.ZERO_ADDRESS);
142
+ var exclusiveRelayer = (_k = (_j = fill.exclusiveRelayer) === null || _j === void 0 ? void 0 : _j.toBytes32()) !== null && _k !== void 0 ? _k : (0, utils_1.toBytes32)(constants_1.ZERO_ADDRESS);
143
+ var relayer = (_m = (_l = fill.relayer) === null || _l === void 0 ? void 0 : _l.toBytes32()) !== null && _m !== void 0 ? _m : (0, utils_1.toBytes32)((0, utils_1.randomAddress)());
152
144
  var topics = [originChainId, depositId, relayer];
153
- var message = (_g = fill.message) !== null && _g !== void 0 ? _g : constants_1.EMPTY_MESSAGE;
154
- var updatedMessage = (_j = (_h = fill.relayExecutionInfo) === null || _h === void 0 ? void 0 : _h.updatedMessage) !== null && _j !== void 0 ? _j : message;
145
+ var message = (_o = fill.message) !== null && _o !== void 0 ? _o : constants_1.EMPTY_MESSAGE;
146
+ var updatedMessage = (_q = (_p = fill.relayExecutionInfo) === null || _p === void 0 ? void 0 : _p.updatedMessage) !== null && _q !== void 0 ? _q : message;
147
+ var updatedRecipient = (_s = (_r = fill.relayExecutionInfo) === null || _r === void 0 ? void 0 : _r.updatedRecipient.toBytes32()) !== null && _s !== void 0 ? _s : recipient;
155
148
  var relayExecutionInfo = {
156
- updatedRecipient: (_l = (_k = fill.relayExecutionInfo) === null || _k === void 0 ? void 0 : _k.updatedRecipient) !== null && _l !== void 0 ? _l : recipient,
157
- updatedOutputAmount: (_o = (_m = fill.relayExecutionInfo) === null || _m === void 0 ? void 0 : _m.updatedOutputAmount) !== null && _o !== void 0 ? _o : outputAmount,
158
- fillType: (_q = (_p = fill.relayExecutionInfo) === null || _p === void 0 ? void 0 : _p.fillType) !== null && _q !== void 0 ? _q : interfaces_1.FillType.FastFill,
149
+ updatedRecipient: updatedRecipient,
150
+ updatedOutputAmount: (_u = (_t = fill.relayExecutionInfo) === null || _t === void 0 ? void 0 : _t.updatedOutputAmount) !== null && _u !== void 0 ? _u : outputAmount,
151
+ fillType: (_w = (_v = fill.relayExecutionInfo) === null || _v === void 0 ? void 0 : _v.fillType) !== null && _w !== void 0 ? _w : interfaces_1.FillType.FastFill,
159
152
  };
160
153
  var _args = {
161
154
  inputToken: inputToken,
162
155
  outputToken: outputToken,
163
156
  inputAmount: fill.inputAmount,
164
157
  outputAmount: fill.outputAmount,
165
- repaymentChainId: (_r = fill.repaymentChainId) !== null && _r !== void 0 ? _r : this.chainId,
158
+ repaymentChainId: (_x = fill.repaymentChainId) !== null && _x !== void 0 ? _x : this.chainId,
166
159
  originChainId: originChainId,
167
160
  depositId: depositId,
168
161
  fillDeadline: fillDeadline,
169
- exclusivityDeadline: (_s = fill.exclusivityDeadline) !== null && _s !== void 0 ? _s : fillDeadline,
162
+ exclusivityDeadline: (_y = fill.exclusivityDeadline) !== null && _y !== void 0 ? _y : fillDeadline,
170
163
  exclusiveRelayer: exclusiveRelayer,
171
164
  relayer: relayer,
172
165
  depositor: depositor,
173
166
  recipient: recipient,
174
167
  relayExecutionInfo: {
175
- updatedRecipient: (_u = (_t = fill.relayExecutionInfo) === null || _t === void 0 ? void 0 : _t.updatedRecipient) !== null && _u !== void 0 ? _u : recipient,
176
- updatedOutputAmount: (_w = (_v = fill.relayExecutionInfo) === null || _v === void 0 ? void 0 : _v.updatedOutputAmount) !== null && _w !== void 0 ? _w : outputAmount,
177
- fillType: (_y = (_x = fill.relayExecutionInfo) === null || _x === void 0 ? void 0 : _x.fillType) !== null && _y !== void 0 ? _y : interfaces_1.FillType.FastFill,
168
+ updatedRecipient: updatedRecipient,
169
+ updatedOutputAmount: (_0 = (_z = fill.relayExecutionInfo) === null || _z === void 0 ? void 0 : _z.updatedOutputAmount) !== null && _0 !== void 0 ? _0 : outputAmount,
170
+ fillType: (_2 = (_1 = fill.relayExecutionInfo) === null || _1 === void 0 ? void 0 : _1.fillType) !== null && _2 !== void 0 ? _2 : interfaces_1.FillType.FastFill,
178
171
  },
179
172
  };
180
- var args = event === "FilledRelay"
181
- ? tslib_1.__assign(tslib_1.__assign({}, _args), { messageHash: (0, utils_1.getMessageHash)(message), relayExecutionInfo: tslib_1.__assign(tslib_1.__assign({}, relayExecutionInfo), { updatedMessageHash: (0, utils_1.getMessageHash)(updatedMessage) }) }) : tslib_1.__assign(tslib_1.__assign({}, _args), { message: message, relayExecutionInfo: tslib_1.__assign(tslib_1.__assign({}, relayExecutionInfo), { updatedMessage: updatedMessage }) });
173
+ var args = tslib_1.__assign(tslib_1.__assign({}, _args), { messageHash: (0, utils_1.getMessageHash)(message), relayExecutionInfo: tslib_1.__assign(tslib_1.__assign({}, relayExecutionInfo), { updatedMessageHash: (0, utils_1.getMessageHash)(updatedMessage) }) });
182
174
  return this.eventManager.generateEvent({
183
175
  event: event,
184
176
  address: this.spokePool.address,
@@ -188,22 +180,18 @@ var MockSpokePoolClient = (function (_super) {
188
180
  transactionIndex: txnIndex,
189
181
  });
190
182
  };
191
- MockSpokePoolClient.prototype.speedUpV3Deposit = function (speedUp) {
192
- return this._speedUpDeposit("RequestedSpeedUpV3Deposit", speedUp);
193
- };
194
183
  MockSpokePoolClient.prototype.speedUpDeposit = function (speedUp) {
195
184
  return this._speedUpDeposit("RequestedSpeedUpDeposit", speedUp);
196
185
  };
197
186
  MockSpokePoolClient.prototype._speedUpDeposit = function (event, speedUp) {
198
- var addressModifier = event === "RequestedSpeedUpDeposit" ? utils_1.toBytes32 : utils_1.toAddress;
199
- var depositor = addressModifier(speedUp.depositor);
187
+ var depositor = speedUp.depositor.toBytes32();
200
188
  var topics = [speedUp.depositId, depositor];
201
189
  var args = tslib_1.__assign({}, speedUp);
202
190
  return this.eventManager.generateEvent({
203
191
  event: event,
204
192
  address: this.spokePool.address,
205
193
  topics: topics.map(function (topic) { return topic.toString(); }),
206
- args: tslib_1.__assign(tslib_1.__assign({}, args), { depositor: depositor, updatedRecipient: addressModifier(speedUp.updatedRecipient) }),
194
+ args: tslib_1.__assign(tslib_1.__assign({}, args), { depositor: depositor, updatedRecipient: speedUp.updatedRecipient.toBytes32() }),
207
195
  });
208
196
  };
209
197
  MockSpokePoolClient.prototype.setTokensBridged = function (tokensBridged) {
@@ -217,37 +205,33 @@ var MockSpokePoolClient = (function (_super) {
217
205
  args: args,
218
206
  });
219
207
  };
220
- MockSpokePoolClient.prototype.requestV3SlowFill = function (request) {
221
- return this._requestSlowFill("RequestedV3SlowFill", request);
222
- };
223
208
  MockSpokePoolClient.prototype.requestSlowFill = function (request) {
224
209
  return this._requestSlowFill("RequestedSlowFill", request);
225
210
  };
226
211
  MockSpokePoolClient.prototype._requestSlowFill = function (event, request) {
227
- var _a, _b, _c, _d, _e;
212
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
228
213
  var originChainId = request.originChainId, depositId = request.depositId;
229
214
  var topics = [originChainId, depositId];
230
215
  var args = tslib_1.__assign({}, request);
231
- var addressModifier = event === "RequestedSlowFill" ? utils_1.toBytes32 : utils_1.toAddress;
232
- var depositor = addressModifier((_a = args.depositor) !== null && _a !== void 0 ? _a : (0, utils_1.randomAddress)());
216
+ var depositor = (_a = args.depositor.toBytes32()) !== null && _a !== void 0 ? _a : (0, utils_1.toBytes32)((0, utils_1.randomAddress)());
233
217
  return this.eventManager.generateEvent({
234
218
  event: event,
235
219
  address: this.spokePool.address,
236
220
  topics: topics.map(function (topic) { return topic.toString(); }),
237
- args: tslib_1.__assign(tslib_1.__assign({}, args), { depositor: depositor, recipient: addressModifier((_b = args.recipient) !== null && _b !== void 0 ? _b : depositor), inputToken: addressModifier((_c = args.inputToken) !== null && _c !== void 0 ? _c : (0, utils_1.randomAddress)()), outputToken: addressModifier((_d = args.outputToken) !== null && _d !== void 0 ? _d : constants_1.ZERO_ADDRESS), exclusiveRelayer: addressModifier((_e = args.exclusiveRelayer) !== null && _e !== void 0 ? _e : constants_1.ZERO_ADDRESS) }),
221
+ args: tslib_1.__assign(tslib_1.__assign({}, args), { destinationChainId: this.chainId, depositor: depositor, recipient: (_c = (_b = args.recipient) === null || _b === void 0 ? void 0 : _b.toBytes32()) !== null && _c !== void 0 ? _c : depositor, inputToken: (_e = (_d = args.inputToken) === null || _d === void 0 ? void 0 : _d.toBytes32()) !== null && _e !== void 0 ? _e : (0, utils_1.toBytes32)((0, utils_1.randomAddress)()), outputToken: (_g = (_f = args.outputToken) === null || _f === void 0 ? void 0 : _f.toBytes32()) !== null && _g !== void 0 ? _g : (0, utils_1.toBytes32)(constants_1.ZERO_ADDRESS), exclusiveRelayer: (_j = (_h = args.exclusiveRelayer) === null || _h === void 0 ? void 0 : _h.toBytes32()) !== null && _j !== void 0 ? _j : (0, utils_1.toBytes32)(constants_1.ZERO_ADDRESS), messageHash: (_k = args.messageHash) !== null && _k !== void 0 ? _k : constants_1.ZERO_BYTES }),
238
222
  blockNumber: request.blockNumber,
239
223
  transactionIndex: request.txnIndex,
240
224
  });
241
225
  };
242
- MockSpokePoolClient.prototype.executeV3SlowRelayLeaf = function (leaf) {
243
- var fill = tslib_1.__assign(tslib_1.__assign({}, leaf.relayData), { destinationChainId: this.chainId, relayer: constants_1.ZERO_ADDRESS, repaymentChainId: 0, relayExecutionInfo: {
226
+ MockSpokePoolClient.prototype.executeSlowRelayLeaf = function (leaf) {
227
+ var fill = tslib_1.__assign(tslib_1.__assign({}, leaf.relayData), { destinationChainId: this.chainId, relayer: (0, utils_1.toAddressType)(constants_1.ZERO_ADDRESS), repaymentChainId: 0, relayExecutionInfo: {
244
228
  updatedRecipient: leaf.relayData.recipient,
245
229
  updatedOutputAmount: leaf.updatedOutputAmount,
246
230
  updatedMessage: leaf.relayData.message,
247
231
  updatedMessageHash: (0, utils_1.getMessageHash)(leaf.relayData.message),
248
232
  fillType: interfaces_1.FillType.SlowFill,
249
233
  } });
250
- return this.fillV3Relay(fill);
234
+ return this.fillRelay(fill);
251
235
  };
252
236
  MockSpokePoolClient.prototype.executeRelayerRefundLeaf = function (refund) {
253
237
  var _a;
@@ -1 +1 @@
1
- {"version":3,"file":"MockSpokePoolClient.js","sourceRoot":"","sources":["../../../../src/clients/mocks/MockSpokePoolClient.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"MockSpokePoolClient.js","sourceRoot":"","sources":["../../../../src/clients/mocks/MockSpokePoolClient.ts"],"names":[],"mappings":"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"}
@@ -2,7 +2,7 @@ import winston from "winston";
2
2
  import { SvmSpokeClient } from "@across-protocol/contracts";
3
3
  import { Address } from "@solana/kit";
4
4
  import { DepositWithBlock, RelayerRefundExecution, SortableEvent, SlowFillLeaf, Log } from "../../interfaces";
5
- import { MakeOptional, EventSearchConfig } from "../../utils";
5
+ import { MakeOptional, EventSearchConfig, Address as SDKAddress } from "../../utils";
6
6
  import { SpokePoolUpdate, SVMSpokePoolClient } from "../SpokePoolClient";
7
7
  import { HubPoolClient } from "../HubPoolClient";
8
8
  import { EventOverrides } from "./MockEvents";
@@ -17,7 +17,7 @@ export declare class MockSvmSpokePoolClient extends SVMSpokePoolClient {
17
17
  });
18
18
  setConfigStoreClient(configStore?: AcrossConfigStoreClient): void;
19
19
  setDestinationTokenForChain(chainId: number, token: string): void;
20
- getDestinationTokenForDeposit(deposit: DepositWithBlock): string;
20
+ getDestinationTokenForDeposit(deposit: DepositWithBlock): SDKAddress;
21
21
  setLatestBlockNumber(blockNumber: number): void;
22
22
  _update(eventsToQuery: string[]): Promise<SpokePoolUpdate>;
23
23
  deposit(deposit: SvmSpokeClient.FundsDeposited & Partial<EventWithData>): EventWithData;
@@ -27,8 +27,8 @@ var MockSvmSpokePoolClient = (function (_super) {
27
27
  this.destinationTokenForChainOverride[chainId] = token;
28
28
  };
29
29
  MockSvmSpokePoolClient.prototype.getDestinationTokenForDeposit = function (deposit) {
30
- var _a;
31
- return (_a = this.destinationTokenForChainOverride[deposit.originChainId]) !== null && _a !== void 0 ? _a : _super.prototype.getDestinationTokenForDeposit.call(this, deposit);
30
+ var override = this.destinationTokenForChainOverride[deposit.originChainId];
31
+ return (0, utils_1.isDefined)(override) ? (0, utils_1.toAddressType)(override) : _super.prototype.getDestinationTokenForDeposit.call(this, deposit);
32
32
  };
33
33
  MockSvmSpokePoolClient.prototype.setLatestBlockNumber = function (blockNumber) {
34
34
  this.latestHeightSearched = blockNumber;
@@ -1 +1 @@
1
- {"version":3,"file":"MockSvmSpokePoolClient.js","sourceRoot":"","sources":["../../../../src/clients/mocks/MockSvmSpokePoolClient.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"MockSvmSpokePoolClient.js","sourceRoot":"","sources":["../../../../src/clients/mocks/MockSvmSpokePoolClient.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import { BigNumber } from "../utils";
1
+ import { Address, BigNumber, EvmAddress } from "../utils";
2
2
  import { SortableEvent } from "./Common";
3
3
  export interface PoolRebalanceLeaf {
4
4
  chainId: number;
@@ -7,15 +7,15 @@ export interface PoolRebalanceLeaf {
7
7
  netSendAmounts: BigNumber[];
8
8
  runningBalances: BigNumber[];
9
9
  leafId: number;
10
- l1Tokens: string[];
10
+ l1Tokens: EvmAddress[];
11
11
  }
12
12
  export interface RelayerRefundLeaf {
13
13
  amountToReturn: BigNumber;
14
14
  chainId: number;
15
15
  refundAmounts: BigNumber[];
16
16
  leafId: number;
17
- l2TokenAddress: string;
18
- refundAddresses: string[];
17
+ l2TokenAddress: Address;
18
+ refundAddresses: Address[];
19
19
  }
20
20
  export interface ProposedRootBundle extends SortableEvent {
21
21
  challengePeriodEndTimestamp: number;
@@ -47,7 +47,7 @@ export interface ExecutedRootBundle extends SortableEvent {
47
47
  netSendAmounts: BigNumber[];
48
48
  runningBalances: BigNumber[];
49
49
  leafId: number;
50
- l1Tokens: string[];
50
+ l1Tokens: EvmAddress[];
51
51
  proof: string[];
52
52
  }
53
53
  export type ExecutedRootBundleStringified = Omit<ExecutedRootBundle, "bundleLpFees" | "netSendAmounts" | "runningBalances"> & {
@@ -61,8 +61,13 @@ export type TokenRunningBalance = {
61
61
  export interface RelayerRefundLeafWithGroup extends RelayerRefundLeaf {
62
62
  groupIndex: number;
63
63
  }
64
- export interface L1Token {
65
- address: string;
64
+ export interface L1TokenInfo {
65
+ address: EvmAddress;
66
+ symbol: string;
67
+ decimals: number;
68
+ }
69
+ export interface TokenInfo {
70
+ address: Address;
66
71
  symbol: string;
67
72
  decimals: number;
68
73
  }
@@ -72,22 +77,22 @@ export interface LpToken {
72
77
  }
73
78
  export interface CrossChainContractsSet extends SortableEvent {
74
79
  l2ChainId: number;
75
- spokePool: string;
80
+ spokePool: Address;
76
81
  }
77
82
  export interface DestinationTokenWithBlock extends SortableEvent {
78
- l2Token: string;
79
- l1Token: string;
83
+ l2Token: Address;
84
+ l1Token: EvmAddress;
80
85
  }
81
86
  export interface SetPoolRebalanceRoot extends SortableEvent {
82
87
  destinationChainId: number;
83
- l1Token: string;
84
- destinationToken: string;
88
+ l1Token: EvmAddress;
89
+ destinationToken: Address;
85
90
  }
86
91
  export interface PendingRootBundle {
87
92
  poolRebalanceRoot: string;
88
93
  relayerRefundRoot: string;
89
94
  slowRelayRoot: string;
90
- proposer: string;
95
+ proposer: EvmAddress;
91
96
  unclaimedPoolRebalanceLeafCount: number;
92
97
  challengePeriodEndTimestamp: number;
93
98
  bundleEvaluationBlockNumbers: number[];
@@ -1,21 +1,19 @@
1
1
  import { SortableEvent } from "./Common";
2
- import { FilledV3RelayEvent, V3FundsDepositedEvent } from "../typechain";
3
2
  import { SpokePoolClient } from "../clients";
4
- import { BigNumber } from "../utils";
3
+ import { BigNumber, Address, EvmAddress } from "../utils";
5
4
  import { RelayerRefundLeaf } from "./HubPool";
6
- export type { FilledV3RelayEvent, V3FundsDepositedEvent };
7
5
  export interface RelayData {
8
6
  originChainId: number;
9
- depositor: string;
10
- recipient: string;
7
+ depositor: Address;
8
+ recipient: Address;
11
9
  depositId: BigNumber;
12
- inputToken: string;
10
+ inputToken: Address;
13
11
  inputAmount: BigNumber;
14
- outputToken: string;
12
+ outputToken: Address;
15
13
  outputAmount: BigNumber;
16
14
  message: string;
17
15
  fillDeadline: number;
18
- exclusiveRelayer: string;
16
+ exclusiveRelayer: Address;
19
17
  exclusivityDeadline: number;
20
18
  }
21
19
  export interface Deposit extends RelayData {
@@ -23,7 +21,7 @@ export interface Deposit extends RelayData {
23
21
  destinationChainId: number;
24
22
  quoteTimestamp: number;
25
23
  speedUpSignature?: string;
26
- updatedRecipient?: string;
24
+ updatedRecipient?: Address;
27
25
  updatedOutputAmount?: BigNumber;
28
26
  updatedMessage?: string;
29
27
  fromLiteChain: boolean;
@@ -46,7 +44,7 @@ export declare enum FillType {
46
44
  SlowFill = 2
47
45
  }
48
46
  export interface RelayExecutionEventInfo {
49
- updatedRecipient: string;
47
+ updatedRecipient: Address;
50
48
  updatedOutputAmount: BigNumber;
51
49
  updatedMessage?: string;
52
50
  updatedMessageHash: string;
@@ -55,7 +53,7 @@ export interface RelayExecutionEventInfo {
55
53
  export interface Fill extends Omit<RelayData, "message"> {
56
54
  messageHash: string;
57
55
  destinationChainId: number;
58
- relayer: string;
56
+ relayer: Address;
59
57
  repaymentChainId: number;
60
58
  relayExecutionInfo: RelayExecutionEventInfo;
61
59
  }
@@ -65,24 +63,24 @@ export interface FillWithTime extends Fill, SortableEvent {
65
63
  fillTimestamp: number;
66
64
  }
67
65
  export interface EnabledDepositRoute {
68
- originToken: string;
66
+ originToken: Address;
69
67
  destinationChainId: number;
70
68
  enabled: boolean;
71
69
  }
72
70
  export interface EnabledDepositRouteWithBlock extends EnabledDepositRoute, SortableEvent {
73
71
  }
74
72
  export interface SpeedUp {
75
- depositor: string;
73
+ depositor: EvmAddress;
76
74
  depositorSignature: string;
77
75
  depositId: BigNumber;
78
76
  originChainId: number;
79
- updatedRecipient: string;
77
+ updatedRecipient: Address;
80
78
  updatedOutputAmount: BigNumber;
81
79
  updatedMessage: string;
82
80
  }
83
81
  export interface SpeedUpWithBlock extends SpeedUp, SortableEvent {
84
82
  }
85
- export interface SlowFillRequest extends RelayData {
83
+ export interface SlowFillRequest extends Omit<RelayData, "message"> {
86
84
  messageHash: string;
87
85
  destinationChainId: number;
88
86
  }
@@ -117,7 +115,7 @@ export interface TokensBridged extends SortableEvent {
117
115
  amountToReturn: BigNumber;
118
116
  chainId: number;
119
117
  leafId: number;
120
- l2TokenAddress: string;
118
+ l2TokenAddress: Address;
121
119
  }
122
120
  export interface SpokePoolClientsByChain {
123
121
  [chainId: number]: SpokePoolClient;
@@ -1 +1 @@
1
- {"version":3,"file":"SpokePool.js","sourceRoot":"","sources":["../../../src/interfaces/SpokePool.ts"],"names":[],"mappings":";;;AA2CA,IAAY,UAIX;AAJD,WAAY,UAAU;IACpB,mDAAY,CAAA;IACZ,qEAAiB,CAAA;IACjB,+CAAM,CAAA;AACR,CAAC,EAJW,UAAU,0BAAV,UAAU,QAIrB;AAED,IAAY,QAIX;AAJD,WAAY,QAAQ;IAClB,+CAAY,CAAA;IACZ,+DAAgB,CAAA;IAChB,+CAAQ,CAAA;AACV,CAAC,EAJW,QAAQ,wBAAR,QAAQ,QAInB"}
1
+ {"version":3,"file":"SpokePool.js","sourceRoot":"","sources":["../../../src/interfaces/SpokePool.ts"],"names":[],"mappings":";;;AAwCA,IAAY,UAIX;AAJD,WAAY,UAAU;IACpB,mDAAY,CAAA;IACZ,qEAAiB,CAAA;IACjB,+CAAM,CAAA;AACR,CAAC,EAJW,UAAU,0BAAV,UAAU,QAIrB;AAED,IAAY,QAIX;AAJD,WAAY,QAAQ;IAClB,+CAAY,CAAA;IACZ,+DAAgB,CAAA;IAChB,+CAAQ,CAAA;AACV,CAAC,EAJW,QAAQ,wBAAR,QAAQ,QAInB"}
@@ -2,7 +2,7 @@ import { L2Provider } from "@eth-optimism/sdk/dist/interfaces/l2-provider";
2
2
  import { PopulatedTransaction, providers } from "ethers";
3
3
  import { Deposit } from "../../interfaces";
4
4
  import { SpokePool } from "../../typechain";
5
- import { BigNumberish, TransactionCostEstimate, BigNumber } from "../../utils";
5
+ import { BigNumberish, TransactionCostEstimate, BigNumber, Address } from "../../utils";
6
6
  import { Logger, QueryInterface } from "../relayFeeCalculator";
7
7
  import { Transport } from "viem";
8
8
  import { EvmProvider } from "../../arch/evm/types";
@@ -21,7 +21,7 @@ export declare class QueryBase implements QueryInterface {
21
21
  readonly coingeckoBaseCurrency: string;
22
22
  readonly spokePool: SpokePool;
23
23
  constructor(provider: EvmProvider, symbolMapping: SymbolMappingType, spokePoolAddress: string, simulatedRelayerAddress: string, logger: Logger, coingeckoProApiKey?: string | undefined, fixedGasPrice?: BigNumberish | undefined, coingeckoBaseCurrency?: string);
24
- getGasCosts(deposit: Omit<Deposit, "messageHash">, relayer?: string, options?: Partial<{
24
+ getGasCosts(deposit: Omit<Deposit, "messageHash">, relayer?: import("../../utils").SvmAddress | Address | import("../../utils").EvmAddress, options?: Partial<{
25
25
  gasPrice: BigNumberish;
26
26
  gasUnits: BigNumberish;
27
27
  baseFeeMultiplier: BigNumber;
@@ -29,13 +29,13 @@ export declare class QueryBase implements QueryInterface {
29
29
  opStackL1GasCostMultiplier: BigNumber;
30
30
  transport: Transport;
31
31
  }>): Promise<TransactionCostEstimate>;
32
- getUnsignedTxFromDeposit(deposit: Omit<Deposit, "messageHash">, relayer?: string): Promise<PopulatedTransaction>;
33
- getNativeGasCost(deposit: Omit<Deposit, "messageHash">, relayer?: string): Promise<BigNumber>;
34
- getOpStackL1DataFee(unsignedTx: PopulatedTransaction, relayer: string | undefined, options: Partial<{
32
+ getUnsignedTxFromDeposit(deposit: Omit<Deposit, "messageHash">, relayer?: import("../../utils").SvmAddress | Address | import("../../utils").EvmAddress): Promise<PopulatedTransaction>;
33
+ getNativeGasCost(deposit: Omit<Deposit, "messageHash">, relayer?: import("../../utils").SvmAddress | Address | import("../../utils").EvmAddress): Promise<BigNumber>;
34
+ getOpStackL1DataFee(unsignedTx: PopulatedTransaction, relayer: import("../../utils").SvmAddress | Address | import("../../utils").EvmAddress | undefined, options: Partial<{
35
35
  opStackL2GasUnits: BigNumberish;
36
36
  opStackL1DataFeeMultiplier: BigNumber;
37
37
  }>): Promise<BigNumber>;
38
- estimateGas(unsignedTx: PopulatedTransaction, senderAddress: string, provider: providers.Provider | L2Provider<providers.Provider>, options?: Partial<{
38
+ estimateGas(unsignedTx: PopulatedTransaction, senderAddress: Address, provider: providers.Provider | L2Provider<providers.Provider>, options?: Partial<{
39
39
  gasPrice: BigNumberish;
40
40
  gasUnits: BigNumberish;
41
41
  baseFeeMultiplier: BigNumber;
@@ -26,7 +26,7 @@ var QueryBase = (function () {
26
26
  this.spokePool = typechain_1.SpokePool__factory.connect(spokePoolAddress, provider);
27
27
  }
28
28
  QueryBase.prototype.getGasCosts = function (deposit, relayer, options) {
29
- if (relayer === void 0) { relayer = (0, relayFeeCalculator_1.getDefaultSimulatedRelayerAddress)(deposit.destinationChainId); }
29
+ if (relayer === void 0) { relayer = (0, utils_1.toAddressType)((0, relayFeeCalculator_1.getDefaultSimulatedRelayerAddress)(deposit.destinationChainId)); }
30
30
  if (options === void 0) { options = {}; }
31
31
  return tslib_1.__awaiter(this, void 0, void 0, function () {
32
32
  var _a, gasPrice, gasUnits, baseFeeMultiplier, priorityFeeMultiplier, opStackL1GasCostMultiplier, transport, tx, _b, nativeGasCost, tokenGasCost, impliedGasPrice, opStackL1GasCost;
@@ -58,11 +58,11 @@ var QueryBase = (function () {
58
58
  });
59
59
  };
60
60
  QueryBase.prototype.getUnsignedTxFromDeposit = function (deposit, relayer) {
61
- if (relayer === void 0) { relayer = (0, relayFeeCalculator_1.getDefaultSimulatedRelayerAddress)(deposit.destinationChainId); }
61
+ if (relayer === void 0) { relayer = (0, utils_1.toAddressType)((0, relayFeeCalculator_1.getDefaultSimulatedRelayerAddress)(deposit.destinationChainId)); }
62
62
  return (0, evm_1.populateV3Relay)(this.spokePool, deposit, relayer);
63
63
  };
64
64
  QueryBase.prototype.getNativeGasCost = function (deposit, relayer) {
65
- if (relayer === void 0) { relayer = (0, relayFeeCalculator_1.getDefaultSimulatedRelayerAddress)(deposit.destinationChainId); }
65
+ if (relayer === void 0) { relayer = (0, utils_1.toAddressType)((0, relayFeeCalculator_1.getDefaultSimulatedRelayerAddress)(deposit.destinationChainId)); }
66
66
  return tslib_1.__awaiter(this, void 0, void 0, function () {
67
67
  var unsignedTx, voidSigner;
68
68
  return tslib_1.__generator(this, function (_a) {
@@ -70,14 +70,14 @@ var QueryBase = (function () {
70
70
  case 0: return [4, this.getUnsignedTxFromDeposit(deposit, relayer)];
71
71
  case 1:
72
72
  unsignedTx = _a.sent();
73
- voidSigner = new ethers_1.VoidSigner(relayer, this.provider);
73
+ voidSigner = new ethers_1.VoidSigner(relayer.toEvmAddress(), this.provider);
74
74
  return [2, voidSigner.estimateGas(unsignedTx)];
75
75
  }
76
76
  });
77
77
  });
78
78
  };
79
79
  QueryBase.prototype.getOpStackL1DataFee = function (unsignedTx, relayer, options) {
80
- if (relayer === void 0) { relayer = (0, relayFeeCalculator_1.getDefaultSimulatedRelayerAddress)(unsignedTx.chainId); }
80
+ if (relayer === void 0) { relayer = (0, utils_1.toAddressType)((0, relayFeeCalculator_1.getDefaultSimulatedRelayerAddress)(unsignedTx.chainId)); }
81
81
  return tslib_1.__awaiter(this, void 0, void 0, function () {
82
82
  var _a, opStackL2GasUnits, _b, opStackL1DataFeeMultiplier, chainId, voidSigner, populatedTransaction, l1DataFee;
83
83
  return tslib_1.__generator(this, function (_c) {
@@ -88,7 +88,7 @@ var QueryBase = (function () {
88
88
  case 1:
89
89
  chainId = (_c.sent()).chainId;
90
90
  (0, assert_1.default)((0, l2_provider_1.isL2Provider)(this.provider), "Unexpected provider for chain ID ".concat(chainId, "."));
91
- voidSigner = new ethers_1.VoidSigner(relayer, this.provider);
91
+ voidSigner = new ethers_1.VoidSigner(relayer.toEvmAddress(), this.provider);
92
92
  return [4, voidSigner.populateTransaction(tslib_1.__assign(tslib_1.__assign({}, unsignedTx), { gasLimit: opStackL2GasUnits }))];
93
93
  case 2:
94
94
  populatedTransaction = _c.sent();
@@ -111,7 +111,7 @@ var QueryBase = (function () {
111
111
  return [4, provider.getNetwork()];
112
112
  case 1:
113
113
  chainId = (_f.sent()).chainId;
114
- voidSigner = new ethers_1.VoidSigner(senderAddress, provider);
114
+ voidSigner = new ethers_1.VoidSigner(senderAddress.toEvmAddress(), provider);
115
115
  queries = [
116
116
  gasUnits ? Promise.resolve(utils_1.BigNumber.from(gasUnits)) : voidSigner.estimateGas(unsignedTx),
117
117
  _gasPrice