@silentswap/sdk 0.0.89 → 0.0.91

package/dist/bridge.js

@@ -410,47 +410,58 @@ const UINT256_MAX = 2n ** 256n - 1n;
  */
 async function solveRelayUsdcAmount(srcChainId, srcToken, srcAmount, userAddress, depositCalldata, maxImpactPercent, depositorAddress, recipientAddress // Optional recipient address (EVM address for Solana swaps)
 ) {
-    // Get relay origin asset parameters (matches relay_origin_asset from Svelte app)
-    // This ensures we use the same logic as relay_origin_asset() for determining originChainId and originCurrency
     const { originChainId, originCurrency } = getRelayOriginAsset(srcChainId, srcToken);
-    // Get initial quote to estimate expected output
-    // Note: Matches Svelte relay_solve_uusdc_amount line 116-125
-    // user is the sender address (Solana address for Solana swaps, EVM address for EVM swaps)
-    // recipient is the EVM signer address (always EVM, matches Svelte line 122)
+    console.log('[SilentSwap:SolveRelay] Starting EXACT_INPUT quote', {
+        srcChainId,
+        srcToken,
+        srcAmount,
+        userAddress,
+        recipientAddress,
+        originChainId,
+        originCurrency,
+    });
     const initialQuote = await fetchRelayQuote({
         user: userAddress,
-        recipient: recipientAddress || userAddress, // Use recipientAddress if provided (for Solana), otherwise use userAddress (for EVM)
+        recipient: recipientAddress || userAddress,
         referrer: 'silentswap',
-        originChainId, // Use originChainId from getRelayOriginAsset (matches relay_origin_asset)
+        originChainId,
         destinationChainId: NI_CHAIN_ID_AVALANCHE,
-        originCurrency, // Use originCurrency from getRelayOriginAsset (matches relay_origin_asset)
+        originCurrency,
         destinationCurrency: S0X_ADDR_USDC_AVALANCHE,
         amount: srcAmount,
         tradeType: 'EXACT_INPUT',
     });
     const baseUsdcOut = BigInt(initialQuote.details.currencyOut.amount);
-    // Overshoot by +10 USDC to +5% (max +100 USDC)
-    // Use BigNumber to ensure integer values (matching Svelte implementation)
-    // Note: Svelte app uses 10_000000n (10 USDC with 6 decimals) minimum
-    // 10_000000n = 10 * 10^6 = 10,000,000 (10 USDC in micro units)
-    // Convert numeric constants to strings for BigNumber (matching Svelte's bigint usage)
-    const TEN_USDC_MICRO = '10000000'; // 10 USDC in micro units (6 decimals)
-    const HUNDRED_USDC_MICRO = '100000000'; // 100 USDC in micro units (6 decimals)
-    let targetUsdcOut = BigInt(BigNumber.max(BigNumber(baseUsdcOut.toString()).plus(TEN_USDC_MICRO), // 10 USDC in micro units (6 decimals)
-    BigNumber.min(BigNumber(baseUsdcOut.toString()).plus(HUNDRED_USDC_MICRO), // 100 USDC in micro units (6 decimals)
-    BigNumber(baseUsdcOut.toString()).times(1.05))).toFixed(0));
+    console.log('[SilentSwap:SolveRelay] EXACT_INPUT result', {
+        baseUsdcOut: baseUsdcOut.toString(),
+        currencyInAmount: initialQuote.details.currencyIn.amount,
+        currencyInAmountUsd: initialQuote.details.currencyIn.amountUsd,
+        currencyOutAmountUsd: initialQuote.details.currencyOut.amountUsd,
+    });
+    const TEN_USDC_MICRO = '10000000';
+    const HUNDRED_USDC_MICRO = '100000000';
+    let targetUsdcOut = BigInt(BigNumber.max(BigNumber(baseUsdcOut.toString()).plus(TEN_USDC_MICRO), BigNumber.min(BigNumber(baseUsdcOut.toString()).plus(HUNDRED_USDC_MICRO), BigNumber(baseUsdcOut.toString()).times(1.05))).toFixed(0));
+    console.log('[SilentSwap:SolveRelay] Overshoot target', {
+        baseUsdcOut: baseUsdcOut.toString(),
+        targetUsdcOut: targetUsdcOut.toString(),
+        overshootDelta: (targetUsdcOut - baseUsdcOut).toString(),
+    });
     // Try up to 4 times to find optimal amount
     for (let attempt = 0; attempt < 4; attempt++) {
+        console.log(`[SilentSwap:SolveRelay] Attempt ${attempt + 1}/4 EXACT_OUTPUT`, {
+            targetUsdcOut: targetUsdcOut.toString(),
+            srcAmountBudget: srcAmount,
+        });
         const quote = await fetchRelayQuote({
             user: userAddress,
             referrer: 'silentswap',
-            originChainId, // Use originChainId from getRelayOriginAsset (matches relay_origin_asset)
+            originChainId,
             destinationChainId: NI_CHAIN_ID_AVALANCHE,
-            originCurrency, // Use originCurrency from getRelayOriginAsset (matches relay_origin_asset)
+            originCurrency,
             destinationCurrency: S0X_ADDR_USDC_AVALANCHE,
             amount: targetUsdcOut.toString(),
             tradeType: 'EXACT_OUTPUT',
-            recipient: recipientAddress || depositorAddress, // Use recipientAddress if provided (for Solana), otherwise use depositorAddress
+            recipient: recipientAddress || depositorAddress,
             txsGasLimit: 500_000,
             txs: [
                 {
@@ -470,16 +481,29 @@ async function solveRelayUsdcAmount(srcChainId, srcToken, srcAmount, userAddress
             ],
         });
         const impactPercent = Number(quote.details.totalImpact.percent);
+        const amountIn = BigInt(quote.details.currencyIn.amount);
+        const amountOut = BigInt(quote.details.currencyOut.amount);
+        console.log(`[SilentSwap:SolveRelay] Attempt ${attempt + 1} result`, {
+            amountIn: amountIn.toString(),
+            amountOut: amountOut.toString(),
+            srcAmountBudget: srcAmount,
+            withinBudget: amountIn <= BigInt(srcAmount),
+            delta: (amountIn - BigInt(srcAmount)).toString(),
+            impactPercent: impactPercent.toFixed(4),
+        });
         if (impactPercent > maxImpactPercent) {
             throw new Error(`Price impact too high: ${impactPercent.toFixed(2)}%`);
         }
-        const amountIn = BigInt(quote.details.currencyIn.amount);
         // Amount in is within our budget
         if (amountIn <= BigInt(srcAmount)) {
-            return [BigInt(quote.details.currencyOut.amount), amountIn, ''];
+            console.log('[SilentSwap:SolveRelay] Found optimal amount', {
+                usdcOut: amountOut.toString(),
+                amountIn: amountIn.toString(),
+                attempt: attempt + 1,
+            });
+            return [amountOut, amountIn, ''];
         }
         // Calculate new target based on overshoot
-        // Use BigNumber to ensure integer values (matching Svelte implementation)
         const yg_uusdc_price = BigNumber(quote.details.currencyOut.amountUsd).div(quote.details.currencyOut.amount);
         const yg_utoken_price = BigNumber(quote.details.currencyIn.amountUsd).div(quote.details.currencyIn.amount);
         const yg_uusdc_over = BigNumber(quote.details.currencyIn.amount)
@@ -489,6 +513,11 @@ async function solveRelayUsdcAmount(srcChainId, srcToken, srcAmount, userAddress
         const sg_uusdc_target = BigNumber(quote.details.currencyOut.amount)
             .minus(yg_uusdc_over)
             .toFixed(0);
+        console.log(`[SilentSwap:SolveRelay] Reducing target`, {
+            previousTarget: targetUsdcOut.toString(),
+            newTarget: sg_uusdc_target,
+            usdcOver: yg_uusdc_over.toFixed(0),
+        });
         if (BigInt(sg_uusdc_target) >= targetUsdcOut) {
             throw new Error('Failed to find optimal bridge price');
         }
@@ -687,23 +716,23 @@ 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)
+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)
 ) {
-    // 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)
+    // 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;
+    // 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;
     // Try both providers in parallel
     const [relayResult, debridgeResult] = await Promise.allSettled([
         solveRelayUsdcAmount(srcChainId, srcToken, srcAmount, userAddress, calldata, maxImpactPercent, depositorAddress, recipientAddress),

package/package.json

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