@across-protocol/sdk 4.3.20 → 4.3.23
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 +4 -2
- package/dist/cjs/arch/svm/SpokeUtils.js +68 -26
- package/dist/cjs/arch/svm/SpokeUtils.js.map +1 -1
- package/dist/cjs/arch/svm/utils.d.ts +4 -1
- package/dist/cjs/arch/svm/utils.js +31 -8
- package/dist/cjs/arch/svm/utils.js.map +1 -1
- package/dist/cjs/caching/Arweave/ArweaveClient.d.ts +4 -1
- package/dist/cjs/caching/Arweave/ArweaveClient.js +66 -17
- package/dist/cjs/caching/Arweave/ArweaveClient.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/utils/SuperstructUtils.d.ts +24 -24
- package/dist/cjs/gasPriceOracle/adapters/ethereum.js +1 -5
- package/dist/cjs/gasPriceOracle/adapters/ethereum.js.map +1 -1
- package/dist/cjs/gasPriceOracle/adapters/solana.js +1 -5
- package/dist/cjs/gasPriceOracle/adapters/solana.js.map +1 -1
- package/dist/cjs/providers/utils.js +2 -0
- package/dist/cjs/providers/utils.js.map +1 -1
- package/dist/cjs/utils/BigNumberUtils.d.ts +2 -0
- package/dist/cjs/utils/BigNumberUtils.js +5 -1
- package/dist/cjs/utils/BigNumberUtils.js.map +1 -1
- package/dist/cjs/utils/DepositUtils.d.ts +2 -0
- package/dist/cjs/utils/DepositUtils.js +9 -1
- package/dist/cjs/utils/DepositUtils.js.map +1 -1
- package/dist/cjs/utils/TokenUtils.d.ts +1 -1
- package/dist/cjs/utils/TokenUtils.js +1 -1
- package/dist/cjs/utils/TokenUtils.js.map +1 -1
- package/dist/esm/arch/svm/SpokeUtils.d.ts +4 -2
- package/dist/esm/arch/svm/SpokeUtils.js +70 -29
- package/dist/esm/arch/svm/SpokeUtils.js.map +1 -1
- package/dist/esm/arch/svm/utils.d.ts +15 -1
- package/dist/esm/arch/svm/utils.js +40 -9
- package/dist/esm/arch/svm/utils.js.map +1 -1
- package/dist/esm/caching/Arweave/ArweaveClient.d.ts +4 -1
- package/dist/esm/caching/Arweave/ArweaveClient.js +72 -20
- package/dist/esm/caching/Arweave/ArweaveClient.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.d.ts +24 -24
- package/dist/esm/gasPriceOracle/adapters/ethereum.js +2 -6
- package/dist/esm/gasPriceOracle/adapters/ethereum.js.map +1 -1
- package/dist/esm/gasPriceOracle/adapters/solana.js +2 -6
- package/dist/esm/gasPriceOracle/adapters/solana.js.map +1 -1
- package/dist/esm/providers/utils.js +4 -1
- package/dist/esm/providers/utils.js.map +1 -1
- package/dist/esm/utils/BigNumberUtils.d.ts +5 -0
- package/dist/esm/utils/BigNumberUtils.js +5 -0
- package/dist/esm/utils/BigNumberUtils.js.map +1 -1
- package/dist/esm/utils/DepositUtils.d.ts +16 -2
- package/dist/esm/utils/DepositUtils.js +20 -2
- package/dist/esm/utils/DepositUtils.js.map +1 -1
- package/dist/esm/utils/TokenUtils.d.ts +3 -23
- package/dist/esm/utils/TokenUtils.js +1 -1
- package/dist/esm/utils/TokenUtils.js.map +1 -1
- package/dist/types/arch/svm/SpokeUtils.d.ts +4 -2
- package/dist/types/arch/svm/SpokeUtils.d.ts.map +1 -1
- package/dist/types/arch/svm/utils.d.ts +15 -1
- package/dist/types/arch/svm/utils.d.ts.map +1 -1
- package/dist/types/caching/Arweave/ArweaveClient.d.ts +4 -1
- package/dist/types/caching/Arweave/ArweaveClient.d.ts.map +1 -1
- package/dist/types/clients/BundleDataClient/utils/SuperstructUtils.d.ts +24 -24
- package/dist/types/gasPriceOracle/adapters/ethereum.d.ts.map +1 -1
- package/dist/types/gasPriceOracle/adapters/solana.d.ts.map +1 -1
- package/dist/types/providers/utils.d.ts.map +1 -1
- package/dist/types/utils/BigNumberUtils.d.ts +5 -0
- package/dist/types/utils/BigNumberUtils.d.ts.map +1 -1
- package/dist/types/utils/DepositUtils.d.ts +16 -2
- package/dist/types/utils/DepositUtils.d.ts.map +1 -1
- package/dist/types/utils/TokenUtils.d.ts +3 -23
- package/dist/types/utils/TokenUtils.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/arch/svm/SpokeUtils.ts +75 -14
- package/src/arch/svm/utils.ts +43 -8
- package/src/caching/Arweave/ArweaveClient.ts +47 -12
- package/src/gasPriceOracle/adapters/ethereum.ts +2 -6
- package/src/gasPriceOracle/adapters/solana.ts +2 -7
- package/src/providers/utils.ts +3 -0
- package/src/utils/BigNumberUtils.ts +6 -0
- package/src/utils/DepositUtils.ts +41 -2
- package/src/utils/TokenUtils.ts +2 -2
|
@@ -3,14 +3,18 @@ import Arweave from "arweave";
|
|
|
3
3
|
import axios from "axios";
|
|
4
4
|
import { create } from "superstruct";
|
|
5
5
|
import { ARWEAVE_TAG_APP_NAME, ARWEAVE_TAG_APP_VERSION, DEFAULT_ARWEAVE_STORAGE_ADDRESS } from "../../constants";
|
|
6
|
-
import { BigNumber, isDefined, jsonReplacerWithBigNumbers, toBN } from "../../utils";
|
|
6
|
+
import { BigNumber, delay, isDefined, jsonReplacerWithBigNumbers, toBN } from "../../utils";
|
|
7
7
|
var ArweaveClient = /** @class */ (function () {
|
|
8
|
-
function ArweaveClient(arweaveJWT, logger, gatewayURL, protocol, port) {
|
|
8
|
+
function ArweaveClient(arweaveJWT, logger, gatewayURL, protocol, port, retries, retryDelaySeconds) {
|
|
9
9
|
if (gatewayURL === void 0) { gatewayURL = "arweave.net"; }
|
|
10
10
|
if (protocol === void 0) { protocol = "https"; }
|
|
11
11
|
if (port === void 0) { port = 443; }
|
|
12
|
+
if (retries === void 0) { retries = 2; }
|
|
13
|
+
if (retryDelaySeconds === void 0) { retryDelaySeconds = 1; }
|
|
12
14
|
this.arweaveJWT = arweaveJWT;
|
|
13
15
|
this.logger = logger;
|
|
16
|
+
this.retries = retries;
|
|
17
|
+
this.retryDelaySeconds = retryDelaySeconds;
|
|
14
18
|
this.gatewayUrl = "".concat(protocol, "://").concat(gatewayURL, ":").concat(port);
|
|
15
19
|
this.client = new Arweave({
|
|
16
20
|
host: gatewayURL,
|
|
@@ -24,6 +28,12 @@ var ArweaveClient = /** @class */ (function () {
|
|
|
24
28
|
message: "Arweave client initialized",
|
|
25
29
|
gateway: this.gatewayUrl,
|
|
26
30
|
});
|
|
31
|
+
if (this.retries < 0) {
|
|
32
|
+
throw new Error("retries cannot be < 0 and must be an integer. Currently set to ".concat(this.retries));
|
|
33
|
+
}
|
|
34
|
+
if (this.retryDelaySeconds < 0) {
|
|
35
|
+
throw new Error("delay cannot be < 0. Currently set to ".concat(this.retryDelaySeconds));
|
|
36
|
+
}
|
|
27
37
|
}
|
|
28
38
|
/**
|
|
29
39
|
* Stores an arbitrary record in the Arweave network. The record is stored as a JSON string and uses
|
|
@@ -238,32 +248,74 @@ var ArweaveClient = /** @class */ (function () {
|
|
|
238
248
|
ArweaveClient.prototype.getAddress = function () {
|
|
239
249
|
return this.client.wallets.jwkToAddress(this.arweaveJWT);
|
|
240
250
|
};
|
|
251
|
+
ArweaveClient.prototype._retryRequest = function (request, retryCount) {
|
|
252
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
253
|
+
var e_2, baseDelay, delayS;
|
|
254
|
+
return __generator(this, function (_a) {
|
|
255
|
+
switch (_a.label) {
|
|
256
|
+
case 0:
|
|
257
|
+
_a.trys.push([0, 1, , 5]);
|
|
258
|
+
return [2 /*return*/, request()];
|
|
259
|
+
case 1:
|
|
260
|
+
e_2 = _a.sent();
|
|
261
|
+
if (!(retryCount < this.retries)) return [3 /*break*/, 3];
|
|
262
|
+
baseDelay = this.retryDelaySeconds * Math.pow(2, retryCount);
|
|
263
|
+
delayS = baseDelay + baseDelay * Math.random();
|
|
264
|
+
this.logger.debug({
|
|
265
|
+
at: "ArweaveClient:getBalance",
|
|
266
|
+
message: "Arweave request failed, retrying after waiting ".concat(delayS, " seconds: ").concat(e_2),
|
|
267
|
+
retryCount: retryCount,
|
|
268
|
+
});
|
|
269
|
+
return [4 /*yield*/, delay(delayS)];
|
|
270
|
+
case 2:
|
|
271
|
+
_a.sent();
|
|
272
|
+
return [2 /*return*/, this._retryRequest(request, retryCount + 1)];
|
|
273
|
+
case 3: throw e_2;
|
|
274
|
+
case 4: return [3 /*break*/, 5];
|
|
275
|
+
case 5: return [2 /*return*/];
|
|
276
|
+
}
|
|
277
|
+
});
|
|
278
|
+
});
|
|
279
|
+
};
|
|
241
280
|
/**
|
|
242
281
|
* The balance of the signer
|
|
243
282
|
* @returns The balance of the signer in winston units
|
|
244
283
|
*/
|
|
245
284
|
ArweaveClient.prototype.getBalance = function () {
|
|
246
285
|
return __awaiter(this, void 0, void 0, function () {
|
|
247
|
-
var address,
|
|
248
|
-
|
|
249
|
-
|
|
286
|
+
var address, request;
|
|
287
|
+
var _this = this;
|
|
288
|
+
return __generator(this, function (_a) {
|
|
289
|
+
switch (_a.label) {
|
|
250
290
|
case 0: return [4 /*yield*/, this.getAddress()];
|
|
251
291
|
case 1:
|
|
252
|
-
address =
|
|
253
|
-
return
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
292
|
+
address = _a.sent();
|
|
293
|
+
request = function () { return __awaiter(_this, void 0, void 0, function () {
|
|
294
|
+
var balanceInFloat, _a, balance, exponent, resultingBN;
|
|
295
|
+
return __generator(this, function (_b) {
|
|
296
|
+
switch (_b.label) {
|
|
297
|
+
case 0: return [4 /*yield*/, this.client.wallets.getBalance(address)];
|
|
298
|
+
case 1:
|
|
299
|
+
balanceInFloat = _b.sent();
|
|
300
|
+
// @dev The reason we add in the BN.from into this retry loop is because the client.getBalance call
|
|
301
|
+
// does not correctly throw an error if the request fails, instead it will return the error string as the
|
|
302
|
+
// balanceInFloat.
|
|
303
|
+
// Sometimes the balance is returned in scientific notation, so we need to
|
|
304
|
+
// convert it to a BigNumber
|
|
305
|
+
if (balanceInFloat.includes("e")) {
|
|
306
|
+
_a = balanceInFloat.split("e"), balance = _a[0], exponent = _a[1];
|
|
307
|
+
resultingBN = BigNumber.from(balance).mul(toBN(10).pow(exponent.replace("+", "")));
|
|
308
|
+
return [2 /*return*/, BigNumber.from(resultingBN.toString())];
|
|
309
|
+
}
|
|
310
|
+
else {
|
|
311
|
+
return [2 /*return*/, BigNumber.from(balanceInFloat)];
|
|
312
|
+
}
|
|
313
|
+
return [2 /*return*/];
|
|
314
|
+
}
|
|
315
|
+
});
|
|
316
|
+
}); };
|
|
317
|
+
return [4 /*yield*/, this._retryRequest(request, 0)];
|
|
318
|
+
case 2: return [2 /*return*/, _a.sent()];
|
|
267
319
|
}
|
|
268
320
|
});
|
|
269
321
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ArweaveClient.js","sourceRoot":"","sources":["../../../../src/caching/Arweave/ArweaveClient.ts"],"names":[],"mappings":";AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAU,MAAM,EAAE,MAAM,aAAa,CAAC;AAE7C,OAAO,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,+BAA+B,EAAE,MAAM,iBAAiB,CAAC;AACjH,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,0BAA0B,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"ArweaveClient.js","sourceRoot":"","sources":["../../../../src/caching/Arweave/ArweaveClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,9 +24,9 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
24
24
|
exclusivityDeadline: number;
|
|
25
25
|
destinationChainId: number;
|
|
26
26
|
quoteTimestamp: number;
|
|
27
|
+
messageHash: string;
|
|
27
28
|
fromLiteChain: boolean;
|
|
28
29
|
toLiteChain: boolean;
|
|
29
|
-
messageHash: string;
|
|
30
30
|
blockNumber: number;
|
|
31
31
|
logIndex: number;
|
|
32
32
|
quoteBlockNumber: number;
|
|
@@ -35,10 +35,10 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
35
35
|
updatedMessage?: string | undefined;
|
|
36
36
|
transactionHash?: string | undefined;
|
|
37
37
|
transactionIndex?: number | undefined;
|
|
38
|
+
relayerFeePct?: BigNumber | undefined;
|
|
38
39
|
speedUpSignature?: string | undefined;
|
|
39
40
|
txnIndex?: number | undefined;
|
|
40
41
|
txnRef?: string | undefined;
|
|
41
|
-
relayerFeePct?: BigNumber | undefined;
|
|
42
42
|
}[]>>;
|
|
43
43
|
bundleFillsV3: Record<string, Record<string, {
|
|
44
44
|
fills: {
|
|
@@ -56,11 +56,8 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
56
56
|
destinationChainId: number;
|
|
57
57
|
repaymentChainId: number;
|
|
58
58
|
quoteTimestamp: number;
|
|
59
|
-
messageHash: string;
|
|
60
|
-
blockNumber: number;
|
|
61
|
-
logIndex: number;
|
|
62
|
-
lpFeePct: BigNumber;
|
|
63
59
|
relayer: SvmAddress | EvmAddress | RawAddress;
|
|
60
|
+
messageHash: string;
|
|
64
61
|
relayExecutionInfo: {
|
|
65
62
|
updatedRecipient: SvmAddress | EvmAddress | RawAddress;
|
|
66
63
|
updatedOutputAmount: BigNumber;
|
|
@@ -68,6 +65,9 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
68
65
|
updatedMessageHash: string;
|
|
69
66
|
updatedMessage?: string | undefined;
|
|
70
67
|
};
|
|
68
|
+
blockNumber: number;
|
|
69
|
+
logIndex: number;
|
|
70
|
+
lpFeePct: BigNumber;
|
|
71
71
|
message?: string | undefined;
|
|
72
72
|
transactionHash?: string | undefined;
|
|
73
73
|
transactionIndex?: number | undefined;
|
|
@@ -93,9 +93,9 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
93
93
|
exclusivityDeadline: number;
|
|
94
94
|
destinationChainId: number;
|
|
95
95
|
quoteTimestamp: number;
|
|
96
|
+
messageHash: string;
|
|
96
97
|
fromLiteChain: boolean;
|
|
97
98
|
toLiteChain: boolean;
|
|
98
|
-
messageHash: string;
|
|
99
99
|
blockNumber: number;
|
|
100
100
|
logIndex: number;
|
|
101
101
|
quoteBlockNumber: number;
|
|
@@ -105,10 +105,10 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
105
105
|
updatedMessage?: string | undefined;
|
|
106
106
|
transactionHash?: string | undefined;
|
|
107
107
|
transactionIndex?: number | undefined;
|
|
108
|
+
relayerFeePct?: BigNumber | undefined;
|
|
108
109
|
speedUpSignature?: string | undefined;
|
|
109
110
|
txnIndex?: number | undefined;
|
|
110
111
|
txnRef?: string | undefined;
|
|
111
|
-
relayerFeePct?: BigNumber | undefined;
|
|
112
112
|
}[]>>;
|
|
113
113
|
expiredDepositsToRefundV3: Record<string, Record<string, {
|
|
114
114
|
message: string;
|
|
@@ -125,9 +125,9 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
125
125
|
exclusivityDeadline: number;
|
|
126
126
|
destinationChainId: number;
|
|
127
127
|
quoteTimestamp: number;
|
|
128
|
+
messageHash: string;
|
|
128
129
|
fromLiteChain: boolean;
|
|
129
130
|
toLiteChain: boolean;
|
|
130
|
-
messageHash: string;
|
|
131
131
|
blockNumber: number;
|
|
132
132
|
logIndex: number;
|
|
133
133
|
quoteBlockNumber: number;
|
|
@@ -136,10 +136,10 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
136
136
|
updatedMessage?: string | undefined;
|
|
137
137
|
transactionHash?: string | undefined;
|
|
138
138
|
transactionIndex?: number | undefined;
|
|
139
|
+
relayerFeePct?: BigNumber | undefined;
|
|
139
140
|
speedUpSignature?: string | undefined;
|
|
140
141
|
txnIndex?: number | undefined;
|
|
141
142
|
txnRef?: string | undefined;
|
|
142
|
-
relayerFeePct?: BigNumber | undefined;
|
|
143
143
|
}[]>>;
|
|
144
144
|
unexecutableSlowFills: Record<string, Record<string, {
|
|
145
145
|
message: string;
|
|
@@ -156,9 +156,9 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
156
156
|
exclusivityDeadline: number;
|
|
157
157
|
destinationChainId: number;
|
|
158
158
|
quoteTimestamp: number;
|
|
159
|
+
messageHash: string;
|
|
159
160
|
fromLiteChain: boolean;
|
|
160
161
|
toLiteChain: boolean;
|
|
161
|
-
messageHash: string;
|
|
162
162
|
blockNumber: number;
|
|
163
163
|
logIndex: number;
|
|
164
164
|
quoteBlockNumber: number;
|
|
@@ -168,10 +168,10 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
168
168
|
updatedMessage?: string | undefined;
|
|
169
169
|
transactionHash?: string | undefined;
|
|
170
170
|
transactionIndex?: number | undefined;
|
|
171
|
+
relayerFeePct?: BigNumber | undefined;
|
|
171
172
|
speedUpSignature?: string | undefined;
|
|
172
173
|
txnIndex?: number | undefined;
|
|
173
174
|
txnRef?: string | undefined;
|
|
174
|
-
relayerFeePct?: BigNumber | undefined;
|
|
175
175
|
}[]>>;
|
|
176
176
|
}, {
|
|
177
177
|
bundleDepositsV3: import("superstruct").Struct<Record<string, Record<string, {
|
|
@@ -189,9 +189,9 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
189
189
|
exclusivityDeadline: number;
|
|
190
190
|
destinationChainId: number;
|
|
191
191
|
quoteTimestamp: number;
|
|
192
|
+
messageHash: string;
|
|
192
193
|
fromLiteChain: boolean;
|
|
193
194
|
toLiteChain: boolean;
|
|
194
|
-
messageHash: string;
|
|
195
195
|
blockNumber: number;
|
|
196
196
|
logIndex: number;
|
|
197
197
|
quoteBlockNumber: number;
|
|
@@ -200,10 +200,10 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
200
200
|
updatedMessage?: string | undefined;
|
|
201
201
|
transactionHash?: string | undefined;
|
|
202
202
|
transactionIndex?: number | undefined;
|
|
203
|
+
relayerFeePct?: BigNumber | undefined;
|
|
203
204
|
speedUpSignature?: string | undefined;
|
|
204
205
|
txnIndex?: number | undefined;
|
|
205
206
|
txnRef?: string | undefined;
|
|
206
|
-
relayerFeePct?: BigNumber | undefined;
|
|
207
207
|
}[]>>, null>;
|
|
208
208
|
expiredDepositsToRefundV3: import("superstruct").Struct<Record<string, Record<string, {
|
|
209
209
|
message: string;
|
|
@@ -220,9 +220,9 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
220
220
|
exclusivityDeadline: number;
|
|
221
221
|
destinationChainId: number;
|
|
222
222
|
quoteTimestamp: number;
|
|
223
|
+
messageHash: string;
|
|
223
224
|
fromLiteChain: boolean;
|
|
224
225
|
toLiteChain: boolean;
|
|
225
|
-
messageHash: string;
|
|
226
226
|
blockNumber: number;
|
|
227
227
|
logIndex: number;
|
|
228
228
|
quoteBlockNumber: number;
|
|
@@ -231,10 +231,10 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
231
231
|
updatedMessage?: string | undefined;
|
|
232
232
|
transactionHash?: string | undefined;
|
|
233
233
|
transactionIndex?: number | undefined;
|
|
234
|
+
relayerFeePct?: BigNumber | undefined;
|
|
234
235
|
speedUpSignature?: string | undefined;
|
|
235
236
|
txnIndex?: number | undefined;
|
|
236
237
|
txnRef?: string | undefined;
|
|
237
|
-
relayerFeePct?: BigNumber | undefined;
|
|
238
238
|
}[]>>, null>;
|
|
239
239
|
unexecutableSlowFills: import("superstruct").Struct<Record<string, Record<string, {
|
|
240
240
|
message: string;
|
|
@@ -251,9 +251,9 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
251
251
|
exclusivityDeadline: number;
|
|
252
252
|
destinationChainId: number;
|
|
253
253
|
quoteTimestamp: number;
|
|
254
|
+
messageHash: string;
|
|
254
255
|
fromLiteChain: boolean;
|
|
255
256
|
toLiteChain: boolean;
|
|
256
|
-
messageHash: string;
|
|
257
257
|
blockNumber: number;
|
|
258
258
|
logIndex: number;
|
|
259
259
|
quoteBlockNumber: number;
|
|
@@ -263,10 +263,10 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
263
263
|
updatedMessage?: string | undefined;
|
|
264
264
|
transactionHash?: string | undefined;
|
|
265
265
|
transactionIndex?: number | undefined;
|
|
266
|
+
relayerFeePct?: BigNumber | undefined;
|
|
266
267
|
speedUpSignature?: string | undefined;
|
|
267
268
|
txnIndex?: number | undefined;
|
|
268
269
|
txnRef?: string | undefined;
|
|
269
|
-
relayerFeePct?: BigNumber | undefined;
|
|
270
270
|
}[]>>, null>;
|
|
271
271
|
bundleSlowFillsV3: import("superstruct").Struct<Record<string, Record<string, {
|
|
272
272
|
message: string;
|
|
@@ -283,9 +283,9 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
283
283
|
exclusivityDeadline: number;
|
|
284
284
|
destinationChainId: number;
|
|
285
285
|
quoteTimestamp: number;
|
|
286
|
+
messageHash: string;
|
|
286
287
|
fromLiteChain: boolean;
|
|
287
288
|
toLiteChain: boolean;
|
|
288
|
-
messageHash: string;
|
|
289
289
|
blockNumber: number;
|
|
290
290
|
logIndex: number;
|
|
291
291
|
quoteBlockNumber: number;
|
|
@@ -295,10 +295,10 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
295
295
|
updatedMessage?: string | undefined;
|
|
296
296
|
transactionHash?: string | undefined;
|
|
297
297
|
transactionIndex?: number | undefined;
|
|
298
|
+
relayerFeePct?: BigNumber | undefined;
|
|
298
299
|
speedUpSignature?: string | undefined;
|
|
299
300
|
txnIndex?: number | undefined;
|
|
300
301
|
txnRef?: string | undefined;
|
|
301
|
-
relayerFeePct?: BigNumber | undefined;
|
|
302
302
|
}[]>>, null>;
|
|
303
303
|
bundleFillsV3: import("superstruct").Struct<Record<string, Record<string, {
|
|
304
304
|
fills: {
|
|
@@ -316,11 +316,8 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
316
316
|
destinationChainId: number;
|
|
317
317
|
repaymentChainId: number;
|
|
318
318
|
quoteTimestamp: number;
|
|
319
|
-
messageHash: string;
|
|
320
|
-
blockNumber: number;
|
|
321
|
-
logIndex: number;
|
|
322
|
-
lpFeePct: BigNumber;
|
|
323
319
|
relayer: SvmAddress | EvmAddress | RawAddress;
|
|
320
|
+
messageHash: string;
|
|
324
321
|
relayExecutionInfo: {
|
|
325
322
|
updatedRecipient: SvmAddress | EvmAddress | RawAddress;
|
|
326
323
|
updatedOutputAmount: BigNumber;
|
|
@@ -328,6 +325,9 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
328
325
|
updatedMessageHash: string;
|
|
329
326
|
updatedMessage?: string | undefined;
|
|
330
327
|
};
|
|
328
|
+
blockNumber: number;
|
|
329
|
+
logIndex: number;
|
|
330
|
+
lpFeePct: BigNumber;
|
|
331
331
|
message?: string | undefined;
|
|
332
332
|
transactionHash?: string | undefined;
|
|
333
333
|
transactionIndex?: number | undefined;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { __awaiter, __generator } from "tslib";
|
|
2
2
|
import assert from "assert";
|
|
3
|
-
import { BigNumber, bnZero, fixedPointAdjustment, getNetworkName
|
|
3
|
+
import { BigNumber, bnZero, fixedPointAdjustment, getNetworkName } from "../../utils";
|
|
4
4
|
import { gasPriceError } from "../util";
|
|
5
5
|
/**
|
|
6
6
|
* @dev Constructs total fee by adding eth_getBlock("pending").baseFee to eth_maxPriorityFeePerGas
|
|
@@ -22,7 +22,7 @@ export function eip1559(provider, opts) {
|
|
|
22
22
|
*/
|
|
23
23
|
export function eip1559Raw(provider, chainId, baseFeeMultiplier, priorityFeeMultiplier) {
|
|
24
24
|
return __awaiter(this, void 0, void 0, function () {
|
|
25
|
-
var _a, baseFeePerGas, _maxPriorityFeePerGas, maxPriorityFeePerGas, scaledPriorityFee,
|
|
25
|
+
var _a, baseFeePerGas, _maxPriorityFeePerGas, maxPriorityFeePerGas, scaledPriorityFee, scaledBaseFee;
|
|
26
26
|
return __generator(this, function (_b) {
|
|
27
27
|
switch (_b.label) {
|
|
28
28
|
case 0: return [4 /*yield*/, Promise.all([
|
|
@@ -34,10 +34,6 @@ export function eip1559Raw(provider, chainId, baseFeeMultiplier, priorityFeeMult
|
|
|
34
34
|
maxPriorityFeePerGas = BigNumber.from(_maxPriorityFeePerGas);
|
|
35
35
|
assert(BigNumber.isBigNumber(baseFeePerGas), "No baseFeePerGas received on ".concat(getNetworkName(chainId)));
|
|
36
36
|
scaledPriorityFee = maxPriorityFeePerGas.mul(priorityFeeMultiplier).div(fixedPointAdjustment);
|
|
37
|
-
flooredPriorityFeePerGas = parseUnits(process.env["MIN_PRIORITY_FEE_PER_GAS_".concat(chainId)] || "0", 9);
|
|
38
|
-
if (scaledPriorityFee.lt(flooredPriorityFeePerGas)) {
|
|
39
|
-
scaledPriorityFee = BigNumber.from(flooredPriorityFeePerGas);
|
|
40
|
-
}
|
|
41
37
|
scaledBaseFee = baseFeePerGas.mul(baseFeeMultiplier).div(fixedPointAdjustment);
|
|
42
38
|
return [2 /*return*/, {
|
|
43
39
|
maxFeePerGas: scaledPriorityFee.add(scaledBaseFee),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ethereum.js","sourceRoot":"","sources":["../../../../src/gasPriceOracle/adapters/ethereum.ts"],"names":[],"mappings":";AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,oBAAoB,EAAE,cAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"ethereum.js","sourceRoot":"","sources":["../../../../src/gasPriceOracle/adapters/ethereum.ts"],"names":[],"mappings":";AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAEtF,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAGxC;;;;;;;GAOG;AACH,MAAM,UAAU,OAAO,CAAC,QAA4B,EAAE,IAA6B;IACjF,OAAO,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;AAChG,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAgB,UAAU,CAC9B,QAA4B,EAC5B,OAAe,EACf,iBAA4B,EAC5B,qBAAgC;;;;;wBAEmB,qBAAM,OAAO,CAAC,GAAG,CAAC;wBACnE,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC;wBAC1B,QAAsC,CAAC,IAAI,CAAC,0BAA0B,EAAE,EAAE,CAAC;qBAC7E,CAAC,EAAA;;oBAHI,KAA6C,SAGjD,EAHO,aAAa,sBAAA,EAAI,qBAAqB,QAAA;oBAIzC,oBAAoB,GAAG,SAAS,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;oBACnE,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,aAAa,CAAC,EAAE,uCAAgC,cAAc,CAAC,OAAO,CAAC,CAAE,CAAC,CAAC;oBAElG,iBAAiB,GAAG,oBAAoB,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;oBAC9F,aAAa,GAAG,aAAa,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;oBACrF,sBAAO;4BACL,YAAY,EAAE,iBAAiB,CAAC,GAAG,CAAC,aAAa,CAAC;4BAClD,oBAAoB,EAAE,iBAAiB;yBACxC,EAAC;;;;CACH;AAED;;;;GAIG;AACH,MAAM,UAAgB,MAAM,CAC1B,QAA4B,EAC5B,IAA6B;;;;;;oBAErB,OAAO,GAAwB,IAAI,QAA5B,EAAE,iBAAiB,GAAK,IAAI,kBAAT,CAAU;oBAC3B,qBAAM,QAAQ,CAAC,WAAW,EAAE,EAAA;;oBAAvC,QAAQ,GAAG,SAA4B;oBAE7C,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,EAAE,CAAC,MAAM,CAAC;wBAAE,aAAa,CAAC,eAAe,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;oBAE/G,sBAAO;4BACL,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,GAAG,CAAC,oBAAoB,CAAC;4BACvE,oBAAoB,EAAE,MAAM;yBAC7B,EAAC;;;;CACH"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { __awaiter, __generator } from "tslib";
|
|
2
|
-
import { toBN, dedupArray
|
|
2
|
+
import { toBN, dedupArray } from "../../utils";
|
|
3
3
|
import { compileTransaction } from "@solana/kit";
|
|
4
4
|
/**
|
|
5
5
|
* @notice Returns result of getFeeForMessage and getRecentPrioritizationFees RPC calls.
|
|
@@ -7,7 +7,7 @@ import { compileTransaction } from "@solana/kit";
|
|
|
7
7
|
*/
|
|
8
8
|
export function messageFee(provider, opts) {
|
|
9
9
|
return __awaiter(this, void 0, void 0, function () {
|
|
10
|
-
var _unsignedTx, unsignedTx, compiledTransaction, encodedTransactionMessage, baseFeeResponse, instructionAddresses, recentPriorityFees, nonzeroPrioritizationFees, totalPrioritizationFees,
|
|
10
|
+
var _unsignedTx, unsignedTx, compiledTransaction, encodedTransactionMessage, baseFeeResponse, instructionAddresses, recentPriorityFees, nonzeroPrioritizationFees, totalPrioritizationFees, microLamportsPerComputeUnit;
|
|
11
11
|
return __generator(this, function (_a) {
|
|
12
12
|
switch (_a.label) {
|
|
13
13
|
case 0:
|
|
@@ -27,11 +27,7 @@ export function messageFee(provider, opts) {
|
|
|
27
27
|
.map(function (value) { return value.prioritizationFee; })
|
|
28
28
|
.filter(function (fee) { return fee > 0; });
|
|
29
29
|
totalPrioritizationFees = nonzeroPrioritizationFees.reduce(function (acc, fee) { return acc + fee; }, BigInt(0));
|
|
30
|
-
flooredPriorityFeePerGas = parseUnits(process.env["MIN_PRIORITY_FEE_PER_GAS_".concat(opts.chainId)] || "0", 6);
|
|
31
30
|
microLamportsPerComputeUnit = toBN(totalPrioritizationFees / BigInt(Math.max(nonzeroPrioritizationFees.length, 1)));
|
|
32
|
-
if (microLamportsPerComputeUnit.lt(flooredPriorityFeePerGas)) {
|
|
33
|
-
microLamportsPerComputeUnit = flooredPriorityFeePerGas;
|
|
34
|
-
}
|
|
35
31
|
return [2 /*return*/, {
|
|
36
32
|
baseFee: toBN(baseFeeResponse.value),
|
|
37
33
|
microLamportsPerComputeUnit: microLamportsPerComputeUnit,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solana.js","sourceRoot":"","sources":["../../../../src/gasPriceOracle/adapters/solana.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"solana.js","sourceRoot":"","sources":["../../../../src/gasPriceOracle/adapters/solana.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAG/C,OAAO,EAA+D,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAE9G;;;GAGG;AACH,MAAM,UAAgB,UAAU,CAAC,QAAqB,EAAE,IAA6B;;;;;;oBAC/D,WAAW,GAAK,IAAI,WAAT,CAAU;oBAGnC,UAAU,GAAG,WAA2C,CAAC;oBACzD,mBAAmB,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;oBAGrD,yBAAyB,GAAG,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC,QAAQ,CACtF,QAAQ,CACwB,CAAC;oBACX,qBAAM,QAAQ,CAAC,gBAAgB,CAAC,yBAAyB,CAAC,CAAC,IAAI,EAAE,EAAA;;oBAAnF,eAAe,GAAG,SAAiE;oBAGnF,oBAAoB,GAAG,UAAU,CAAC,UAAU,CAAC,YAAY,CAAC,GAAG,CAAC,UAAC,WAAW,IAAK,OAAA,WAAW,CAAC,cAAc,EAA1B,CAA0B,CAAC,CAAC,CAAC;oBACvF,qBAAM,QAAQ,CAAC,2BAA2B,CAAC,oBAAoB,CAAC,CAAC,IAAI,EAAE,EAAA;;oBAA5F,kBAAkB,GAAG,SAAuE;oBAG5F,yBAAyB,GAAG,kBAAkB;yBACjD,KAAK,CAAC,GAAG,CAAC;yBACV,GAAG,CAAC,UAAC,KAAK,IAAK,OAAA,KAAK,CAAC,iBAAiB,EAAvB,CAAuB,CAAC;yBACvC,MAAM,CAAC,UAAC,GAAG,IAAK,OAAA,GAAG,GAAG,CAAC,EAAP,CAAO,CAAC,CAAC;oBACtB,uBAAuB,GAAG,yBAAyB,CAAC,MAAM,CAAC,UAAC,GAAG,EAAE,GAAG,IAAK,OAAA,GAAG,GAAG,GAAG,EAAT,CAAS,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;oBAE/F,2BAA2B,GAAG,IAAI,CACtC,uBAAuB,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,yBAAyB,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAChF,CAAC;oBACF,sBAAO;4BACL,OAAO,EAAE,IAAI,CAAC,eAAgB,CAAC,KAAM,CAAC;4BACtC,2BAA2B,6BAAA;yBAC5B,EAAC;;;;CACH"}
|
|
@@ -79,14 +79,17 @@ var IGNORED_FIELDS = {
|
|
|
79
79
|
// 2023-08-31 Added blockHash because of upstream zkSync provider disagreements. Consider removing later.
|
|
80
80
|
// 2024-05-07 Added l1BatchNumber and logType due to Alchemy. Consider removing later.
|
|
81
81
|
// 2024-07-11 Added blockTimestamp after zkSync rolled out a new node release.
|
|
82
|
+
// 2025-07-24 Added additional fields returned by Chainstack on (at least) Polygon.
|
|
82
83
|
eth_getBlockByNumber: [
|
|
83
84
|
"miner",
|
|
84
85
|
"l1BatchNumber",
|
|
85
86
|
"l1BatchTimestamp",
|
|
87
|
+
"requestsHash",
|
|
86
88
|
"size",
|
|
87
89
|
"totalDifficulty",
|
|
88
90
|
"logsBloom",
|
|
89
|
-
"transactions",
|
|
91
|
+
"transactions",
|
|
92
|
+
"withdrawals", // Chainstack (Polygon)
|
|
90
93
|
],
|
|
91
94
|
eth_getLogs: ["blockTimestamp", "transactionLogIndex", "l1BatchNumber", "logType"],
|
|
92
95
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/providers/utils.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/providers/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,11 @@ export declare const bnZero: BigNumber;
|
|
|
12
12
|
export declare const bnOne: BigNumber;
|
|
13
13
|
export declare const bnUint32Max: BigNumber;
|
|
14
14
|
export declare const bnUint256Max: BigNumber;
|
|
15
|
+
/**
|
|
16
|
+
* BigInt min/max helpers.
|
|
17
|
+
*/
|
|
18
|
+
export declare const biMin: (a: bigint, b: bigint) => bigint;
|
|
19
|
+
export declare const biMax: (a: bigint, b: bigint) => bigint;
|
|
15
20
|
/**
|
|
16
21
|
* Converts a stringified number into a BigNumber with 18 decimal places.
|
|
17
22
|
* @param num The number to parse.
|
|
@@ -13,6 +13,11 @@ export var bnZero = BigNumber.from("0");
|
|
|
13
13
|
export var bnOne = BigNumber.from("1");
|
|
14
14
|
export var bnUint32Max = BigNumber.from("0xffffffff");
|
|
15
15
|
export var bnUint256Max = BigNumber.from("0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
|
|
16
|
+
/**
|
|
17
|
+
* BigInt min/max helpers.
|
|
18
|
+
*/
|
|
19
|
+
export var biMin = function (a, b) { return (a > b ? b : a); };
|
|
20
|
+
export var biMax = function (a, b) { return (a > b ? a : b); };
|
|
16
21
|
/**
|
|
17
22
|
* Converts a stringified number into a BigNumber with 18 decimal places.
|
|
18
23
|
* @param num The number to parse.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BigNumberUtils.js","sourceRoot":"","sources":["../../../src/utils/BigNumberUtils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,QAAQ,CAAC;AAE9C,iDAAiD;AACjD,OAAO,EAAE,SAAS,EAAgB,MAAM,0BAA0B,CAAC;AAEnE,iDAAiD;AACjD,cAAc,0BAA0B,CAAC;AAGzC,MAAM,CAAS,IAAA,WAAW,GAA0C,WAAW,YAArD,EAAE,WAAW,GAA6B,WAAW,YAAxC,EAAE,UAAU,GAAiB,WAAW,WAA5B,EAAE,UAAU,GAAK,WAAW,WAAhB,CAAiB;AAChF,MAAM,CAAC,IAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC1C,MAAM,CAAC,IAAM,KAAK,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACzC,MAAM,CAAC,IAAM,WAAW,GAAG,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;AACxD,MAAM,CAAC,IAAM,YAAY,GAAG,SAAS,CAAC,IAAI,CAAC,oEAAoE,CAAC,CAAC;AAEjH;;;;GAIG;AACH,MAAM,UAAU,KAAK,CAAC,GAAiB;IACrC,OAAO,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;AAChD,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,MAAM,CAAC,GAAiB;IACtC,OAAO,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;AACnD,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,IAAM,IAAI,GAAG,UAAC,GAAiB,EAAE,QAA8C;IAA9C,yBAAA,EAAA,kBAA8C;IACpF,gHAAgH;IAChH,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QAChC,2DAA2D;QACrD,IAAA,KAAqB,GAAG,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,EAA7C,OAAO,QAAA,EAAE,OAAO,QAA6B,CAAC;QACrD,kFAAkF;QAClF,gFAAgF;QAChF,+EAA+E;QAC/E,iFAAiF;QACjF,iEAAiE;QACjE,IAAM,OAAO,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,QAAQ,KAAK,MAAM,IAAI,CAAC,QAAQ,KAAK,OAAO,IAAI,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACnH,4DAA4D;QAC5D,OAAO,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KACrD;IACD,8DAA8D;IAC9D,OAAO,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;AACxC,CAAC,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,CAAC,IAAM,KAAK,GAAG,UAAC,GAAc,EAAE,GAAc;IAClD,OAAO,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;AACjC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"BigNumberUtils.js","sourceRoot":"","sources":["../../../src/utils/BigNumberUtils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,QAAQ,CAAC;AAE9C,iDAAiD;AACjD,OAAO,EAAE,SAAS,EAAgB,MAAM,0BAA0B,CAAC;AAEnE,iDAAiD;AACjD,cAAc,0BAA0B,CAAC;AAGzC,MAAM,CAAS,IAAA,WAAW,GAA0C,WAAW,YAArD,EAAE,WAAW,GAA6B,WAAW,YAAxC,EAAE,UAAU,GAAiB,WAAW,WAA5B,EAAE,UAAU,GAAK,WAAW,WAAhB,CAAiB;AAChF,MAAM,CAAC,IAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC1C,MAAM,CAAC,IAAM,KAAK,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACzC,MAAM,CAAC,IAAM,WAAW,GAAG,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;AACxD,MAAM,CAAC,IAAM,YAAY,GAAG,SAAS,CAAC,IAAI,CAAC,oEAAoE,CAAC,CAAC;AAEjH;;GAEG;AACH,MAAM,CAAC,IAAM,KAAK,GAAG,UAAC,CAAS,EAAE,CAAS,IAAK,OAAA,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAf,CAAe,CAAC;AAC/D,MAAM,CAAC,IAAM,KAAK,GAAG,UAAC,CAAS,EAAE,CAAS,IAAK,OAAA,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAf,CAAe,CAAC;AAE/D;;;;GAIG;AACH,MAAM,UAAU,KAAK,CAAC,GAAiB;IACrC,OAAO,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;AAChD,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,MAAM,CAAC,GAAiB;IACtC,OAAO,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;AACnD,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,IAAM,IAAI,GAAG,UAAC,GAAiB,EAAE,QAA8C;IAA9C,yBAAA,EAAA,kBAA8C;IACpF,gHAAgH;IAChH,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QAChC,2DAA2D;QACrD,IAAA,KAAqB,GAAG,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,EAA7C,OAAO,QAAA,EAAE,OAAO,QAA6B,CAAC;QACrD,kFAAkF;QAClF,gFAAgF;QAChF,+EAA+E;QAC/E,iFAAiF;QACjF,iEAAiE;QACjE,IAAM,OAAO,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,QAAQ,KAAK,MAAM,IAAI,CAAC,QAAQ,KAAK,OAAO,IAAI,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACnH,4DAA4D;QAC5D,OAAO,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KACrD;IACD,8DAA8D;IAC9D,OAAO,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;AACxC,CAAC,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,CAAC,IAAM,KAAK,GAAG,UAAC,GAAc,EAAE,GAAc;IAClD,OAAO,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;AACjC,CAAC,CAAC"}
|
|
@@ -81,13 +81,27 @@ export declare function resolveDepositMessage(deposit: Deposit): string;
|
|
|
81
81
|
* Converts a RelayData object with `Address` types as address fields to a `RelayData`-like object with
|
|
82
82
|
* strings as address fields.
|
|
83
83
|
* @param relayData RelayData type.
|
|
84
|
-
* @returns a RelayData-like type which has strings as fields.
|
|
84
|
+
* @returns a RelayData-like type which has hex 32 byte strings as fields.
|
|
85
85
|
*/
|
|
86
86
|
export declare function convertRelayDataParamsToBytes32(relayData: RelayData): ConvertedRelayData;
|
|
87
87
|
/**
|
|
88
88
|
* Converts a Fill object with `Address` types as address fields to a `RelayData`-like object with
|
|
89
89
|
* strings as address fields.
|
|
90
90
|
* @param relayData RelayData type.
|
|
91
|
-
* @returns a RelayData-like type which has strings as fields.
|
|
91
|
+
* @returns a RelayData-like type which has hex 32 byte strings as fields.
|
|
92
92
|
*/
|
|
93
93
|
export declare function convertFillParamsToBytes32(fill: Fill): ConvertedFill;
|
|
94
|
+
/**
|
|
95
|
+
* Converts a RelayData object with `Address` types as address fields to a `RelayData`-like object with
|
|
96
|
+
* strings as address fields.
|
|
97
|
+
* @param relayData RelayData type.
|
|
98
|
+
* @returns a RelayData-like type which has native address representation strings as fields.
|
|
99
|
+
*/
|
|
100
|
+
export declare function convertRelayDataParamsToNative(relayData: RelayData): ConvertedRelayData;
|
|
101
|
+
/**
|
|
102
|
+
* Converts a Fill object with `Address` types as address fields to a `RelayData`-like object with
|
|
103
|
+
* strings as address fields.
|
|
104
|
+
* @param relayData RelayData type.
|
|
105
|
+
* @returns a RelayData-like type which has native address representation strings as fields.
|
|
106
|
+
*/
|
|
107
|
+
export declare function convertFillParamsToNative(fill: Fill): ConvertedFill;
|
|
@@ -230,7 +230,7 @@ export function resolveDepositMessage(deposit) {
|
|
|
230
230
|
* Converts a RelayData object with `Address` types as address fields to a `RelayData`-like object with
|
|
231
231
|
* strings as address fields.
|
|
232
232
|
* @param relayData RelayData type.
|
|
233
|
-
* @returns a RelayData-like type which has strings as fields.
|
|
233
|
+
* @returns a RelayData-like type which has hex 32 byte strings as fields.
|
|
234
234
|
*/
|
|
235
235
|
export function convertRelayDataParamsToBytes32(relayData) {
|
|
236
236
|
return __assign(__assign({}, relayData), { depositor: relayData.depositor.toBytes32(), recipient: relayData.recipient.toBytes32(), inputToken: relayData.inputToken.toBytes32(), outputToken: relayData.outputToken.toBytes32(), exclusiveRelayer: relayData.exclusiveRelayer.toBytes32() });
|
|
@@ -239,9 +239,27 @@ export function convertRelayDataParamsToBytes32(relayData) {
|
|
|
239
239
|
* Converts a Fill object with `Address` types as address fields to a `RelayData`-like object with
|
|
240
240
|
* strings as address fields.
|
|
241
241
|
* @param relayData RelayData type.
|
|
242
|
-
* @returns a RelayData-like type which has strings as fields.
|
|
242
|
+
* @returns a RelayData-like type which has hex 32 byte strings as fields.
|
|
243
243
|
*/
|
|
244
244
|
export function convertFillParamsToBytes32(fill) {
|
|
245
245
|
return __assign(__assign({}, fill), { depositor: fill.depositor.toBytes32(), recipient: fill.recipient.toBytes32(), inputToken: fill.inputToken.toBytes32(), outputToken: fill.outputToken.toBytes32(), exclusiveRelayer: fill.exclusiveRelayer.toBytes32(), relayer: fill.relayer.toBytes32(), relayExecutionInfo: __assign(__assign({}, fill.relayExecutionInfo), { updatedRecipient: fill.relayExecutionInfo.updatedRecipient.toBytes32() }) });
|
|
246
246
|
}
|
|
247
|
+
/**
|
|
248
|
+
* Converts a RelayData object with `Address` types as address fields to a `RelayData`-like object with
|
|
249
|
+
* strings as address fields.
|
|
250
|
+
* @param relayData RelayData type.
|
|
251
|
+
* @returns a RelayData-like type which has native address representation strings as fields.
|
|
252
|
+
*/
|
|
253
|
+
export function convertRelayDataParamsToNative(relayData) {
|
|
254
|
+
return __assign(__assign({}, relayData), { depositor: relayData.depositor.toNative(), recipient: relayData.recipient.toNative(), inputToken: relayData.inputToken.toNative(), outputToken: relayData.outputToken.toNative(), exclusiveRelayer: relayData.exclusiveRelayer.toNative() });
|
|
255
|
+
}
|
|
256
|
+
/**
|
|
257
|
+
* Converts a Fill object with `Address` types as address fields to a `RelayData`-like object with
|
|
258
|
+
* strings as address fields.
|
|
259
|
+
* @param relayData RelayData type.
|
|
260
|
+
* @returns a RelayData-like type which has native address representation strings as fields.
|
|
261
|
+
*/
|
|
262
|
+
export function convertFillParamsToNative(fill) {
|
|
263
|
+
return __assign(__assign({}, fill), { depositor: fill.depositor.toNative(), recipient: fill.recipient.toNative(), inputToken: fill.inputToken.toNative(), outputToken: fill.outputToken.toNative(), exclusiveRelayer: fill.exclusiveRelayer.toNative(), relayer: fill.relayer.toNative(), relayExecutionInfo: __assign(__assign({}, fill.relayExecutionInfo), { updatedRecipient: fill.relayExecutionInfo.updatedRecipient.toNative() }) });
|
|
264
|
+
}
|
|
247
265
|
//# sourceMappingURL=DepositUtils.js.map
|