@lombard.finance/sdk-solana 2.0.1 → 2.0.2

package/src/web3Sdk/redeemToken/redeemForBtc.ts

@@ -6,10 +6,7 @@ import { DEFAULT_ENV, getConfig, networkToEnv } from '../../const/getConfig';
 import { getConnection } from '../../const/rpcUrls';
 import { getAssetRouterIdl } from '../../idl/getAssetRouterIdl';
 import { ISolanaWalletProvider } from '../../types';
-import {
-  ErrorCode,
-  SolanaSdkError,
-} from '../../utils';
+import { ErrorCode, SolanaSdkError } from '../../utils';
 import { createDebugLogger } from '../../utils/createDebugLogger';
 import { getTokenProgramForMint } from '../../utils/tokenAccount';
 import { redeemBtcbForBtc } from './redeemBtcb';
@@ -29,7 +26,14 @@ export async function redeemForBtc(
   provider: ISolanaWalletProvider,
   params: RedeemForBtcParams,
 ): Promise<string> {
-  const { amount, btcAddress, network, env: envOverride, rpcUrl, debug = false } = params;
+  const {
+    amount,
+    btcAddress,
+    network,
+    env: envOverride,
+    rpcUrl,
+    debug = false,
+  } = params;
   const { debugLog, printLogs } = createDebugLogger({ debug });
 
   try {
@@ -47,10 +51,14 @@ export async function redeemForBtc(
       throw new Error(`Mailbox not configured for network: ${network}`);
     }
     if (!config.solanaRoutingChainId) {
-      throw new Error(`Solana routing chain ID not configured for network: ${network}`);
+      throw new Error(
+        `Solana routing chain ID not configured for network: ${network}`,
+      );
     }
     if (!config.bitcoinRoutingChainId) {
-      throw new Error(`Bitcoin routing chain ID not configured for network: ${network}`);
+      throw new Error(
+        `Bitcoin routing chain ID not configured for network: ${network}`,
+      );
     }
 
     const mintAddress = params.tokenMint;
@@ -65,13 +73,19 @@ export async function redeemForBtc(
 
     validateAmount(amount);
 
-    const connection = getConnection(network, rpcUrl);
+    const connection = getConnection(network, rpcUrl, env);
     const payer = new PublicKey(provider.publicKey);
     const mint = new PublicKey(mintAddress);
     const assetRouterProgramId = new PublicKey(config.assetRouter);
     const mailboxProgramId = new PublicKey(config.mailbox);
-    const solanaRoutingChainId = Buffer.from(config.solanaRoutingChainId, 'hex');
-    const bitcoinRoutingChainId = Buffer.from(config.bitcoinRoutingChainId, 'hex');
+    const solanaRoutingChainId = Buffer.from(
+      config.solanaRoutingChainId,
+      'hex',
+    );
+    const bitcoinRoutingChainId = Buffer.from(
+      config.bitcoinRoutingChainId,
+      'hex',
+    );
 
     debugLog('Payer:', payer.toBase58());
     debugLog('Mint:', mint.toBase58());
@@ -143,10 +157,9 @@ export async function redeemForBtc(
     );
     debugLog('Mailbox treasury:', mailboxTreasury.toBase58());
 
-    const assetRouterProgram = new Program(
-      getAssetRouterIdl(env),
-      { connection },
-    );
+    const assetRouterProgram = new Program(getAssetRouterIdl(env), {
+      connection,
+    });
 
     const ctx: RedeemContext = {
       provider,

package/src/web3Sdk/redeemToken/redeemLbtc.ts

@@ -16,12 +16,23 @@ import { BTC_NATIVE_TOKEN_ADDRESS, RedeemContext } from './shared';
  */
 export async function redeemLbtcForBtc(ctx: RedeemContext): Promise<string> {
   const {
-    provider, params, config, connection,
-    payer, mint, tokenProgramId, scriptPubKey,
-    assetRouterProgramId, mailboxProgramId,
-    solanaRoutingChainId, bitcoinRoutingChainId,
-    assetRouterProgram, assetRouterConfigPDA, mailboxConfigPDA,
-    arTreasury, mailboxTreasury,
+    provider,
+    params,
+    config,
+    connection,
+    payer,
+    mint,
+    tokenProgramId,
+    scriptPubKey,
+    assetRouterProgramId,
+    mailboxProgramId,
+    solanaRoutingChainId,
+    bitcoinRoutingChainId,
+    assetRouterProgram,
+    assetRouterConfigPDA,
+    mailboxConfigPDA,
+    arTreasury,
+    mailboxTreasury,
     debugLog,
   } = ctx;
 
@@ -53,7 +64,9 @@ export async function redeemLbtcForBtc(ctx: RedeemContext): Promise<string> {
 
   // ── Mailbox PDAs ──
   if (!config.ledgerChainId) {
-    throw new Error(`Ledger chain ID not configured for network: ${params.network}`);
+    throw new Error(
+      `Ledger chain ID not configured for network: ${params.network}`,
+    );
   }
   const ledgerChainId = Buffer.from(config.ledgerChainId, 'hex');
   const [outboundMessagePathPDA] = PublicKey.findProgramAddressSync(
@@ -88,7 +101,8 @@ export async function redeemLbtcForBtc(ctx: RedeemContext): Promise<string> {
   debugLog('Treasury token account:', treasuryTokenAccount.toBase58());
 
   // ── Balance check ──
-  const tokenBalance = await connection.getTokenAccountBalance(payerTokenAccount);
+  const tokenBalance =
+    await connection.getTokenAccountBalance(payerTokenAccount);
   const userBalance = BigInt(tokenBalance.value.amount);
   const parsedAmount = BigInt(amount);
   if (userBalance < parsedAmount) {
@@ -102,7 +116,8 @@ export async function redeemLbtcForBtc(ctx: RedeemContext): Promise<string> {
   // reads. Retry up to 3 times if the nonce becomes stale.
   const MAX_NONCE_RETRIES = 3;
   for (let attempt = 0; attempt < MAX_NONCE_RETRIES; attempt++) {
-    const freshMailboxConfig = await connection.getAccountInfo(mailboxConfigPDA);
+    const freshMailboxConfig =
+      await connection.getAccountInfo(mailboxConfigPDA);
     if (!freshMailboxConfig) {
       throw new Error('Mailbox config account not found');
     }
@@ -121,7 +136,9 @@ export async function redeemLbtcForBtc(ctx: RedeemContext): Promise<string> {
       mailboxProgramId,
     );
 
-    debugLog(`Attempt ${attempt + 1}: global nonce=${globalNonce}, outbound_message=${outboundMessagePDA.toBase58()}`);
+    debugLog(
+      `Attempt ${attempt + 1}: global nonce=${globalNonce}, outbound_message=${outboundMessagePDA.toBase58()}`,
+    );
 
     const tx = await assetRouterProgram.methods
       .redeemForBtc(scriptPubKey, new BN(amount))
@@ -160,8 +177,7 @@ export async function redeemLbtcForBtc(ctx: RedeemContext): Promise<string> {
       return signature;
     } catch (err: unknown) {
       const isNonceError =
-        err instanceof Error &&
-        err.message.includes('0x7d6'); // ConstraintSeeds
+        err instanceof Error && err.message.includes('0x7d6'); // ConstraintSeeds
       if (isNonceError && attempt < MAX_NONCE_RETRIES - 1) {
         debugLog(`Nonce stale (ConstraintSeeds), retrying...`);
         continue;

package/src/web3Sdk/redeemToken/shared.test.ts

@@ -22,8 +22,12 @@ describe('validateAmount', () => {
   });
 
   it('should reject amounts exceeding u64 max', () => {
-    expect(() => validateAmount('18446744073709551616')).toThrow('exceeds the u64 maximum');
-    expect(() => validateAmount('99999999999999999999999')).toThrow('exceeds the u64 maximum');
+    expect(() => validateAmount('18446744073709551616')).toThrow(
+      'exceeds the u64 maximum',
+    );
+    expect(() => validateAmount('99999999999999999999999')).toThrow(
+      'exceeds the u64 maximum',
+    );
   });
 });
 

package/src/web3Sdk/redeemToken/shared.ts

@@ -90,8 +90,6 @@ export function validateAmount(amount: string): void {
     throw new Error('Amount must be greater than zero');
   }
   if (parsedAmount > U64_MAX) {
-    throw new Error(
-      `Amount ${amount} exceeds the u64 maximum (${U64_MAX})`,
-    );
+    throw new Error(`Amount ${amount} exceeds the u64 maximum (${U64_MAX})`);
   }
 }