@across-protocol/sdk 4.0.3-beta.0 → 4.0.4

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 (109) hide show
  1. package/dist/cjs/clients/BundleDataClient/BundleDataClient.d.ts +2 -1
  2. package/dist/cjs/clients/BundleDataClient/BundleDataClient.js +25 -9
  3. package/dist/cjs/clients/BundleDataClient/BundleDataClient.js.map +1 -1
  4. package/dist/cjs/clients/BundleDataClient/utils/FillUtils.d.ts +1 -1
  5. package/dist/cjs/clients/BundleDataClient/utils/FillUtils.js +4 -4
  6. package/dist/cjs/clients/BundleDataClient/utils/FillUtils.js.map +1 -1
  7. package/dist/cjs/clients/BundleDataClient/utils/SuperstructUtils.d.ts +6 -3
  8. package/dist/cjs/clients/BundleDataClient/utils/SuperstructUtils.js +5 -4
  9. package/dist/cjs/clients/BundleDataClient/utils/SuperstructUtils.js.map +1 -1
  10. package/dist/cjs/clients/SpokePoolClient.d.ts +1 -1
  11. package/dist/cjs/clients/SpokePoolClient.js +130 -84
  12. package/dist/cjs/clients/SpokePoolClient.js.map +1 -1
  13. package/dist/cjs/clients/mocks/MockSpokePoolClient.d.ts +16 -2
  14. package/dist/cjs/clients/mocks/MockSpokePoolClient.js +77 -35
  15. package/dist/cjs/clients/mocks/MockSpokePoolClient.js.map +1 -1
  16. package/dist/cjs/constants.d.ts +2 -1
  17. package/dist/cjs/constants.js +3 -2
  18. package/dist/cjs/constants.js.map +1 -1
  19. package/dist/cjs/interfaces/SpokePool.d.ts +4 -2
  20. package/dist/cjs/package.json +1 -0
  21. package/dist/cjs/utils/AddressUtils.d.ts +1 -0
  22. package/dist/cjs/utils/AddressUtils.js +5 -1
  23. package/dist/cjs/utils/AddressUtils.js.map +1 -1
  24. package/dist/cjs/utils/CachingUtils.js +1 -1
  25. package/dist/cjs/utils/CachingUtils.js.map +1 -1
  26. package/dist/cjs/utils/DepositUtils.d.ts +1 -1
  27. package/dist/cjs/utils/DepositUtils.js +11 -8
  28. package/dist/cjs/utils/DepositUtils.js.map +1 -1
  29. package/dist/cjs/utils/FlowUtils.d.ts +4 -3
  30. package/dist/cjs/utils/FlowUtils.js +5 -1
  31. package/dist/cjs/utils/FlowUtils.js.map +1 -1
  32. package/dist/cjs/utils/SpokeUtils.d.ts +6 -3
  33. package/dist/cjs/utils/SpokeUtils.js +2 -2
  34. package/dist/cjs/utils/SpokeUtils.js.map +1 -1
  35. package/dist/esm/clients/BundleDataClient/BundleDataClient.d.ts +2 -1
  36. package/dist/esm/clients/BundleDataClient/BundleDataClient.js +29 -13
  37. package/dist/esm/clients/BundleDataClient/BundleDataClient.js.map +1 -1
  38. package/dist/esm/clients/BundleDataClient/utils/FillUtils.d.ts +1 -1
  39. package/dist/esm/clients/BundleDataClient/utils/FillUtils.js +2 -2
  40. package/dist/esm/clients/BundleDataClient/utils/FillUtils.js.map +1 -1
  41. package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.d.ts +6 -3
  42. package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.js +3 -2
  43. package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.js.map +1 -1
  44. package/dist/esm/clients/SpokePoolClient.d.ts +1 -6
  45. package/dist/esm/clients/SpokePoolClient.js +138 -94
  46. package/dist/esm/clients/SpokePoolClient.js.map +1 -1
  47. package/dist/esm/clients/mocks/MockSpokePoolClient.d.ts +16 -2
  48. package/dist/esm/clients/mocks/MockSpokePoolClient.js +79 -37
  49. package/dist/esm/clients/mocks/MockSpokePoolClient.js.map +1 -1
  50. package/dist/esm/constants.d.ts +2 -1
  51. package/dist/esm/constants.js +6 -1
  52. package/dist/esm/constants.js.map +1 -1
  53. package/dist/esm/interfaces/SpokePool.d.ts +4 -2
  54. package/dist/esm/package.json +1 -0
  55. package/dist/esm/utils/AddressUtils.d.ts +1 -0
  56. package/dist/esm/utils/AddressUtils.js +7 -4
  57. package/dist/esm/utils/AddressUtils.js.map +1 -1
  58. package/dist/esm/utils/CachingUtils.js +2 -2
  59. package/dist/esm/utils/CachingUtils.js.map +1 -1
  60. package/dist/esm/utils/DepositUtils.d.ts +1 -1
  61. package/dist/esm/utils/DepositUtils.js +12 -9
  62. package/dist/esm/utils/DepositUtils.js.map +1 -1
  63. package/dist/esm/utils/FlowUtils.d.ts +4 -3
  64. package/dist/esm/utils/FlowUtils.js +6 -1
  65. package/dist/esm/utils/FlowUtils.js.map +1 -1
  66. package/dist/esm/utils/SpokeUtils.d.ts +6 -3
  67. package/dist/esm/utils/SpokeUtils.js +2 -2
  68. package/dist/esm/utils/SpokeUtils.js.map +1 -1
  69. package/dist/esm/utils/abi/typechain/Multicall3.d.ts +4 -1
  70. package/dist/esm/utils/abi/typechain/factories/Multicall3__factory.js.map +1 -1
  71. package/dist/types/clients/BundleDataClient/BundleDataClient.d.ts +2 -1
  72. package/dist/types/clients/BundleDataClient/BundleDataClient.d.ts.map +1 -1
  73. package/dist/types/clients/BundleDataClient/utils/FillUtils.d.ts +1 -1
  74. package/dist/types/clients/BundleDataClient/utils/FillUtils.d.ts.map +1 -1
  75. package/dist/types/clients/BundleDataClient/utils/SuperstructUtils.d.ts +6 -3
  76. package/dist/types/clients/BundleDataClient/utils/SuperstructUtils.d.ts.map +1 -1
  77. package/dist/types/clients/SpokePoolClient.d.ts +1 -6
  78. package/dist/types/clients/SpokePoolClient.d.ts.map +1 -1
  79. package/dist/types/clients/mocks/MockSpokePoolClient.d.ts +16 -2
  80. package/dist/types/clients/mocks/MockSpokePoolClient.d.ts.map +1 -1
  81. package/dist/types/constants.d.ts +2 -1
  82. package/dist/types/constants.d.ts.map +1 -1
  83. package/dist/types/interfaces/SpokePool.d.ts +4 -2
  84. package/dist/types/interfaces/SpokePool.d.ts.map +1 -1
  85. package/dist/types/utils/AddressUtils.d.ts +1 -0
  86. package/dist/types/utils/AddressUtils.d.ts.map +1 -1
  87. package/dist/types/utils/DepositUtils.d.ts +1 -1
  88. package/dist/types/utils/DepositUtils.d.ts.map +1 -1
  89. package/dist/types/utils/FlowUtils.d.ts +4 -3
  90. package/dist/types/utils/FlowUtils.d.ts.map +1 -1
  91. package/dist/types/utils/SpokeUtils.d.ts +6 -3
  92. package/dist/types/utils/SpokeUtils.d.ts.map +1 -1
  93. package/dist/types/utils/abi/typechain/Multicall3.d.ts +4 -1
  94. package/dist/types/utils/abi/typechain/Multicall3.d.ts.map +1 -1
  95. package/dist/types/utils/abi/typechain/common.d.ts.map +1 -1
  96. package/dist/types/utils/abi/typechain/factories/Multicall3__factory.d.ts.map +1 -1
  97. package/package.json +1 -1
  98. package/src/clients/BundleDataClient/BundleDataClient.ts +30 -13
  99. package/src/clients/BundleDataClient/utils/FillUtils.ts +2 -2
  100. package/src/clients/BundleDataClient/utils/SuperstructUtils.ts +6 -3
  101. package/src/clients/SpokePoolClient.ts +71 -34
  102. package/src/clients/mocks/MockSpokePoolClient.ts +125 -29
  103. package/src/constants.ts +6 -1
  104. package/src/interfaces/SpokePool.ts +4 -2
  105. package/src/utils/AddressUtils.ts +8 -4
  106. package/src/utils/CachingUtils.ts +2 -2
  107. package/src/utils/DepositUtils.ts +8 -3
  108. package/src/utils/FlowUtils.ts +10 -4
  109. package/src/utils/SpokeUtils.ts +7 -4
@@ -80,36 +80,44 @@ var MockSpokePoolClient = (function (_super) {
80
80
  searchEndBlock: this.eventSearchConfig.toBlock || latestBlockSearched,
81
81
  });
82
82
  };
83
+ MockSpokePoolClient.prototype.deposit = function (deposit) {
84
+ return this._deposit("FundsDeposited", deposit);
85
+ };
83
86
  MockSpokePoolClient.prototype.depositV3 = function (deposit) {
84
- var _a, _b, _c, _d, _e, _f, _g;
85
- var event = "V3FundsDeposited";
87
+ return this._deposit("V3FundsDeposited", deposit);
88
+ };
89
+ MockSpokePoolClient.prototype._deposit = function (event, deposit) {
90
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
86
91
  var blockNumber = deposit.blockNumber, transactionIndex = deposit.transactionIndex;
87
- var depositId = deposit.depositId, depositor = deposit.depositor, destinationChainId = deposit.destinationChainId, inputToken = deposit.inputToken, inputAmount = deposit.inputAmount, outputToken = deposit.outputToken, outputAmount = deposit.outputAmount;
92
+ var depositId = deposit.depositId, destinationChainId = deposit.destinationChainId, inputAmount = deposit.inputAmount, outputAmount = deposit.outputAmount;
88
93
  depositId !== null && depositId !== void 0 ? depositId : (depositId = this.numberOfDeposits);
89
94
  this.numberOfDeposits = depositId.add(utils_1.bnOne);
90
95
  destinationChainId !== null && destinationChainId !== void 0 ? destinationChainId : (destinationChainId = (0, lodash_1.random)(1, 42161, false));
91
- depositor !== null && depositor !== void 0 ? depositor : (depositor = (0, utils_1.randomAddress)());
92
- inputToken !== null && inputToken !== void 0 ? inputToken : (inputToken = (0, utils_1.randomAddress)());
93
- outputToken !== null && outputToken !== void 0 ? outputToken : (outputToken = inputToken);
96
+ var addressModifier = event === "FundsDeposited" ? utils_1.toBytes32 : utils_1.toAddress;
97
+ var depositor = addressModifier((_a = deposit.depositor) !== null && _a !== void 0 ? _a : (0, utils_1.randomAddress)());
98
+ var recipient = addressModifier((_b = deposit.recipient) !== null && _b !== void 0 ? _b : depositor);
99
+ var inputToken = addressModifier((_c = deposit.inputToken) !== null && _c !== void 0 ? _c : (0, utils_1.randomAddress)());
100
+ var outputToken = addressModifier((_d = deposit.outputToken) !== null && _d !== void 0 ? _d : inputToken);
101
+ var exclusiveRelayer = addressModifier((_e = deposit.exclusiveRelayer) !== null && _e !== void 0 ? _e : constants_1.ZERO_ADDRESS);
94
102
  inputAmount !== null && inputAmount !== void 0 ? inputAmount : (inputAmount = (0, utils_1.toBNWei)((0, lodash_1.random)(1, 1000, false)));
95
103
  outputAmount !== null && outputAmount !== void 0 ? outputAmount : (outputAmount = inputAmount.mul((0, utils_1.toBN)("0.95")));
96
- var message = (_a = deposit["message"]) !== null && _a !== void 0 ? _a : "0x";
104
+ var message = (_f = deposit["message"]) !== null && _f !== void 0 ? _f : "0x";
97
105
  var topics = [destinationChainId, depositId, depositor];
98
- var quoteTimestamp = (_b = deposit.quoteTimestamp) !== null && _b !== void 0 ? _b : (0, utils_1.getCurrentTime)();
106
+ var quoteTimestamp = (_g = deposit.quoteTimestamp) !== null && _g !== void 0 ? _g : (0, utils_1.getCurrentTime)();
99
107
  var args = {
100
108
  depositId: depositId,
101
- originChainId: (_c = deposit.originChainId) !== null && _c !== void 0 ? _c : this.chainId,
109
+ originChainId: (_h = deposit.originChainId) !== null && _h !== void 0 ? _h : this.chainId,
102
110
  destinationChainId: destinationChainId,
103
111
  depositor: depositor,
104
- recipient: (_d = deposit.recipient) !== null && _d !== void 0 ? _d : depositor,
112
+ recipient: recipient,
105
113
  inputToken: inputToken,
106
114
  inputAmount: inputAmount,
107
115
  outputToken: outputToken,
108
116
  outputAmount: outputAmount,
109
117
  quoteTimestamp: quoteTimestamp,
110
- fillDeadline: (_e = deposit.fillDeadline) !== null && _e !== void 0 ? _e : quoteTimestamp + 3600,
111
- exclusiveRelayer: (_f = deposit.exclusiveRelayer) !== null && _f !== void 0 ? _f : constants_1.ZERO_ADDRESS,
112
- exclusivityDeadline: (_g = deposit.exclusivityDeadline) !== null && _g !== void 0 ? _g : quoteTimestamp + 600,
118
+ fillDeadline: (_j = deposit.fillDeadline) !== null && _j !== void 0 ? _j : quoteTimestamp + 3600,
119
+ exclusiveRelayer: exclusiveRelayer,
120
+ exclusivityDeadline: (_k = deposit.exclusivityDeadline) !== null && _k !== void 0 ? _k : quoteTimestamp + 600,
113
121
  message: message,
114
122
  };
115
123
  return this.eventManager.generateEvent({
@@ -122,42 +130,60 @@ var MockSpokePoolClient = (function (_super) {
122
130
  });
123
131
  };
124
132
  MockSpokePoolClient.prototype.fillV3Relay = function (fill) {
125
- var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
126
- var event = "FilledV3Relay";
133
+ return this._fillRelay("FilledV3Relay", fill);
134
+ };
135
+ MockSpokePoolClient.prototype.fillRelay = function (fill) {
136
+ return this._fillRelay("FilledRelay", fill);
137
+ };
138
+ MockSpokePoolClient.prototype._fillRelay = function (event, fill) {
139
+ 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;
127
140
  var blockNumber = fill.blockNumber, transactionIndex = fill.transactionIndex;
128
- var originChainId = fill.originChainId, depositId = fill.depositId, inputToken = fill.inputToken, inputAmount = fill.inputAmount, outputAmount = fill.outputAmount, fillDeadline = fill.fillDeadline, relayer = fill.relayer;
141
+ var originChainId = fill.originChainId, depositId = fill.depositId, inputAmount = fill.inputAmount, outputAmount = fill.outputAmount, fillDeadline = fill.fillDeadline;
129
142
  originChainId !== null && originChainId !== void 0 ? originChainId : (originChainId = (0, lodash_1.random)(1, 42161, false));
130
143
  depositId !== null && depositId !== void 0 ? depositId : (depositId = utils_1.BigNumber.from((0, lodash_1.random)(1, 100000, false)));
131
- inputToken !== null && inputToken !== void 0 ? inputToken : (inputToken = (0, utils_1.randomAddress)());
132
144
  inputAmount !== null && inputAmount !== void 0 ? inputAmount : (inputAmount = (0, utils_1.toBNWei)((0, lodash_1.random)(1, 1000, false)));
133
145
  outputAmount !== null && outputAmount !== void 0 ? outputAmount : (outputAmount = inputAmount);
134
146
  fillDeadline !== null && fillDeadline !== void 0 ? fillDeadline : (fillDeadline = (0, utils_1.getCurrentTime)() + 60);
135
- relayer !== null && relayer !== void 0 ? relayer : (relayer = (0, utils_1.randomAddress)());
147
+ var addressModifier = event === "FilledRelay" ? utils_1.toBytes32 : utils_1.toAddress;
148
+ var depositor = addressModifier((_a = fill.depositor) !== null && _a !== void 0 ? _a : (0, utils_1.randomAddress)());
149
+ var recipient = addressModifier((_b = fill.recipient) !== null && _b !== void 0 ? _b : depositor);
150
+ var inputToken = addressModifier((_c = fill.inputToken) !== null && _c !== void 0 ? _c : (0, utils_1.randomAddress)());
151
+ var outputToken = addressModifier((_d = fill.outputToken) !== null && _d !== void 0 ? _d : constants_1.ZERO_ADDRESS);
152
+ var exclusiveRelayer = addressModifier((_e = fill.exclusiveRelayer) !== null && _e !== void 0 ? _e : constants_1.ZERO_ADDRESS);
153
+ var relayer = addressModifier((_f = fill.relayer) !== null && _f !== void 0 ? _f : (0, utils_1.randomAddress)());
136
154
  var topics = [originChainId, depositId, relayer];
137
- var recipient = (_a = fill.recipient) !== null && _a !== void 0 ? _a : (0, utils_1.randomAddress)();
138
- var message = (_b = fill["message"]) !== null && _b !== void 0 ? _b : "0x";
139
- var args = {
155
+ var message = (_g = fill["message"]) !== null && _g !== void 0 ? _g : "0x";
156
+ var updatedMessage = (_j = (_h = fill.relayExecutionInfo) === null || _h === void 0 ? void 0 : _h.updatedMessage) !== null && _j !== void 0 ? _j : message;
157
+ var relayExecutionInfo = {
158
+ updatedRecipient: (_l = (_k = fill.relayExecutionInfo) === null || _k === void 0 ? void 0 : _k.updatedRecipient) !== null && _l !== void 0 ? _l : recipient,
159
+ updatedOutputAmount: (_o = (_m = fill.relayExecutionInfo) === null || _m === void 0 ? void 0 : _m.updatedOutputAmount) !== null && _o !== void 0 ? _o : outputAmount,
160
+ fillType: (_q = (_p = fill.relayExecutionInfo) === null || _p === void 0 ? void 0 : _p.fillType) !== null && _q !== void 0 ? _q : interfaces_1.FillType.FastFill,
161
+ };
162
+ var _args = {
140
163
  inputToken: inputToken,
141
- outputToken: (_c = fill.outputToken) !== null && _c !== void 0 ? _c : constants_1.ZERO_ADDRESS,
164
+ outputToken: outputToken,
142
165
  inputAmount: fill.inputAmount,
143
166
  outputAmount: fill.outputAmount,
144
- repaymentChainId: (_d = fill.repaymentChainId) !== null && _d !== void 0 ? _d : this.chainId,
167
+ repaymentChainId: (_r = fill.repaymentChainId) !== null && _r !== void 0 ? _r : this.chainId,
145
168
  originChainId: originChainId,
146
169
  depositId: depositId,
147
170
  fillDeadline: fillDeadline,
148
- exclusivityDeadline: (_e = fill.exclusivityDeadline) !== null && _e !== void 0 ? _e : fillDeadline,
149
- exclusiveRelayer: (_f = fill.exclusiveRelayer) !== null && _f !== void 0 ? _f : constants_1.ZERO_ADDRESS,
171
+ exclusivityDeadline: (_s = fill.exclusivityDeadline) !== null && _s !== void 0 ? _s : fillDeadline,
172
+ exclusiveRelayer: exclusiveRelayer,
150
173
  relayer: relayer,
151
- depositor: (_g = fill.depositor) !== null && _g !== void 0 ? _g : (0, utils_1.randomAddress)(),
174
+ depositor: depositor,
152
175
  recipient: recipient,
153
176
  message: message,
154
177
  relayExecutionInfo: {
155
- updatedRecipient: (_j = (_h = fill.relayExecutionInfo) === null || _h === void 0 ? void 0 : _h.updatedRecipient) !== null && _j !== void 0 ? _j : recipient,
156
- updatedMessage: (_l = (_k = fill.relayExecutionInfo) === null || _k === void 0 ? void 0 : _k.updatedMessage) !== null && _l !== void 0 ? _l : message,
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,
178
+ updatedRecipient: (_u = (_t = fill.relayExecutionInfo) === null || _t === void 0 ? void 0 : _t.updatedRecipient) !== null && _u !== void 0 ? _u : recipient,
179
+ updatedMessage: updatedMessage,
180
+ updatedMessageHash: (0, utils_1.getMessageHash)(updatedMessage),
181
+ updatedOutputAmount: (_w = (_v = fill.relayExecutionInfo) === null || _v === void 0 ? void 0 : _v.updatedOutputAmount) !== null && _w !== void 0 ? _w : outputAmount,
182
+ fillType: (_y = (_x = fill.relayExecutionInfo) === null || _x === void 0 ? void 0 : _x.fillType) !== null && _y !== void 0 ? _y : interfaces_1.FillType.FastFill,
159
183
  },
160
184
  };
185
+ var args = event === "FilledRelay"
186
+ ? tslib_1.__assign(tslib_1.__assign({}, _args), { messageHash: (0, utils_1.getMessageHash)(message), relayExecutionInfo: tslib_1.__assign(tslib_1.__assign({}, relayExecutionInfo), { updatedMessageHash: (_z = fill.relayExecutionInfo.updatedMessageHash) !== null && _z !== void 0 ? _z : (0, utils_1.getMessageHash)(fill.message) }) }) : tslib_1.__assign(tslib_1.__assign({}, _args), { message: message, relayExecutionInfo: tslib_1.__assign(tslib_1.__assign({}, relayExecutionInfo), { updatedMessage: (_1 = (_0 = fill.relayExecutionInfo) === null || _0 === void 0 ? void 0 : _0.updatedMessage) !== null && _1 !== void 0 ? _1 : message }) });
161
187
  return this.eventManager.generateEvent({
162
188
  event: event,
163
189
  address: this.spokePool.address,
@@ -168,14 +194,21 @@ var MockSpokePoolClient = (function (_super) {
168
194
  });
169
195
  };
170
196
  MockSpokePoolClient.prototype.speedUpV3Deposit = function (speedUp) {
171
- var event = "RequestedSpeedUpV3Deposit";
172
- var topics = [speedUp.depositId, speedUp.depositor];
197
+ return this._speedUpDeposit("RequestedSpeedUpV3Deposit", speedUp);
198
+ };
199
+ MockSpokePoolClient.prototype.speedUpDeposit = function (speedUp) {
200
+ return this._speedUpDeposit("RequestedSpeedUpDeposit", speedUp);
201
+ };
202
+ MockSpokePoolClient.prototype._speedUpDeposit = function (event, speedUp) {
203
+ var addressModifier = event === "RequestedSpeedUpDeposit" ? utils_1.toBytes32 : utils_1.toAddress;
204
+ var depositor = addressModifier(speedUp.depositor);
205
+ var topics = [speedUp.depositId, depositor];
173
206
  var args = tslib_1.__assign({}, speedUp);
174
207
  return this.eventManager.generateEvent({
175
208
  event: event,
176
209
  address: this.spokePool.address,
177
210
  topics: topics.map(function (topic) { return topic.toString(); }),
178
- args: args,
211
+ args: tslib_1.__assign(tslib_1.__assign({}, args), { depositor: depositor, updatedRecipient: addressModifier(speedUp.updatedRecipient) }),
179
212
  });
180
213
  };
181
214
  MockSpokePoolClient.prototype.setTokensBridged = function (tokensBridged) {
@@ -190,15 +223,23 @@ var MockSpokePoolClient = (function (_super) {
190
223
  });
191
224
  };
192
225
  MockSpokePoolClient.prototype.requestV3SlowFill = function (request) {
193
- var event = "RequestedV3SlowFill";
226
+ return this._requestSlowFill("RequestedV3SlowFill", request);
227
+ };
228
+ MockSpokePoolClient.prototype.requestSlowFill = function (request) {
229
+ return this._requestSlowFill("RequestedSlowFill", request);
230
+ };
231
+ MockSpokePoolClient.prototype._requestSlowFill = function (event, request) {
232
+ var _a, _b, _c, _d, _e;
194
233
  var originChainId = request.originChainId, depositId = request.depositId;
195
234
  var topics = [originChainId, depositId];
196
235
  var args = tslib_1.__assign({}, request);
236
+ var addressModifier = event === "RequestedSlowFill" ? utils_1.toBytes32 : utils_1.toAddress;
237
+ var depositor = addressModifier((_a = args.depositor) !== null && _a !== void 0 ? _a : (0, utils_1.randomAddress)());
197
238
  return this.eventManager.generateEvent({
198
239
  event: event,
199
240
  address: this.spokePool.address,
200
241
  topics: topics.map(function (topic) { return topic.toString(); }),
201
- args: args,
242
+ 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) }),
202
243
  blockNumber: request.blockNumber,
203
244
  transactionIndex: request.transactionIndex,
204
245
  });
@@ -208,6 +249,7 @@ var MockSpokePoolClient = (function (_super) {
208
249
  updatedRecipient: leaf.relayData.recipient,
209
250
  updatedOutputAmount: leaf.updatedOutputAmount,
210
251
  updatedMessage: leaf.relayData.message,
252
+ updatedMessageHash: (0, utils_1.getMessageHash)(leaf.relayData.message),
211
253
  fillType: interfaces_1.FillType.SlowFill,
212
254
  } });
213
255
  return this.fillV3Relay(fill);
@@ -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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"}
@@ -7,7 +7,7 @@ export declare const HUBPOOL_CHAIN_ID = 1;
7
7
  export declare const TRANSFER_THRESHOLD_MAX_CONFIG_STORE_VERSION = 1;
8
8
  export declare const PRE_FILL_MIN_CONFIG_STORE_VERSION = 5;
9
9
  export declare const ARWEAVE_TAG_APP_NAME = "across-protocol";
10
- export declare const ARWEAVE_TAG_APP_VERSION = 3;
10
+ export declare const ARWEAVE_TAG_APP_VERSION = 4;
11
11
  export declare const PROTOCOL_DEFAULT_CHAIN_ID_INDICES: number[];
12
12
  export declare const DEFAULT_CACHING_TTL: number;
13
13
  export declare const DEFAULT_CACHING_SAFE_LAG: number;
@@ -15,6 +15,7 @@ export declare const DEFAULT_SIMULATED_RELAYER_ADDRESS = "0x07aE8551Be970cB1cCa1
15
15
  export declare const DEFAULT_SIMULATED_RELAYER_ADDRESS_TEST = "0x9A8f92a830A5cB89a3816e3D267CB7791c16b04D";
16
16
  export declare const DEFAULT_ARWEAVE_STORAGE_ADDRESS = "Z6hjBM8FHu90lYWB8o5jR1dfX92FlV2WBaND9xgp8Lg";
17
17
  export declare const EMPTY_MESSAGE = "0x";
18
+ export declare const UNDEFINED_MESSAGE_HASH = "";
18
19
  export declare const BRIDGED_USDC_SYMBOLS: string[];
19
20
  export declare const CUSTOM_GAS_TOKENS: {
20
21
  [x: number]: string;
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
2
  var _a;
3
3
  Object.defineProperty(exports, "__esModule", { value: true });
4
- exports.CUSTOM_GAS_TOKENS = exports.BRIDGED_USDC_SYMBOLS = exports.EMPTY_MESSAGE = exports.DEFAULT_ARWEAVE_STORAGE_ADDRESS = exports.DEFAULT_SIMULATED_RELAYER_ADDRESS_TEST = exports.DEFAULT_SIMULATED_RELAYER_ADDRESS = exports.DEFAULT_CACHING_SAFE_LAG = exports.DEFAULT_CACHING_TTL = exports.PROTOCOL_DEFAULT_CHAIN_ID_INDICES = exports.ARWEAVE_TAG_APP_VERSION = exports.ARWEAVE_TAG_APP_NAME = exports.PRE_FILL_MIN_CONFIG_STORE_VERSION = exports.TRANSFER_THRESHOLD_MAX_CONFIG_STORE_VERSION = exports.HUBPOOL_CHAIN_ID = exports.SECONDS_PER_YEAR = exports.MAX_SAFE_DEPOSIT_ID = exports.MAX_SAFE_ALLOWANCE = exports.ZERO_BYTES = exports.ZERO_ADDRESS = exports.TOKEN_SYMBOLS_MAP = exports.TESTNET_CHAIN_IDs = exports.PUBLIC_NETWORKS = exports.MAINNET_CHAIN_IDs = exports.CHAIN_IDs = exports.ChainFamily = void 0;
4
+ exports.CUSTOM_GAS_TOKENS = exports.BRIDGED_USDC_SYMBOLS = exports.UNDEFINED_MESSAGE_HASH = exports.EMPTY_MESSAGE = exports.DEFAULT_ARWEAVE_STORAGE_ADDRESS = exports.DEFAULT_SIMULATED_RELAYER_ADDRESS_TEST = exports.DEFAULT_SIMULATED_RELAYER_ADDRESS = exports.DEFAULT_CACHING_SAFE_LAG = exports.DEFAULT_CACHING_TTL = exports.PROTOCOL_DEFAULT_CHAIN_ID_INDICES = exports.ARWEAVE_TAG_APP_VERSION = exports.ARWEAVE_TAG_APP_NAME = exports.PRE_FILL_MIN_CONFIG_STORE_VERSION = exports.TRANSFER_THRESHOLD_MAX_CONFIG_STORE_VERSION = exports.HUBPOOL_CHAIN_ID = exports.SECONDS_PER_YEAR = exports.MAX_SAFE_DEPOSIT_ID = exports.MAX_SAFE_ALLOWANCE = exports.ZERO_BYTES = exports.ZERO_ADDRESS = exports.TOKEN_SYMBOLS_MAP = exports.TESTNET_CHAIN_IDs = exports.PUBLIC_NETWORKS = exports.MAINNET_CHAIN_IDs = exports.CHAIN_IDs = exports.ChainFamily = void 0;
5
5
  var ethers_1 = require("ethers");
6
6
  var constants_1 = require("@across-protocol/constants");
7
7
  var constants_2 = require("@across-protocol/constants");
@@ -19,7 +19,7 @@ exports.HUBPOOL_CHAIN_ID = 1;
19
19
  exports.TRANSFER_THRESHOLD_MAX_CONFIG_STORE_VERSION = 1;
20
20
  exports.PRE_FILL_MIN_CONFIG_STORE_VERSION = 5;
21
21
  exports.ARWEAVE_TAG_APP_NAME = "across-protocol";
22
- exports.ARWEAVE_TAG_APP_VERSION = 3;
22
+ exports.ARWEAVE_TAG_APP_VERSION = 4;
23
23
  exports.PROTOCOL_DEFAULT_CHAIN_ID_INDICES = [1, 10, 137, 288, 42161];
24
24
  exports.DEFAULT_CACHING_TTL = 60 * 60 * 24 * 7 * 2;
25
25
  exports.DEFAULT_CACHING_SAFE_LAG = 60 * 60;
@@ -27,6 +27,7 @@ exports.DEFAULT_SIMULATED_RELAYER_ADDRESS = "0x07aE8551Be970cB1cCa11Dd7a11F47Ae8
27
27
  exports.DEFAULT_SIMULATED_RELAYER_ADDRESS_TEST = "0x9A8f92a830A5cB89a3816e3D267CB7791c16b04D";
28
28
  exports.DEFAULT_ARWEAVE_STORAGE_ADDRESS = "Z6hjBM8FHu90lYWB8o5jR1dfX92FlV2WBaND9xgp8Lg";
29
29
  exports.EMPTY_MESSAGE = "0x";
30
+ exports.UNDEFINED_MESSAGE_HASH = "";
30
31
  exports.BRIDGED_USDC_SYMBOLS = [
31
32
  constants_1.TOKEN_SYMBOLS_MAP["USDC.e"].symbol,
32
33
  constants_1.TOKEN_SYMBOLS_MAP.USDbC.symbol,
@@ -1 +1 @@
1
- {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":";;;;AAAA,iCAAsD;AACtD,wDAA0E;AAE1E,wDAOoC;AANlC,wGAAA,WAAW,OAAA;AACX,sGAAA,SAAS,OAAA;AACT,8GAAA,iBAAiB,OAAA;AACjB,4GAAA,eAAe,OAAA;AACf,8GAAA,iBAAiB,OAAA;AACjB,8GAAA,iBAAiB,OAAA;AAGS,QAAA,YAAY,GAA2B,kBAAe,cAA9B,QAAA,UAAU,GAAK,kBAAe,UAAC;AAGtE,QAAA,kBAAkB,GAAG,+BAA+B,CAAC;AAIrD,QAAA,mBAAmB,GAAG,YAAY,CAAC;AAEnC,QAAA,gBAAgB,GAAG,QAAQ,CAAC;AAK5B,QAAA,gBAAgB,GAAG,CAAC,CAAC;AAGrB,QAAA,2CAA2C,GAAG,CAAC,CAAC;AAEhD,QAAA,iCAAiC,GAAG,CAAC,CAAC;AAGtC,QAAA,oBAAoB,GAAG,iBAAiB,CAAC;AAGzC,QAAA,uBAAuB,GAAG,CAAC,CAAC;AAU5B,QAAA,iCAAiC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;AAE7D,QAAA,mBAAmB,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;AAC3C,QAAA,wBAAwB,GAAG,EAAE,GAAG,EAAE,CAAC;AAEnC,QAAA,iCAAiC,GAAG,4CAA4C,CAAC;AACjF,QAAA,sCAAsC,GAAG,4CAA4C,CAAC;AAEtF,QAAA,+BAA+B,GAAG,6CAA6C,CAAC;AAEhF,QAAA,aAAa,GAAG,IAAI,CAAC;AAErB,QAAA,oBAAoB,GAAG;IAClC,6BAAiB,CAAC,QAAQ,CAAC,CAAC,MAAM;IAClC,6BAAiB,CAAC,KAAK,CAAC,MAAM;IAC9B,6BAAiB,CAAC,KAAK,CAAC,MAAM;CAC/B,CAAC;AAEW,QAAA,iBAAiB;IAC5B,GAAC,qBAAS,CAAC,OAAO,IAAG,OAAO;IAC5B,GAAC,qBAAS,CAAC,YAAY,IAAG,OAAO;IACjC,GAAC,qBAAS,CAAC,UAAU,IAAG,OAAO;IAG/B,GAAC,qBAAS,CAAC,YAAY,IAAG,KAAK;QAC/B"}
1
+ {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":";;;;AAAA,iCAAsD;AACtD,wDAA0E;AAE1E,wDAOoC;AANlC,wGAAA,WAAW,OAAA;AACX,sGAAA,SAAS,OAAA;AACT,8GAAA,iBAAiB,OAAA;AACjB,4GAAA,eAAe,OAAA;AACf,8GAAA,iBAAiB,OAAA;AACjB,8GAAA,iBAAiB,OAAA;AAGS,QAAA,YAAY,GAA2B,kBAAe,cAA9B,QAAA,UAAU,GAAK,kBAAe,UAAC;AAGtE,QAAA,kBAAkB,GAAG,+BAA+B,CAAC;AAIrD,QAAA,mBAAmB,GAAG,YAAY,CAAC;AAEnC,QAAA,gBAAgB,GAAG,QAAQ,CAAC;AAK5B,QAAA,gBAAgB,GAAG,CAAC,CAAC;AAGrB,QAAA,2CAA2C,GAAG,CAAC,CAAC;AAEhD,QAAA,iCAAiC,GAAG,CAAC,CAAC;AAGtC,QAAA,oBAAoB,GAAG,iBAAiB,CAAC;AAOzC,QAAA,uBAAuB,GAAG,CAAC,CAAC;AAU5B,QAAA,iCAAiC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;AAE7D,QAAA,mBAAmB,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;AAC3C,QAAA,wBAAwB,GAAG,EAAE,GAAG,EAAE,CAAC;AAEnC,QAAA,iCAAiC,GAAG,4CAA4C,CAAC;AACjF,QAAA,sCAAsC,GAAG,4CAA4C,CAAC;AAEtF,QAAA,+BAA+B,GAAG,6CAA6C,CAAC;AAEhF,QAAA,aAAa,GAAG,IAAI,CAAC;AACrB,QAAA,sBAAsB,GAAG,EAAE,CAAC;AAE5B,QAAA,oBAAoB,GAAG;IAClC,6BAAiB,CAAC,QAAQ,CAAC,CAAC,MAAM;IAClC,6BAAiB,CAAC,KAAK,CAAC,MAAM;IAC9B,6BAAiB,CAAC,KAAK,CAAC,MAAM;CAC/B,CAAC;AAEW,QAAA,iBAAiB;IAC5B,GAAC,qBAAS,CAAC,OAAO,IAAG,OAAO;IAC5B,GAAC,qBAAS,CAAC,YAAY,IAAG,OAAO;IACjC,GAAC,qBAAS,CAAC,UAAU,IAAG,OAAO;IAG/B,GAAC,qBAAS,CAAC,YAAY,IAAG,KAAK;QAC/B"}
@@ -45,10 +45,12 @@ export declare enum FillType {
45
45
  export interface RelayExecutionEventInfo {
46
46
  updatedRecipient: string;
47
47
  updatedOutputAmount: BigNumber;
48
- updatedMessage: string;
48
+ updatedMessage?: string;
49
+ updatedMessageHash: string;
49
50
  fillType: FillType;
50
51
  }
51
- export interface Fill extends RelayData {
52
+ export interface Fill extends Omit<RelayData, "message"> {
53
+ messageHash: string;
52
54
  destinationChainId: number;
53
55
  relayer: string;
54
56
  repaymentChainId: number;
@@ -0,0 +1 @@
1
+ {"type":"commonjs"}
@@ -2,5 +2,6 @@ import { providers } from "ethers";
2
2
  export declare function isContractDeployedToAddress(address: string, provider: providers.Provider): Promise<boolean>;
3
3
  export declare function compareAddresses(addressA: string, addressB: string): 1 | -1 | 0;
4
4
  export declare function compareAddressesSimple(addressA?: string, addressB?: string): boolean;
5
+ export declare function toBytes32(address: string): string;
5
6
  export declare function toAddress(hexString: string): string;
6
7
  export declare function isValidEvmAddress(address: string): boolean;
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.isValidEvmAddress = exports.toAddress = exports.compareAddressesSimple = exports.compareAddresses = exports.isContractDeployedToAddress = void 0;
3
+ exports.isValidEvmAddress = exports.toAddress = exports.toBytes32 = exports.compareAddressesSimple = exports.compareAddresses = exports.isContractDeployedToAddress = void 0;
4
4
  var tslib_1 = require("tslib");
5
5
  var ethers_1 = require("ethers");
6
6
  var BigNumberUtils_1 = require("./BigNumberUtils");
@@ -43,6 +43,10 @@ function compareAddressesSimple(addressA, addressB) {
43
43
  return addressA.toLowerCase() === addressB.toLowerCase();
44
44
  }
45
45
  exports.compareAddressesSimple = compareAddressesSimple;
46
+ function toBytes32(address) {
47
+ return ethers_1.utils.hexZeroPad(address, 32).toLowerCase();
48
+ }
49
+ exports.toBytes32 = toBytes32;
46
50
  function toAddress(hexString) {
47
51
  var rawAddress = ethers_1.utils.hexZeroPad(ethers_1.utils.hexStripZeros(hexString), 20);
48
52
  return ethers_1.utils.getAddress(rawAddress);
@@ -1 +1 @@
1
- {"version":3,"file":"AddressUtils.js","sourceRoot":"","sources":["../../../src/utils/AddressUtils.ts"],"names":[],"mappings":";;;;AAAA,iCAA0C;AAC1C,mDAA6C;AAQ7C,SAAsB,2BAA2B,CAAC,OAAe,EAAE,QAA4B;;;;;;oBAE7F,IAAI,CAAC,OAAO,IAAI,CAAC,cAAK,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;wBACzC,WAAO,KAAK,EAAC;qBACd;oBAEY,WAAM,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAA;;oBAAtC,IAAI,GAAG,SAA+B;oBAE5C,WAAO,IAAI,KAAK,IAAI,EAAC;;;;CACtB;AATD,kEASC;AAED,SAAgB,gBAAgB,CAAC,QAAgB,EAAE,QAAgB;IAGjE,IAAM,UAAU,GAAG,0BAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC5C,IAAM,UAAU,GAAG,0BAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC5C,IAAI,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,EAAE;QAC7B,OAAO,CAAC,CAAC;KACV;SAAM,IAAI,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,EAAE;QACpC,OAAO,CAAC,CAAC,CAAC;KACX;SAAM;QACL,OAAO,CAAC,CAAC;KACV;AACH,CAAC;AAZD,4CAYC;AAED,SAAgB,sBAAsB,CAAC,QAAiB,EAAE,QAAiB;IACzE,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,SAAS,EAAE;QACpD,OAAO,KAAK,CAAC;KACd;IACD,OAAO,QAAQ,CAAC,WAAW,EAAE,KAAK,QAAQ,CAAC,WAAW,EAAE,CAAC;AAC3D,CAAC;AALD,wDAKC;AAMD,SAAgB,SAAS,CAAC,SAAiB;IAEzC,IAAM,UAAU,GAAG,cAAK,CAAC,UAAU,CAAC,cAAK,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;IACxE,OAAO,cAAK,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;AACtC,CAAC;AAJD,8BAIC;AAED,SAAgB,iBAAiB,CAAC,OAAe;IAC/C,IAAI,cAAK,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;QAC5B,OAAO,IAAI,CAAC;KACb;IAKD,IAAI;QACF,IAAM,UAAU,GAAG,cAAK,CAAC,UAAU,CAAC,cAAK,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QACtE,OAAO,cAAK,CAAC,SAAS,CAAC,cAAK,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;KACtD;IAAC,OAAO,EAAE,EAAE;QACX,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAdD,8CAcC"}
1
+ {"version":3,"file":"AddressUtils.js","sourceRoot":"","sources":["../../../src/utils/AddressUtils.ts"],"names":[],"mappings":";;;;AAAA,iCAA0C;AAC1C,mDAA6C;AAQ7C,SAAsB,2BAA2B,CAAC,OAAe,EAAE,QAA4B;;;;;;oBAE7F,IAAI,CAAC,OAAO,IAAI,CAAC,cAAK,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;wBACzC,WAAO,KAAK,EAAC;qBACd;oBAEY,WAAM,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAA;;oBAAtC,IAAI,GAAG,SAA+B;oBAE5C,WAAO,IAAI,KAAK,IAAI,EAAC;;;;CACtB;AATD,kEASC;AAED,SAAgB,gBAAgB,CAAC,QAAgB,EAAE,QAAgB;IAGjE,IAAM,UAAU,GAAG,0BAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC5C,IAAM,UAAU,GAAG,0BAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC5C,IAAI,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,EAAE;QAC7B,OAAO,CAAC,CAAC;KACV;SAAM,IAAI,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,EAAE;QACpC,OAAO,CAAC,CAAC,CAAC;KACX;SAAM;QACL,OAAO,CAAC,CAAC;KACV;AACH,CAAC;AAZD,4CAYC;AAED,SAAgB,sBAAsB,CAAC,QAAiB,EAAE,QAAiB;IACzE,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,SAAS,EAAE;QACpD,OAAO,KAAK,CAAC;KACd;IACD,OAAO,QAAQ,CAAC,WAAW,EAAE,KAAK,QAAQ,CAAC,WAAW,EAAE,CAAC;AAC3D,CAAC;AALD,wDAKC;AAKD,SAAgB,SAAS,CAAC,OAAe;IACvC,OAAO,cAAK,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;AACrD,CAAC;AAFD,8BAEC;AAGD,SAAgB,SAAS,CAAC,SAAiB;IAEzC,IAAM,UAAU,GAAG,cAAK,CAAC,UAAU,CAAC,cAAK,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;IACxE,OAAO,cAAK,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;AACtC,CAAC;AAJD,8BAIC;AAED,SAAgB,iBAAiB,CAAC,OAAe;IAC/C,IAAI,cAAK,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;QAC5B,OAAO,IAAI,CAAC;KACb;IAKD,IAAI;QACF,IAAM,UAAU,GAAG,cAAK,CAAC,UAAU,CAAC,cAAK,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QACtE,OAAO,cAAK,CAAC,SAAS,CAAC,cAAK,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;KACtD;IAAC,OAAO,EAAE,EAAE;QACX,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAdD,8CAcC"}
@@ -52,7 +52,7 @@ function setDepositInCache(deposit, currentChainTime, cache, expirySeconds, time
52
52
  }
53
53
  exports.setDepositInCache = setDepositInCache;
54
54
  function getDepositKey(bridgeEvent) {
55
- var relayHash = (0, SpokeUtils_1.getRelayHashFromEvent)(bridgeEvent);
55
+ var relayHash = (0, SpokeUtils_1.getRelayEventKey)(bridgeEvent);
56
56
  return "deposit_".concat(bridgeEvent.originChainId, "_").concat(bridgeEvent.depositId.toString(), "_").concat(relayHash);
57
57
  }
58
58
  exports.getDepositKey = getDepositKey;
@@ -1 +1 @@
1
- {"version":3,"file":"CachingUtils.js","sourceRoot":"","sources":["../../../src/utils/CachingUtils.ts"],"names":[],"mappings":";;;;AAAA,0CAA6E;AAE7E,uCAAoC;AACpC,+CAA6E;AAC7E,2CAAqD;AACrD,yCAA6C;AAC7C,2CAAyC;AAEzC,SAAgB,WAAW,CAAC,cAAsB,EAAE,UAAkB,EAAE,aAAqB;IAC3F,IAAA,iBAAM,EAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,MAAM,KAAK,EAAE,EAAE,mCAAmC,CAAC,CAAC;IACrF,IAAA,iBAAM,EAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,MAAM,KAAK,EAAE,EAAE,mCAAmC,CAAC,CAAC;IACjF,OAAO,UAAU,GAAG,cAAc,IAAI,aAAa,CAAC;AACtD,CAAC;AAJD,kCAIC;AAQD,SAAsB,iBAAiB,CAAC,GAAW,EAAE,KAAgC;;;;;wBAChE,WAAM,KAAK,CAAC,GAAG,CAAS,GAAG,CAAC,EAAA;;oBAAzC,UAAU,GAAG,SAA4B;oBAC/C,WAAO,IAAA,sBAAS,EAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,IAAA,8BAAe,EAAC,yCAA0B,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,EAAC;;;;CAChH;AAHD,8CAGC;AAED,SAAsB,iBAAiB,CACrC,OAAgB,EAChB,gBAAwB,EACxB,KAAgC,EAChC,aAAmC,EACnC,WAAsC;IADtC,8BAAA,EAAA,gBAAgB,+BAAmB;IACnC,4BAAA,EAAA,cAAc,oCAAwB;;;;;;oBAEhC,oBAAoB,GAAG,IAAA,0BAAc,GAAE,CAAC;oBAG9C,IAAI,OAAO,CAAC,cAAc,GAAG,oBAAoB,IAAI,gBAAgB,GAAG,oBAAoB,EAAE;wBAC5F,WAAO;qBACR;yBAIG,WAAW,CAAC,OAAO,CAAC,cAAc,EAAE,gBAAgB,EAAE,WAAW,CAAC,EAAlE,cAAkE;oBACpE,WAAM,KAAK,CAAC,GAAG,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC,EAAA;;oBAA/E,SAA+E,CAAC;;;;;;CAEnF;AAnBD,8CAmBC;AAQD,SAAgB,aAAa,CAAC,WAA6C;IACzE,IAAM,SAAS,GAAG,IAAA,kCAAqB,EAAC,WAAW,CAAC,CAAC;IACrD,OAAO,kBAAW,WAAW,CAAC,aAAa,cAAI,WAAW,CAAC,SAAS,CAAC,QAAQ,EAAE,cAAI,SAAS,CAAE,CAAC;AACjG,CAAC;AAHD,sCAGC"}
1
+ {"version":3,"file":"CachingUtils.js","sourceRoot":"","sources":["../../../src/utils/CachingUtils.ts"],"names":[],"mappings":";;;;AAAA,0CAA6E;AAE7E,uCAAoC;AACpC,+CAA6E;AAC7E,2CAAgD;AAChD,yCAA6C;AAC7C,2CAAyC;AAEzC,SAAgB,WAAW,CAAC,cAAsB,EAAE,UAAkB,EAAE,aAAqB;IAC3F,IAAA,iBAAM,EAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,MAAM,KAAK,EAAE,EAAE,mCAAmC,CAAC,CAAC;IACrF,IAAA,iBAAM,EAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,MAAM,KAAK,EAAE,EAAE,mCAAmC,CAAC,CAAC;IACjF,OAAO,UAAU,GAAG,cAAc,IAAI,aAAa,CAAC;AACtD,CAAC;AAJD,kCAIC;AAQD,SAAsB,iBAAiB,CAAC,GAAW,EAAE,KAAgC;;;;;wBAChE,WAAM,KAAK,CAAC,GAAG,CAAS,GAAG,CAAC,EAAA;;oBAAzC,UAAU,GAAG,SAA4B;oBAC/C,WAAO,IAAA,sBAAS,EAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,IAAA,8BAAe,EAAC,yCAA0B,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,EAAC;;;;CAChH;AAHD,8CAGC;AAED,SAAsB,iBAAiB,CACrC,OAAgB,EAChB,gBAAwB,EACxB,KAAgC,EAChC,aAAmC,EACnC,WAAsC;IADtC,8BAAA,EAAA,gBAAgB,+BAAmB;IACnC,4BAAA,EAAA,cAAc,oCAAwB;;;;;;oBAEhC,oBAAoB,GAAG,IAAA,0BAAc,GAAE,CAAC;oBAG9C,IAAI,OAAO,CAAC,cAAc,GAAG,oBAAoB,IAAI,gBAAgB,GAAG,oBAAoB,EAAE;wBAC5F,WAAO;qBACR;yBAIG,WAAW,CAAC,OAAO,CAAC,cAAc,EAAE,gBAAgB,EAAE,WAAW,CAAC,EAAlE,cAAkE;oBACpE,WAAM,KAAK,CAAC,GAAG,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC,EAAA;;oBAA/E,SAA+E,CAAC;;;;;;CAEnF;AAnBD,8CAmBC;AAQD,SAAgB,aAAa,CAAC,WAA6C;IACzE,IAAM,SAAS,GAAG,IAAA,6BAAgB,EAAC,WAAW,CAAC,CAAC;IAChD,OAAO,kBAAW,WAAW,CAAC,aAAa,cAAI,WAAW,CAAC,SAAS,CAAC,QAAQ,EAAE,cAAI,SAAS,CAAE,CAAC;AACjG,CAAC;AAHD,sCAGC"}
@@ -16,7 +16,7 @@ export type DepositSearchResult = {
16
16
  };
17
17
  export declare function queryHistoricalDepositForFill(spokePoolClient: SpokePoolClient, fill: Fill | SlowFillRequest, cache?: CachingMechanismInterface): Promise<DepositSearchResult>;
18
18
  export declare function isZeroValueDeposit(deposit: Pick<Deposit, "inputAmount" | "message">): boolean;
19
- export declare function isZeroValueFillOrSlowFillRequest(e: Pick<Fill | SlowFillRequest, "inputAmount" | "message">): boolean;
19
+ export declare function isZeroValueFillOrSlowFillRequest(e: Pick<Fill | SlowFillRequest, "inputAmount" | "messageHash">): boolean;
20
20
  export declare function isMessageEmpty(message?: string): boolean;
21
21
  export declare function isFillOrSlowFillRequestMessageEmpty(message: string): boolean;
22
22
  export declare function isDepositSpedUp(deposit: Deposit): boolean;
@@ -5,6 +5,7 @@ var tslib_1 = require("tslib");
5
5
  var assert_1 = tslib_1.__importDefault(require("assert"));
6
6
  var constants_1 = require("../constants");
7
7
  var NetworkUtils_1 = require("./NetworkUtils");
8
+ var BigNumberUtils_1 = require("./BigNumberUtils");
8
9
  var CachingUtils_1 = require("./CachingUtils");
9
10
  var FlowUtils_1 = require("./FlowUtils");
10
11
  var SpokeUtils_1 = require("./SpokeUtils");
@@ -19,10 +20,11 @@ var InvalidFill;
19
20
  InvalidFill[InvalidFill["DepositIdOutOfRange"] = 3] = "DepositIdOutOfRange";
20
21
  })(InvalidFill || (exports.InvalidFill = InvalidFill = {}));
21
22
  function queryHistoricalDepositForFill(spokePoolClient, fill, cache) {
23
+ var _a;
22
24
  return tslib_1.__awaiter(this, void 0, void 0, function () {
23
25
  var depositId, lowId, highId, originChain, deposit_1, match_1, deposit, cachedDeposit, match;
24
- return tslib_1.__generator(this, function (_a) {
25
- switch (_a.label) {
26
+ return tslib_1.__generator(this, function (_b) {
27
+ switch (_b.label) {
26
28
  case 0:
27
29
  if ((0, SpokeUtils_1.isUnsafeDepositId)(fill.depositId)) {
28
30
  return [2, {
@@ -70,7 +72,7 @@ function queryHistoricalDepositForFill(spokePoolClient, fill, cache) {
70
72
  if (!cache) return [3, 2];
71
73
  return [4, (0, CachingUtils_1.getDepositInCache)((0, CachingUtils_1.getDepositKey)(fill), cache)];
72
74
  case 1:
73
- cachedDeposit = _a.sent();
75
+ cachedDeposit = _b.sent();
74
76
  if ((0, TypeGuards_1.isDefined)(cachedDeposit) && !(0, ValidatorUtils_1.isDepositFormedCorrectly)(cachedDeposit)) {
75
77
  spokePoolClient.logger.warn({
76
78
  at: "[SDK]:DepositUtils#queryHistoricalDepositForFill",
@@ -80,20 +82,21 @@ function queryHistoricalDepositForFill(spokePoolClient, fill, cache) {
80
82
  });
81
83
  cachedDeposit = undefined;
82
84
  }
83
- _a.label = 2;
85
+ _b.label = 2;
84
86
  case 2:
85
87
  if (!(0, TypeGuards_1.isDefined)(cachedDeposit)) return [3, 3];
86
88
  deposit = cachedDeposit;
87
89
  return [3, 6];
88
90
  case 3: return [4, spokePoolClient.findDeposit(fill.depositId, fill.destinationChainId)];
89
91
  case 4:
90
- deposit = _a.sent();
92
+ deposit = _b.sent();
91
93
  if (!cache) return [3, 6];
92
94
  return [4, (0, CachingUtils_1.setDepositInCache)(deposit, (0, TimeUtils_1.getCurrentTime)(), cache, constants_1.DEFAULT_CACHING_TTL)];
93
95
  case 5:
94
- _a.sent();
95
- _a.label = 6;
96
+ _b.sent();
97
+ _b.label = 6;
96
98
  case 6:
99
+ (_a = deposit.messageHash) !== null && _a !== void 0 ? _a : (deposit.messageHash = (0, SpokeUtils_1.getMessageHash)(deposit.message));
97
100
  match = (0, FlowUtils_1.validateFillForDeposit)(fill, deposit);
98
101
  if (match.valid) {
99
102
  return [2, { found: true, deposit: deposit }];
@@ -113,7 +116,7 @@ function isZeroValueDeposit(deposit) {
113
116
  }
114
117
  exports.isZeroValueDeposit = isZeroValueDeposit;
115
118
  function isZeroValueFillOrSlowFillRequest(e) {
116
- return e.inputAmount.eq(0) && isFillOrSlowFillRequestMessageEmpty(e.message);
119
+ return e.inputAmount.eq(BigNumberUtils_1.bnZero) && e.messageHash === constants_1.ZERO_BYTES;
117
120
  }
118
121
  exports.isZeroValueFillOrSlowFillRequest = isZeroValueFillOrSlowFillRequest;
119
122
  function isMessageEmpty(message) {
@@ -1 +1 @@
1
- {"version":3,"file":"DepositUtils.js","sourceRoot":"","sources":["../../../src/utils/DepositUtils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"DepositUtils.js","sourceRoot":"","sources":["../../../src/utils/DepositUtils.ts"],"names":[],"mappings":";;;;AAAA,0DAA4B;AAE5B,0CAA8E;AAE9E,+CAAgD;AAChD,mDAA0C;AAC1C,+CAAqF;AACrF,yCAAqD;AACrD,2CAAiE;AACjE,yCAA6C;AAC7C,2CAAyC;AACzC,mDAA4D;AAM5D,IAAY,WAKX;AALD,WAAY,WAAW;IACrB,qEAAoB,CAAA;IACpB,uEAAiB,CAAA;IACjB,6DAAY,CAAA;IACZ,2EAAmB,CAAA;AACrB,CAAC,EALW,WAAW,2BAAX,WAAW,QAKtB;AAkBD,SAAsB,6BAA6B,CACjD,eAAgC,EAChC,IAA4B,EAC5B,KAAiC;;;;;;;oBAEjC,IAAI,IAAA,8BAAiB,EAAC,IAAI,CAAC,SAAS,CAAC,EAAE;wBACrC,WAAO;gCACL,KAAK,EAAE,KAAK;gCACZ,IAAI,EAAE,WAAW,CAAC,mBAAmB;gCACrC,MAAM,EAAE,yEAAkE,IAAI,CAAC,SAAS,MAAG;6BAC5F,EAAC;qBACH;oBACD,IAAI,IAAI,CAAC,aAAa,KAAK,eAAe,CAAC,OAAO,EAAE;wBAClD,MAAM,IAAI,KAAK,CAAC,kCAA2B,IAAI,CAAC,aAAa,iBAAO,eAAe,CAAC,OAAO,MAAG,CAAC,CAAC;qBACjG;oBAID,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE;wBAC9B,MAAM,IAAI,KAAK,CAAC,qEAAqE,CAAC,CAAC;qBACxF;oBAEO,SAAS,GAAK,IAAI,UAAT,CAAU;oBACO,KAAK,GAAwC,eAAe,2BAAvD,EAA6B,MAAM,GAAK,eAAe,0BAApB,CAAqB;oBAC/F,IAAI,SAAS,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE;wBAC/C,WAAO;gCACL,KAAK,EAAE,KAAK;gCACZ,IAAI,EAAE,WAAW,CAAC,gBAAgB;gCAClC,MAAM,EAAE,qBAAc,SAAS,CAAC,QAAQ,EAAE,8CAAoC,KAAK,cAAI,MAAM,OAAI;6BAClG,EAAC;qBACH;oBAED,CAA6B,KAAK,GAAqC,eAAe,yBAApD,EAA0B,MAAM,GAAK,eAAe,uBAApB,CAAqB,CAAC;oBACxF,IAAI,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;wBAC3C,WAAW,GAAG,IAAA,6BAAc,EAAC,IAAI,CAAC,aAAa,CAAC,CAAC;wBACjD,YAAU,eAAe,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;wBACtD,IAAI,IAAA,sBAAS,EAAC,SAAO,CAAC,EAAE;4BAChB,UAAQ,IAAA,kCAAsB,EAAC,IAAI,EAAE,SAAO,CAAC,CAAC;4BACpD,IAAI,OAAK,CAAC,KAAK,EAAE;gCACf,WAAO,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,WAAA,EAAE,EAAC;6BACjC;4BAED,WAAO;oCACL,KAAK,EAAE,KAAK;oCACZ,IAAI,EAAE,WAAW,CAAC,YAAY;oCAC9B,MAAM,EAAE,mBAAY,WAAW,yBAAe,SAAS,CAAC,QAAQ,EAAE,0BAAgB,OAAK,CAAC,MAAM,OAAI;iCACnG,EAAC;yBACH;wBAED,WAAO;gCACL,KAAK,EAAE,KAAK;gCACZ,IAAI,EAAE,WAAW,CAAC,iBAAiB;gCACnC,MAAM,EAAE,UAAG,WAAW,yBAAe,SAAS,CAAC,QAAQ,EAAE,gDAA6C;6BACvG,EAAC;qBACH;yBAGG,KAAK,EAAL,cAAK;oBACS,WAAM,IAAA,gCAAiB,EAAC,IAAA,4BAAa,EAAC,IAAI,CAAC,EAAE,KAAK,CAAC,EAAA;;oBAAnE,aAAa,GAAG,SAAmD,CAAC;oBAIpE,IAAI,IAAA,sBAAS,EAAC,aAAa,CAAC,IAAI,CAAC,IAAA,yCAAwB,EAAC,aAAa,CAAC,EAAE;wBACxE,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC;4BAC1B,EAAE,EAAE,kDAAkD;4BACtD,OAAO,EAAE,8DAA8D;4BACvE,IAAI,MAAA;4BACJ,aAAa,eAAA;yBACd,CAAC,CAAC;wBAIH,aAAa,GAAG,SAAS,CAAC;qBAC3B;;;yBAGC,IAAA,sBAAS,EAAC,aAAa,CAAC,EAAxB,cAAwB;oBAC1B,OAAO,GAAG,aAAiC,CAAC;;wBAElC,WAAM,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,kBAAkB,CAAC,EAAA;;oBAApF,OAAO,GAAG,SAA0E,CAAC;yBACjF,KAAK,EAAL,cAAK;oBACP,WAAM,IAAA,gCAAiB,EAAC,OAAO,EAAE,IAAA,0BAAc,GAAE,EAAE,KAAK,EAAE,+BAAmB,CAAC,EAAA;;oBAA9E,SAA8E,CAAC;;;oBAInF,MAAA,OAAO,CAAC,WAAW,oCAAnB,OAAO,CAAC,WAAW,GAAK,IAAA,2BAAc,EAAC,OAAO,CAAC,OAAO,CAAC,EAAC;oBAElD,KAAK,GAAG,IAAA,kCAAsB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;oBACpD,IAAI,KAAK,CAAC,KAAK,EAAE;wBACf,WAAO,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,SAAA,EAAE,EAAC;qBACjC;oBAED,WAAO;4BACL,KAAK,EAAE,KAAK;4BACZ,IAAI,EAAE,WAAW,CAAC,YAAY;4BAC9B,MAAM,EAAE,KAAK,CAAC,MAAM;yBACrB,EAAC;;;;CACH;AAjGD,sEAiGC;AAUD,SAAgB,kBAAkB,CAAC,OAAiD;IAClF,OAAO,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;AACtE,CAAC;AAFD,gDAEC;AAED,SAAgB,gCAAgC,CAC9C,CAA8D;IAE9D,OAAO,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC,uBAAM,CAAC,IAAI,CAAC,CAAC,WAAW,KAAK,sBAAU,CAAC;AAClE,CAAC;AAJD,4EAIC;AAOD,SAAgB,cAAc,CAAC,OAAuB;IAAvB,wBAAA,EAAA,UAAU,yBAAa;IACpD,OAAO,OAAO,KAAK,EAAE,IAAI,OAAO,KAAK,IAAI,CAAC;AAC5C,CAAC;AAFD,wCAEC;AAED,SAAgB,mCAAmC,CAAC,OAAe;IACjE,OAAO,cAAc,CAAC,OAAO,CAAC,IAAI,OAAO,KAAK,sBAAU,CAAC;AAC3D,CAAC;AAFD,kFAEC;AAOD,SAAgB,eAAe,CAAC,OAAgB;IAC9C,OAAO,IAAA,sBAAS,EAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,IAAA,sBAAS,EAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;AACvF,CAAC;AAFD,0CAEC;AAOD,SAAgB,qBAAqB,CAAC,OAAgB;IACpD,IAAM,OAAO,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC;IACpF,IAAA,gBAAM,EAAC,IAAA,sBAAS,EAAC,OAAO,CAAC,CAAC,CAAC;IAC3B,OAAO,OAAO,CAAC;AACjB,CAAC;AAJD,sDAIC"}
@@ -1,8 +1,9 @@
1
1
  import { Deposit, RelayData } from "../interfaces";
2
- export declare const RELAYDATA_KEYS: readonly ["depositId", "originChainId", "destinationChainId", "depositor", "recipient", "inputToken", "inputAmount", "outputToken", "outputAmount", "fillDeadline", "exclusivityDeadline", "exclusiveRelayer", "message"];
3
- export declare function validateFillForDeposit(relayData: RelayData & {
2
+ export declare const RELAYDATA_KEYS: readonly ["depositId", "originChainId", "destinationChainId", "depositor", "recipient", "inputToken", "inputAmount", "outputToken", "outputAmount", "fillDeadline", "exclusivityDeadline", "exclusiveRelayer", "messageHash"];
3
+ export declare function validateFillForDeposit(relayData: Omit<RelayData, "message"> & {
4
+ messageHash: string;
4
5
  destinationChainId: number;
5
- }, deposit?: Deposit): {
6
+ }, deposit?: Omit<Deposit, "quoteTimestamp" | "fromLiteChain" | "toLiteChain">): {
6
7
  valid: true;
7
8
  } | {
8
9
  valid: false;
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.validateFillForDeposit = exports.RELAYDATA_KEYS = void 0;
4
4
  var utils_1 = require("../utils");
5
+ var constants_1 = require("../constants");
5
6
  exports.RELAYDATA_KEYS = [
6
7
  "depositId",
7
8
  "originChainId",
@@ -15,13 +16,16 @@ exports.RELAYDATA_KEYS = [
15
16
  "fillDeadline",
16
17
  "exclusivityDeadline",
17
18
  "exclusiveRelayer",
18
- "message",
19
+ "messageHash",
19
20
  ];
20
21
  function validateFillForDeposit(relayData, deposit) {
21
22
  if (deposit === undefined) {
22
23
  return { valid: false, reason: "Deposit is undefined" };
23
24
  }
24
25
  var invalidKey = exports.RELAYDATA_KEYS.find(function (key) { return relayData[key].toString() !== deposit[key].toString(); });
26
+ if (!(0, utils_1.isDefined)(invalidKey) && [relayData.messageHash, deposit.messageHash].includes(constants_1.UNDEFINED_MESSAGE_HASH)) {
27
+ invalidKey = "messageHash";
28
+ }
25
29
  return (0, utils_1.isDefined)(invalidKey)
26
30
  ? { valid: false, reason: "".concat(invalidKey, " mismatch (").concat(relayData[invalidKey], " != ").concat(deposit[invalidKey], ")") }
27
31
  : { valid: true };
@@ -1 +1 @@
1
- {"version":3,"file":"FlowUtils.js","sourceRoot":"","sources":["../../../src/utils/FlowUtils.ts"],"names":[],"mappings":";;;AAAA,kCAAqC;AAGxB,QAAA,cAAc,GAAG;IAC5B,WAAW;IACX,eAAe;IACf,oBAAoB;IACpB,WAAW;IACX,WAAW;IACX,YAAY;IACZ,aAAa;IACb,aAAa;IACb,cAAc;IACd,cAAc;IACd,qBAAqB;IACrB,kBAAkB;IAClB,SAAS;CACD,CAAC;AAIX,SAAgB,sBAAsB,CACpC,SAAqD,EACrD,OAAiB;IAEjB,IAAI,OAAO,KAAK,SAAS,EAAE;QACzB,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,sBAAsB,EAAE,CAAC;KACzD;IAKD,IAAM,UAAU,GAAG,sBAAc,CAAC,IAAI,CAAC,UAAC,GAAG,IAAK,OAAA,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAArD,CAAqD,CAAC,CAAC;IAEvG,OAAO,IAAA,iBAAS,EAAC,UAAU,CAAC;QAC1B,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,UAAG,UAAU,wBAAc,SAAS,CAAC,UAAU,CAAC,iBAAO,OAAO,CAAC,UAAU,CAAC,MAAG,EAAE;QACzG,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AACtB,CAAC;AAhBD,wDAgBC"}
1
+ {"version":3,"file":"FlowUtils.js","sourceRoot":"","sources":["../../../src/utils/FlowUtils.ts"],"names":[],"mappings":";;;AAAA,kCAAqC;AAErC,0CAAsD;AAEzC,QAAA,cAAc,GAAG;IAC5B,WAAW;IACX,eAAe;IACf,oBAAoB;IACpB,WAAW;IACX,WAAW;IACX,YAAY;IACZ,aAAa;IACb,aAAa;IACb,cAAc;IACd,cAAc;IACd,qBAAqB;IACrB,kBAAkB;IAClB,aAAa;CACL,CAAC;AAIX,SAAgB,sBAAsB,CACpC,SAA2F,EAC3F,OAA2E;IAE3E,IAAI,OAAO,KAAK,SAAS,EAAE;QACzB,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,sBAAsB,EAAE,CAAC;KACzD;IAKD,IAAI,UAAU,GAAG,sBAAc,CAAC,IAAI,CAAC,UAAC,GAAG,IAAK,OAAA,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAArD,CAAqD,CAAC,CAAC;IAGrG,IAAI,CAAC,IAAA,iBAAS,EAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,kCAAsB,CAAC,EAAE;QAC3G,UAAU,GAAG,aAAa,CAAC;KAC5B;IAED,OAAO,IAAA,iBAAS,EAAC,UAAU,CAAC;QAC1B,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,UAAG,UAAU,wBAAc,SAAS,CAAC,UAAU,CAAC,iBAAO,OAAO,CAAC,UAAU,CAAC,MAAG,EAAE;QACzG,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AACtB,CAAC;AArBD,wDAqBC"}
@@ -1,10 +1,11 @@
1
1
  import { Contract, PopulatedTransaction, providers } from "ethers";
2
- import { Deposit, Fill, FillStatus, FillWithBlock, RelayData, SlowFillRequest } from "../interfaces";
2
+ import { Deposit, FillStatus, FillWithBlock, RelayData } from "../interfaces";
3
3
  import { SpokePoolClient } from "../clients";
4
4
  import { BigNumber } from "./BigNumberUtils";
5
5
  type BlockTag = providers.BlockTag;
6
6
  export declare function populateV3Relay(spokePool: Contract, deposit: Omit<Deposit, "messageHash">, relayer: string, repaymentChainId?: number): Promise<PopulatedTransaction>;
7
- export declare function getRelayEventKey(data: RelayData & {
7
+ export declare function getRelayEventKey(data: Omit<RelayData, "message"> & {
8
+ messageHash: string;
8
9
  destinationChainId: number;
9
10
  }): string;
10
11
  export declare function getBlockRangeForDepositId(targetDepositId: BigNumber, initLow: number, initHigh: number, maxSearches: number, spokePool: SpokePoolClient): Promise<{
@@ -13,7 +14,9 @@ export declare function getBlockRangeForDepositId(targetDepositId: BigNumber, in
13
14
  }>;
14
15
  export declare function getDepositIdAtBlock(contract: Contract, blockTag: number): Promise<BigNumber>;
15
16
  export declare function getRelayDataHash(relayData: RelayData, destinationChainId: number): string;
16
- export declare function getRelayHashFromEvent(e: Deposit | Fill | SlowFillRequest): string;
17
+ export declare function getRelayHashFromEvent(e: RelayData & {
18
+ destinationChainId: number;
19
+ }): string;
17
20
  export declare function isUnsafeDepositId(depositId: BigNumber): boolean;
18
21
  export declare function relayFillStatus(spokePool: Contract, relayData: RelayData, blockTag?: number | "latest", destinationChainId?: number): Promise<FillStatus>;
19
22
  export declare function fillStatusArray(spokePool: Contract, relayData: RelayData[], blockTag?: BlockTag): Promise<(FillStatus | undefined)[]>;
@@ -52,7 +52,7 @@ function getRelayEventKey(data) {
52
52
  data.depositId,
53
53
  data.fillDeadline,
54
54
  data.exclusivityDeadline,
55
- data.message,
55
+ data.messageHash,
56
56
  ]
57
57
  .map(String)
58
58
  .join("-");
@@ -361,7 +361,7 @@ function findFillEvent(spokePool, relayData, lowBlockNumber, highBlockNumber) {
361
361
  _c.label = 6;
362
362
  case 6:
363
363
  destinationChainId = _a;
364
- fill = tslib_1.__assign(tslib_1.__assign({}, (0, EventUtils_1.spreadEventWithBlockNumber)(event)), { destinationChainId: destinationChainId });
364
+ fill = tslib_1.__assign(tslib_1.__assign({}, (0, EventUtils_1.spreadEventWithBlockNumber)(event)), { destinationChainId: destinationChainId, messageHash: getMessageHash(event.args.message) });
365
365
  return [2, fill];
366
366
  }
367
367
  });