@across-protocol/sdk 4.3.22 → 4.3.24
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 +54 -22
- 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 +25 -3
- 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/esm/arch/svm/SpokeUtils.d.ts +1 -1
- package/dist/esm/arch/svm/SpokeUtils.js +58 -26
- 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 +33 -3
- 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/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 +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/package.json +1 -1
- package/src/arch/svm/SpokeUtils.ts +62 -11
- package/src/arch/svm/utils.ts +40 -5
- package/src/caching/Arweave/ArweaveClient.ts +47 -12
- package/src/gasPriceOracle/adapters/ethereum.ts +2 -6
- package/src/gasPriceOracle/adapters/solana.ts +2 -7
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import { __awaiter, __generator } from "tslib";
|
|
2
|
-
import
|
|
3
|
-
import { MessageTransmitterClient, SvmSpokeClient } from "@across-protocol/contracts";
|
|
2
|
+
import { MessageTransmitterClient, SpokePool__factory, SvmSpokeClient } from "@across-protocol/contracts";
|
|
4
3
|
import { BN, BorshEventCoder } from "@coral-xyz/anchor";
|
|
5
4
|
import { address, appendTransactionMessageInstruction, createTransactionMessage, getAddressEncoder, getBase64EncodedWireTransaction, getProgramDerivedAddress, getU32Encoder, getU64Encoder, isAddress, pipe, setTransactionMessageFeePayerSigner, setTransactionMessageLifetimeUsingBlockhash, signTransactionMessageWithSigners, } from "@solana/kit";
|
|
5
|
+
import assert from "assert";
|
|
6
6
|
import bs58 from "bs58";
|
|
7
7
|
import { ethers } from "ethers";
|
|
8
8
|
import { FillType } from "../../interfaces";
|
|
9
9
|
import { BigNumber, biMin, getRelayDataHash, isDefined, isUint8Array } from "../../utils";
|
|
10
|
-
import { SVMEventNames } from "./types";
|
|
11
10
|
import { getTimestampForSlot } from "./SpokeUtils";
|
|
11
|
+
import { SVMEventNames } from "./types";
|
|
12
12
|
export { isSolanaError } from "@solana/kit";
|
|
13
13
|
/**
|
|
14
14
|
* Basic void TransactionSigner type
|
|
@@ -558,6 +558,36 @@ export var getCCTPNoncePda = function (solanaClient, signer, nonce, sourceDomain
|
|
|
558
558
|
export function isDepositForBurnEvent(event) {
|
|
559
559
|
return event.type === "transfer";
|
|
560
560
|
}
|
|
561
|
+
/**
|
|
562
|
+
* True if `body` encodes a `relayRootBundle(bytes32,bytes32)` call.
|
|
563
|
+
*/
|
|
564
|
+
export var isRelayRootBundleMessageBody = function (body) {
|
|
565
|
+
if (body.length < 4)
|
|
566
|
+
return false;
|
|
567
|
+
var spokePoolInterface = new ethers.utils.Interface(SpokePool__factory.abi);
|
|
568
|
+
var relayRootBundleSelector = spokePoolInterface.getSighash("relayRootBundle");
|
|
569
|
+
return body.slice(0, 4).equals(Buffer.from(relayRootBundleSelector.slice(2), "hex"));
|
|
570
|
+
};
|
|
571
|
+
/**
|
|
572
|
+
* True if `body` encodes a `emergencyDeleteRootBundle(uint32)` call.
|
|
573
|
+
*/
|
|
574
|
+
export var isEmergencyDeleteRootBundleMessageBody = function (body) {
|
|
575
|
+
if (body.length < 4)
|
|
576
|
+
return false;
|
|
577
|
+
var spokePoolInterface = new ethers.utils.Interface(SpokePool__factory.abi);
|
|
578
|
+
var emergencyDeleteRootBundleSelector = spokePoolInterface.getSighash("emergencyDeleteRootBundle");
|
|
579
|
+
return body.slice(0, 4).equals(Buffer.from(emergencyDeleteRootBundleSelector.slice(2), "hex"));
|
|
580
|
+
};
|
|
581
|
+
/**
|
|
582
|
+
* Decodes the root bundle ID from an emergency delete root bundle message body.
|
|
583
|
+
* @param body The message body.
|
|
584
|
+
* @returns The root bundle ID.
|
|
585
|
+
*/
|
|
586
|
+
export var getEmergencyDeleteRootBundleRootBundleId = function (body) {
|
|
587
|
+
var spokePoolInterface = new ethers.utils.Interface(SpokePool__factory.abi);
|
|
588
|
+
var result = spokePoolInterface.decodeFunctionData("emergencyDeleteRootBundle", body);
|
|
589
|
+
return result.rootBundleId.toNumber();
|
|
590
|
+
};
|
|
561
591
|
/**
|
|
562
592
|
* Convert a bigint (0 ≤ n < 2^256) to a 32-byte Uint8Array (big-endian).
|
|
563
593
|
* @param n The bigint to convert.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/arch/svm/utils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/arch/svm/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,9 +5,11 @@ import { BigNumber } from "../../utils";
|
|
|
5
5
|
export declare class ArweaveClient {
|
|
6
6
|
private arweaveJWT;
|
|
7
7
|
private logger;
|
|
8
|
+
private readonly retries;
|
|
9
|
+
private readonly retryDelaySeconds;
|
|
8
10
|
private client;
|
|
9
11
|
private gatewayUrl;
|
|
10
|
-
constructor(arweaveJWT: JWKInterface, logger: winston.Logger, gatewayURL?: string, protocol?: string, port?: number);
|
|
12
|
+
constructor(arweaveJWT: JWKInterface, logger: winston.Logger, gatewayURL?: string, protocol?: string, port?: number, retries?: number, retryDelaySeconds?: number);
|
|
11
13
|
/**
|
|
12
14
|
* Stores an arbitrary record in the Arweave network. The record is stored as a JSON string and uses
|
|
13
15
|
* JSON.stringify to convert the record to a string. The record has all of its big numbers converted
|
|
@@ -53,6 +55,7 @@ export declare class ArweaveClient {
|
|
|
53
55
|
* @returns The address of the signer in this client
|
|
54
56
|
*/
|
|
55
57
|
getAddress(): Promise<string>;
|
|
58
|
+
private _retryRequest;
|
|
56
59
|
/**
|
|
57
60
|
* The balance of the signer
|
|
58
61
|
* @returns The balance of the signer in winston units
|
|
@@ -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"}
|
|
@@ -254,7 +254,7 @@ export declare const hasCCTPV1MessageBeenProcessed: (solanaClient: SVMProvider,
|
|
|
254
254
|
* Returns the account metas for a tokenless message.
|
|
255
255
|
* @returns The account metas for a tokenless message.
|
|
256
256
|
*/
|
|
257
|
-
export declare function getAccountMetasForTokenlessMessage(): Promise<IAccountMeta<string>[]>;
|
|
257
|
+
export declare function getAccountMetasForTokenlessMessage(solanaClient: SVMProvider, signer: KeyPairSigner, messageBytes: string): Promise<IAccountMeta<string>[]>;
|
|
258
258
|
/**
|
|
259
259
|
* Returns the CCTP v1 receive message transaction.
|
|
260
260
|
* @param solanaClient The Solana client.
|