@lifi/sdk 3.3.1 → 3.4.0

package/src/core/Solana/getSolanaBalance.ts

@@ -1,7 +1,8 @@
 import type { ChainId, Token, TokenAmount } from '@lifi/types'
 import { PublicKey } from '@solana/web3.js'
 import { SolSystemProgram } from '../../constants.js'
-import { getSolanaConnection } from './connection.js'
+import { withDedupe } from '../../utils/withDedupe.js'
+import { callSolanaWithRetry } from './connection.js'
 import { TokenProgramAddress } from './types.js'
 
 export const getSolanaBalance = async (
@@ -26,15 +27,34 @@ const getSolanaBalanceDefault = async (
   tokens: Token[],
   walletAddress: string
 ): Promise<TokenAmount[]> => {
-  const connection = await getSolanaConnection()
   const accountPublicKey = new PublicKey(walletAddress)
   const tokenProgramPublicKey = new PublicKey(TokenProgramAddress)
   const [slot, balance, tokenAccountsByOwner] = await Promise.allSettled([
-    connection.getSlot(),
-    connection.getBalance(accountPublicKey),
-    connection.getParsedTokenAccountsByOwner(accountPublicKey, {
-      programId: tokenProgramPublicKey,
-    }),
+    withDedupe(
+      () =>
+        callSolanaWithRetry((connection) => connection.getSlot('confirmed')),
+      { id: `${getSolanaBalanceDefault.name}.getSlot` }
+    ),
+    withDedupe(
+      () =>
+        callSolanaWithRetry((connection) =>
+          connection.getBalance(accountPublicKey, 'confirmed')
+        ),
+      { id: `${getSolanaBalanceDefault.name}.getBalance` }
+    ),
+    withDedupe(
+      () =>
+        callSolanaWithRetry((connection) =>
+          connection.getParsedTokenAccountsByOwner(
+            accountPublicKey,
+            {
+              programId: tokenProgramPublicKey,
+            },
+            'confirmed'
+          )
+        ),
+      { id: `${getSolanaBalanceDefault.name}.getParsedTokenAccountsByOwner` }
+    ),
   ])
   const blockNumber = slot.status === 'fulfilled' ? BigInt(slot.value) : 0n
   const solBalance = balance.status === 'fulfilled' ? BigInt(balance.value) : 0n

package/src/core/Solana/sendAndConfirmTransaction.ts

@@ -0,0 +1,111 @@
+import type {
+  SendOptions,
+  SignatureResult,
+  VersionedTransaction,
+} from '@solana/web3.js'
+import bs58 from 'bs58'
+import { sleep } from '../../utils/sleep.js'
+import { getSolanaConnections } from './connection.js'
+
+export type ConfirmedTransactionResult = {
+  signatureResult: SignatureResult | null
+  txSignature: string
+}
+
+/**
+ * Sends a Solana transaction to multiple RPC endpoints and returns the confirmation
+ * as soon as any of them confirm the transaction.
+ * @param signedTx - The signed transaction to send.
+ * @returns - The confirmation result of the transaction.
+ */
+export async function sendAndConfirmTransaction(
+  signedTx: VersionedTransaction
+): Promise<ConfirmedTransactionResult> {
+  const connections = await getSolanaConnections()
+
+  const signedTxSerialized = signedTx.serialize()
+  // Create transaction hash (signature)
+  const txSignature = bs58.encode(signedTx.signatures[0])
+
+  if (!txSignature) {
+    throw new Error('Transaction signature is missing.')
+  }
+
+  const rawTransactionOptions: SendOptions = {
+    // We can skip preflight check after the first transaction has been sent
+    // https://solana.com/docs/advanced/retry#the-cost-of-skipping-preflight
+    skipPreflight: true,
+    // Setting max retries to 0 as we are handling retries manually
+    maxRetries: 0,
+    // https://solana.com/docs/advanced/confirmation#use-an-appropriate-preflight-commitment-level
+    preflightCommitment: 'confirmed',
+  }
+
+  for (const connection of connections) {
+    connection
+      .sendRawTransaction(signedTxSerialized, rawTransactionOptions)
+      .catch()
+  }
+
+  const abortControllers: AbortController[] = []
+
+  const confirmPromises = connections.map(async (connection) => {
+    const abortController = new AbortController()
+    abortControllers.push(abortController)
+    try {
+      const blockhashResult = await connection.getLatestBlockhash('confirmed')
+
+      const confirmTransactionPromise = connection
+        .confirmTransaction(
+          {
+            signature: txSignature,
+            blockhash: blockhashResult.blockhash,
+            lastValidBlockHeight: blockhashResult.lastValidBlockHeight,
+            abortSignal: abortController.signal,
+          },
+          'confirmed'
+        )
+        .then((result) => result.value)
+
+      let signatureResult: SignatureResult | null = null
+      let blockHeight = await connection.getBlockHeight('confirmed')
+
+      while (
+        !signatureResult &&
+        blockHeight < blockhashResult.lastValidBlockHeight
+      ) {
+        await connection.sendRawTransaction(
+          signedTxSerialized,
+          rawTransactionOptions
+        )
+        signatureResult = await Promise.race([
+          confirmTransactionPromise,
+          sleep(1000),
+        ])
+
+        if (signatureResult || abortController.signal.aborted) {
+          break
+        }
+
+        blockHeight = await connection.getBlockHeight('confirmed')
+      }
+
+      abortController.abort()
+
+      return signatureResult
+    } catch (error) {
+      if (abortController.signal.aborted) {
+        return Promise.reject(new Error('Confirmation aborted.'))
+      }
+      throw error
+    }
+  })
+
+  const signatureResult = await Promise.any(confirmPromises).catch(() => null)
+
+  for (const abortController of abortControllers) {
+    abortController.abort()
+  }
+
+  return { signatureResult, txSignature }
+}

package/src/utils/withDedupe.ts

@@ -29,10 +29,10 @@ type WithDedupeOptions = {
 }
 
 /** Deduplicates in-flight promises. */
-export function withDedupe<data>(
-  fn: () => Promise<data>,
+export function withDedupe<T>(
+  fn: () => Promise<T>,
   { enabled = true, id }: WithDedupeOptions
-): Promise<data> {
+): Promise<T> {
   if (!enabled || !id) {
     return fn()
   }

package/src/version.ts

@@ -1,2 +1,2 @@
 export const name = '@lifi/sdk'
-export const version = '3.3.1'
+export const version = '3.4.0'