@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) {
@@ -440,6 +601,267 @@ function createDefaultRpcSubscriptionsTransport(config) {
440
601
  );
441
602
  }
442
603
 
443
- export { createDefaultRpcSubscriptionsTransport, createDefaultRpcTransport, createSolanaRpc, createSolanaRpcSubscriptions };
604
+ // src/transaction-confirmation-strategy-blockheight.ts
605
+ function createBlockHeightExceedencePromiseFactory(rpcSubscriptions) {
606
+ return async function getBlockHeightExceedencePromise({ abortSignal: callerAbortSignal, lastValidBlockHeight }) {
607
+ const abortController = new AbortController();
608
+ function handleAbort() {
609
+ abortController.abort();
610
+ }
611
+ callerAbortSignal.addEventListener("abort", handleAbort, { signal: abortController.signal });
612
+ const slotNotifications = await rpcSubscriptions.slotNotifications().subscribe({ abortSignal: abortController.signal });
613
+ try {
614
+ for await (const slotNotification of slotNotifications) {
615
+ if (slotNotification.slot > lastValidBlockHeight) {
616
+ throw new Error(
617
+ "The network has progressed past the last block for which this transaction could have committed."
618
+ );
619
+ }
620
+ }
621
+ } finally {
622
+ abortController.abort();
623
+ }
624
+ };
625
+ }
626
+ var NONCE_VALUE_OFFSET = 4 + // version(u32)
627
+ 4 + // state(u32)
628
+ 32;
629
+ function createNonceInvalidationPromiseFactory(rpc, rpcSubscriptions) {
630
+ return async function getNonceInvalidationPromise({
631
+ abortSignal: callerAbortSignal,
632
+ commitment,
633
+ currentNonceValue,
634
+ nonceAccountAddress
635
+ }) {
636
+ const abortController = new AbortController();
637
+ function handleAbort() {
638
+ abortController.abort();
639
+ }
640
+ callerAbortSignal.addEventListener("abort", handleAbort, { signal: abortController.signal });
641
+ const accountNotifications = await rpcSubscriptions.accountNotifications(nonceAccountAddress, { commitment, encoding: "base64" }).subscribe({ abortSignal: abortController.signal });
642
+ function getNonceFromAccountData([base64EncodedBytes]) {
643
+ const data = base64.serialize(base64EncodedBytes);
644
+ const nonceValueBytes = data.slice(NONCE_VALUE_OFFSET, NONCE_VALUE_OFFSET + 32);
645
+ return base58.deserialize(nonceValueBytes)[0];
646
+ }
647
+ const nonceAccountDidAdvancePromise = (async () => {
648
+ for await (const accountNotification of accountNotifications) {
649
+ const nonceValue = getNonceFromAccountData(accountNotification.value.data);
650
+ if (nonceValue !== currentNonceValue) {
651
+ throw new Error(
652
+ `The nonce \`${currentNonceValue}\` is no longer valid. It has advanced to \`${nonceValue}\`.`
653
+ );
654
+ }
655
+ }
656
+ })();
657
+ const nonceIsAlreadyInvalidPromise = (async () => {
658
+ const { value: nonceAccount } = await rpc.getAccountInfo(nonceAccountAddress, {
659
+ commitment,
660
+ dataSlice: { length: 32, offset: NONCE_VALUE_OFFSET },
661
+ encoding: "base58"
662
+ }).send({ abortSignal: abortController.signal });
663
+ if (!nonceAccount) {
664
+ throw new Error(`No nonce account could be found at address \`${nonceAccountAddress}\`.`);
665
+ }
666
+ const nonceValue = (
667
+ // This works because we asked for the exact slice of data representing the nonce
668
+ // value, and furthermore asked for it in `base58` encoding.
669
+ nonceAccount.data[0]
670
+ );
671
+ if (nonceValue !== currentNonceValue) {
672
+ throw new Error(
673
+ `The nonce \`${currentNonceValue}\` is no longer valid. It has advanced to \`${nonceValue}\`.`
674
+ );
675
+ } else {
676
+ await new Promise(() => {
677
+ });
678
+ }
679
+ })();
680
+ try {
681
+ return await Promise.race([nonceAccountDidAdvancePromise, nonceIsAlreadyInvalidPromise]);
682
+ } finally {
683
+ abortController.abort();
684
+ }
685
+ };
686
+ }
687
+
688
+ // src/transaction-confirmation.ts
689
+ function createDefaultDurableNonceTransactionConfirmer({
690
+ rpc,
691
+ rpcSubscriptions
692
+ }) {
693
+ const getNonceInvalidationPromise = createNonceInvalidationPromiseFactory(rpc, rpcSubscriptions);
694
+ const getRecentSignatureConfirmationPromise = createRecentSignatureConfirmationPromiseFactory(
695
+ rpc,
696
+ rpcSubscriptions
697
+ );
698
+ return async function confirmDurableNonceTransaction(config) {
699
+ await waitForDurableNonceTransactionConfirmation({
700
+ ...config,
701
+ getNonceInvalidationPromise,
702
+ getRecentSignatureConfirmationPromise
703
+ });
704
+ };
705
+ }
706
+ function createDefaultRecentTransactionConfirmer({
707
+ rpc,
708
+ rpcSubscriptions
709
+ }) {
710
+ const getBlockHeightExceedencePromise = createBlockHeightExceedencePromiseFactory(rpcSubscriptions);
711
+ const getRecentSignatureConfirmationPromise = createRecentSignatureConfirmationPromiseFactory(
712
+ rpc,
713
+ rpcSubscriptions
714
+ );
715
+ return async function confirmRecentTransaction(config) {
716
+ await waitForRecentTransactionConfirmation({
717
+ ...config,
718
+ getBlockHeightExceedencePromise,
719
+ getRecentSignatureConfirmationPromise
720
+ });
721
+ };
722
+ }
723
+ async function waitForDurableNonceTransactionConfirmation(config) {
724
+ await raceStrategies(
725
+ getSignatureFromTransaction(config.transaction),
726
+ config,
727
+ function getSpecificStrategiesForRace({ abortSignal, commitment, getNonceInvalidationPromise, transaction }) {
728
+ return [
729
+ getNonceInvalidationPromise({
730
+ abortSignal,
731
+ commitment,
732
+ currentNonceValue: transaction.lifetimeConstraint.nonce,
733
+ nonceAccountAddress: transaction.instructions[0].accounts[0].address
734
+ })
735
+ ];
736
+ }
737
+ );
738
+ }
739
+ async function waitForRecentTransactionConfirmation(config) {
740
+ await raceStrategies(
741
+ getSignatureFromTransaction(config.transaction),
742
+ config,
743
+ function getSpecificStrategiesForRace({ abortSignal, getBlockHeightExceedencePromise, transaction }) {
744
+ return [
745
+ getBlockHeightExceedencePromise({
746
+ abortSignal,
747
+ lastValidBlockHeight: transaction.lifetimeConstraint.lastValidBlockHeight
748
+ })
749
+ ];
750
+ }
751
+ );
752
+ }
753
+
754
+ // src/send-transaction.ts
755
+ function getSendTransactionConfigWithAdjustedPreflightCommitment(commitment, config) {
756
+ if (
757
+ // The developer has supplied no value for `preflightCommitment`.
758
+ !config?.preflightCommitment && // The value of `commitment` is lower than the server default of `preflightCommitment`.
759
+ commitmentComparator(
760
+ commitment,
761
+ "finalized"
762
+ /* default value of `preflightCommitment` */
763
+ ) < 0
764
+ ) {
765
+ return {
766
+ ...config,
767
+ // In the common case, it is unlikely that you want to simulate a transaction at
768
+ // `finalized` commitment when your standard of commitment for confirming the
769
+ // transaction is lower. Cap the simulation commitment level to the level of the
770
+ // confirmation commitment.
771
+ preflightCommitment: commitment
772
+ };
773
+ }
774
+ return config;
775
+ }
776
+ async function sendTransaction_INTERNAL({
777
+ abortSignal,
778
+ commitment,
779
+ rpc,
780
+ transaction,
781
+ sendTransactionConfig
782
+ }) {
783
+ const base64EncodedWireTransaction = getBase64EncodedWireTransaction(transaction);
784
+ return await rpc.sendTransaction(base64EncodedWireTransaction, {
785
+ ...getSendTransactionConfigWithAdjustedPreflightCommitment(commitment, sendTransactionConfig),
786
+ encoding: "base64"
787
+ }).send({ abortSignal });
788
+ }
789
+ function createDefaultDurableNonceTransactionSender({
790
+ rpc,
791
+ rpcSubscriptions
792
+ }) {
793
+ const confirmDurableNonceTransaction = createDefaultDurableNonceTransactionConfirmer({
794
+ rpc,
795
+ rpcSubscriptions
796
+ });
797
+ return async function sendDurableNonceTransaction(transaction, config) {
798
+ await sendAndConfirmDurableNonceTransaction({
799
+ ...config,
800
+ confirmDurableNonceTransaction,
801
+ rpc,
802
+ transaction
803
+ });
804
+ };
805
+ }
806
+ function createDefaultTransactionSender({ rpc, rpcSubscriptions }) {
807
+ const confirmRecentTransaction = createDefaultRecentTransactionConfirmer({
808
+ rpc,
809
+ rpcSubscriptions
810
+ });
811
+ return async function sendTransaction(transaction, config) {
812
+ await sendAndConfirmTransaction({
813
+ ...config,
814
+ confirmRecentTransaction,
815
+ rpc,
816
+ transaction
817
+ });
818
+ };
819
+ }
820
+ async function sendAndConfirmDurableNonceTransaction({
821
+ abortSignal,
822
+ commitment,
823
+ confirmDurableNonceTransaction,
824
+ rpc,
825
+ transaction,
826
+ ...sendTransactionConfig
827
+ }) {
828
+ const transactionSignature = await sendTransaction_INTERNAL({
829
+ abortSignal,
830
+ commitment,
831
+ rpc,
832
+ sendTransactionConfig,
833
+ transaction
834
+ });
835
+ await confirmDurableNonceTransaction({
836
+ abortSignal,
837
+ commitment,
838
+ transaction
839
+ });
840
+ return transactionSignature;
841
+ }
842
+ async function sendAndConfirmTransaction({
843
+ abortSignal,
844
+ commitment,
845
+ confirmRecentTransaction,
846
+ rpc,
847
+ transaction,
848
+ ...sendTransactionConfig
849
+ }) {
850
+ const transactionSignature = await sendTransaction_INTERNAL({
851
+ abortSignal,
852
+ commitment,
853
+ rpc,
854
+ sendTransactionConfig,
855
+ transaction
856
+ });
857
+ await confirmRecentTransaction({
858
+ abortSignal,
859
+ commitment,
860
+ transaction
861
+ });
862
+ return transactionSignature;
863
+ }
864
+
865
+ export { createBlockHeightExceedencePromiseFactory, createDefaultAirdropRequester, createDefaultDurableNonceTransactionConfirmer, createDefaultDurableNonceTransactionSender, createDefaultRecentTransactionConfirmer, createDefaultRpcSubscriptionsTransport, createDefaultRpcTransport, createDefaultTransactionSender, createNonceInvalidationPromiseFactory, createRecentSignatureConfirmationPromiseFactory, createSolanaRpc, createSolanaRpcSubscriptions, createSolanaRpcSubscriptions_UNSTABLE, requestAndConfirmAirdrop, sendAndConfirmDurableNonceTransaction, sendAndConfirmTransaction, waitForDurableNonceTransactionConfirmation, waitForRecentTransactionConfirmation };
444
866
  //# sourceMappingURL=out.js.map
445
867
  //# sourceMappingURL=index.browser.js.map