@across-protocol/sdk 4.3.13 → 4.3.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/arch/svm/SpokeUtils.d.ts +1 -1
- package/dist/cjs/arch/svm/SpokeUtils.js +2 -3
- package/dist/cjs/arch/svm/SpokeUtils.js.map +1 -1
- package/dist/cjs/arch/svm/eventsClient.js +1 -1
- package/dist/cjs/arch/svm/eventsClient.js.map +1 -1
- package/dist/cjs/arch/svm/utils.js +1 -1
- package/dist/cjs/arch/svm/utils.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/utils/SuperstructUtils.d.ts +10 -10
- package/dist/cjs/gasPriceOracle/oracle.js +0 -2
- package/dist/cjs/gasPriceOracle/oracle.js.map +1 -1
- package/dist/cjs/relayFeeCalculator/chain-queries/svmQuery.d.ts +1 -1
- package/dist/esm/arch/svm/SpokeUtils.d.ts +1 -1
- package/dist/esm/arch/svm/SpokeUtils.js +2 -4
- package/dist/esm/arch/svm/SpokeUtils.js.map +1 -1
- package/dist/esm/arch/svm/eventsClient.js +1 -1
- package/dist/esm/arch/svm/eventsClient.js.map +1 -1
- package/dist/esm/arch/svm/utils.js +1 -1
- package/dist/esm/arch/svm/utils.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.d.ts +10 -10
- package/dist/esm/gasPriceOracle/oracle.js +0 -2
- package/dist/esm/gasPriceOracle/oracle.js.map +1 -1
- package/dist/esm/relayFeeCalculator/chain-queries/svmQuery.d.ts +1 -1
- package/dist/types/arch/svm/SpokeUtils.d.ts +1 -1
- package/dist/types/arch/svm/SpokeUtils.d.ts.map +1 -1
- package/dist/types/arch/svm/utils.d.ts.map +1 -1
- package/dist/types/clients/BundleDataClient/utils/SuperstructUtils.d.ts +10 -10
- package/dist/types/gasPriceOracle/oracle.d.ts.map +1 -1
- package/dist/types/relayFeeCalculator/chain-queries/svmQuery.d.ts +1 -1
- package/dist/types/relayFeeCalculator/chain-queries/svmQuery.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/arch/svm/SpokeUtils.ts +6 -5
- package/src/arch/svm/eventsClient.ts +1 -1
- package/src/arch/svm/utils.ts +1 -1
- package/src/gasPriceOracle/oracle.ts +0 -8
- package/src/relayFeeCalculator/chain-queries/svmQuery.ts +1 -1
|
@@ -13,6 +13,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
13
13
|
message: string;
|
|
14
14
|
depositId: BigNumber;
|
|
15
15
|
outputAmount: BigNumber;
|
|
16
|
+
inputAmount: BigNumber;
|
|
16
17
|
originChainId: number;
|
|
17
18
|
destinationChainId: number;
|
|
18
19
|
fromLiteChain: boolean;
|
|
@@ -22,7 +23,6 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
22
23
|
depositor: SvmAddress | EvmAddress | RawAddress;
|
|
23
24
|
recipient: SvmAddress | EvmAddress | RawAddress;
|
|
24
25
|
inputToken: SvmAddress | EvmAddress | RawAddress;
|
|
25
|
-
inputAmount: BigNumber;
|
|
26
26
|
outputToken: SvmAddress | EvmAddress | RawAddress;
|
|
27
27
|
fillDeadline: number;
|
|
28
28
|
exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
|
|
@@ -44,6 +44,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
44
44
|
fills: {
|
|
45
45
|
depositId: BigNumber;
|
|
46
46
|
outputAmount: BigNumber;
|
|
47
|
+
inputAmount: BigNumber;
|
|
47
48
|
originChainId: number;
|
|
48
49
|
destinationChainId: number;
|
|
49
50
|
repaymentChainId: number;
|
|
@@ -52,7 +53,6 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
52
53
|
depositor: SvmAddress | EvmAddress | RawAddress;
|
|
53
54
|
recipient: SvmAddress | EvmAddress | RawAddress;
|
|
54
55
|
inputToken: SvmAddress | EvmAddress | RawAddress;
|
|
55
|
-
inputAmount: BigNumber;
|
|
56
56
|
outputToken: SvmAddress | EvmAddress | RawAddress;
|
|
57
57
|
fillDeadline: number;
|
|
58
58
|
exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
|
|
@@ -82,6 +82,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
82
82
|
message: string;
|
|
83
83
|
depositId: BigNumber;
|
|
84
84
|
outputAmount: BigNumber;
|
|
85
|
+
inputAmount: BigNumber;
|
|
85
86
|
originChainId: number;
|
|
86
87
|
destinationChainId: number;
|
|
87
88
|
fromLiteChain: boolean;
|
|
@@ -91,7 +92,6 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
91
92
|
depositor: SvmAddress | EvmAddress | RawAddress;
|
|
92
93
|
recipient: SvmAddress | EvmAddress | RawAddress;
|
|
93
94
|
inputToken: SvmAddress | EvmAddress | RawAddress;
|
|
94
|
-
inputAmount: BigNumber;
|
|
95
95
|
outputToken: SvmAddress | EvmAddress | RawAddress;
|
|
96
96
|
fillDeadline: number;
|
|
97
97
|
exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
|
|
@@ -114,6 +114,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
114
114
|
message: string;
|
|
115
115
|
depositId: BigNumber;
|
|
116
116
|
outputAmount: BigNumber;
|
|
117
|
+
inputAmount: BigNumber;
|
|
117
118
|
originChainId: number;
|
|
118
119
|
destinationChainId: number;
|
|
119
120
|
fromLiteChain: boolean;
|
|
@@ -123,7 +124,6 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
123
124
|
depositor: SvmAddress | EvmAddress | RawAddress;
|
|
124
125
|
recipient: SvmAddress | EvmAddress | RawAddress;
|
|
125
126
|
inputToken: SvmAddress | EvmAddress | RawAddress;
|
|
126
|
-
inputAmount: BigNumber;
|
|
127
127
|
outputToken: SvmAddress | EvmAddress | RawAddress;
|
|
128
128
|
fillDeadline: number;
|
|
129
129
|
exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
|
|
@@ -145,6 +145,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
145
145
|
message: string;
|
|
146
146
|
depositId: BigNumber;
|
|
147
147
|
outputAmount: BigNumber;
|
|
148
|
+
inputAmount: BigNumber;
|
|
148
149
|
originChainId: number;
|
|
149
150
|
destinationChainId: number;
|
|
150
151
|
fromLiteChain: boolean;
|
|
@@ -154,7 +155,6 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
154
155
|
depositor: SvmAddress | EvmAddress | RawAddress;
|
|
155
156
|
recipient: SvmAddress | EvmAddress | RawAddress;
|
|
156
157
|
inputToken: SvmAddress | EvmAddress | RawAddress;
|
|
157
|
-
inputAmount: BigNumber;
|
|
158
158
|
outputToken: SvmAddress | EvmAddress | RawAddress;
|
|
159
159
|
fillDeadline: number;
|
|
160
160
|
exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
|
|
@@ -178,6 +178,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
178
178
|
message: string;
|
|
179
179
|
depositId: BigNumber;
|
|
180
180
|
outputAmount: BigNumber;
|
|
181
|
+
inputAmount: BigNumber;
|
|
181
182
|
originChainId: number;
|
|
182
183
|
destinationChainId: number;
|
|
183
184
|
fromLiteChain: boolean;
|
|
@@ -187,7 +188,6 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
187
188
|
depositor: SvmAddress | EvmAddress | RawAddress;
|
|
188
189
|
recipient: SvmAddress | EvmAddress | RawAddress;
|
|
189
190
|
inputToken: SvmAddress | EvmAddress | RawAddress;
|
|
190
|
-
inputAmount: BigNumber;
|
|
191
191
|
outputToken: SvmAddress | EvmAddress | RawAddress;
|
|
192
192
|
fillDeadline: number;
|
|
193
193
|
exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
|
|
@@ -209,6 +209,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
209
209
|
message: string;
|
|
210
210
|
depositId: BigNumber;
|
|
211
211
|
outputAmount: BigNumber;
|
|
212
|
+
inputAmount: BigNumber;
|
|
212
213
|
originChainId: number;
|
|
213
214
|
destinationChainId: number;
|
|
214
215
|
fromLiteChain: boolean;
|
|
@@ -218,7 +219,6 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
218
219
|
depositor: SvmAddress | EvmAddress | RawAddress;
|
|
219
220
|
recipient: SvmAddress | EvmAddress | RawAddress;
|
|
220
221
|
inputToken: SvmAddress | EvmAddress | RawAddress;
|
|
221
|
-
inputAmount: BigNumber;
|
|
222
222
|
outputToken: SvmAddress | EvmAddress | RawAddress;
|
|
223
223
|
fillDeadline: number;
|
|
224
224
|
exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
|
|
@@ -240,6 +240,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
240
240
|
message: string;
|
|
241
241
|
depositId: BigNumber;
|
|
242
242
|
outputAmount: BigNumber;
|
|
243
|
+
inputAmount: BigNumber;
|
|
243
244
|
originChainId: number;
|
|
244
245
|
destinationChainId: number;
|
|
245
246
|
fromLiteChain: boolean;
|
|
@@ -249,7 +250,6 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
249
250
|
depositor: SvmAddress | EvmAddress | RawAddress;
|
|
250
251
|
recipient: SvmAddress | EvmAddress | RawAddress;
|
|
251
252
|
inputToken: SvmAddress | EvmAddress | RawAddress;
|
|
252
|
-
inputAmount: BigNumber;
|
|
253
253
|
outputToken: SvmAddress | EvmAddress | RawAddress;
|
|
254
254
|
fillDeadline: number;
|
|
255
255
|
exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
|
|
@@ -272,6 +272,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
272
272
|
message: string;
|
|
273
273
|
depositId: BigNumber;
|
|
274
274
|
outputAmount: BigNumber;
|
|
275
|
+
inputAmount: BigNumber;
|
|
275
276
|
originChainId: number;
|
|
276
277
|
destinationChainId: number;
|
|
277
278
|
fromLiteChain: boolean;
|
|
@@ -281,7 +282,6 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
281
282
|
depositor: SvmAddress | EvmAddress | RawAddress;
|
|
282
283
|
recipient: SvmAddress | EvmAddress | RawAddress;
|
|
283
284
|
inputToken: SvmAddress | EvmAddress | RawAddress;
|
|
284
|
-
inputAmount: BigNumber;
|
|
285
285
|
outputToken: SvmAddress | EvmAddress | RawAddress;
|
|
286
286
|
fillDeadline: number;
|
|
287
287
|
exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
|
|
@@ -304,6 +304,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
304
304
|
fills: {
|
|
305
305
|
depositId: BigNumber;
|
|
306
306
|
outputAmount: BigNumber;
|
|
307
|
+
inputAmount: BigNumber;
|
|
307
308
|
originChainId: number;
|
|
308
309
|
destinationChainId: number;
|
|
309
310
|
repaymentChainId: number;
|
|
@@ -312,7 +313,6 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
312
313
|
depositor: SvmAddress | EvmAddress | RawAddress;
|
|
313
314
|
recipient: SvmAddress | EvmAddress | RawAddress;
|
|
314
315
|
inputToken: SvmAddress | EvmAddress | RawAddress;
|
|
315
|
-
inputAmount: BigNumber;
|
|
316
316
|
outputToken: SvmAddress | EvmAddress | RawAddress;
|
|
317
317
|
fillDeadline: number;
|
|
318
318
|
exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oracle.d.ts","sourceRoot":"","sources":["../../../src/gasPriceOracle/oracle.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEnC,OAAO,EAAE,SAAS,EAAgE,MAAM,UAAU,CAAC;AACnG,OAAO,EAAE,WAAW,IAAI,cAAc,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAOrF,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,WAAW,uBAAuB;IAEtC,iBAAiB,EAAE,SAAS,CAAC;IAE7B,qBAAqB,EAAE,SAAS,CAAC;IAEjC,cAAc,EAAE,OAAO,CAAC;IAExB,OAAO,EAAE,MAAM,CAAC;IAEhB,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB;AAUD,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,WAAW,EACrB,IAAI,CAAC,EAAE,OAAO,CAAC,uBAAuB,CAAC,GACtC,OAAO,CAAC,mBAAmB,CAAC,CAAC;AAGhC,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,cAAc,EACxB,IAAI,CAAC,EAAE,OAAO,CAAC,uBAAuB,CAAC,GACtC,OAAO,CAAC,mBAAmB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"oracle.d.ts","sourceRoot":"","sources":["../../../src/gasPriceOracle/oracle.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEnC,OAAO,EAAE,SAAS,EAAgE,MAAM,UAAU,CAAC;AACnG,OAAO,EAAE,WAAW,IAAI,cAAc,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAOrF,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,WAAW,uBAAuB;IAEtC,iBAAiB,EAAE,SAAS,CAAC;IAE7B,qBAAqB,EAAE,SAAS,CAAC;IAEjC,cAAc,EAAE,OAAO,CAAC;IAExB,OAAO,EAAE,MAAM,CAAC;IAEhB,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB;AAUD,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,WAAW,EACrB,IAAI,CAAC,EAAE,OAAO,CAAC,uBAAuB,CAAC,GACtC,OAAO,CAAC,mBAAmB,CAAC,CAAC;AAGhC,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,cAAc,EACxB,IAAI,CAAC,EAAE,OAAO,CAAC,uBAAuB,CAAC,GACtC,OAAO,CAAC,mBAAmB,CAAC,CAAC;AAkFhC;;;;;;GAMG;AACH,wBAAsB,wBAAwB,CAC5C,iBAAiB,EAAE,SAAS,CAAC,QAAQ,GAAG,MAAM,EAC9C,IAAI,EAAE,uBAAuB,GAC5B,OAAO,CAAC,gBAAgB,CAAC,CA2B3B"}
|
|
@@ -69,7 +69,7 @@ export declare class SvmQuery implements QueryInterface {
|
|
|
69
69
|
* @param relayer SVM address of the relayer
|
|
70
70
|
* @returns FillRelay transaction
|
|
71
71
|
*/
|
|
72
|
-
protected getFillRelayTx(relayData: Omit<RelayData, "
|
|
72
|
+
protected getFillRelayTx(relayData: Omit<RelayData, "recipient" | "outputToken"> & {
|
|
73
73
|
destinationChainId: number;
|
|
74
74
|
recipient: SvmAddress;
|
|
75
75
|
outputToken: SvmAddress;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"svmQuery.d.ts","sourceRoot":"","sources":["../../../../src/relayFeeCalculator/chain-queries/svmQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAsD,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACpG,OAAO,EAAE,WAAW,EAAoC,MAAM,gBAAgB,CAAC;AAI/E,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,UAAU,EAAE,uBAAuB,EAAQ,MAAM,aAAa,CAAC;AAC1G,OAAO,EAAE,MAAM,EAAE,cAAc,EAAqB,MAAM,uBAAuB,CAAC;AAClF,OAAO,EAAE,iBAAiB,EAAE,MAAM,IAAI,CAAC;AAEvC;;;GAGG;AACH,qBAAa,QAAS,YAAW,cAAc;IAe3C,QAAQ,CAAC,QAAQ,EAAE,WAAW;IAC9B,QAAQ,CAAC,aAAa,EAAE,iBAAiB;IACzC,QAAQ,CAAC,SAAS,EAAE,UAAU;IAC9B,QAAQ,CAAC,uBAAuB,EAAE,UAAU;IAC5C,QAAQ,CAAC,MAAM,EAAE,MAAM;IACvB,QAAQ,CAAC,kBAAkB,CAAC;IAC5B,QAAQ,CAAC,aAAa,CAAC;IACvB,QAAQ,CAAC,qBAAqB,EAAE,MAAM;IArBxC,SAAS,CAAC,oBAAoB;;;;;;sEAAC;IAE/B;;;;;;;;;;OAUG;gBAEQ,QAAQ,EAAE,WAAW,EACrB,aAAa,EAAE,iBAAiB,EAChC,SAAS,EAAE,UAAU,EACrB,uBAAuB,EAAE,UAAU,EACnC,MAAM,EAAE,MAAM,EACd,kBAAkB,CAAC,oBAAQ,EAC3B,aAAa,CAAC,0BAAc,EAC5B,qBAAqB,GAAE,MAAc;IAOhD;;;;;;;;;OASG;IACG,WAAW,CACf,SAAS,EAAE,SAAS,GAAG;QAAE,kBAAkB,EAAE,MAAM,CAAA;KAAE,EACrD,OAAO,UAAkD,EACzD,OAAO,GAAE,OAAO,CAAC;QACf,QAAQ,EAAE,YAAY,CAAC;QACvB,QAAQ,EAAE,YAAY,CAAC;QACvB,iBAAiB,EAAE,SAAS,CAAC;QAC7B,qBAAqB,EAAE,SAAS,CAAC;KAClC,CAAM,GACN,OAAO,CAAC,uBAAuB,CAAC;IAqCnC;;;;;OAKG;IACG,gBAAgB,CACpB,OAAO,EAAE,SAAS,GAAG;QAAE,kBAAkB,EAAE,MAAM,CAAA;KAAE,EACnD,OAAO,UAAgD,GACtD,OAAO,CAAC,SAAS,CAAC;IAiBrB;;;;;OAKG;cACa,cAAc,CAC5B,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"svmQuery.d.ts","sourceRoot":"","sources":["../../../../src/relayFeeCalculator/chain-queries/svmQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAsD,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACpG,OAAO,EAAE,WAAW,EAAoC,MAAM,gBAAgB,CAAC;AAI/E,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,UAAU,EAAE,uBAAuB,EAAQ,MAAM,aAAa,CAAC;AAC1G,OAAO,EAAE,MAAM,EAAE,cAAc,EAAqB,MAAM,uBAAuB,CAAC;AAClF,OAAO,EAAE,iBAAiB,EAAE,MAAM,IAAI,CAAC;AAEvC;;;GAGG;AACH,qBAAa,QAAS,YAAW,cAAc;IAe3C,QAAQ,CAAC,QAAQ,EAAE,WAAW;IAC9B,QAAQ,CAAC,aAAa,EAAE,iBAAiB;IACzC,QAAQ,CAAC,SAAS,EAAE,UAAU;IAC9B,QAAQ,CAAC,uBAAuB,EAAE,UAAU;IAC5C,QAAQ,CAAC,MAAM,EAAE,MAAM;IACvB,QAAQ,CAAC,kBAAkB,CAAC;IAC5B,QAAQ,CAAC,aAAa,CAAC;IACvB,QAAQ,CAAC,qBAAqB,EAAE,MAAM;IArBxC,SAAS,CAAC,oBAAoB;;;;;;sEAAC;IAE/B;;;;;;;;;;OAUG;gBAEQ,QAAQ,EAAE,WAAW,EACrB,aAAa,EAAE,iBAAiB,EAChC,SAAS,EAAE,UAAU,EACrB,uBAAuB,EAAE,UAAU,EACnC,MAAM,EAAE,MAAM,EACd,kBAAkB,CAAC,oBAAQ,EAC3B,aAAa,CAAC,0BAAc,EAC5B,qBAAqB,GAAE,MAAc;IAOhD;;;;;;;;;OASG;IACG,WAAW,CACf,SAAS,EAAE,SAAS,GAAG;QAAE,kBAAkB,EAAE,MAAM,CAAA;KAAE,EACrD,OAAO,UAAkD,EACzD,OAAO,GAAE,OAAO,CAAC;QACf,QAAQ,EAAE,YAAY,CAAC;QACvB,QAAQ,EAAE,YAAY,CAAC;QACvB,iBAAiB,EAAE,SAAS,CAAC;QAC7B,qBAAqB,EAAE,SAAS,CAAC;KAClC,CAAM,GACN,OAAO,CAAC,uBAAuB,CAAC;IAqCnC;;;;;OAKG;IACG,gBAAgB,CACpB,OAAO,EAAE,SAAS,GAAG;QAAE,kBAAkB,EAAE,MAAM,CAAA;KAAE,EACnD,OAAO,UAAgD,GACtD,OAAO,CAAC,SAAS,CAAC;IAiBrB;;;;;OAKG;cACa,cAAc,CAC5B,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,WAAW,GAAG,aAAa,CAAC,GAAG;QACxD,kBAAkB,EAAE,MAAM,CAAC;QAC3B,SAAS,EAAE,UAAU,CAAC;QACtB,WAAW,EAAE,UAAU,CAAC;KACzB,EACD,MAAM,EAAE,iBAAiB,EACzB,gBAAgB,EAAE,MAAM,EACxB,gBAAgB,EAAE,OAAO;;;;IAK3B;;;;OAIG;IACG,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAUzD;;;;OAIG;IACH,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;CAI9C"}
|
package/package.json
CHANGED
|
@@ -182,7 +182,10 @@ export async function findDeposit(
|
|
|
182
182
|
return undefined;
|
|
183
183
|
}
|
|
184
184
|
|
|
185
|
-
const unwrappedDepositEvent = unwrapEventData(depositEvent.data) as Record<
|
|
185
|
+
const unwrappedDepositEvent = unwrapEventData(depositEvent.data, ["depositId", "outputAmount"]) as Record<
|
|
186
|
+
string,
|
|
187
|
+
unknown
|
|
188
|
+
>;
|
|
186
189
|
const destinationChainId = unwrappedDepositEvent.destinationChainId as number;
|
|
187
190
|
// Return the deposit event with block info
|
|
188
191
|
return {
|
|
@@ -371,7 +374,7 @@ export async function findFillEvent(
|
|
|
371
374
|
|
|
372
375
|
if (fillEvents.length > 0) {
|
|
373
376
|
const rawFillEvent = fillEvents[0];
|
|
374
|
-
const eventData = unwrapEventData(rawFillEvent.data) as FillWithBlock & {
|
|
377
|
+
const eventData = unwrapEventData(rawFillEvent.data, ["depositId", "inputAmount"]) as FillWithBlock & {
|
|
375
378
|
depositor: string;
|
|
376
379
|
recipient: string;
|
|
377
380
|
inputToken: string;
|
|
@@ -518,7 +521,7 @@ export function createTokenAccountsInstruction(
|
|
|
518
521
|
export async function getFillRelayTx(
|
|
519
522
|
spokePoolAddr: SvmAddress,
|
|
520
523
|
solanaClient: SVMProvider,
|
|
521
|
-
relayData: Omit<RelayData, "
|
|
524
|
+
relayData: Omit<RelayData, "recipient" | "outputToken"> & {
|
|
522
525
|
destinationChainId: number;
|
|
523
526
|
recipient: SvmAddress;
|
|
524
527
|
outputToken: SvmAddress;
|
|
@@ -529,8 +532,6 @@ export async function getFillRelayTx(
|
|
|
529
532
|
) {
|
|
530
533
|
const { depositor, recipient, inputToken, outputToken, exclusiveRelayer, destinationChainId } = relayData;
|
|
531
534
|
|
|
532
|
-
// tsc appeasement...should be unnecessary, but isn't. @todo Identify why.
|
|
533
|
-
assert(recipient.isSVM(), `getFillRelayTx: recipient not an SVM address (${recipient})`);
|
|
534
535
|
assert(
|
|
535
536
|
repaymentAddress.isValidOn(repaymentChainId),
|
|
536
537
|
`getFillRelayTx: repayment address ${repaymentAddress} not valid on chain ${repaymentChainId})`
|
|
@@ -326,7 +326,7 @@ export class SvmCpiEventsClient {
|
|
|
326
326
|
return fillEvents.map((event) => {
|
|
327
327
|
const unwrappedEventData = unwrapEventData(event as Record<string, unknown>, [
|
|
328
328
|
"depositId",
|
|
329
|
-
"
|
|
329
|
+
"inputAmount",
|
|
330
330
|
]) as Record<"data", Fill> &
|
|
331
331
|
Record<
|
|
332
332
|
"data",
|
package/src/arch/svm/utils.ts
CHANGED
|
@@ -150,7 +150,7 @@ export function getEventName(rawName: string): EventName {
|
|
|
150
150
|
*/
|
|
151
151
|
export function unwrapEventData(
|
|
152
152
|
data: unknown,
|
|
153
|
-
uint8ArrayKeysAsBigInt: string[] = ["depositId", "outputAmount"],
|
|
153
|
+
uint8ArrayKeysAsBigInt: string[] = ["depositId", "outputAmount", "inputAmount"],
|
|
154
154
|
currentKey?: string
|
|
155
155
|
): unknown {
|
|
156
156
|
// Handle null/undefined
|
|
@@ -58,15 +58,7 @@ export async function getGasPriceEstimate(
|
|
|
58
58
|
opts: Partial<GasPriceEstimateOptions> = {}
|
|
59
59
|
): Promise<GasPriceEstimate> {
|
|
60
60
|
const baseFeeMultiplier = opts.baseFeeMultiplier ?? toBNWei("1");
|
|
61
|
-
assert(
|
|
62
|
-
baseFeeMultiplier.gte(toBNWei("1.0")) && baseFeeMultiplier.lte(toBNWei("5")),
|
|
63
|
-
`Require 1.0 < base fee multiplier (${baseFeeMultiplier}) <= 5.0 for a total gas multiplier within [+1.0, +5.0]`
|
|
64
|
-
);
|
|
65
61
|
const priorityFeeMultiplier = opts.priorityFeeMultiplier ?? toBNWei("1");
|
|
66
|
-
assert(
|
|
67
|
-
priorityFeeMultiplier.gte(toBNWei("1.0")) && priorityFeeMultiplier.lte(toBNWei("5")),
|
|
68
|
-
`Require 1.0 < priority fee multiplier (${priorityFeeMultiplier}) <= 5.0 for a total gas multiplier within [+1.0, +5.0]`
|
|
69
|
-
);
|
|
70
62
|
|
|
71
63
|
// Exit here if we need to estimate on Solana.
|
|
72
64
|
if (!isEvmProvider(provider)) {
|
|
@@ -131,7 +131,7 @@ export class SvmQuery implements QueryInterface {
|
|
|
131
131
|
* @returns FillRelay transaction
|
|
132
132
|
*/
|
|
133
133
|
protected async getFillRelayTx(
|
|
134
|
-
relayData: Omit<RelayData, "
|
|
134
|
+
relayData: Omit<RelayData, "recipient" | "outputToken"> & {
|
|
135
135
|
destinationChainId: number;
|
|
136
136
|
recipient: SvmAddress;
|
|
137
137
|
outputToken: SvmAddress;
|