@silentswap/sdk 0.0.90 → 0.0.92

package/dist/bridge.d.ts

@@ -291,4 +291,5 @@ export interface SolveUsdcResult {
  * @param maxImpactPercent - Maximum price impact percentage allowed (default from constants)
  * @returns Promise resolving to solve result with optimal amounts
  */
-export declare function solveOptimalUsdcAmount(srcChainId: number, srcToken: string, srcAmount: string, userAddress: string, depositCalldata: string | undefined, maxImpactPercent: number, depositorAddress: Hex, evmSignerAddress?: `0x${string}`): Promise<SolveUsdcResult>;
+export declare function solveOptimalUsdcAmount(srcChainId: number, srcToken: string, srcAmount: string, userAddress: string, depositCalldata: string | undefined, maxImpactPercent: number, depositorAddress: Hex, evmSignerAddress?: `0x${string}`, // Optional EVM address for deposit calldata (required for non-EVM swaps: Solana, Bitcoin)
+forceProvider?: 'relay' | 'debridge'): Promise<SolveUsdcResult>;

package/dist/bridge.js

@@ -138,8 +138,14 @@ export async function executeDebridgeBridge(quote, executeTransaction, switchCha
         throw new Error('No transactions in debridge quote');
     }
     const tx = quote.txs[0];
-    // Solana transactions don't need chain switching (handled by connector)
-    if (!tx.instructions) {
+    // Non-EVM transactions don't need EVM chain switching.
+    const isNonEvmTx = !!tx.instructions ||
+        tx.chainId === N_DEBRIDGE_CHAIN_ID_SOLANA ||
+        tx.chainId === N_RELAY_CHAIN_ID_SOLANA ||
+        tx.chainId === N_RELAY_CHAIN_ID_BITCOIN ||
+        tx.chainId === N_RELAY_CHAIN_ID_TRON ||
+        !!tx.psbt;
+    if (!isNonEvmTx) {
         setStep(`Switching to chain ${tx.chainId}`);
         // Switch to the correct chain for EVM transactions
         await switchChain(tx.chainId);
@@ -716,27 +722,33 @@ async function solveDebridgeSingleChainUsdcAmount(chainId, srcToken, srcAmount,
  * @param maxImpactPercent - Maximum price impact percentage allowed (default from constants)
  * @returns Promise resolving to solve result with optimal amounts
  */
-export async function solveOptimalUsdcAmount(srcChainId, srcToken, srcAmount, userAddress, depositCalldata, maxImpactPercent, depositorAddress, evmSignerAddress // Optional EVM address for deposit calldata (required for Solana swaps)
-) {
-    // Check if this is a Solana chain
-    const isSolanaChain = isSolanaChainId(srcChainId);
-    // For Solana chains, we need an EVM address for deposit calldata
-    // userAddress is the Solana address (for relay quote user parameter)
+export async function solveOptimalUsdcAmount(srcChainId, srcToken, srcAmount, userAddress, depositCalldata, maxImpactPercent, depositorAddress, evmSignerAddress, // Optional EVM address for deposit calldata (required for non-EVM swaps: Solana, Bitcoin)
+forceProvider) {
+    // Check if this is a non-EVM chain (Solana, Bitcoin, etc.)
+    const isNonEvmChain = isNonEvmRelayChainId(srcChainId);
+    // For non-EVM chains (Solana, Bitcoin), we need an EVM address for deposit calldata
+    // userAddress is the source chain address (Solana/Bitcoin) for relay quote user parameter
     // evmSignerAddress is the EVM address (for deposit calldata and relay quote recipient)
-    const evmAddressForCalldata = evmSignerAddress || (!isSolanaChain && userAddress.startsWith('0x') ? userAddress : undefined);
+    const evmAddressForCalldata = evmSignerAddress || (!isNonEvmChain && userAddress.startsWith('0x') ? userAddress : undefined);
     if (!depositCalldata && !evmAddressForCalldata) {
-        throw new Error('EVM address required for deposit calldata. Provide evmSignerAddress parameter for Solana swaps.');
+        throw new Error('EVM address required for deposit calldata. Provide evmSignerAddress parameter for non-EVM swaps.');
     }
     // Create phony deposit calldata if not provided
     const calldata = depositCalldata || createPhonyDepositCalldata(evmAddressForCalldata);
-    // For Solana chains, we need to pass the EVM address as recipient in relay quotes
-    // userAddress is the Solana address (for user parameter)
-    // evmSignerAddress is the EVM address (for recipient parameter)
-    const recipientAddress = isSolanaChain && evmSignerAddress ? evmSignerAddress : userAddress;
-    // Try both providers in parallel
+    // For non-EVM chains, we need to pass the EVM address as recipient in relay quotes
+    // userAddress is the source chain address (for user parameter)
+    // evmSignerAddress is the EVM address (for recipient parameter on the destination EVM chain)
+    const recipientAddress = isNonEvmChain && evmSignerAddress ? evmSignerAddress : userAddress;
+    const useRelay = forceProvider !== 'debridge';
+    const useDebridge = forceProvider !== 'relay';
+    // Try enabled providers in parallel
     const [relayResult, debridgeResult] = await Promise.allSettled([
-        solveRelayUsdcAmount(srcChainId, srcToken, srcAmount, userAddress, calldata, maxImpactPercent, depositorAddress, recipientAddress),
-        solveDebridgeUsdcAmount(srcChainId, srcToken, srcAmount, userAddress, calldata, maxImpactPercent, depositorAddress),
+        useRelay
+            ? solveRelayUsdcAmount(srcChainId, srcToken, srcAmount, userAddress, calldata, maxImpactPercent, depositorAddress, recipientAddress)
+            : Promise.resolve(null),
+        useDebridge
+            ? solveDebridgeUsdcAmount(srcChainId, srcToken, srcAmount, userAddress, calldata, maxImpactPercent, depositorAddress)
+            : Promise.resolve(null),
     ]);
     // Extract results
     const relayData = relayResult.status === 'fulfilled' ? relayResult.value : null;

package/dist/transaction-utils.js

@@ -1,5 +1,5 @@
 import { executeRelayBridge, executeDebridgeBridge, getRelayStatus, getDebridgeStatus, } from './bridge.js';
-import { N_RELAY_CHAIN_ID_BITCOIN } from './constants.js';
+import { N_DEBRIDGE_CHAIN_ID_SOLANA, N_RELAY_CHAIN_ID_BITCOIN, N_RELAY_CHAIN_ID_SOLANA } from './constants.js';
 /**
  * Create transaction execution wrapper for framework-agnostic bridge execution
  * Supports EVM, Solana, and Bitcoin transactions
@@ -14,8 +14,11 @@ export function createTransactionExecutor(walletClient, connector, solanaExecuto
             }
             return await bitcoinExecutor(tx);
         }
-        // Solana transaction - check for instructions
-        if (tx.instructions) {
+        // Solana transaction - relay instructions or deBridge serialized Solana tx
+        const isSolanaTx = !!tx.instructions ||
+            tx.chainId === N_RELAY_CHAIN_ID_SOLANA ||
+            tx.chainId === N_DEBRIDGE_CHAIN_ID_SOLANA;
+        if (isSolanaTx) {
             if (!solanaExecutor) {
                 throw new Error('Solana transaction detected but Solana executor not provided. ' +
                     'Please provide solanaExecutor when creating the transaction executor.');

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@silentswap/sdk",
   "type": "module",
-  "version": "0.0.90",
+  "version": "0.0.92",
   "license": "MIT",
   "main": "dist/index.js",
   "files": [