@wopr-network/platform-core 1.35.2 → 1.36.1

package/dist/billing/crypto/btc/watcher.d.ts

@@ -24,7 +24,10 @@ export declare class BtcWatcher {
     constructor(opts: BtcWatcherOpts);
     /** Update the set of watched addresses. */
     setWatchedAddresses(addresses: string[]): void;
-    /** Import an address into bitcoind's wallet (watch-only, no rescan). */
+    /**
+     * Import an address into bitcoind's wallet (watch-only).
+     * Uses `importdescriptors` (modern bitcoind v24+) with fallback to legacy `importaddress`.
+     */
     importAddress(address: string): Promise<void>;
     /** Poll for confirmed payments to watched addresses. */
     poll(): Promise<void>;

package/dist/billing/crypto/btc/watcher.js

@@ -21,9 +21,23 @@ export class BtcWatcher {
         for (const a of addresses)
             this.addresses.add(a);
     }
-    /** Import an address into bitcoind's wallet (watch-only, no rescan). */
+    /**
+     * Import an address into bitcoind's wallet (watch-only).
+     * Uses `importdescriptors` (modern bitcoind v24+) with fallback to legacy `importaddress`.
+     */
     async importAddress(address) {
-        await this.rpc("importaddress", [address, "", false]);
+        try {
+            // Modern bitcoind: get descriptor checksum, then import
+            const info = (await this.rpc("getdescriptorinfo", [`addr(${address})`]));
+            const result = (await this.rpc("importdescriptors", [[{ desc: info.descriptor, timestamp: 0 }]]));
+            if (result[0] && !result[0].success) {
+                throw new Error(result[0].error?.message ?? "importdescriptors failed");
+            }
+        }
+        catch {
+            // Fallback: legacy importaddress (bitcoind <v24)
+            await this.rpc("importaddress", [address, "", false]);
+        }
         this.addresses.add(address);
     }
     /** Poll for confirmed payments to watched addresses. */

package/dist/billing/crypto/unified-checkout.d.ts

@@ -7,6 +7,8 @@ export interface UnifiedCheckoutDeps {
     oracle: IPriceOracle;
     evmXpub: string;
     btcXpub?: string;
+    /** UTXO network override (auto-detected from node in production). Default: "mainnet". */
+    utxoNetwork?: "mainnet" | "testnet" | "regtest";
 }
 export interface UnifiedCheckoutResult {
     depositAddress: string;

package/dist/billing/crypto/unified-checkout.js

@@ -77,7 +77,7 @@ async function handleNativeUtxo(deps, method, tenant, amountUsdCents, amountUsd)
             depositAddress = deriveP2pkhAddress(xpub, derivationIndex, "dogecoin");
         }
         else {
-            depositAddress = deriveAddress(xpub, derivationIndex, "mainnet", method.chain);
+            depositAddress = deriveAddress(xpub, derivationIndex, deps.utxoNetwork ?? "mainnet", method.chain);
         }
         const referenceId = `${method.token.toLowerCase()}:${depositAddress}`;
         try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wopr-network/platform-core",
-  "version": "1.35.2",
+  "version": "1.36.1",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/billing/crypto/btc/watcher.ts

@@ -48,9 +48,27 @@ export class BtcWatcher {
     for (const a of addresses) this.addresses.add(a);
   }
 
-  /** Import an address into bitcoind's wallet (watch-only, no rescan). */
+  /**
+   * Import an address into bitcoind's wallet (watch-only).
+   * Uses `importdescriptors` (modern bitcoind v24+) with fallback to legacy `importaddress`.
+   */
   async importAddress(address: string): Promise<void> {
-    await this.rpc("importaddress", [address, "", false]);
+    try {
+      // Modern bitcoind: get descriptor checksum, then import
+      const info = (await this.rpc("getdescriptorinfo", [`addr(${address})`])) as {
+        descriptor: string;
+      };
+      const result = (await this.rpc("importdescriptors", [[{ desc: info.descriptor, timestamp: 0 }]])) as Array<{
+        success: boolean;
+        error?: { message: string };
+      }>;
+      if (result[0] && !result[0].success) {
+        throw new Error(result[0].error?.message ?? "importdescriptors failed");
+      }
+    } catch {
+      // Fallback: legacy importaddress (bitcoind <v24)
+      await this.rpc("importaddress", [address, "", false]);
+    }
     this.addresses.add(address);
   }
 

package/src/billing/crypto/unified-checkout.ts

@@ -13,6 +13,8 @@ export interface UnifiedCheckoutDeps {
   oracle: IPriceOracle;
   evmXpub: string;
   btcXpub?: string;
+  /** UTXO network override (auto-detected from node in production). Default: "mainnet". */
+  utxoNetwork?: "mainnet" | "testnet" | "regtest";
 }
 
 export interface UnifiedCheckoutResult {
@@ -133,7 +135,12 @@ async function handleNativeUtxo(
     if (method.chain === "dogecoin") {
       depositAddress = deriveP2pkhAddress(xpub, derivationIndex, "dogecoin");
     } else {
-      depositAddress = deriveAddress(xpub, derivationIndex, "mainnet", method.chain as "bitcoin" | "litecoin");
+      depositAddress = deriveAddress(
+        xpub,
+        derivationIndex,
+        deps.utxoNetwork ?? "mainnet",
+        method.chain as "bitcoin" | "litecoin",
+      );
     }
 
     const referenceId = `${method.token.toLowerCase()}:${depositAddress}`;