@lendasat/lendaswap-sdk-pure 0.2.26 → 0.2.27

package/dist/client.js

@@ -9,6 +9,7 @@ import { delegateClaim, delegateRefund } from "./delegate.js";
 import { broadcastTransaction, findOutputByAddress } from "./esplora.js";
 import { buildCollabRefundEvmDigest, buildCollabRefundEvmTypedData, buildEip2612PermitDigest, buildPermit2FundingDigest, buildPermit2TypedData, deriveEvmAddress, encodeApproveCallData, encodeExecuteAndCreateWithPermit2, encodeHtlcErc20RefundCallData, PERMIT2_ADDRESS, signEvmDigest, } from "./evm/index.js";
 import { decodeUint256, encodeAllowanceCall, encodeBalanceOfCall, encodeMaxApproveData, getRevertReason, parseSignature, simulateTransaction, } from "./evm/wallet.js";
+import { createSdkLogger, } from "./logging.js";
 import { buildArkadeClaim, continueArkadeClaim, claimViaGasless as gaslessClaim, claim as redeemClaim, } from "./redeem/index.js";
 import { buildArkadeRefund, buildOnchainClaimTransaction, buildOnchainRefundTransaction, collabRefundArkadeToEvmDelegate, collabRefundArkadeToEvmOffchain, collabRefundArkadeToLightningOffchain, verifyHtlcAddress, } from "./refund/index.js";
 import { bytesToHex, hexToBytes, Signer, } from "./signer/index.js";
@@ -64,6 +65,8 @@ export class ClientBuilder {
     #mnemonic;
     #xprv;
     #aa;
+    #logger;
+    #logLevel;
     /**
      * Sets the base URL for the API.
      * @param baseUrl - The base URL of the Lendaswap API.
@@ -197,6 +200,25 @@ export class ClientBuilder {
         this.#aa = aa;
         return this;
     }
+    /**
+     * Sets the logger sink used by the SDK.
+     *
+     * The SDK is silent by default. Pair this with `withLogLevel()` to opt in
+     * to runtime logs.
+     */
+    withLogger(logger) {
+        this.#logger = logger;
+        return this;
+    }
+    /**
+     * Sets the minimum log level emitted by the SDK.
+     *
+     * Defaults to `silent`.
+     */
+    withLogLevel(logLevel) {
+        this.#logLevel = logLevel;
+        return this;
+    }
     /**
      * Builds and returns a fully initialized Client instance.
      *
@@ -253,6 +275,8 @@ export class ClientBuilder {
             esploraUrl: this.#esploraUrl?.replace(/\/+$/, ""),
             arkadeServerUrl: this.#arkadeServerUrl?.replace(/\/+$/, ""),
             aa: this.#aa,
+            logger: this.#logger,
+            logLevel: this.#logLevel,
         }, signer, this.#signerStorage, this.#swapStorage);
     }
 }
@@ -288,6 +312,7 @@ export class Client {
     #swapStorage;
     #statusWatcher = null;
     #cctpInbound = null;
+    #logger;
     /**
      * Creates a new Client instance.
      *
@@ -305,6 +330,10 @@ export class Client {
         this.#signer = signer;
         this.#signerStorage = signerStorage;
         this.#swapStorage = swapStorage;
+        this.#logger = createSdkLogger({
+            logger: config.logger,
+            logLevel: config.logLevel,
+        });
     }
     /**
      * Subscribe to status updates for one or more swaps over a shared WebSocket.
@@ -366,6 +395,8 @@ export class Client {
             this.#cctpInbound = new CctpInboundClient({
                 apiClient: this.#apiClient,
                 aa: this.#config.aa,
+                logger: this.#config.logger,
+                logLevel: this.#config.logLevel,
             });
         }
         return this.#cctpInbound;
@@ -749,9 +780,12 @@ export class Client {
      * @returns The recovered swaps stored locally.
      */
     async recoverSwaps() {
-        console.log(`Recovering ...`);
         const xpub = this.getUserIdXpub();
-        console.log(`Recovering ${xpub}`);
+        this.#logger.info({
+            event: "client.recover.start",
+            message: "Recovering swaps for wallet",
+            data: { xpub },
+        });
         const { data, error } = await this.#apiClient.POST("/swap/recover", {
             body: { xpub },
         });
@@ -762,7 +796,14 @@ export class Client {
             throw new Error("No recovery data returned");
         }
         const storedSwaps = [];
-        console.log(`Recovered data ${JSON.stringify(data)}`);
+        this.#logger.debug({
+            event: "client.recover.response",
+            message: "Recovered swap data from server",
+            data: {
+                recoveredSwapCount: data.swaps.length,
+                highestIndex: data.highest_index,
+            },
+        });
         for (const recoveredSwap of data.swaps) {
             const { index, ...response } = recoveredSwap;
             const swapParams = this.deriveSwapParamsAtIndex(index);
@@ -1112,12 +1153,22 @@ export class Client {
         // Query VTXO status to determine claim method, polling briefly while
         // the Arkade indexer catches up if the funding tx hasn't been seen yet.
         const vtxoStatus = await this.#waitForVtxoStatus(id, options.waitForVtxoMs ?? 30_000);
-        if (vtxoStatus === "not_funded" || vtxoStatus === "spent") {
+        if (vtxoStatus === "not_funded") {
             return {
                 success: false,
-                message: vtxoStatus === "not_funded"
-                    ? `No VTXOs found at the VHTLC address ${claimParams.vhtlcAddress}. The swap may not have been funded yet.`
-                    : "All VTXOs have already been spent.",
+                message: `No VTXOs found at the VHTLC address ${claimParams.vhtlcAddress}. The swap may not have been funded yet.`,
+            };
+        }
+        if (vtxoStatus === "spent") {
+            // A submitted-but-not-finalized Arkade offchain tx can make the original
+            // VHTLC inputs look spent. Try to resume that pending tx before declaring
+            // the claim already spent.
+            const continued = await this.continueArkadeClaimSwap(id);
+            if (continued.success)
+                return continued;
+            return {
+                success: false,
+                message: "All VTXOs have already been spent.",
             };
         }
         // Route based on VTXO status:
@@ -1195,6 +1246,8 @@ export class Client {
                 ...claimParams,
                 destinationAddress: "", // not needed for continue
                 arkadeServerUrl: this.#config.arkadeServerUrl,
+                logger: this.#config.logger,
+                logLevel: this.#config.logLevel,
             });
             return {
                 success: true,
@@ -1289,6 +1342,8 @@ export class Client {
                 ...params,
                 destinationAddress: options.destinationAddress,
                 arkadeServerUrl: options.arkadeServerUrl ?? this.#config.arkadeServerUrl,
+                logger: this.#config.logger,
+                logLevel: this.#config.logLevel,
             });
             return {
                 success: true,
@@ -1317,6 +1372,8 @@ export class Client {
                 lendaswapApiUrl: this.#config.baseUrl,
                 arkadeServerUrl: options.arkadeServerUrl ?? this.#config.arkadeServerUrl,
                 swapId,
+                logger: this.#config.logger,
+                logLevel: this.#config.logLevel,
             });
             return {
                 success: true,
@@ -1893,6 +1950,8 @@ export class Client {
             swapId: id,
             apiClient: this.#apiClient,
             arkadeServerUrl: options.arkadeServerUrl ?? this.#config.arkadeServerUrl,
+            logger: this.#config.logger,
+            logLevel: this.#config.logLevel,
         };
         try {
             if (vtxoStatus === "spendable") {
@@ -1918,7 +1977,13 @@ export class Client {
             const collabMsg = collabError instanceof Error
                 ? collabError.message
                 : String(collabError);
-            console.warn(`Collaborative refund failed (${collabMsg}), falling back to non-collab refund`);
+            this.#logger.warn({
+                event: "arkade.refund.collab_failed",
+                message: "Collaborative refund failed, falling back to non-collaborative refund",
+                swapId: id,
+                data: { reason: collabMsg },
+                error: collabError,
+            });
         }
         // Fallback: non-collaborative refund (requires locktime to have expired)
         const now = Math.floor(Date.now() / 1000);
@@ -2000,6 +2065,8 @@ export class Client {
                 arkadeServerUrl: options.arkadeServerUrl ?? this.#config.arkadeServerUrl,
                 swapId: id,
                 apiClient: this.#apiClient,
+                logger: this.#config.logger,
+                logLevel: this.#config.logLevel,
             });
             return {
                 success: true,
@@ -2013,7 +2080,13 @@ export class Client {
             const collabMsg = collabError instanceof Error
                 ? collabError.message
                 : String(collabError);
-            console.warn(`collaborative refund failed (${collabMsg}), checking locktime fallback`);
+            this.#logger.warn({
+                event: "arkade_to_lightning.refund.collab_failed",
+                message: "Collaborative refund failed, checking locktime fallback",
+                swapId: id,
+                data: { reason: collabMsg },
+                error: collabError,
+            });
         }
         // Fallback: non-collaborative refund (requires locktime to have expired)
         // TODO: Should use Bitcoin's MTP.
@@ -2073,6 +2146,8 @@ export class Client {
             const result = await buildArkadeRefund({
                 ...params,
                 arkadeServerUrl: options.arkadeServerUrl ?? this.#config.arkadeServerUrl,
+                logger: this.#config.logger,
+                logLevel: this.#config.logLevel,
             });
             return {
                 success: true,
@@ -2100,6 +2175,8 @@ export class Client {
                 ...params,
                 lendaswapApiUrl: this.#config.baseUrl,
                 arkadeServerUrl: options.arkadeServerUrl ?? this.#config.arkadeServerUrl,
+                logger: this.#config.logger,
+                logLevel: this.#config.logLevel,
             });
             return {
                 success: true,
@@ -2504,6 +2581,8 @@ export class Client {
             baseUrl: this.#config.baseUrl,
             deriveSwapParams: () => this.deriveSwapParams(),
             evmAddress: this.getEvmAddress(),
+            logger: this.#config.logger,
+            logLevel: this.#config.logLevel,
             skipKeyIndices: async (n) => {
                 if (this.#signerStorage) {
                     const current = await this.#signerStorage.getKeyIndex();
@@ -3082,11 +3161,16 @@ export class Client {
             ? oldSwap.hash_lock.slice(2)
             : oldSwap.hash_lock;
         // Collaborative refund: old VHTLC → new VHTLC address
-        console.log("[retry] Starting collaborative refund", {
-            oldSwapId: swapId,
-            newSwapId: newSwap.id,
-            sourceAmount: sourceAmountSats,
-            network: oldSwap.network,
+        this.#logger.info({
+            event: "arkade_to_lightning.retry.collab_refund_start",
+            message: "Starting collaborative refund before retry",
+            swapId,
+            data: {
+                oldSwapId: swapId,
+                newSwapId: newSwap.id,
+                sourceAmount: sourceAmountSats,
+                network: oldSwap.network,
+            },
         });
         const refundResult = await collabRefundArkadeToLightningOffchain({
             userSecretKey: storedSwap.secretKey,
@@ -3104,6 +3188,8 @@ export class Client {
             arkadeServerUrl: this.#config.arkadeServerUrl,
             swapId,
             apiClient: this.#apiClient,
+            logger: this.#config.logger,
+            logLevel: this.#config.logLevel,
         });
         return {
             newSwap,
@@ -3863,39 +3949,39 @@ export class Client {
      *
      * For Arkade-destination swaps (EVM/Bitcoin/Lightning → Arkade), queries the
      * Arkade indexer for VTXOs at the `target_arkade_address` and checks if any
-     * VTXO's txid matches the swap's `btc_claim_txid`.
+     * VTXO's txid matches the Arkade txid that paid the target address.
      *
      * @param swapId - The UUID of the swap
-     * @returns `true` if the VTXO matching `btc_claim_txid` was found
+     * @returns `true` if the received Arkade VTXO was found
      */
     async hasReceivedVtxo(swapId) {
         const swap = await this.getSwap(swapId);
-        // Extract target_arkade_address and btc_claim_txid based on direction
+        // Extract target_arkade_address and the Arkade-side txid that pays it.
         let targetArkadeAddress;
-        let btcClaimTxid;
+        let receiveArkadeTxid;
         let network;
         if (swap.direction === "evm_to_arkade") {
             const s = swap;
             targetArkadeAddress = s.target_arkade_address;
-            btcClaimTxid = s.btc_claim_txid;
+            receiveArkadeTxid = s.btc_claim_txid;
             network = s.network;
         }
         else if (swap.direction === "btc_to_arkade") {
             const s = swap;
             targetArkadeAddress = s.target_arkade_address;
-            btcClaimTxid = s.arkade_claim_txid;
+            receiveArkadeTxid = s.arkade_claim_txid;
             network = s.network;
         }
         else if (swap.direction === "lightning_to_arkade") {
             const s = swap;
             targetArkadeAddress = s.target_arkade_address;
-            btcClaimTxid = s.btc_claim_txid;
+            receiveArkadeTxid = s.arkade_claim_txid;
             network = s.network;
         }
         else {
             throw new Error(`hasReceivedVtxo only works for Arkade-destination swaps, got ${swap.direction}`);
         }
-        if (!btcClaimTxid) {
+        if (!receiveArkadeTxid) {
             return false;
         }
         const { ArkAddress, RestIndexerProvider } = await import("@arkade-os/sdk");
@@ -3910,7 +3996,7 @@ export class Client {
         const { vtxos } = await indexer.getVtxos({
             scripts: [pkScript],
         });
-        return vtxos.some((v) => v.txid === btcClaimTxid);
+        return vtxos.some((v) => v.txid === receiveArkadeTxid);
     }
 }
 //# sourceMappingURL=client.js.map