@across-protocol/sdk 4.2.2 → 4.2.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/arch/svm/BlockUtils.d.ts +2 -2
- package/dist/cjs/arch/svm/BlockUtils.js +3 -4
- package/dist/cjs/arch/svm/BlockUtils.js.map +1 -1
- package/dist/cjs/arch/svm/eventsClient.js +2 -2
- package/dist/cjs/arch/svm/eventsClient.js.map +1 -1
- package/dist/cjs/arch/svm/utils.js +4 -0
- package/dist/cjs/arch/svm/utils.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/utils/SuperstructUtils.d.ts +22 -22
- package/dist/cjs/clients/index.d.ts +1 -1
- package/dist/cjs/clients/index.js +3 -1
- package/dist/cjs/clients/index.js.map +1 -1
- package/dist/cjs/gasPriceOracle/adapters/solana.d.ts +2 -2
- package/dist/cjs/gasPriceOracle/oracle.d.ts +3 -2
- package/dist/cjs/gasPriceOracle/oracle.js +1 -3
- package/dist/cjs/gasPriceOracle/oracle.js.map +1 -1
- package/dist/cjs/gasPriceOracle/types.d.ts +2 -0
- package/dist/cjs/gasPriceOracle/types.js +12 -0
- package/dist/cjs/gasPriceOracle/types.js.map +1 -1
- package/dist/cjs/utils/TypeGuards.d.ts +3 -0
- package/dist/cjs/utils/TypeGuards.js +6 -1
- package/dist/cjs/utils/TypeGuards.js.map +1 -1
- package/dist/esm/arch/svm/BlockUtils.d.ts +2 -2
- package/dist/esm/arch/svm/BlockUtils.js +4 -5
- package/dist/esm/arch/svm/BlockUtils.js.map +1 -1
- package/dist/esm/arch/svm/eventsClient.js +2 -2
- package/dist/esm/arch/svm/eventsClient.js.map +1 -1
- package/dist/esm/arch/svm/utils.js +4 -0
- package/dist/esm/arch/svm/utils.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.d.ts +22 -22
- package/dist/esm/clients/index.d.ts +1 -1
- package/dist/esm/clients/index.js +1 -1
- package/dist/esm/clients/index.js.map +1 -1
- package/dist/esm/gasPriceOracle/adapters/solana.d.ts +2 -2
- package/dist/esm/gasPriceOracle/oracle.d.ts +3 -8
- package/dist/esm/gasPriceOracle/oracle.js +3 -6
- package/dist/esm/gasPriceOracle/oracle.js.map +1 -1
- package/dist/esm/gasPriceOracle/types.d.ts +2 -0
- package/dist/esm/gasPriceOracle/types.js +9 -1
- package/dist/esm/gasPriceOracle/types.js.map +1 -1
- package/dist/esm/utils/TypeGuards.d.ts +3 -0
- package/dist/esm/utils/TypeGuards.js +4 -0
- package/dist/esm/utils/TypeGuards.js.map +1 -1
- package/dist/types/arch/svm/BlockUtils.d.ts +2 -2
- package/dist/types/arch/svm/BlockUtils.d.ts.map +1 -1
- package/dist/types/arch/svm/eventsClient.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 +22 -22
- package/dist/types/clients/index.d.ts +1 -1
- package/dist/types/clients/index.d.ts.map +1 -1
- package/dist/types/gasPriceOracle/adapters/solana.d.ts +2 -2
- package/dist/types/gasPriceOracle/adapters/solana.d.ts.map +1 -1
- package/dist/types/gasPriceOracle/oracle.d.ts +3 -8
- package/dist/types/gasPriceOracle/oracle.d.ts.map +1 -1
- package/dist/types/gasPriceOracle/types.d.ts +2 -0
- package/dist/types/gasPriceOracle/types.d.ts.map +1 -1
- package/dist/types/utils/TypeGuards.d.ts +3 -0
- package/dist/types/utils/TypeGuards.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/arch/svm/BlockUtils.ts +8 -13
- package/src/arch/svm/eventsClient.ts +3 -13
- package/src/arch/svm/utils.ts +4 -0
- package/src/clients/index.ts +8 -1
- package/src/gasPriceOracle/adapters/solana.ts +2 -2
- package/src/gasPriceOracle/oracle.ts +16 -5
- package/src/gasPriceOracle/types.ts +11 -1
- package/src/utils/TypeGuards.ts +7 -0
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { BlockFinder, type Block, type
|
|
1
|
+
import { BlockFinder, type Block, type BlockTimeAverage, type BlockFinderHints } from "../../utils/BlockFinder";
|
|
2
2
|
import { SVMProvider } from "./";
|
|
3
3
|
interface SVMBlock extends Block {
|
|
4
4
|
}
|
|
5
|
-
export declare function averageBlockTime(
|
|
5
|
+
export declare function averageBlockTime(): Pick<BlockTimeAverage, "average" | "blockRange">;
|
|
6
6
|
export declare class SVMBlockFinder extends BlockFinder<SVMBlock> {
|
|
7
7
|
private readonly provider;
|
|
8
8
|
private readonly blocks;
|
|
@@ -13,12 +13,11 @@ var now = (0, TimeUtils_1.getCurrentTime)();
|
|
|
13
13
|
var averageBlockTimes = (_a = {},
|
|
14
14
|
_a[constants_1.CHAIN_IDs.SOLANA] = { average: 0.4, timestamp: now, blockRange: 1 },
|
|
15
15
|
_a);
|
|
16
|
-
function averageBlockTime(
|
|
17
|
-
if (_opts === void 0) { _opts = {}; }
|
|
16
|
+
function averageBlockTime() {
|
|
18
17
|
return averageBlockTimes[constants_1.CHAIN_IDs.SOLANA];
|
|
19
18
|
}
|
|
20
19
|
exports.averageBlockTime = averageBlockTime;
|
|
21
|
-
function estimateBlocksElapsed(seconds, cushionPercentage,
|
|
20
|
+
function estimateBlocksElapsed(seconds, cushionPercentage, _provider) {
|
|
22
21
|
if (cushionPercentage === void 0) { cushionPercentage = 0.0; }
|
|
23
22
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
24
23
|
var cushionMultiplier, average;
|
|
@@ -26,7 +25,7 @@ function estimateBlocksElapsed(seconds, cushionPercentage, provider) {
|
|
|
26
25
|
switch (_a.label) {
|
|
27
26
|
case 0:
|
|
28
27
|
cushionMultiplier = cushionPercentage + 1.0;
|
|
29
|
-
return [4, averageBlockTime(
|
|
28
|
+
return [4, averageBlockTime()];
|
|
30
29
|
case 1:
|
|
31
30
|
average = (_a.sent()).average;
|
|
32
31
|
return [2, Math.floor((seconds * cushionMultiplier) / average)];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BlockUtils.js","sourceRoot":"","sources":["../../../../src/arch/svm/BlockUtils.ts"],"names":[],"mappings":";;;;;AAAA,0DAA4B;AAC5B,iCAA8C;AAC9C,
|
|
1
|
+
{"version":3,"file":"BlockUtils.js","sourceRoot":"","sources":["../../../../src/arch/svm/BlockUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -204,7 +204,7 @@ var SvmCpiEventsClient = (function () {
|
|
|
204
204
|
}
|
|
205
205
|
return [2, events.map(function (event) {
|
|
206
206
|
var unwrappedEventArgs = (0, _1.unwrapEventData)(event, ["depositId"]);
|
|
207
|
-
return tslib_1.__assign(tslib_1.__assign({}, unwrappedEventArgs.data), { depositTimestamp: Number(txDetails.blockTime), originChainId: originChainId, messageHash: (0, utils_1.getMessageHash)(unwrappedEventArgs.data.message), blockNumber: Number(txDetails.slot), txnIndex: 0, txnRef: txSignature, logIndex: 0
|
|
207
|
+
return tslib_1.__assign(tslib_1.__assign({}, unwrappedEventArgs.data), { depositTimestamp: Number(txDetails.blockTime), originChainId: originChainId, messageHash: (0, utils_1.getMessageHash)(unwrappedEventArgs.data.message), blockNumber: Number(txDetails.slot), txnIndex: 0, txnRef: txSignature, logIndex: 0 });
|
|
208
208
|
})];
|
|
209
209
|
}
|
|
210
210
|
});
|
|
@@ -235,7 +235,7 @@ var SvmCpiEventsClient = (function () {
|
|
|
235
235
|
}
|
|
236
236
|
return [2, fillEvents.map(function (event) {
|
|
237
237
|
var unwrappedEventData = (0, _1.unwrapEventData)(event);
|
|
238
|
-
return tslib_1.__assign(tslib_1.__assign({}, unwrappedEventData.data), { fillTimestamp: Number(txDetails.blockTime), blockNumber: Number(txDetails.slot), txnRef: txSignature, txnIndex: 0, logIndex: 0, destinationChainId: destinationChainId
|
|
238
|
+
return tslib_1.__assign(tslib_1.__assign({}, unwrappedEventData.data), { fillTimestamp: Number(txDetails.blockTime), blockNumber: Number(txDetails.slot), txnRef: txSignature, txnIndex: 0, logIndex: 0, destinationChainId: destinationChainId });
|
|
239
239
|
})];
|
|
240
240
|
}
|
|
241
241
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eventsClient.js","sourceRoot":"","sources":["../../../../src/arch/svm/eventsClient.ts"],"names":[],"mappings":";;;;AACA,wDAA6E;AAC7E,2EAAmF;AACnF,mCAQqB;AACrB,qCAA+D;AAE/D,iCAAgD;AAEhD,uBAAqC;AACrC,0DAA4B;
|
|
1
|
+
{"version":3,"file":"eventsClient.js","sourceRoot":"","sources":["../../../../src/arch/svm/eventsClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -84,6 +84,10 @@ function unwrapEventData(data, uint8ArrayKeysAsBigInt, currentKey) {
|
|
|
84
84
|
return data;
|
|
85
85
|
}
|
|
86
86
|
if (typeof data === "bigint") {
|
|
87
|
+
var bigIntKeysAsNumber = ["originChainId", "destinationChainId", "repaymentChainId", "chainId"];
|
|
88
|
+
if (currentKey && bigIntKeysAsNumber.includes(currentKey)) {
|
|
89
|
+
return Number(data);
|
|
90
|
+
}
|
|
87
91
|
return utils_1.BigNumber.from(data);
|
|
88
92
|
}
|
|
89
93
|
if (data instanceof Uint8Array || (0, utils_1.isUint8Array)(data)) {
|
|
@@ -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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"}
|
|
@@ -11,12 +11,12 @@ export declare const SortableEventSS: {
|
|
|
11
11
|
export declare const BundleDataSS: import("superstruct").Struct<{
|
|
12
12
|
bundleDepositsV3: Record<string, Record<string, {
|
|
13
13
|
depositId: BigNumber;
|
|
14
|
+
originChainId: number;
|
|
15
|
+
destinationChainId: number;
|
|
14
16
|
fromLiteChain: boolean;
|
|
15
17
|
toLiteChain: boolean;
|
|
16
18
|
messageHash: string;
|
|
17
|
-
destinationChainId: number;
|
|
18
19
|
quoteTimestamp: number;
|
|
19
|
-
originChainId: number;
|
|
20
20
|
depositor: string;
|
|
21
21
|
recipient: string;
|
|
22
22
|
inputToken: string;
|
|
@@ -43,10 +43,11 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
43
43
|
bundleFillsV3: Record<string, Record<string, {
|
|
44
44
|
fills: {
|
|
45
45
|
depositId: BigNumber;
|
|
46
|
-
|
|
46
|
+
originChainId: number;
|
|
47
47
|
destinationChainId: number;
|
|
48
|
+
repaymentChainId: number;
|
|
49
|
+
messageHash: string;
|
|
48
50
|
quoteTimestamp: number;
|
|
49
|
-
originChainId: number;
|
|
50
51
|
depositor: string;
|
|
51
52
|
recipient: string;
|
|
52
53
|
inputToken: string;
|
|
@@ -58,7 +59,6 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
58
59
|
exclusivityDeadline: number;
|
|
59
60
|
blockNumber: number;
|
|
60
61
|
logIndex: number;
|
|
61
|
-
repaymentChainId: number;
|
|
62
62
|
relayer: string;
|
|
63
63
|
lpFeePct: BigNumber;
|
|
64
64
|
relayExecutionInfo: {
|
|
@@ -80,12 +80,12 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
80
80
|
}>>;
|
|
81
81
|
bundleSlowFillsV3: Record<string, Record<string, {
|
|
82
82
|
depositId: BigNumber;
|
|
83
|
+
originChainId: number;
|
|
84
|
+
destinationChainId: number;
|
|
83
85
|
fromLiteChain: boolean;
|
|
84
86
|
toLiteChain: boolean;
|
|
85
87
|
messageHash: string;
|
|
86
|
-
destinationChainId: number;
|
|
87
88
|
quoteTimestamp: number;
|
|
88
|
-
originChainId: number;
|
|
89
89
|
depositor: string;
|
|
90
90
|
recipient: string;
|
|
91
91
|
inputToken: string;
|
|
@@ -112,12 +112,12 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
112
112
|
}[]>>;
|
|
113
113
|
expiredDepositsToRefundV3: Record<string, Record<string, {
|
|
114
114
|
depositId: BigNumber;
|
|
115
|
+
originChainId: number;
|
|
116
|
+
destinationChainId: number;
|
|
115
117
|
fromLiteChain: boolean;
|
|
116
118
|
toLiteChain: boolean;
|
|
117
119
|
messageHash: string;
|
|
118
|
-
destinationChainId: number;
|
|
119
120
|
quoteTimestamp: number;
|
|
120
|
-
originChainId: number;
|
|
121
121
|
depositor: string;
|
|
122
122
|
recipient: string;
|
|
123
123
|
inputToken: string;
|
|
@@ -143,12 +143,12 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
143
143
|
}[]>>;
|
|
144
144
|
unexecutableSlowFills: Record<string, Record<string, {
|
|
145
145
|
depositId: BigNumber;
|
|
146
|
+
originChainId: number;
|
|
147
|
+
destinationChainId: number;
|
|
146
148
|
fromLiteChain: boolean;
|
|
147
149
|
toLiteChain: boolean;
|
|
148
150
|
messageHash: string;
|
|
149
|
-
destinationChainId: number;
|
|
150
151
|
quoteTimestamp: number;
|
|
151
|
-
originChainId: number;
|
|
152
152
|
depositor: string;
|
|
153
153
|
recipient: string;
|
|
154
154
|
inputToken: string;
|
|
@@ -176,12 +176,12 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
176
176
|
}, {
|
|
177
177
|
bundleDepositsV3: import("superstruct").Struct<Record<string, Record<string, {
|
|
178
178
|
depositId: BigNumber;
|
|
179
|
+
originChainId: number;
|
|
180
|
+
destinationChainId: number;
|
|
179
181
|
fromLiteChain: boolean;
|
|
180
182
|
toLiteChain: boolean;
|
|
181
183
|
messageHash: string;
|
|
182
|
-
destinationChainId: number;
|
|
183
184
|
quoteTimestamp: number;
|
|
184
|
-
originChainId: number;
|
|
185
185
|
depositor: string;
|
|
186
186
|
recipient: string;
|
|
187
187
|
inputToken: string;
|
|
@@ -207,12 +207,12 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
207
207
|
}[]>>, null>;
|
|
208
208
|
expiredDepositsToRefundV3: import("superstruct").Struct<Record<string, Record<string, {
|
|
209
209
|
depositId: BigNumber;
|
|
210
|
+
originChainId: number;
|
|
211
|
+
destinationChainId: number;
|
|
210
212
|
fromLiteChain: boolean;
|
|
211
213
|
toLiteChain: boolean;
|
|
212
214
|
messageHash: string;
|
|
213
|
-
destinationChainId: number;
|
|
214
215
|
quoteTimestamp: number;
|
|
215
|
-
originChainId: number;
|
|
216
216
|
depositor: string;
|
|
217
217
|
recipient: string;
|
|
218
218
|
inputToken: string;
|
|
@@ -238,12 +238,12 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
238
238
|
}[]>>, null>;
|
|
239
239
|
unexecutableSlowFills: import("superstruct").Struct<Record<string, Record<string, {
|
|
240
240
|
depositId: BigNumber;
|
|
241
|
+
originChainId: number;
|
|
242
|
+
destinationChainId: number;
|
|
241
243
|
fromLiteChain: boolean;
|
|
242
244
|
toLiteChain: boolean;
|
|
243
245
|
messageHash: string;
|
|
244
|
-
destinationChainId: number;
|
|
245
246
|
quoteTimestamp: number;
|
|
246
|
-
originChainId: number;
|
|
247
247
|
depositor: string;
|
|
248
248
|
recipient: string;
|
|
249
249
|
inputToken: string;
|
|
@@ -270,12 +270,12 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
270
270
|
}[]>>, null>;
|
|
271
271
|
bundleSlowFillsV3: import("superstruct").Struct<Record<string, Record<string, {
|
|
272
272
|
depositId: BigNumber;
|
|
273
|
+
originChainId: number;
|
|
274
|
+
destinationChainId: number;
|
|
273
275
|
fromLiteChain: boolean;
|
|
274
276
|
toLiteChain: boolean;
|
|
275
277
|
messageHash: string;
|
|
276
|
-
destinationChainId: number;
|
|
277
278
|
quoteTimestamp: number;
|
|
278
|
-
originChainId: number;
|
|
279
279
|
depositor: string;
|
|
280
280
|
recipient: string;
|
|
281
281
|
inputToken: string;
|
|
@@ -303,10 +303,11 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
303
303
|
bundleFillsV3: import("superstruct").Struct<Record<string, Record<string, {
|
|
304
304
|
fills: {
|
|
305
305
|
depositId: BigNumber;
|
|
306
|
-
|
|
306
|
+
originChainId: number;
|
|
307
307
|
destinationChainId: number;
|
|
308
|
+
repaymentChainId: number;
|
|
309
|
+
messageHash: string;
|
|
308
310
|
quoteTimestamp: number;
|
|
309
|
-
originChainId: number;
|
|
310
311
|
depositor: string;
|
|
311
312
|
recipient: string;
|
|
312
313
|
inputToken: string;
|
|
@@ -318,7 +319,6 @@ export declare const BundleDataSS: import("superstruct").Struct<{
|
|
|
318
319
|
exclusivityDeadline: number;
|
|
319
320
|
blockNumber: number;
|
|
320
321
|
logIndex: number;
|
|
321
|
-
repaymentChainId: number;
|
|
322
322
|
relayer: string;
|
|
323
323
|
lpFeePct: BigNumber;
|
|
324
324
|
relayExecutionInfo: {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export { DEFAULT_CONFIG_STORE_VERSION, GLOBAL_CONFIG_STORE_KEYS, AcrossConfigStoreClient, ConfigStoreUpdate, } from "./AcrossConfigStoreClient";
|
|
2
2
|
export { UpdateFailureReason } from "./BaseAbstractClient";
|
|
3
3
|
export { HubPoolClient, LpFeeRequest } from "./HubPoolClient";
|
|
4
|
-
export { SpokePoolClient, SpokePoolUpdate, EVMSpokePoolClient, SVMSpokePoolClient } from "./SpokePoolClient";
|
|
4
|
+
export { SpokePoolClient, SpokePoolUpdate, EVMSpokePoolClient, SVMSpokePoolClient, isEVMSpokePoolClient, isSVMSpokePoolClient, } from "./SpokePoolClient";
|
|
5
5
|
export * as BundleDataClient from "./BundleDataClient";
|
|
6
6
|
export * as mocks from "./mocks";
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.mocks = exports.BundleDataClient = exports.SVMSpokePoolClient = exports.EVMSpokePoolClient = exports.SpokePoolClient = exports.HubPoolClient = exports.UpdateFailureReason = exports.AcrossConfigStoreClient = exports.GLOBAL_CONFIG_STORE_KEYS = exports.DEFAULT_CONFIG_STORE_VERSION = void 0;
|
|
3
|
+
exports.mocks = exports.BundleDataClient = exports.isSVMSpokePoolClient = exports.isEVMSpokePoolClient = exports.SVMSpokePoolClient = exports.EVMSpokePoolClient = exports.SpokePoolClient = exports.HubPoolClient = exports.UpdateFailureReason = exports.AcrossConfigStoreClient = exports.GLOBAL_CONFIG_STORE_KEYS = exports.DEFAULT_CONFIG_STORE_VERSION = void 0;
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
5
|
var AcrossConfigStoreClient_1 = require("./AcrossConfigStoreClient");
|
|
6
6
|
Object.defineProperty(exports, "DEFAULT_CONFIG_STORE_VERSION", { enumerable: true, get: function () { return AcrossConfigStoreClient_1.DEFAULT_CONFIG_STORE_VERSION; } });
|
|
@@ -14,6 +14,8 @@ var SpokePoolClient_1 = require("./SpokePoolClient");
|
|
|
14
14
|
Object.defineProperty(exports, "SpokePoolClient", { enumerable: true, get: function () { return SpokePoolClient_1.SpokePoolClient; } });
|
|
15
15
|
Object.defineProperty(exports, "EVMSpokePoolClient", { enumerable: true, get: function () { return SpokePoolClient_1.EVMSpokePoolClient; } });
|
|
16
16
|
Object.defineProperty(exports, "SVMSpokePoolClient", { enumerable: true, get: function () { return SpokePoolClient_1.SVMSpokePoolClient; } });
|
|
17
|
+
Object.defineProperty(exports, "isEVMSpokePoolClient", { enumerable: true, get: function () { return SpokePoolClient_1.isEVMSpokePoolClient; } });
|
|
18
|
+
Object.defineProperty(exports, "isSVMSpokePoolClient", { enumerable: true, get: function () { return SpokePoolClient_1.isSVMSpokePoolClient; } });
|
|
17
19
|
exports.BundleDataClient = tslib_1.__importStar(require("./BundleDataClient"));
|
|
18
20
|
exports.mocks = tslib_1.__importStar(require("./mocks"));
|
|
19
21
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/clients/index.ts"],"names":[],"mappings":";;;;AAAA,qEAKmC;AAJjC,uIAAA,4BAA4B,OAAA;AAC5B,mIAAA,wBAAwB,OAAA;AACxB,kIAAA,uBAAuB,OAAA;AAGzB,2DAA2D;AAAlD,yHAAA,mBAAmB,OAAA;AAC5B,iDAA8D;AAArD,8GAAA,aAAa,OAAA;AACtB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/clients/index.ts"],"names":[],"mappings":";;;;AAAA,qEAKmC;AAJjC,uIAAA,4BAA4B,OAAA;AAC5B,mIAAA,wBAAwB,OAAA;AACxB,kIAAA,uBAAuB,OAAA;AAGzB,2DAA2D;AAAlD,yHAAA,mBAAmB,OAAA;AAC5B,iDAA8D;AAArD,8GAAA,aAAa,OAAA;AACtB,qDAO2B;AANzB,kHAAA,eAAe,OAAA;AAEf,qHAAA,kBAAkB,OAAA;AAClB,qHAAA,kBAAkB,OAAA;AAClB,uHAAA,oBAAoB,OAAA;AACpB,uHAAA,oBAAoB,OAAA;AAEtB,+EAAuD;AACvD,yDAAiC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { SVMProvider } from "../../arch/svm";
|
|
2
|
-
import {
|
|
2
|
+
import { SvmGasPriceEstimate } from "../types";
|
|
3
3
|
import { GasPriceEstimateOptions } from "../oracle";
|
|
4
|
-
export declare function messageFee(provider: SVMProvider, opts: GasPriceEstimateOptions): Promise<
|
|
4
|
+
export declare function messageFee(provider: SVMProvider, opts: GasPriceEstimateOptions): Promise<SvmGasPriceEstimate>;
|
|
@@ -2,7 +2,7 @@ import { Transport } from "viem";
|
|
|
2
2
|
import { providers } from "ethers";
|
|
3
3
|
import { BigNumber } from "../utils";
|
|
4
4
|
import { SVMProvider as SolanaProvider } from "../arch/svm";
|
|
5
|
-
import { GasPriceEstimate } from "./types";
|
|
5
|
+
import { EvmGasPriceEstimate, GasPriceEstimate, SvmGasPriceEstimate } from "./types";
|
|
6
6
|
export interface GasPriceEstimateOptions {
|
|
7
7
|
baseFeeMultiplier: BigNumber;
|
|
8
8
|
priorityFeeMultiplier: BigNumber;
|
|
@@ -11,5 +11,6 @@ export interface GasPriceEstimateOptions {
|
|
|
11
11
|
unsignedTx?: unknown;
|
|
12
12
|
transport?: Transport;
|
|
13
13
|
}
|
|
14
|
-
export declare function getGasPriceEstimate(provider: providers.Provider
|
|
14
|
+
export declare function getGasPriceEstimate(provider: providers.Provider, opts?: Partial<GasPriceEstimateOptions>): Promise<EvmGasPriceEstimate>;
|
|
15
|
+
export declare function getGasPriceEstimate(provider: SolanaProvider, opts?: Partial<GasPriceEstimateOptions>): Promise<SvmGasPriceEstimate>;
|
|
15
16
|
export declare function _getViemGasPriceEstimate(providerOrChainId: providers.Provider | number, opts: GasPriceEstimateOptions): Promise<GasPriceEstimate>;
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports._getViemGasPriceEstimate = exports.getGasPriceEstimate = void 0;
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
5
|
var assert_1 = tslib_1.__importDefault(require("assert"));
|
|
6
|
-
var ethers_1 = require("ethers");
|
|
7
6
|
var constants_1 = require("../constants");
|
|
8
7
|
var utils_1 = require("../utils");
|
|
9
8
|
var util_1 = require("./util");
|
|
@@ -28,11 +27,10 @@ function getGasPriceEstimate(provider, opts) {
|
|
|
28
27
|
(0, assert_1.default)(baseFeeMultiplier.gte((0, utils_1.toBNWei)("1.0")) && baseFeeMultiplier.lte((0, utils_1.toBNWei)("5")), "Require 1.0 < base fee multiplier (".concat(baseFeeMultiplier, ") <= 5.0 for a total gas multiplier within [+1.0, +5.0]"));
|
|
29
28
|
priorityFeeMultiplier = (_b = opts.priorityFeeMultiplier) !== null && _b !== void 0 ? _b : (0, utils_1.toBNWei)("1");
|
|
30
29
|
(0, assert_1.default)(priorityFeeMultiplier.gte((0, utils_1.toBNWei)("1.0")) && priorityFeeMultiplier.lte((0, utils_1.toBNWei)("5")), "Require 1.0 < priority fee multiplier (".concat(priorityFeeMultiplier, ") <= 5.0 for a total gas multiplier within [+1.0, +5.0]"));
|
|
31
|
-
if (!(
|
|
30
|
+
if (!(0, utils_1.isEvmProvider)(provider)) {
|
|
32
31
|
optsWithDefaults_1 = tslib_1.__assign(tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({}, GAS_PRICE_ESTIMATE_DEFAULTS), { baseFeeMultiplier: baseFeeMultiplier, priorityFeeMultiplier: priorityFeeMultiplier }), opts), { chainId: (_c = opts.chainId) !== null && _c !== void 0 ? _c : constants_1.CHAIN_IDs.SOLANA });
|
|
33
32
|
return [2, solana.messageFee(provider, optsWithDefaults_1)];
|
|
34
33
|
}
|
|
35
|
-
provider = provider;
|
|
36
34
|
if (!((_d = opts.chainId) !== null && _d !== void 0)) return [3, 1];
|
|
37
35
|
_e = _d;
|
|
38
36
|
return [3, 3];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oracle.js","sourceRoot":"","sources":["../../../src/gasPriceOracle/oracle.ts"],"names":[],"mappings":";;;;AAAA,0DAA4B;
|
|
1
|
+
{"version":3,"file":"oracle.js","sourceRoot":"","sources":["../../../src/gasPriceOracle/oracle.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,3 +13,5 @@ export type SvmGasPriceEstimate = {
|
|
|
13
13
|
export interface GasPriceFeed {
|
|
14
14
|
(provider: PublicClient<Transport, Chain>, chainId: number): Promise<InternalGasPriceEstimate>;
|
|
15
15
|
}
|
|
16
|
+
export declare function isEVMGasPrice(gasPrice: GasPriceEstimate): gasPrice is EvmGasPriceEstimate;
|
|
17
|
+
export declare function isSVMGasPrice(gasPrice: GasPriceEstimate): gasPrice is SvmGasPriceEstimate;
|
|
@@ -1,3 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.isSVMGasPrice = exports.isEVMGasPrice = void 0;
|
|
4
|
+
var utils_1 = require("../utils");
|
|
5
|
+
function isEVMGasPrice(gasPrice) {
|
|
6
|
+
var _a = gasPrice, maxFeePerGas = _a.maxFeePerGas, maxPriorityFeePerGas = _a.maxPriorityFeePerGas;
|
|
7
|
+
return (0, utils_1.isDefined)(maxFeePerGas) && (0, utils_1.isDefined)(maxPriorityFeePerGas);
|
|
8
|
+
}
|
|
9
|
+
exports.isEVMGasPrice = isEVMGasPrice;
|
|
10
|
+
function isSVMGasPrice(gasPrice) {
|
|
11
|
+
var _a = gasPrice, baseFee = _a.baseFee, microLamportsPerComputeUnit = _a.microLamportsPerComputeUnit;
|
|
12
|
+
return (0, utils_1.isDefined)(baseFee) && (0, utils_1.isDefined)(microLamportsPerComputeUnit);
|
|
13
|
+
}
|
|
14
|
+
exports.isSVMGasPrice = isSVMGasPrice;
|
|
3
15
|
//# sourceMappingURL=types.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/gasPriceOracle/types.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/gasPriceOracle/types.ts"],"names":[],"mappings":";;;AACA,kCAAgD;AAmBhD,SAAgB,aAAa,CAAC,QAA0B;IAChD,IAAA,KAAyC,QAA+B,EAAtE,YAAY,kBAAA,EAAE,oBAAoB,0BAAoC,CAAC;IAC/E,OAAO,IAAA,iBAAS,EAAC,YAAY,CAAC,IAAI,IAAA,iBAAS,EAAC,oBAAoB,CAAC,CAAC;AACpE,CAAC;AAHD,sCAGC;AAED,SAAgB,aAAa,CAAC,QAA0B;IAChD,IAAA,KAA2C,QAA+B,EAAxE,OAAO,aAAA,EAAE,2BAA2B,iCAAoC,CAAC;IACjF,OAAO,IAAA,iBAAS,EAAC,OAAO,CAAC,IAAI,IAAA,iBAAS,EAAC,2BAA2B,CAAC,CAAC;AACtE,CAAC;AAHD,sCAGC"}
|
|
@@ -1,3 +1,6 @@
|
|
|
1
|
+
import { providers } from "ethers";
|
|
2
|
+
import { SVMProvider } from "../arch/svm/types";
|
|
1
3
|
export declare function isPromiseFulfilled<T>(promiseSettledResult: PromiseSettledResult<T>): promiseSettledResult is PromiseFulfilledResult<T>;
|
|
2
4
|
export declare function isPromiseRejected<T>(promiseSettledResult: PromiseSettledResult<T>): promiseSettledResult is PromiseRejectedResult;
|
|
3
5
|
export declare function isDefined<T>(input: T | null | undefined): input is T;
|
|
6
|
+
export declare function isEvmProvider(provider: providers.Provider | SVMProvider): provider is providers.Provider;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.isDefined = exports.isPromiseRejected = exports.isPromiseFulfilled = void 0;
|
|
3
|
+
exports.isEvmProvider = exports.isDefined = exports.isPromiseRejected = exports.isPromiseFulfilled = void 0;
|
|
4
|
+
var ethers_1 = require("ethers");
|
|
4
5
|
function isPromiseFulfilled(promiseSettledResult) {
|
|
5
6
|
return promiseSettledResult.status === "fulfilled";
|
|
6
7
|
}
|
|
@@ -13,4 +14,8 @@ function isDefined(input) {
|
|
|
13
14
|
return input !== null && input !== undefined;
|
|
14
15
|
}
|
|
15
16
|
exports.isDefined = isDefined;
|
|
17
|
+
function isEvmProvider(provider) {
|
|
18
|
+
return provider instanceof ethers_1.providers.Provider;
|
|
19
|
+
}
|
|
20
|
+
exports.isEvmProvider = isEvmProvider;
|
|
16
21
|
//# sourceMappingURL=TypeGuards.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TypeGuards.js","sourceRoot":"","sources":["../../../src/utils/TypeGuards.ts"],"names":[],"mappings":";;;AAAA,SAAgB,kBAAkB,CAChC,oBAA6C;IAE7C,OAAO,oBAAoB,CAAC,MAAM,KAAK,WAAW,CAAC;AACrD,CAAC;AAJD,gDAIC;AAED,SAAgB,iBAAiB,CAC/B,oBAA6C;IAE7C,OAAO,oBAAoB,CAAC,MAAM,KAAK,UAAU,CAAC;AACpD,CAAC;AAJD,8CAIC;AAED,SAAgB,SAAS,CAAI,KAA2B;IACtD,OAAO,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,CAAC;AAC/C,CAAC;AAFD,8BAEC"}
|
|
1
|
+
{"version":3,"file":"TypeGuards.js","sourceRoot":"","sources":["../../../src/utils/TypeGuards.ts"],"names":[],"mappings":";;;AAAA,iCAAmC;AAGnC,SAAgB,kBAAkB,CAChC,oBAA6C;IAE7C,OAAO,oBAAoB,CAAC,MAAM,KAAK,WAAW,CAAC;AACrD,CAAC;AAJD,gDAIC;AAED,SAAgB,iBAAiB,CAC/B,oBAA6C;IAE7C,OAAO,oBAAoB,CAAC,MAAM,KAAK,UAAU,CAAC;AACpD,CAAC;AAJD,8CAIC;AAED,SAAgB,SAAS,CAAI,KAA2B;IACtD,OAAO,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,CAAC;AAC/C,CAAC;AAFD,8BAEC;AAED,SAAgB,aAAa,CAAC,QAA0C;IACtE,OAAO,QAAQ,YAAY,kBAAS,CAAC,QAAQ,CAAC;AAChD,CAAC;AAFD,sCAEC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { BlockFinder, type Block, type
|
|
1
|
+
import { BlockFinder, type Block, type BlockTimeAverage, type BlockFinderHints } from "../../utils/BlockFinder";
|
|
2
2
|
import { SVMProvider } from "./";
|
|
3
3
|
interface SVMBlock extends Block {
|
|
4
4
|
}
|
|
@@ -7,7 +7,7 @@ interface SVMBlock extends Block {
|
|
|
7
7
|
* @dev Solana slots are all defined to be ~400ms away from each other += a small deviation, so we can hardcode this.
|
|
8
8
|
* @returns Average number of seconds per slot
|
|
9
9
|
*/
|
|
10
|
-
export declare function averageBlockTime(
|
|
10
|
+
export declare function averageBlockTime(): Pick<BlockTimeAverage, "average" | "blockRange">;
|
|
11
11
|
export declare class SVMBlockFinder extends BlockFinder<SVMBlock> {
|
|
12
12
|
private readonly provider;
|
|
13
13
|
private readonly blocks;
|
|
@@ -2,7 +2,7 @@ var _a;
|
|
|
2
2
|
import { __awaiter, __extends, __generator } from "tslib";
|
|
3
3
|
import assert from "assert";
|
|
4
4
|
import { clamp, sortedIndexBy } from "lodash";
|
|
5
|
-
import { BlockFinder
|
|
5
|
+
import { BlockFinder } from "../../utils/BlockFinder";
|
|
6
6
|
import { isDefined } from "../../utils/TypeGuards";
|
|
7
7
|
import { getCurrentTime } from "../../utils/TimeUtils";
|
|
8
8
|
import { CHAIN_IDs } from "../../constants";
|
|
@@ -15,12 +15,11 @@ var averageBlockTimes = (_a = {},
|
|
|
15
15
|
* @dev Solana slots are all defined to be ~400ms away from each other += a small deviation, so we can hardcode this.
|
|
16
16
|
* @returns Average number of seconds per slot
|
|
17
17
|
*/
|
|
18
|
-
export function averageBlockTime(
|
|
19
|
-
if (_opts === void 0) { _opts = {}; }
|
|
18
|
+
export function averageBlockTime() {
|
|
20
19
|
// @todo This may need to be expanded to work without assuming that chainId = CHAIN_IDs.SOLANA.
|
|
21
20
|
return averageBlockTimes[CHAIN_IDs.SOLANA];
|
|
22
21
|
}
|
|
23
|
-
function estimateBlocksElapsed(seconds, cushionPercentage,
|
|
22
|
+
function estimateBlocksElapsed(seconds, cushionPercentage, _provider) {
|
|
24
23
|
if (cushionPercentage === void 0) { cushionPercentage = 0.0; }
|
|
25
24
|
return __awaiter(this, void 0, void 0, function () {
|
|
26
25
|
var cushionMultiplier, average;
|
|
@@ -28,7 +27,7 @@ function estimateBlocksElapsed(seconds, cushionPercentage, provider) {
|
|
|
28
27
|
switch (_a.label) {
|
|
29
28
|
case 0:
|
|
30
29
|
cushionMultiplier = cushionPercentage + 1.0;
|
|
31
|
-
return [4 /*yield*/, averageBlockTime(
|
|
30
|
+
return [4 /*yield*/, averageBlockTime()];
|
|
32
31
|
case 1:
|
|
33
32
|
average = (_a.sent()).average;
|
|
34
33
|
return [2 /*return*/, Math.floor((seconds * cushionMultiplier) / average)];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BlockUtils.js","sourceRoot":"","sources":["../../../../src/arch/svm/BlockUtils.ts"],"names":[],"mappings":";;AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,
|
|
1
|
+
{"version":3,"file":"BlockUtils.js","sourceRoot":"","sources":["../../../../src/arch/svm/BlockUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -260,7 +260,7 @@ var SvmCpiEventsClient = /** @class */ (function () {
|
|
|
260
260
|
}
|
|
261
261
|
return [2 /*return*/, events.map(function (event) {
|
|
262
262
|
var unwrappedEventArgs = unwrapEventData(event, ["depositId"]);
|
|
263
|
-
return __assign(__assign({}, unwrappedEventArgs.data), { depositTimestamp: Number(txDetails.blockTime), originChainId: originChainId, messageHash: getMessageHash(unwrappedEventArgs.data.message), blockNumber: Number(txDetails.slot), txnIndex: 0, txnRef: txSignature, logIndex: 0
|
|
263
|
+
return __assign(__assign({}, unwrappedEventArgs.data), { depositTimestamp: Number(txDetails.blockTime), originChainId: originChainId, messageHash: getMessageHash(unwrappedEventArgs.data.message), blockNumber: Number(txDetails.slot), txnIndex: 0, txnRef: txSignature, logIndex: 0 });
|
|
264
264
|
})];
|
|
265
265
|
}
|
|
266
266
|
});
|
|
@@ -298,7 +298,7 @@ var SvmCpiEventsClient = /** @class */ (function () {
|
|
|
298
298
|
}
|
|
299
299
|
return [2 /*return*/, fillEvents.map(function (event) {
|
|
300
300
|
var unwrappedEventData = unwrapEventData(event);
|
|
301
|
-
return __assign(__assign({}, unwrappedEventData.data), { fillTimestamp: Number(txDetails.blockTime), blockNumber: Number(txDetails.slot), txnRef: txSignature, txnIndex: 0, logIndex: 0, destinationChainId: destinationChainId
|
|
301
|
+
return __assign(__assign({}, unwrappedEventData.data), { fillTimestamp: Number(txDetails.blockTime), blockNumber: Number(txDetails.slot), txnRef: txSignature, txnIndex: 0, logIndex: 0, destinationChainId: destinationChainId });
|
|
302
302
|
})];
|
|
303
303
|
}
|
|
304
304
|
});
|