@solana/web3.js 2.0.0-experimental.ba46ce1 → 2.0.0-experimental.ba9b4c7

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.
@@ -1,15 +1,170 @@
1
1
  export * from '@solana/addresses';
2
2
  export * from '@solana/instructions';
3
3
  export * from '@solana/keys';
4
+ import { getSignatureFromTransaction, getBase64EncodedWireTransaction } from '@solana/transactions';
4
5
  export * from '@solana/transactions';
6
+ import { commitmentComparator, createSolanaRpcApi, createSolanaRpcSubscriptionsApi, createSolanaRpcSubscriptionsApi_UNSTABLE } from '@solana/rpc-core';
5
7
  import { pipe } from '@solana/functional';
6
- import { createSolanaRpcApi, createSolanaRpcSubscriptionsApi } from '@solana/rpc-core';
7
8
  import { createJsonRpc, createJsonSubscriptionRpc, createHttpTransport, createWebSocketTransport } from '@solana/rpc-transport';
8
9
  import fastStableStringify from 'fast-stable-stringify';
10
+ import { base64, base58 } from '@metaplex-foundation/umi-serializers';
9
11
 
10
12
  // ../build-scripts/env-shim.ts
11
13
  var __DEV__ = /* @__PURE__ */ (() => process["env"].NODE_ENV === "development")();
12
14
 
15
+ // src/transaction-confirmation-strategy-racer.ts
16
+ async function raceStrategies(signature, config, getSpecificStrategiesForRace) {
17
+ const { abortSignal: callerAbortSignal, commitment, getRecentSignatureConfirmationPromise } = config;
18
+ callerAbortSignal.throwIfAborted();
19
+ const abortController = new AbortController();
20
+ function handleAbort() {
21
+ abortController.abort();
22
+ }
23
+ callerAbortSignal.addEventListener("abort", handleAbort, { signal: abortController.signal });
24
+ try {
25
+ const specificStrategies = getSpecificStrategiesForRace({
26
+ ...config,
27
+ abortSignal: abortController.signal
28
+ });
29
+ return await Promise.race([
30
+ getRecentSignatureConfirmationPromise({
31
+ abortSignal: abortController.signal,
32
+ commitment,
33
+ signature
34
+ }),
35
+ ...specificStrategies
36
+ ]);
37
+ } finally {
38
+ abortController.abort();
39
+ }
40
+ }
41
+ function createRecentSignatureConfirmationPromiseFactory(rpc, rpcSubscriptions) {
42
+ return async function getRecentSignatureConfirmationPromise({
43
+ abortSignal: callerAbortSignal,
44
+ commitment,
45
+ signature
46
+ }) {
47
+ const abortController = new AbortController();
48
+ function handleAbort() {
49
+ abortController.abort();
50
+ }
51
+ callerAbortSignal.addEventListener("abort", handleAbort, { signal: abortController.signal });
52
+ const signatureStatusNotifications = await rpcSubscriptions.signatureNotifications(signature, { commitment }).subscribe({ abortSignal: abortController.signal });
53
+ const signatureDidCommitPromise = (async () => {
54
+ for await (const signatureStatusNotification of signatureStatusNotifications) {
55
+ if (signatureStatusNotification.value.err) {
56
+ throw new Error(`The transaction with signature \`${signature}\` failed.`, {
57
+ cause: signatureStatusNotification.value.err
58
+ });
59
+ } else {
60
+ return;
61
+ }
62
+ }
63
+ })();
64
+ const signatureStatusLookupPromise = (async () => {
65
+ const { value: signatureStatusResults } = await rpc.getSignatureStatuses([signature]).send({ abortSignal: abortController.signal });
66
+ const signatureStatus = signatureStatusResults[0];
67
+ if (signatureStatus && signatureStatus.confirmationStatus && commitmentComparator(signatureStatus.confirmationStatus, commitment) >= 0) {
68
+ return;
69
+ } else {
70
+ await new Promise(() => {
71
+ });
72
+ }
73
+ })();
74
+ try {
75
+ return await Promise.race([signatureDidCommitPromise, signatureStatusLookupPromise]);
76
+ } finally {
77
+ abortController.abort();
78
+ }
79
+ };
80
+ }
81
+
82
+ // src/transaction-confirmation-strategy-timeout.ts
83
+ async function getTimeoutPromise({ abortSignal: callerAbortSignal, commitment }) {
84
+ return await new Promise((_, reject) => {
85
+ const handleAbort = (e) => {
86
+ clearTimeout(timeoutId);
87
+ const abortError = new DOMException(e.target.reason, "AbortError");
88
+ reject(abortError);
89
+ };
90
+ callerAbortSignal.addEventListener("abort", handleAbort);
91
+ const timeoutMs = commitment === "processed" ? 3e4 : 6e4;
92
+ const startMs = performance.now();
93
+ const timeoutId = (
94
+ // We use `setTimeout` instead of `AbortSignal.timeout()` because we want to measure
95
+ // elapsed time instead of active time.
96
+ // See https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal/timeout_static
97
+ setTimeout(() => {
98
+ const elapsedMs = performance.now() - startMs;
99
+ reject(new DOMException(`Timeout elapsed after ${elapsedMs} ms`, "TimeoutError"));
100
+ }, timeoutMs)
101
+ );
102
+ });
103
+ }
104
+
105
+ // src/airdrop-confirmer.ts
106
+ function createDefaultSignatureOnlyRecentTransactionConfirmer({
107
+ rpc,
108
+ rpcSubscriptions
109
+ }) {
110
+ const getRecentSignatureConfirmationPromise = createRecentSignatureConfirmationPromiseFactory(
111
+ rpc,
112
+ rpcSubscriptions
113
+ );
114
+ return async function confirmSignatureOnlyRecentTransaction(config) {
115
+ await waitForRecentTransactionConfirmationUntilTimeout({
116
+ ...config,
117
+ getRecentSignatureConfirmationPromise,
118
+ getTimeoutPromise
119
+ });
120
+ };
121
+ }
122
+ async function waitForRecentTransactionConfirmationUntilTimeout(config) {
123
+ await raceStrategies(
124
+ config.signature,
125
+ config,
126
+ function getSpecificStrategiesForRace({ abortSignal, commitment, getTimeoutPromise: getTimeoutPromise2 }) {
127
+ return [
128
+ getTimeoutPromise2({
129
+ abortSignal,
130
+ commitment
131
+ })
132
+ ];
133
+ }
134
+ );
135
+ }
136
+
137
+ // src/airdrop.ts
138
+ function createDefaultAirdropRequester({ rpc, rpcSubscriptions }) {
139
+ const confirmSignatureOnlyTransaction = createDefaultSignatureOnlyRecentTransactionConfirmer({
140
+ rpc,
141
+ rpcSubscriptions
142
+ });
143
+ return async function requestAirdrop(config) {
144
+ return await requestAndConfirmAirdrop({
145
+ ...config,
146
+ confirmSignatureOnlyTransaction,
147
+ rpc
148
+ });
149
+ };
150
+ }
151
+ async function requestAndConfirmAirdrop({
152
+ abortSignal,
153
+ commitment,
154
+ confirmSignatureOnlyTransaction,
155
+ lamports,
156
+ recipientAddress,
157
+ rpc
158
+ }) {
159
+ const airdropTransactionSignature = await rpc.requestAirdrop(recipientAddress, lamports, { commitment }).send({ abortSignal });
160
+ await confirmSignatureOnlyTransaction({
161
+ abortSignal,
162
+ commitment,
163
+ signature: airdropTransactionSignature
164
+ });
165
+ return airdropTransactionSignature;
166
+ }
167
+
13
168
  // src/rpc-integer-overflow-error.ts
14
169
  var SolanaJsonRpcIntegerOverflowError = class extends Error {
15
170
  constructor(methodName, keyPath, value) {
@@ -252,6 +407,12 @@ function createSolanaRpcSubscriptions(config) {
252
407
  })
253
408
  );
254
409
  }
410
+ function createSolanaRpcSubscriptions_UNSTABLE(config) {
411
+ return createJsonSubscriptionRpc({
412
+ ...config,
413
+ api: createSolanaRpcSubscriptionsApi_UNSTABLE(DEFAULT_RPC_CONFIG)
414
+ });
415
+ }
255
416
 
256
417
  // src/rpc-request-coalescer.ts
257
418
  function getRpcTransportWithRequestCoalescing(transport, getDeduplicationKey) {
@@ -429,6 +590,267 @@ function createDefaultRpcSubscriptionsTransport(config) {
429
590
  );
430
591
  }
431
592
 
432
- export { createDefaultRpcSubscriptionsTransport, createDefaultRpcTransport, createSolanaRpc, createSolanaRpcSubscriptions };
593
+ // src/transaction-confirmation-strategy-blockheight.ts
594
+ function createBlockHeightExceedencePromiseFactory(rpcSubscriptions) {
595
+ return async function getBlockHeightExceedencePromise({ abortSignal: callerAbortSignal, lastValidBlockHeight }) {
596
+ const abortController = new AbortController();
597
+ function handleAbort() {
598
+ abortController.abort();
599
+ }
600
+ callerAbortSignal.addEventListener("abort", handleAbort, { signal: abortController.signal });
601
+ const slotNotifications = await rpcSubscriptions.slotNotifications().subscribe({ abortSignal: abortController.signal });
602
+ try {
603
+ for await (const slotNotification of slotNotifications) {
604
+ if (slotNotification.slot > lastValidBlockHeight) {
605
+ throw new Error(
606
+ "The network has progressed past the last block for which this transaction could have committed."
607
+ );
608
+ }
609
+ }
610
+ } finally {
611
+ abortController.abort();
612
+ }
613
+ };
614
+ }
615
+ var NONCE_VALUE_OFFSET = 4 + // version(u32)
616
+ 4 + // state(u32)
617
+ 32;
618
+ function createNonceInvalidationPromiseFactory(rpc, rpcSubscriptions) {
619
+ return async function getNonceInvalidationPromise({
620
+ abortSignal: callerAbortSignal,
621
+ commitment,
622
+ currentNonceValue,
623
+ nonceAccountAddress
624
+ }) {
625
+ const abortController = new AbortController();
626
+ function handleAbort() {
627
+ abortController.abort();
628
+ }
629
+ callerAbortSignal.addEventListener("abort", handleAbort, { signal: abortController.signal });
630
+ const accountNotifications = await rpcSubscriptions.accountNotifications(nonceAccountAddress, { commitment, encoding: "base64" }).subscribe({ abortSignal: abortController.signal });
631
+ function getNonceFromAccountData([base64EncodedBytes]) {
632
+ const data = base64.serialize(base64EncodedBytes);
633
+ const nonceValueBytes = data.slice(NONCE_VALUE_OFFSET, NONCE_VALUE_OFFSET + 32);
634
+ return base58.deserialize(nonceValueBytes)[0];
635
+ }
636
+ const nonceAccountDidAdvancePromise = (async () => {
637
+ for await (const accountNotification of accountNotifications) {
638
+ const nonceValue = getNonceFromAccountData(accountNotification.value.data);
639
+ if (nonceValue !== currentNonceValue) {
640
+ throw new Error(
641
+ `The nonce \`${currentNonceValue}\` is no longer valid. It has advanced to \`${nonceValue}\`.`
642
+ );
643
+ }
644
+ }
645
+ })();
646
+ const nonceIsAlreadyInvalidPromise = (async () => {
647
+ const { value: nonceAccount } = await rpc.getAccountInfo(nonceAccountAddress, {
648
+ commitment,
649
+ dataSlice: { length: 32, offset: NONCE_VALUE_OFFSET },
650
+ encoding: "base58"
651
+ }).send({ abortSignal: abortController.signal });
652
+ if (!nonceAccount) {
653
+ throw new Error(`No nonce account could be found at address \`${nonceAccountAddress}\`.`);
654
+ }
655
+ const nonceValue = (
656
+ // This works because we asked for the exact slice of data representing the nonce
657
+ // value, and furthermore asked for it in `base58` encoding.
658
+ nonceAccount.data[0]
659
+ );
660
+ if (nonceValue !== currentNonceValue) {
661
+ throw new Error(
662
+ `The nonce \`${currentNonceValue}\` is no longer valid. It has advanced to \`${nonceValue}\`.`
663
+ );
664
+ } else {
665
+ await new Promise(() => {
666
+ });
667
+ }
668
+ })();
669
+ try {
670
+ return await Promise.race([nonceAccountDidAdvancePromise, nonceIsAlreadyInvalidPromise]);
671
+ } finally {
672
+ abortController.abort();
673
+ }
674
+ };
675
+ }
676
+
677
+ // src/transaction-confirmation.ts
678
+ function createDefaultDurableNonceTransactionConfirmer({
679
+ rpc,
680
+ rpcSubscriptions
681
+ }) {
682
+ const getNonceInvalidationPromise = createNonceInvalidationPromiseFactory(rpc, rpcSubscriptions);
683
+ const getRecentSignatureConfirmationPromise = createRecentSignatureConfirmationPromiseFactory(
684
+ rpc,
685
+ rpcSubscriptions
686
+ );
687
+ return async function confirmDurableNonceTransaction(config) {
688
+ await waitForDurableNonceTransactionConfirmation({
689
+ ...config,
690
+ getNonceInvalidationPromise,
691
+ getRecentSignatureConfirmationPromise
692
+ });
693
+ };
694
+ }
695
+ function createDefaultRecentTransactionConfirmer({
696
+ rpc,
697
+ rpcSubscriptions
698
+ }) {
699
+ const getBlockHeightExceedencePromise = createBlockHeightExceedencePromiseFactory(rpcSubscriptions);
700
+ const getRecentSignatureConfirmationPromise = createRecentSignatureConfirmationPromiseFactory(
701
+ rpc,
702
+ rpcSubscriptions
703
+ );
704
+ return async function confirmRecentTransaction(config) {
705
+ await waitForRecentTransactionConfirmation({
706
+ ...config,
707
+ getBlockHeightExceedencePromise,
708
+ getRecentSignatureConfirmationPromise
709
+ });
710
+ };
711
+ }
712
+ async function waitForDurableNonceTransactionConfirmation(config) {
713
+ await raceStrategies(
714
+ getSignatureFromTransaction(config.transaction),
715
+ config,
716
+ function getSpecificStrategiesForRace({ abortSignal, commitment, getNonceInvalidationPromise, transaction }) {
717
+ return [
718
+ getNonceInvalidationPromise({
719
+ abortSignal,
720
+ commitment,
721
+ currentNonceValue: transaction.lifetimeConstraint.nonce,
722
+ nonceAccountAddress: transaction.instructions[0].accounts[0].address
723
+ })
724
+ ];
725
+ }
726
+ );
727
+ }
728
+ async function waitForRecentTransactionConfirmation(config) {
729
+ await raceStrategies(
730
+ getSignatureFromTransaction(config.transaction),
731
+ config,
732
+ function getSpecificStrategiesForRace({ abortSignal, getBlockHeightExceedencePromise, transaction }) {
733
+ return [
734
+ getBlockHeightExceedencePromise({
735
+ abortSignal,
736
+ lastValidBlockHeight: transaction.lifetimeConstraint.lastValidBlockHeight
737
+ })
738
+ ];
739
+ }
740
+ );
741
+ }
742
+
743
+ // src/send-transaction.ts
744
+ function getSendTransactionConfigWithAdjustedPreflightCommitment(commitment, config) {
745
+ if (
746
+ // The developer has supplied no value for `preflightCommitment`.
747
+ !config?.preflightCommitment && // The value of `commitment` is lower than the server default of `preflightCommitment`.
748
+ commitmentComparator(
749
+ commitment,
750
+ "finalized"
751
+ /* default value of `preflightCommitment` */
752
+ ) < 0
753
+ ) {
754
+ return {
755
+ ...config,
756
+ // In the common case, it is unlikely that you want to simulate a transaction at
757
+ // `finalized` commitment when your standard of commitment for confirming the
758
+ // transaction is lower. Cap the simulation commitment level to the level of the
759
+ // confirmation commitment.
760
+ preflightCommitment: commitment
761
+ };
762
+ }
763
+ return config;
764
+ }
765
+ async function sendTransaction_INTERNAL({
766
+ abortSignal,
767
+ commitment,
768
+ rpc,
769
+ transaction,
770
+ sendTransactionConfig
771
+ }) {
772
+ const base64EncodedWireTransaction = getBase64EncodedWireTransaction(transaction);
773
+ return await rpc.sendTransaction(base64EncodedWireTransaction, {
774
+ ...getSendTransactionConfigWithAdjustedPreflightCommitment(commitment, sendTransactionConfig),
775
+ encoding: "base64"
776
+ }).send({ abortSignal });
777
+ }
778
+ function createDefaultDurableNonceTransactionSender({
779
+ rpc,
780
+ rpcSubscriptions
781
+ }) {
782
+ const confirmDurableNonceTransaction = createDefaultDurableNonceTransactionConfirmer({
783
+ rpc,
784
+ rpcSubscriptions
785
+ });
786
+ return async function sendDurableNonceTransaction(transaction, config) {
787
+ await sendAndConfirmDurableNonceTransaction({
788
+ ...config,
789
+ confirmDurableNonceTransaction,
790
+ rpc,
791
+ transaction
792
+ });
793
+ };
794
+ }
795
+ function createDefaultTransactionSender({ rpc, rpcSubscriptions }) {
796
+ const confirmRecentTransaction = createDefaultRecentTransactionConfirmer({
797
+ rpc,
798
+ rpcSubscriptions
799
+ });
800
+ return async function sendTransaction(transaction, config) {
801
+ await sendAndConfirmTransaction({
802
+ ...config,
803
+ confirmRecentTransaction,
804
+ rpc,
805
+ transaction
806
+ });
807
+ };
808
+ }
809
+ async function sendAndConfirmDurableNonceTransaction({
810
+ abortSignal,
811
+ commitment,
812
+ confirmDurableNonceTransaction,
813
+ rpc,
814
+ transaction,
815
+ ...sendTransactionConfig
816
+ }) {
817
+ const transactionSignature = await sendTransaction_INTERNAL({
818
+ abortSignal,
819
+ commitment,
820
+ rpc,
821
+ sendTransactionConfig,
822
+ transaction
823
+ });
824
+ await confirmDurableNonceTransaction({
825
+ abortSignal,
826
+ commitment,
827
+ transaction
828
+ });
829
+ return transactionSignature;
830
+ }
831
+ async function sendAndConfirmTransaction({
832
+ abortSignal,
833
+ commitment,
834
+ confirmRecentTransaction,
835
+ rpc,
836
+ transaction,
837
+ ...sendTransactionConfig
838
+ }) {
839
+ const transactionSignature = await sendTransaction_INTERNAL({
840
+ abortSignal,
841
+ commitment,
842
+ rpc,
843
+ sendTransactionConfig,
844
+ transaction
845
+ });
846
+ await confirmRecentTransaction({
847
+ abortSignal,
848
+ commitment,
849
+ transaction
850
+ });
851
+ return transactionSignature;
852
+ }
853
+
854
+ export { createBlockHeightExceedencePromiseFactory, createDefaultAirdropRequester, createDefaultDurableNonceTransactionConfirmer, createDefaultDurableNonceTransactionSender, createDefaultRecentTransactionConfirmer, createDefaultRpcSubscriptionsTransport, createDefaultRpcTransport, createDefaultTransactionSender, createNonceInvalidationPromiseFactory, createRecentSignatureConfirmationPromiseFactory, createSolanaRpc, createSolanaRpcSubscriptions, createSolanaRpcSubscriptions_UNSTABLE, requestAndConfirmAirdrop, sendAndConfirmDurableNonceTransaction, sendAndConfirmTransaction, waitForDurableNonceTransactionConfirmation, waitForRecentTransactionConfirmation };
433
855
  //# sourceMappingURL=out.js.map
434
856
  //# sourceMappingURL=index.native.js.map