@solana/web3.js 2.0.0-experimental.b463a7a → 2.0.0-experimental.b755749
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/LICENSE +1 -1
- package/README.md +1111 -43
- package/dist/index.browser.cjs +684 -13
- package/dist/index.browser.cjs.map +1 -1
- package/dist/index.browser.js +670 -15
- package/dist/index.browser.js.map +1 -1
- package/dist/index.development.js +2225 -819
- package/dist/index.development.js.map +1 -1
- package/dist/index.native.js +668 -15
- package/dist/index.native.js.map +1 -1
- package/dist/index.node.cjs +686 -13
- package/dist/index.node.cjs.map +1 -1
- package/dist/index.node.js +668 -15
- package/dist/index.node.js.map +1 -1
- package/dist/index.production.min.js +75 -33
- package/dist/types/airdrop-confirmer.d.ts +20 -0
- package/dist/types/airdrop.d.ts +23 -0
- package/dist/types/cached-abortable-iterable.d.ts +11 -0
- package/dist/types/index.d.ts +7 -0
- package/dist/types/rpc-subscription-coalescer.d.ts +10 -0
- package/dist/types/rpc-websocket-connection-sharding.d.ts +13 -0
- package/dist/types/rpc-websocket-transport.d.ts +6 -0
- package/dist/types/rpc.d.ts +2 -1
- package/dist/types/send-transaction.d.ts +37 -0
- package/dist/types/transaction-confirmation-strategy-blockheight.d.ts +10 -0
- package/dist/types/transaction-confirmation-strategy-nonce.d.ts +15 -0
- package/dist/types/transaction-confirmation-strategy-racer.d.ts +14 -0
- package/dist/types/transaction-confirmation-strategy-recent-signature.d.ts +13 -0
- package/dist/types/transaction-confirmation-strategy-timeout.d.ts +8 -0
- package/dist/types/transaction-confirmation.d.ts +37 -0
- package/package.json +19 -16
package/dist/index.node.js
CHANGED
|
@@ -1,12 +1,173 @@
|
|
|
1
1
|
export * from '@solana/addresses';
|
|
2
2
|
export * from '@solana/instructions';
|
|
3
3
|
export * from '@solana/keys';
|
|
4
|
+
import { commitmentComparator } from '@solana/rpc-types';
|
|
5
|
+
export * from '@solana/rpc-types';
|
|
6
|
+
import { getSignatureFromTransaction, getBase64EncodedWireTransaction } from '@solana/transactions';
|
|
4
7
|
export * from '@solana/transactions';
|
|
5
|
-
import {
|
|
8
|
+
import { pipe } from '@solana/functional';
|
|
9
|
+
import { createSolanaRpcApi, createSolanaRpcSubscriptionsApi, createSolanaRpcSubscriptionsApi_UNSTABLE } from '@solana/rpc-core';
|
|
6
10
|
import { createJsonRpc, createJsonSubscriptionRpc, createHttpTransport, createWebSocketTransport } from '@solana/rpc-transport';
|
|
7
11
|
import fastStableStringify from 'fast-stable-stringify';
|
|
12
|
+
import { getBase58Decoder, getBase64Encoder } from '@solana/codecs-strings';
|
|
8
13
|
|
|
9
|
-
//
|
|
14
|
+
// ../build-scripts/env-shim.ts
|
|
15
|
+
var __DEV__ = /* @__PURE__ */ (() => process["env"].NODE_ENV === "development")();
|
|
16
|
+
|
|
17
|
+
// src/transaction-confirmation-strategy-racer.ts
|
|
18
|
+
async function raceStrategies(signature, config, getSpecificStrategiesForRace) {
|
|
19
|
+
const { abortSignal: callerAbortSignal, commitment, getRecentSignatureConfirmationPromise } = config;
|
|
20
|
+
callerAbortSignal?.throwIfAborted();
|
|
21
|
+
const abortController = new AbortController();
|
|
22
|
+
if (callerAbortSignal) {
|
|
23
|
+
const handleAbort = () => {
|
|
24
|
+
abortController.abort();
|
|
25
|
+
};
|
|
26
|
+
callerAbortSignal.addEventListener("abort", handleAbort, { signal: abortController.signal });
|
|
27
|
+
}
|
|
28
|
+
try {
|
|
29
|
+
const specificStrategies = getSpecificStrategiesForRace({
|
|
30
|
+
...config,
|
|
31
|
+
abortSignal: abortController.signal
|
|
32
|
+
});
|
|
33
|
+
return await Promise.race([
|
|
34
|
+
getRecentSignatureConfirmationPromise({
|
|
35
|
+
abortSignal: abortController.signal,
|
|
36
|
+
commitment,
|
|
37
|
+
signature
|
|
38
|
+
}),
|
|
39
|
+
...specificStrategies
|
|
40
|
+
]);
|
|
41
|
+
} finally {
|
|
42
|
+
abortController.abort();
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
function createRecentSignatureConfirmationPromiseFactory(rpc, rpcSubscriptions) {
|
|
46
|
+
return async function getRecentSignatureConfirmationPromise({
|
|
47
|
+
abortSignal: callerAbortSignal,
|
|
48
|
+
commitment,
|
|
49
|
+
signature
|
|
50
|
+
}) {
|
|
51
|
+
const abortController = new AbortController();
|
|
52
|
+
function handleAbort() {
|
|
53
|
+
abortController.abort();
|
|
54
|
+
}
|
|
55
|
+
callerAbortSignal.addEventListener("abort", handleAbort, { signal: abortController.signal });
|
|
56
|
+
const signatureStatusNotifications = await rpcSubscriptions.signatureNotifications(signature, { commitment }).subscribe({ abortSignal: abortController.signal });
|
|
57
|
+
const signatureDidCommitPromise = (async () => {
|
|
58
|
+
for await (const signatureStatusNotification of signatureStatusNotifications) {
|
|
59
|
+
if (signatureStatusNotification.value.err) {
|
|
60
|
+
throw new Error(`The transaction with signature \`${signature}\` failed.`, {
|
|
61
|
+
cause: signatureStatusNotification.value.err
|
|
62
|
+
});
|
|
63
|
+
} else {
|
|
64
|
+
return;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
})();
|
|
68
|
+
const signatureStatusLookupPromise = (async () => {
|
|
69
|
+
const { value: signatureStatusResults } = await rpc.getSignatureStatuses([signature]).send({ abortSignal: abortController.signal });
|
|
70
|
+
const signatureStatus = signatureStatusResults[0];
|
|
71
|
+
if (signatureStatus && signatureStatus.confirmationStatus && commitmentComparator(signatureStatus.confirmationStatus, commitment) >= 0) {
|
|
72
|
+
return;
|
|
73
|
+
} else {
|
|
74
|
+
await new Promise(() => {
|
|
75
|
+
});
|
|
76
|
+
}
|
|
77
|
+
})();
|
|
78
|
+
try {
|
|
79
|
+
return await Promise.race([signatureDidCommitPromise, signatureStatusLookupPromise]);
|
|
80
|
+
} finally {
|
|
81
|
+
abortController.abort();
|
|
82
|
+
}
|
|
83
|
+
};
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
// src/transaction-confirmation-strategy-timeout.ts
|
|
87
|
+
async function getTimeoutPromise({ abortSignal: callerAbortSignal, commitment }) {
|
|
88
|
+
return await new Promise((_, reject) => {
|
|
89
|
+
const handleAbort = (e) => {
|
|
90
|
+
clearTimeout(timeoutId);
|
|
91
|
+
const abortError = new DOMException(e.target.reason, "AbortError");
|
|
92
|
+
reject(abortError);
|
|
93
|
+
};
|
|
94
|
+
callerAbortSignal.addEventListener("abort", handleAbort);
|
|
95
|
+
const timeoutMs = commitment === "processed" ? 3e4 : 6e4;
|
|
96
|
+
const startMs = performance.now();
|
|
97
|
+
const timeoutId = (
|
|
98
|
+
// We use `setTimeout` instead of `AbortSignal.timeout()` because we want to measure
|
|
99
|
+
// elapsed time instead of active time.
|
|
100
|
+
// See https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal/timeout_static
|
|
101
|
+
setTimeout(() => {
|
|
102
|
+
const elapsedMs = performance.now() - startMs;
|
|
103
|
+
reject(new DOMException(`Timeout elapsed after ${elapsedMs} ms`, "TimeoutError"));
|
|
104
|
+
}, timeoutMs)
|
|
105
|
+
);
|
|
106
|
+
});
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
// src/airdrop-confirmer.ts
|
|
110
|
+
function createDefaultSignatureOnlyRecentTransactionConfirmer({
|
|
111
|
+
rpc,
|
|
112
|
+
rpcSubscriptions
|
|
113
|
+
}) {
|
|
114
|
+
const getRecentSignatureConfirmationPromise = createRecentSignatureConfirmationPromiseFactory(
|
|
115
|
+
rpc,
|
|
116
|
+
rpcSubscriptions
|
|
117
|
+
);
|
|
118
|
+
return async function confirmSignatureOnlyRecentTransaction(config) {
|
|
119
|
+
await waitForRecentTransactionConfirmationUntilTimeout({
|
|
120
|
+
...config,
|
|
121
|
+
getRecentSignatureConfirmationPromise,
|
|
122
|
+
getTimeoutPromise
|
|
123
|
+
});
|
|
124
|
+
};
|
|
125
|
+
}
|
|
126
|
+
async function waitForRecentTransactionConfirmationUntilTimeout(config) {
|
|
127
|
+
await raceStrategies(
|
|
128
|
+
config.signature,
|
|
129
|
+
config,
|
|
130
|
+
function getSpecificStrategiesForRace({ abortSignal, commitment, getTimeoutPromise: getTimeoutPromise2 }) {
|
|
131
|
+
return [
|
|
132
|
+
getTimeoutPromise2({
|
|
133
|
+
abortSignal,
|
|
134
|
+
commitment
|
|
135
|
+
})
|
|
136
|
+
];
|
|
137
|
+
}
|
|
138
|
+
);
|
|
139
|
+
}
|
|
140
|
+
|
|
141
|
+
// src/airdrop.ts
|
|
142
|
+
function createDefaultAirdropRequester({ rpc, rpcSubscriptions }) {
|
|
143
|
+
const confirmSignatureOnlyTransaction = createDefaultSignatureOnlyRecentTransactionConfirmer({
|
|
144
|
+
rpc,
|
|
145
|
+
rpcSubscriptions
|
|
146
|
+
});
|
|
147
|
+
return async function requestAirdrop(config) {
|
|
148
|
+
return await requestAndConfirmAirdrop({
|
|
149
|
+
...config,
|
|
150
|
+
confirmSignatureOnlyTransaction,
|
|
151
|
+
rpc
|
|
152
|
+
});
|
|
153
|
+
};
|
|
154
|
+
}
|
|
155
|
+
async function requestAndConfirmAirdrop({
|
|
156
|
+
abortSignal,
|
|
157
|
+
commitment,
|
|
158
|
+
confirmSignatureOnlyTransaction,
|
|
159
|
+
lamports,
|
|
160
|
+
recipientAddress,
|
|
161
|
+
rpc
|
|
162
|
+
}) {
|
|
163
|
+
const airdropTransactionSignature = await rpc.requestAirdrop(recipientAddress, lamports, { commitment }).send({ abortSignal });
|
|
164
|
+
await confirmSignatureOnlyTransaction({
|
|
165
|
+
abortSignal,
|
|
166
|
+
commitment,
|
|
167
|
+
signature: airdropTransactionSignature
|
|
168
|
+
});
|
|
169
|
+
return airdropTransactionSignature;
|
|
170
|
+
}
|
|
10
171
|
|
|
11
172
|
// src/rpc-integer-overflow-error.ts
|
|
12
173
|
var SolanaJsonRpcIntegerOverflowError = class extends Error {
|
|
@@ -44,6 +205,193 @@ var DEFAULT_RPC_CONFIG = {
|
|
|
44
205
|
}
|
|
45
206
|
};
|
|
46
207
|
|
|
208
|
+
// src/cached-abortable-iterable.ts
|
|
209
|
+
function registerIterableCleanup(iterable, cleanupFn) {
|
|
210
|
+
(async () => {
|
|
211
|
+
try {
|
|
212
|
+
for await (const _ of iterable)
|
|
213
|
+
;
|
|
214
|
+
} catch {
|
|
215
|
+
} finally {
|
|
216
|
+
cleanupFn();
|
|
217
|
+
}
|
|
218
|
+
})();
|
|
219
|
+
}
|
|
220
|
+
function getCachedAbortableIterableFactory({
|
|
221
|
+
getAbortSignalFromInputArgs,
|
|
222
|
+
getCacheEntryMissingError,
|
|
223
|
+
getCacheKeyFromInputArgs,
|
|
224
|
+
onCacheHit,
|
|
225
|
+
onCreateIterable
|
|
226
|
+
}) {
|
|
227
|
+
const cache = /* @__PURE__ */ new Map();
|
|
228
|
+
function getCacheEntryOrThrow(cacheKey) {
|
|
229
|
+
const currentCacheEntry = cache.get(cacheKey);
|
|
230
|
+
if (!currentCacheEntry) {
|
|
231
|
+
throw getCacheEntryMissingError(cacheKey);
|
|
232
|
+
}
|
|
233
|
+
return currentCacheEntry;
|
|
234
|
+
}
|
|
235
|
+
return async (...args) => {
|
|
236
|
+
const cacheKey = getCacheKeyFromInputArgs(...args);
|
|
237
|
+
const signal = getAbortSignalFromInputArgs(...args);
|
|
238
|
+
if (cacheKey === void 0) {
|
|
239
|
+
return await onCreateIterable(signal, ...args);
|
|
240
|
+
}
|
|
241
|
+
const cleanup = () => {
|
|
242
|
+
cache.delete(cacheKey);
|
|
243
|
+
signal.removeEventListener("abort", handleAbort);
|
|
244
|
+
};
|
|
245
|
+
const handleAbort = () => {
|
|
246
|
+
const cacheEntry = getCacheEntryOrThrow(cacheKey);
|
|
247
|
+
if (cacheEntry.purgeScheduled !== true) {
|
|
248
|
+
cacheEntry.purgeScheduled = true;
|
|
249
|
+
globalThis.queueMicrotask(() => {
|
|
250
|
+
cacheEntry.purgeScheduled = false;
|
|
251
|
+
if (cacheEntry.referenceCount === 0) {
|
|
252
|
+
cacheEntry.abortController.abort();
|
|
253
|
+
cleanup();
|
|
254
|
+
}
|
|
255
|
+
});
|
|
256
|
+
}
|
|
257
|
+
cacheEntry.referenceCount--;
|
|
258
|
+
};
|
|
259
|
+
signal.addEventListener("abort", handleAbort);
|
|
260
|
+
try {
|
|
261
|
+
const cacheEntry = cache.get(cacheKey);
|
|
262
|
+
if (!cacheEntry) {
|
|
263
|
+
const singletonAbortController = new AbortController();
|
|
264
|
+
const newIterablePromise = onCreateIterable(singletonAbortController.signal, ...args);
|
|
265
|
+
const newCacheEntry = {
|
|
266
|
+
abortController: singletonAbortController,
|
|
267
|
+
iterable: newIterablePromise,
|
|
268
|
+
purgeScheduled: false,
|
|
269
|
+
referenceCount: 1
|
|
270
|
+
};
|
|
271
|
+
cache.set(cacheKey, newCacheEntry);
|
|
272
|
+
const newIterable = await newIterablePromise;
|
|
273
|
+
registerIterableCleanup(newIterable, cleanup);
|
|
274
|
+
newCacheEntry.iterable = newIterable;
|
|
275
|
+
return newIterable;
|
|
276
|
+
} else {
|
|
277
|
+
cacheEntry.referenceCount++;
|
|
278
|
+
const iterableOrIterablePromise = cacheEntry.iterable;
|
|
279
|
+
const cachedIterable = "then" in iterableOrIterablePromise ? await iterableOrIterablePromise : iterableOrIterablePromise;
|
|
280
|
+
await onCacheHit(cachedIterable, ...args);
|
|
281
|
+
return cachedIterable;
|
|
282
|
+
}
|
|
283
|
+
} catch (e) {
|
|
284
|
+
cleanup();
|
|
285
|
+
throw e;
|
|
286
|
+
}
|
|
287
|
+
};
|
|
288
|
+
}
|
|
289
|
+
|
|
290
|
+
// src/rpc-subscription-coalescer.ts
|
|
291
|
+
var EXPLICIT_ABORT_TOKEN = Symbol(
|
|
292
|
+
__DEV__ ? "This symbol is thrown from a subscription's iterator when the subscription is explicitly aborted by the user" : void 0
|
|
293
|
+
);
|
|
294
|
+
function registerIterableCleanup2(iterable, cleanupFn) {
|
|
295
|
+
(async () => {
|
|
296
|
+
try {
|
|
297
|
+
for await (const _ of iterable)
|
|
298
|
+
;
|
|
299
|
+
} catch {
|
|
300
|
+
} finally {
|
|
301
|
+
cleanupFn();
|
|
302
|
+
}
|
|
303
|
+
})();
|
|
304
|
+
}
|
|
305
|
+
function getRpcSubscriptionsWithSubscriptionCoalescing({
|
|
306
|
+
getDeduplicationKey,
|
|
307
|
+
rpcSubscriptions
|
|
308
|
+
}) {
|
|
309
|
+
const cache = /* @__PURE__ */ new Map();
|
|
310
|
+
return new Proxy(rpcSubscriptions, {
|
|
311
|
+
defineProperty() {
|
|
312
|
+
return false;
|
|
313
|
+
},
|
|
314
|
+
deleteProperty() {
|
|
315
|
+
return false;
|
|
316
|
+
},
|
|
317
|
+
get(target, p, receiver) {
|
|
318
|
+
const subscriptionMethod = Reflect.get(target, p, receiver);
|
|
319
|
+
if (typeof subscriptionMethod !== "function") {
|
|
320
|
+
return subscriptionMethod;
|
|
321
|
+
}
|
|
322
|
+
return function(...rawParams) {
|
|
323
|
+
const deduplicationKey = getDeduplicationKey(p, rawParams);
|
|
324
|
+
if (deduplicationKey === void 0) {
|
|
325
|
+
return subscriptionMethod(...rawParams);
|
|
326
|
+
}
|
|
327
|
+
if (cache.has(deduplicationKey)) {
|
|
328
|
+
return cache.get(deduplicationKey);
|
|
329
|
+
}
|
|
330
|
+
const iterableFactory = getCachedAbortableIterableFactory({
|
|
331
|
+
getAbortSignalFromInputArgs: ({ abortSignal }) => abortSignal,
|
|
332
|
+
getCacheEntryMissingError(deduplicationKey2) {
|
|
333
|
+
return new Error(
|
|
334
|
+
`Found no cache entry for subscription with deduplication key \`${deduplicationKey2?.toString()}\``
|
|
335
|
+
);
|
|
336
|
+
},
|
|
337
|
+
getCacheKeyFromInputArgs: () => deduplicationKey,
|
|
338
|
+
async onCacheHit(_iterable, _config) {
|
|
339
|
+
},
|
|
340
|
+
async onCreateIterable(abortSignal, config) {
|
|
341
|
+
const pendingSubscription2 = subscriptionMethod(
|
|
342
|
+
...rawParams
|
|
343
|
+
);
|
|
344
|
+
const iterable = await pendingSubscription2.subscribe({
|
|
345
|
+
...config,
|
|
346
|
+
abortSignal
|
|
347
|
+
});
|
|
348
|
+
registerIterableCleanup2(iterable, () => {
|
|
349
|
+
cache.delete(deduplicationKey);
|
|
350
|
+
});
|
|
351
|
+
return iterable;
|
|
352
|
+
}
|
|
353
|
+
});
|
|
354
|
+
const pendingSubscription = {
|
|
355
|
+
async subscribe(...args) {
|
|
356
|
+
const iterable = await iterableFactory(...args);
|
|
357
|
+
const { abortSignal } = args[0];
|
|
358
|
+
let abortPromise;
|
|
359
|
+
return {
|
|
360
|
+
...iterable,
|
|
361
|
+
async *[Symbol.asyncIterator]() {
|
|
362
|
+
abortPromise || (abortPromise = abortSignal.aborted ? Promise.reject(EXPLICIT_ABORT_TOKEN) : new Promise((_, reject) => {
|
|
363
|
+
abortSignal.addEventListener("abort", () => {
|
|
364
|
+
reject(EXPLICIT_ABORT_TOKEN);
|
|
365
|
+
});
|
|
366
|
+
}));
|
|
367
|
+
try {
|
|
368
|
+
const iterator = iterable[Symbol.asyncIterator]();
|
|
369
|
+
while (true) {
|
|
370
|
+
const iteratorResult = await Promise.race([iterator.next(), abortPromise]);
|
|
371
|
+
if (iteratorResult.done) {
|
|
372
|
+
return;
|
|
373
|
+
} else {
|
|
374
|
+
yield iteratorResult.value;
|
|
375
|
+
}
|
|
376
|
+
}
|
|
377
|
+
} catch (e) {
|
|
378
|
+
if (e === EXPLICIT_ABORT_TOKEN) {
|
|
379
|
+
return;
|
|
380
|
+
}
|
|
381
|
+
cache.delete(deduplicationKey);
|
|
382
|
+
throw e;
|
|
383
|
+
}
|
|
384
|
+
}
|
|
385
|
+
};
|
|
386
|
+
}
|
|
387
|
+
};
|
|
388
|
+
cache.set(deduplicationKey, pendingSubscription);
|
|
389
|
+
return pendingSubscription;
|
|
390
|
+
};
|
|
391
|
+
}
|
|
392
|
+
});
|
|
393
|
+
}
|
|
394
|
+
|
|
47
395
|
// src/rpc.ts
|
|
48
396
|
function createSolanaRpc(config) {
|
|
49
397
|
return createJsonRpc({
|
|
@@ -52,9 +400,21 @@ function createSolanaRpc(config) {
|
|
|
52
400
|
});
|
|
53
401
|
}
|
|
54
402
|
function createSolanaRpcSubscriptions(config) {
|
|
403
|
+
return pipe(
|
|
404
|
+
createJsonSubscriptionRpc({
|
|
405
|
+
...config,
|
|
406
|
+
api: createSolanaRpcSubscriptionsApi(DEFAULT_RPC_CONFIG)
|
|
407
|
+
}),
|
|
408
|
+
(rpcSubscriptions) => getRpcSubscriptionsWithSubscriptionCoalescing({
|
|
409
|
+
getDeduplicationKey: (...args) => fastStableStringify(args),
|
|
410
|
+
rpcSubscriptions
|
|
411
|
+
})
|
|
412
|
+
);
|
|
413
|
+
}
|
|
414
|
+
function createSolanaRpcSubscriptions_UNSTABLE(config) {
|
|
55
415
|
return createJsonSubscriptionRpc({
|
|
56
416
|
...config,
|
|
57
|
-
api:
|
|
417
|
+
api: createSolanaRpcSubscriptionsApi_UNSTABLE(DEFAULT_RPC_CONFIG)
|
|
58
418
|
});
|
|
59
419
|
}
|
|
60
420
|
|
|
@@ -109,13 +469,14 @@ function getRpcTransportWithRequestCoalescing(transport, getDeduplicationKey) {
|
|
|
109
469
|
}
|
|
110
470
|
};
|
|
111
471
|
}
|
|
112
|
-
function
|
|
472
|
+
function isJsonRpcPayload(payload) {
|
|
113
473
|
if (payload == null || typeof payload !== "object" || Array.isArray(payload)) {
|
|
114
|
-
return;
|
|
115
|
-
}
|
|
116
|
-
if ("jsonrpc" in payload && payload.jsonrpc === "2.0" && "method" in payload && "params" in payload) {
|
|
117
|
-
return fastStableStringify([payload.method, payload.params]);
|
|
474
|
+
return false;
|
|
118
475
|
}
|
|
476
|
+
return "jsonrpc" in payload && payload.jsonrpc === "2.0" && "method" in payload && typeof payload.method === "string" && "params" in payload;
|
|
477
|
+
}
|
|
478
|
+
function getSolanaRpcPayloadDeduplicationKey(payload) {
|
|
479
|
+
return isJsonRpcPayload(payload) ? fastStableStringify([payload.method, payload.params]) : void 0;
|
|
119
480
|
}
|
|
120
481
|
|
|
121
482
|
// src/rpc-transport.ts
|
|
@@ -127,7 +488,7 @@ function normalizeHeaders(headers) {
|
|
|
127
488
|
return out;
|
|
128
489
|
}
|
|
129
490
|
function createDefaultRpcTransport(config) {
|
|
130
|
-
return
|
|
491
|
+
return pipe(
|
|
131
492
|
createHttpTransport({
|
|
132
493
|
...config,
|
|
133
494
|
headers: {
|
|
@@ -138,7 +499,7 @@ function createDefaultRpcTransport(config) {
|
|
|
138
499
|
}
|
|
139
500
|
}
|
|
140
501
|
}),
|
|
141
|
-
getSolanaRpcPayloadDeduplicationKey
|
|
502
|
+
(transport) => getRpcTransportWithRequestCoalescing(transport, getSolanaRpcPayloadDeduplicationKey)
|
|
142
503
|
);
|
|
143
504
|
}
|
|
144
505
|
|
|
@@ -194,19 +555,311 @@ function getWebSocketTransportWithAutoping({ intervalMs, transport }) {
|
|
|
194
555
|
};
|
|
195
556
|
}
|
|
196
557
|
|
|
558
|
+
// src/rpc-websocket-connection-sharding.ts
|
|
559
|
+
var NULL_SHARD_CACHE_KEY = Symbol(
|
|
560
|
+
__DEV__ ? "Cache key to use when there is no connection sharding strategy" : void 0
|
|
561
|
+
);
|
|
562
|
+
function getWebSocketTransportWithConnectionSharding({ getShard, transport }) {
|
|
563
|
+
return getCachedAbortableIterableFactory({
|
|
564
|
+
getAbortSignalFromInputArgs: ({ signal }) => signal,
|
|
565
|
+
getCacheEntryMissingError(shardKey) {
|
|
566
|
+
return new Error(`Found no cache entry for connection with shard key \`${shardKey?.toString()}\``);
|
|
567
|
+
},
|
|
568
|
+
getCacheKeyFromInputArgs: ({ payload }) => getShard ? getShard(payload) : NULL_SHARD_CACHE_KEY,
|
|
569
|
+
onCacheHit: (connection, { payload }) => connection.send_DO_NOT_USE_OR_YOU_WILL_BE_FIRED(payload),
|
|
570
|
+
onCreateIterable: (abortSignal, config) => transport({
|
|
571
|
+
...config,
|
|
572
|
+
signal: abortSignal
|
|
573
|
+
})
|
|
574
|
+
});
|
|
575
|
+
}
|
|
576
|
+
|
|
197
577
|
// src/rpc-websocket-transport.ts
|
|
198
578
|
function createDefaultRpcSubscriptionsTransport(config) {
|
|
199
|
-
const { intervalMs, ...rest } = config;
|
|
200
|
-
return
|
|
201
|
-
|
|
202
|
-
transport: createWebSocketTransport({
|
|
579
|
+
const { getShard, intervalMs, ...rest } = config;
|
|
580
|
+
return pipe(
|
|
581
|
+
createWebSocketTransport({
|
|
203
582
|
...rest,
|
|
204
583
|
sendBufferHighWatermark: config.sendBufferHighWatermark ?? // Let 128KB of data into the WebSocket buffer before buffering it in the app.
|
|
205
584
|
131072
|
|
585
|
+
}),
|
|
586
|
+
(transport) => getWebSocketTransportWithAutoping({
|
|
587
|
+
intervalMs: intervalMs ?? 5e3,
|
|
588
|
+
transport
|
|
589
|
+
}),
|
|
590
|
+
(transport) => getWebSocketTransportWithConnectionSharding({
|
|
591
|
+
getShard,
|
|
592
|
+
transport
|
|
206
593
|
})
|
|
594
|
+
);
|
|
595
|
+
}
|
|
596
|
+
|
|
597
|
+
// src/transaction-confirmation-strategy-blockheight.ts
|
|
598
|
+
function createBlockHeightExceedencePromiseFactory(rpcSubscriptions) {
|
|
599
|
+
return async function getBlockHeightExceedencePromise({ abortSignal: callerAbortSignal, lastValidBlockHeight }) {
|
|
600
|
+
const abortController = new AbortController();
|
|
601
|
+
function handleAbort() {
|
|
602
|
+
abortController.abort();
|
|
603
|
+
}
|
|
604
|
+
callerAbortSignal.addEventListener("abort", handleAbort, { signal: abortController.signal });
|
|
605
|
+
const slotNotifications = await rpcSubscriptions.slotNotifications().subscribe({ abortSignal: abortController.signal });
|
|
606
|
+
try {
|
|
607
|
+
for await (const slotNotification of slotNotifications) {
|
|
608
|
+
if (slotNotification.slot > lastValidBlockHeight) {
|
|
609
|
+
throw new Error(
|
|
610
|
+
"The network has progressed past the last block for which this transaction could have committed."
|
|
611
|
+
);
|
|
612
|
+
}
|
|
613
|
+
}
|
|
614
|
+
} finally {
|
|
615
|
+
abortController.abort();
|
|
616
|
+
}
|
|
617
|
+
};
|
|
618
|
+
}
|
|
619
|
+
var NONCE_VALUE_OFFSET = 4 + // version(u32)
|
|
620
|
+
4 + // state(u32)
|
|
621
|
+
32;
|
|
622
|
+
function createNonceInvalidationPromiseFactory(rpc, rpcSubscriptions) {
|
|
623
|
+
return async function getNonceInvalidationPromise({
|
|
624
|
+
abortSignal: callerAbortSignal,
|
|
625
|
+
commitment,
|
|
626
|
+
currentNonceValue,
|
|
627
|
+
nonceAccountAddress
|
|
628
|
+
}) {
|
|
629
|
+
const abortController = new AbortController();
|
|
630
|
+
function handleAbort() {
|
|
631
|
+
abortController.abort();
|
|
632
|
+
}
|
|
633
|
+
callerAbortSignal.addEventListener("abort", handleAbort, { signal: abortController.signal });
|
|
634
|
+
const accountNotifications = await rpcSubscriptions.accountNotifications(nonceAccountAddress, { commitment, encoding: "base64" }).subscribe({ abortSignal: abortController.signal });
|
|
635
|
+
const base58Decoder = getBase58Decoder();
|
|
636
|
+
const base64Encoder = getBase64Encoder();
|
|
637
|
+
function getNonceFromAccountData([base64EncodedBytes]) {
|
|
638
|
+
const data = base64Encoder.encode(base64EncodedBytes);
|
|
639
|
+
const nonceValueBytes = data.slice(NONCE_VALUE_OFFSET, NONCE_VALUE_OFFSET + 32);
|
|
640
|
+
return base58Decoder.decode(nonceValueBytes)[0];
|
|
641
|
+
}
|
|
642
|
+
const nonceAccountDidAdvancePromise = (async () => {
|
|
643
|
+
for await (const accountNotification of accountNotifications) {
|
|
644
|
+
const nonceValue = getNonceFromAccountData(accountNotification.value.data);
|
|
645
|
+
if (nonceValue !== currentNonceValue) {
|
|
646
|
+
throw new Error(
|
|
647
|
+
`The nonce \`${currentNonceValue}\` is no longer valid. It has advanced to \`${nonceValue}\`.`
|
|
648
|
+
);
|
|
649
|
+
}
|
|
650
|
+
}
|
|
651
|
+
})();
|
|
652
|
+
const nonceIsAlreadyInvalidPromise = (async () => {
|
|
653
|
+
const { value: nonceAccount } = await rpc.getAccountInfo(nonceAccountAddress, {
|
|
654
|
+
commitment,
|
|
655
|
+
dataSlice: { length: 32, offset: NONCE_VALUE_OFFSET },
|
|
656
|
+
encoding: "base58"
|
|
657
|
+
}).send({ abortSignal: abortController.signal });
|
|
658
|
+
if (!nonceAccount) {
|
|
659
|
+
throw new Error(`No nonce account could be found at address \`${nonceAccountAddress}\`.`);
|
|
660
|
+
}
|
|
661
|
+
const nonceValue = (
|
|
662
|
+
// This works because we asked for the exact slice of data representing the nonce
|
|
663
|
+
// value, and furthermore asked for it in `base58` encoding.
|
|
664
|
+
nonceAccount.data[0]
|
|
665
|
+
);
|
|
666
|
+
if (nonceValue !== currentNonceValue) {
|
|
667
|
+
throw new Error(
|
|
668
|
+
`The nonce \`${currentNonceValue}\` is no longer valid. It has advanced to \`${nonceValue}\`.`
|
|
669
|
+
);
|
|
670
|
+
} else {
|
|
671
|
+
await new Promise(() => {
|
|
672
|
+
});
|
|
673
|
+
}
|
|
674
|
+
})();
|
|
675
|
+
try {
|
|
676
|
+
return await Promise.race([nonceAccountDidAdvancePromise, nonceIsAlreadyInvalidPromise]);
|
|
677
|
+
} finally {
|
|
678
|
+
abortController.abort();
|
|
679
|
+
}
|
|
680
|
+
};
|
|
681
|
+
}
|
|
682
|
+
|
|
683
|
+
// src/transaction-confirmation.ts
|
|
684
|
+
function createDefaultDurableNonceTransactionConfirmer({
|
|
685
|
+
rpc,
|
|
686
|
+
rpcSubscriptions
|
|
687
|
+
}) {
|
|
688
|
+
const getNonceInvalidationPromise = createNonceInvalidationPromiseFactory(rpc, rpcSubscriptions);
|
|
689
|
+
const getRecentSignatureConfirmationPromise = createRecentSignatureConfirmationPromiseFactory(
|
|
690
|
+
rpc,
|
|
691
|
+
rpcSubscriptions
|
|
692
|
+
);
|
|
693
|
+
return async function confirmDurableNonceTransaction(config) {
|
|
694
|
+
await waitForDurableNonceTransactionConfirmation({
|
|
695
|
+
...config,
|
|
696
|
+
getNonceInvalidationPromise,
|
|
697
|
+
getRecentSignatureConfirmationPromise
|
|
698
|
+
});
|
|
699
|
+
};
|
|
700
|
+
}
|
|
701
|
+
function createDefaultRecentTransactionConfirmer({
|
|
702
|
+
rpc,
|
|
703
|
+
rpcSubscriptions
|
|
704
|
+
}) {
|
|
705
|
+
const getBlockHeightExceedencePromise = createBlockHeightExceedencePromiseFactory(rpcSubscriptions);
|
|
706
|
+
const getRecentSignatureConfirmationPromise = createRecentSignatureConfirmationPromiseFactory(
|
|
707
|
+
rpc,
|
|
708
|
+
rpcSubscriptions
|
|
709
|
+
);
|
|
710
|
+
return async function confirmRecentTransaction(config) {
|
|
711
|
+
await waitForRecentTransactionConfirmation({
|
|
712
|
+
...config,
|
|
713
|
+
getBlockHeightExceedencePromise,
|
|
714
|
+
getRecentSignatureConfirmationPromise
|
|
715
|
+
});
|
|
716
|
+
};
|
|
717
|
+
}
|
|
718
|
+
async function waitForDurableNonceTransactionConfirmation(config) {
|
|
719
|
+
await raceStrategies(
|
|
720
|
+
getSignatureFromTransaction(config.transaction),
|
|
721
|
+
config,
|
|
722
|
+
function getSpecificStrategiesForRace({ abortSignal, commitment, getNonceInvalidationPromise, transaction }) {
|
|
723
|
+
return [
|
|
724
|
+
getNonceInvalidationPromise({
|
|
725
|
+
abortSignal,
|
|
726
|
+
commitment,
|
|
727
|
+
currentNonceValue: transaction.lifetimeConstraint.nonce,
|
|
728
|
+
nonceAccountAddress: transaction.instructions[0].accounts[0].address
|
|
729
|
+
})
|
|
730
|
+
];
|
|
731
|
+
}
|
|
732
|
+
);
|
|
733
|
+
}
|
|
734
|
+
async function waitForRecentTransactionConfirmation(config) {
|
|
735
|
+
await raceStrategies(
|
|
736
|
+
getSignatureFromTransaction(config.transaction),
|
|
737
|
+
config,
|
|
738
|
+
function getSpecificStrategiesForRace({ abortSignal, getBlockHeightExceedencePromise, transaction }) {
|
|
739
|
+
return [
|
|
740
|
+
getBlockHeightExceedencePromise({
|
|
741
|
+
abortSignal,
|
|
742
|
+
lastValidBlockHeight: transaction.lifetimeConstraint.lastValidBlockHeight
|
|
743
|
+
})
|
|
744
|
+
];
|
|
745
|
+
}
|
|
746
|
+
);
|
|
747
|
+
}
|
|
748
|
+
|
|
749
|
+
// src/send-transaction.ts
|
|
750
|
+
function getSendTransactionConfigWithAdjustedPreflightCommitment(commitment, config) {
|
|
751
|
+
if (
|
|
752
|
+
// The developer has supplied no value for `preflightCommitment`.
|
|
753
|
+
!config?.preflightCommitment && // The value of `commitment` is lower than the server default of `preflightCommitment`.
|
|
754
|
+
commitmentComparator(
|
|
755
|
+
commitment,
|
|
756
|
+
"finalized"
|
|
757
|
+
/* default value of `preflightCommitment` */
|
|
758
|
+
) < 0
|
|
759
|
+
) {
|
|
760
|
+
return {
|
|
761
|
+
...config,
|
|
762
|
+
// In the common case, it is unlikely that you want to simulate a transaction at
|
|
763
|
+
// `finalized` commitment when your standard of commitment for confirming the
|
|
764
|
+
// transaction is lower. Cap the simulation commitment level to the level of the
|
|
765
|
+
// confirmation commitment.
|
|
766
|
+
preflightCommitment: commitment
|
|
767
|
+
};
|
|
768
|
+
}
|
|
769
|
+
return config;
|
|
770
|
+
}
|
|
771
|
+
async function sendTransaction_INTERNAL({
|
|
772
|
+
abortSignal,
|
|
773
|
+
commitment,
|
|
774
|
+
rpc,
|
|
775
|
+
transaction,
|
|
776
|
+
...sendTransactionConfig
|
|
777
|
+
}) {
|
|
778
|
+
const base64EncodedWireTransaction = getBase64EncodedWireTransaction(transaction);
|
|
779
|
+
return await rpc.sendTransaction(base64EncodedWireTransaction, {
|
|
780
|
+
...getSendTransactionConfigWithAdjustedPreflightCommitment(commitment, sendTransactionConfig),
|
|
781
|
+
encoding: "base64"
|
|
782
|
+
}).send({ abortSignal });
|
|
783
|
+
}
|
|
784
|
+
function createDefaultDurableNonceTransactionSender({
|
|
785
|
+
rpc,
|
|
786
|
+
rpcSubscriptions
|
|
787
|
+
}) {
|
|
788
|
+
const confirmDurableNonceTransaction = createDefaultDurableNonceTransactionConfirmer({
|
|
789
|
+
rpc,
|
|
790
|
+
rpcSubscriptions
|
|
791
|
+
});
|
|
792
|
+
return async function sendDurableNonceTransaction(transaction, config) {
|
|
793
|
+
await sendAndConfirmDurableNonceTransaction({
|
|
794
|
+
...config,
|
|
795
|
+
confirmDurableNonceTransaction,
|
|
796
|
+
rpc,
|
|
797
|
+
transaction
|
|
798
|
+
});
|
|
799
|
+
};
|
|
800
|
+
}
|
|
801
|
+
function createDefaultTransactionSender({
|
|
802
|
+
rpc,
|
|
803
|
+
rpcSubscriptions
|
|
804
|
+
}) {
|
|
805
|
+
const confirmRecentTransaction = createDefaultRecentTransactionConfirmer({
|
|
806
|
+
rpc,
|
|
807
|
+
rpcSubscriptions
|
|
808
|
+
});
|
|
809
|
+
return async function sendTransaction(transaction, config) {
|
|
810
|
+
await sendAndConfirmTransaction({
|
|
811
|
+
...config,
|
|
812
|
+
confirmRecentTransaction,
|
|
813
|
+
rpc,
|
|
814
|
+
transaction
|
|
815
|
+
});
|
|
816
|
+
};
|
|
817
|
+
}
|
|
818
|
+
async function sendAndConfirmDurableNonceTransaction({
|
|
819
|
+
abortSignal,
|
|
820
|
+
commitment,
|
|
821
|
+
confirmDurableNonceTransaction,
|
|
822
|
+
rpc,
|
|
823
|
+
transaction,
|
|
824
|
+
...sendTransactionConfig
|
|
825
|
+
}) {
|
|
826
|
+
const transactionSignature = await sendTransaction_INTERNAL({
|
|
827
|
+
...sendTransactionConfig,
|
|
828
|
+
abortSignal,
|
|
829
|
+
commitment,
|
|
830
|
+
rpc,
|
|
831
|
+
transaction
|
|
832
|
+
});
|
|
833
|
+
await confirmDurableNonceTransaction({
|
|
834
|
+
abortSignal,
|
|
835
|
+
commitment,
|
|
836
|
+
transaction
|
|
837
|
+
});
|
|
838
|
+
return transactionSignature;
|
|
839
|
+
}
|
|
840
|
+
async function sendAndConfirmTransaction({
|
|
841
|
+
abortSignal,
|
|
842
|
+
commitment,
|
|
843
|
+
confirmRecentTransaction,
|
|
844
|
+
rpc,
|
|
845
|
+
transaction,
|
|
846
|
+
...sendTransactionConfig
|
|
847
|
+
}) {
|
|
848
|
+
const transactionSignature = await sendTransaction_INTERNAL({
|
|
849
|
+
...sendTransactionConfig,
|
|
850
|
+
abortSignal,
|
|
851
|
+
commitment,
|
|
852
|
+
rpc,
|
|
853
|
+
transaction
|
|
854
|
+
});
|
|
855
|
+
await confirmRecentTransaction({
|
|
856
|
+
abortSignal,
|
|
857
|
+
commitment,
|
|
858
|
+
transaction
|
|
207
859
|
});
|
|
860
|
+
return transactionSignature;
|
|
208
861
|
}
|
|
209
862
|
|
|
210
|
-
export { createDefaultRpcSubscriptionsTransport, createDefaultRpcTransport, createSolanaRpc, createSolanaRpcSubscriptions };
|
|
863
|
+
export { createBlockHeightExceedencePromiseFactory, createDefaultAirdropRequester, createDefaultDurableNonceTransactionConfirmer, createDefaultDurableNonceTransactionSender, createDefaultRecentTransactionConfirmer, createDefaultRpcSubscriptionsTransport, createDefaultRpcTransport, createDefaultTransactionSender, createNonceInvalidationPromiseFactory, createRecentSignatureConfirmationPromiseFactory, createSolanaRpc, createSolanaRpcSubscriptions, createSolanaRpcSubscriptions_UNSTABLE, requestAndConfirmAirdrop, sendAndConfirmDurableNonceTransaction, sendAndConfirmTransaction, waitForDurableNonceTransactionConfirmation, waitForRecentTransactionConfirmation };
|
|
211
864
|
//# sourceMappingURL=out.js.map
|
|
212
865
|
//# sourceMappingURL=index.node.js.map
|