Evict all transaction confirmation methods into `@solana/transaction-…

…confirmation`

packages/library/package.json

@@ -78,6 +78,7 @@
         "@solana/rpc-transport": "workspace:*",
         "@solana/rpc-types": "workspace:*",
         "@solana/signers": "workspace:*",
+        "@solana/transaction-confirmation": "workspace:*",
         "@solana/transactions": "workspace:*",
         "fast-stable-stringify": "^1.0.0"
     },

packages/library/src/airdrop-internal.ts

@@ -2,13 +2,17 @@ import { Address } from '@solana/addresses';
 import { Signature } from '@solana/keys';
 import { RequestAirdropApi } from '@solana/rpc-core';
 import { Commitment, LamportsUnsafeBeyond2Pow53Minus1, Rpc } from '@solana/rpc-types';
-
-import { createDefaultSignatureOnlyRecentTransactionConfirmer } from './airdrop-confirmer';
+import { waitForRecentTransactionConfirmationUntilTimeout } from '@solana/transaction-confirmation';
 
 type RequestAndConfirmAirdropConfig = Readonly<{
     abortSignal?: AbortSignal;
     commitment: Commitment;
-    confirmSignatureOnlyTransaction: ReturnType<typeof createDefaultSignatureOnlyRecentTransactionConfirmer>;
+    confirmSignatureOnlyTransaction: (
+        config: Omit<
+            Parameters<typeof waitForRecentTransactionConfirmationUntilTimeout>[0],
+            'getRecentSignatureConfirmationPromise' | 'getTimeoutPromise'
+        >,
+    ) => Promise<void>;
     lamports: LamportsUnsafeBeyond2Pow53Minus1;
     recipientAddress: Address;
     rpc: Rpc<RequestAirdropApi>;

packages/library/src/airdrop.ts

@@ -1,8 +1,12 @@
 import { Signature } from '@solana/keys';
 import type { GetSignatureStatusesApi, RequestAirdropApi, SignatureNotificationsApi } from '@solana/rpc-core';
 import type { Rpc, RpcSubscriptions } from '@solana/rpc-types';
+import {
+    createRecentSignatureConfirmationPromiseFactory,
+    getTimeoutPromise,
+    waitForRecentTransactionConfirmationUntilTimeout,
+} from '@solana/transaction-confirmation';
 
-import { createDefaultSignatureOnlyRecentTransactionConfirmer } from './airdrop-confirmer';
 import { requestAndConfirmAirdrop_INTERNAL_ONLY_DO_NOT_EXPORT } from './airdrop-internal';
 
 type AirdropFunction = (
@@ -18,10 +22,22 @@ type AirdropFactoryConfig = Readonly<{
 }>;
 
 export function airdropFactory({ rpc, rpcSubscriptions }: AirdropFactoryConfig): AirdropFunction {
-    const confirmSignatureOnlyTransaction = createDefaultSignatureOnlyRecentTransactionConfirmer({
+    const getRecentSignatureConfirmationPromise = createRecentSignatureConfirmationPromiseFactory(
         rpc,
         rpcSubscriptions,
-    });
+    );
+    async function confirmSignatureOnlyTransaction(
+        config: Omit<
+            Parameters<typeof waitForRecentTransactionConfirmationUntilTimeout>[0],
+            'getRecentSignatureConfirmationPromise' | 'getTimeoutPromise'
+        >,
+    ) {
+        await waitForRecentTransactionConfirmationUntilTimeout({
+            ...config,
+            getRecentSignatureConfirmationPromise,
+            getTimeoutPromise,
+        });
+    }
     return async function airdrop(config) {
         return await requestAndConfirmAirdrop_INTERNAL_ONLY_DO_NOT_EXPORT({
             ...config,

packages/library/src/index.ts

@@ -15,7 +15,3 @@ export * from './rpc';
 export * from './rpc-transport';
 export * from './rpc-websocket-transport';
 export * from './send-transaction';
-export * from './transaction-confirmation';
-export * from './transaction-confirmation-strategy-blockheight';
-export * from './transaction-confirmation-strategy-nonce';
-export * from './transaction-confirmation-strategy-recent-signature';

packages/library/src/send-transaction-internal.ts

@@ -1,6 +1,10 @@
 import { Signature } from '@solana/keys';
 import { SendTransactionApi } from '@solana/rpc-core';
 import { Commitment, commitmentComparator, Rpc } from '@solana/rpc-types';
+import {
+    waitForDurableNonceTransactionConfirmation,
+    waitForRecentTransactionConfirmation,
+} from '@solana/transaction-confirmation';
 import {
     BaseTransaction,
     getBase64EncodedWireTransaction,
@@ -10,22 +14,27 @@ import {
     ITransactionWithFeePayer,
 } from '@solana/transactions';
 
-import {
-    createDefaultDurableNonceTransactionConfirmer,
-    createDefaultRecentTransactionConfirmer,
-} from './transaction-confirmation';
-
 interface SendAndConfirmDurableNonceTransactionConfig
     extends SendTransactionBaseConfig,
         SendTransactionConfigWithoutEncoding {
-    confirmDurableNonceTransaction: ReturnType<typeof createDefaultDurableNonceTransactionConfirmer>;
+    confirmDurableNonceTransaction: (
+        config: Omit<
+            Parameters<typeof waitForDurableNonceTransactionConfirmation>[0],
+            'getNonceInvalidationPromise' | 'getRecentSignatureConfirmationPromise'
+        >,
+    ) => Promise<void>;
     transaction: SendableTransaction & IDurableNonceTransaction;
 }
 
 interface SendAndConfirmTransactionWithBlockhashLifetimeConfig
     extends SendTransactionBaseConfig,
         SendTransactionConfigWithoutEncoding {
-    confirmRecentTransaction: ReturnType<typeof createDefaultRecentTransactionConfirmer>;
+    confirmRecentTransaction: (
+        config: Omit<
+            Parameters<typeof waitForRecentTransactionConfirmation>[0],
+            'getBlockHeightExceedencePromise' | 'getRecentSignatureConfirmationPromise'
+        >,
+    ) => Promise<void>;
     transaction: SendableTransaction & ITransactionWithBlockhashLifetime;
 }