@wopr-network/platform-core 1.65.0 → 1.66.1

package/drizzle/migrations/0014_crypto_key_server.sql

@@ -2,11 +2,11 @@
 -- Adds atomic derivation counter + path registry + address log.
 
 -- 1. Add network column to payment_methods (parallel to chain)
-ALTER TABLE "payment_methods" ADD COLUMN "network" text NOT NULL DEFAULT 'mainnet';
+ALTER TABLE "payment_methods" ADD COLUMN IF NOT EXISTS "network" text NOT NULL DEFAULT 'mainnet';
 --> statement-breakpoint
 
 -- 2. Add next_index atomic counter to payment_methods
-ALTER TABLE "payment_methods" ADD COLUMN "next_index" integer NOT NULL DEFAULT 0;
+ALTER TABLE "payment_methods" ADD COLUMN IF NOT EXISTS "next_index" integer NOT NULL DEFAULT 0;
 --> statement-breakpoint
 
 -- 3. BIP-44 path allocation registry

package/drizzle/migrations/0015_callback_url.sql

@@ -1,15 +1,15 @@
 -- Watcher service schema additions: webhook outbox + charge amount tracking.
 
 -- 1. callback_url for webhook delivery
-ALTER TABLE "crypto_charges" ADD COLUMN "callback_url" text;
+ALTER TABLE "crypto_charges" ADD COLUMN IF NOT EXISTS "callback_url" text;
 --> statement-breakpoint
 
 -- 2. Expected crypto amount in native base units (locked at charge creation)
-ALTER TABLE "crypto_charges" ADD COLUMN "expected_amount" text;
+ALTER TABLE "crypto_charges" ADD COLUMN IF NOT EXISTS "expected_amount" text;
 --> statement-breakpoint
 
 -- 3. Running total of received crypto in native base units (partial payments)
-ALTER TABLE "crypto_charges" ADD COLUMN "received_amount" text;
+ALTER TABLE "crypto_charges" ADD COLUMN IF NOT EXISTS "received_amount" text;
 --> statement-breakpoint
 
 -- 4. Webhook delivery outbox — durable retry for payment callbacks

package/drizzle/migrations/0016_charge_progress_columns.sql

@@ -1,4 +1,4 @@
-ALTER TABLE "crypto_charges" ADD COLUMN "confirmations" integer DEFAULT 0 NOT NULL;--> statement-breakpoint
-ALTER TABLE "crypto_charges" ADD COLUMN "confirmations_required" integer DEFAULT 1 NOT NULL;--> statement-breakpoint
-ALTER TABLE "crypto_charges" ADD COLUMN "tx_hash" text;--> statement-breakpoint
-ALTER TABLE "crypto_charges" ADD COLUMN "amount_received_cents" integer DEFAULT 0 NOT NULL;
+ALTER TABLE "crypto_charges" ADD COLUMN IF NOT EXISTS "confirmations" integer DEFAULT 0 NOT NULL;--> statement-breakpoint
+ALTER TABLE "crypto_charges" ADD COLUMN IF NOT EXISTS "confirmations_required" integer DEFAULT 1 NOT NULL;--> statement-breakpoint
+ALTER TABLE "crypto_charges" ADD COLUMN IF NOT EXISTS "tx_hash" text;--> statement-breakpoint
+ALTER TABLE "crypto_charges" ADD COLUMN IF NOT EXISTS "amount_received_cents" integer DEFAULT 0 NOT NULL;

package/drizzle/migrations/0020_encoding_params_column.sql

@@ -1,4 +1,4 @@
-ALTER TABLE "payment_methods" ADD COLUMN "encoding_params" text DEFAULT '{}' NOT NULL;
+ALTER TABLE "payment_methods" ADD COLUMN IF NOT EXISTS "encoding_params" text DEFAULT '{}' NOT NULL;
 --> statement-breakpoint
 UPDATE "payment_methods" SET "encoding_params" = '{"hrp":"bc"}' WHERE "address_type" = 'bech32' AND "chain" = 'bitcoin';
 --> statement-breakpoint

package/drizzle/migrations/0021_watcher_type_column.sql

@@ -1,3 +1,3 @@
-ALTER TABLE "payment_methods" ADD COLUMN "watcher_type" text DEFAULT 'evm' NOT NULL;
+ALTER TABLE "payment_methods" ADD COLUMN IF NOT EXISTS "watcher_type" text DEFAULT 'evm' NOT NULL;
 --> statement-breakpoint
 UPDATE "payment_methods" SET "watcher_type" = 'utxo' WHERE "chain" IN ('bitcoin', 'litecoin', 'dogecoin');

package/drizzle/migrations/0022_oracle_asset_id_column.sql

@@ -1,4 +1,4 @@
-ALTER TABLE "payment_methods" ADD COLUMN "oracle_asset_id" text;
+ALTER TABLE "payment_methods" ADD COLUMN IF NOT EXISTS "oracle_asset_id" text;
 --> statement-breakpoint
 UPDATE "payment_methods" SET "oracle_asset_id" = 'bitcoin' WHERE "token" = 'BTC';
 --> statement-breakpoint

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wopr-network/platform-core",
-  "version": "1.65.0",
+  "version": "1.66.1",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -140,6 +140,7 @@
     "@scure/base": "^2.0.0",
     "@scure/bip32": "^2.0.1",
     "@scure/bip39": "^2.0.1",
+    "@wopr-network/crypto-plugins": "^1.0.1",
     "handlebars": "^4.7.8",
     "js-yaml": "^4.1.1",
     "postmark": "^4.0.7",

package/src/billing/crypto/key-server-entry.ts

@@ -8,6 +8,14 @@
  */
 /* biome-ignore-all lint/suspicious/noConsole: standalone entry point */
 import { serve } from "@hono/node-server";
+import {
+  bitcoinPlugin,
+  dogecoinPlugin,
+  evmPlugin,
+  litecoinPlugin,
+  solanaPlugin,
+  tronPlugin,
+} from "@wopr-network/crypto-plugins";
 import { drizzle } from "drizzle-orm/node-postgres";
 import { migrate } from "drizzle-orm/node-postgres/migrator";
 import pg from "pg";
@@ -21,6 +29,8 @@ import { CoinGeckoOracle } from "./oracle/coingecko.js";
 import { CompositeOracle } from "./oracle/composite.js";
 import { FixedPriceOracle } from "./oracle/fixed.js";
 import { DrizzlePaymentMethodStore } from "./payment-method-store.js";
+import { PluginRegistry } from "./plugin/registry.js";
+import { startPluginWatchers } from "./plugin-watcher-service.js";
 import { startWatchers } from "./watcher-service.js";
 
 const PORT = Number(process.env.PORT ?? "3100");
@@ -64,6 +74,19 @@ async function main(): Promise<void> {
   const coingecko = new CoinGeckoOracle({ tokenIds: dbTokenIds });
   const oracle = new CompositeOracle(chainlink, coingecko);
 
+  // Build plugin registry — one plugin per chain family
+  const registry = new PluginRegistry();
+  registry.register(bitcoinPlugin);
+  registry.register(litecoinPlugin);
+  registry.register(dogecoinPlugin);
+  registry.register(evmPlugin);
+  registry.register(tronPlugin);
+  registry.register(solanaPlugin);
+  console.log(
+    `[crypto-key-server] Registered ${registry.list().length} chain plugins:`,
+    registry.list().map((p) => p.pluginId),
+  );
+
   const app = createKeyServerApp({
     db,
     chargeStore,
@@ -71,21 +94,34 @@ async function main(): Promise<void> {
     oracle,
     serviceKey: SERVICE_KEY,
     adminToken: ADMIN_TOKEN,
+    registry,
   });
 
-  // Boot watchers (BTC + EVM) — polls for payments, sends webhooks
+  // Boot plugin-driven watchers — polls for payments, sends webhooks.
+  // Falls back to legacy startWatchers() if USE_LEGACY_WATCHERS=1 is set.
   const cursorStore = new DrizzleWatcherCursorStore(db);
-  const stopWatchers = await startWatchers({
-    db,
-    chargeStore,
-    methodStore,
-    cursorStore,
-    oracle,
-    bitcoindUser: BITCOIND_USER,
-    bitcoindPassword: BITCOIND_PASSWORD,
-    serviceKey: SERVICE_KEY,
-    log: (msg, meta) => console.log(`[watcher] ${msg}`, meta ?? ""),
-  });
+  const useLegacy = process.env.USE_LEGACY_WATCHERS === "1";
+  const stopWatchers = useLegacy
+    ? await startWatchers({
+        db,
+        chargeStore,
+        methodStore,
+        cursorStore,
+        oracle,
+        bitcoindUser: BITCOIND_USER,
+        bitcoindPassword: BITCOIND_PASSWORD,
+        serviceKey: SERVICE_KEY,
+        log: (msg, meta) => console.log(`[watcher] ${msg}`, meta ?? ""),
+      })
+    : await startPluginWatchers({
+        db,
+        chargeStore,
+        methodStore,
+        cursorStore,
+        oracle,
+        registry,
+        log: (msg, meta) => console.log(`[watcher] ${msg}`, meta ?? ""),
+      });
 
   const server = serve({ fetch: app.fetch, port: PORT });
   console.log(`[crypto-key-server] Listening on :${PORT}`);

package/src/billing/crypto/key-server.ts

@@ -7,6 +7,8 @@
  *
  * ~200 lines of new code wrapping platform-core's existing crypto modules.
  */
+
+import { HDKey } from "@scure/bip32";
 import { eq, sql } from "drizzle-orm";
 import { Hono } from "hono";
 import type { DrizzleDb } from "../../db/index.js";
@@ -18,6 +20,7 @@ import { centsToNative } from "./oracle/convert.js";
 import type { IPriceOracle } from "./oracle/types.js";
 import { AssetNotSupportedError } from "./oracle/types.js";
 import type { IPaymentMethodStore } from "./payment-method-store.js";
+import type { PluginRegistry } from "./plugin/registry.js";
 
 export interface KeyServerDeps {
   db: DrizzleDb;
@@ -28,6 +31,8 @@ export interface KeyServerDeps {
   serviceKey?: string;
   /** Bearer token for admin routes. If unset, admin routes are disabled. */
   adminToken?: string;
+  /** Plugin registry for address encoding. Falls back to address-gen.ts when absent. */
+  registry?: PluginRegistry;
 }
 
 /**
@@ -42,6 +47,7 @@ async function deriveNextAddress(
   db: DrizzleDb,
   chainId: string,
   tenantId?: string,
+  registry?: PluginRegistry,
 ): Promise<{ address: string; index: number; chain: string; token: string }> {
   const maxRetries = 10;
   const dbWithTx = db as unknown as { transaction: (fn: (tx: DrizzleDb) => Promise<unknown>) => Promise<unknown> };
@@ -68,7 +74,23 @@ async function deriveNextAddress(
     } catch {
       throw new Error(`Invalid encoding_params JSON for chain ${chainId}: ${method.encodingParams}`);
     }
-    const address = deriveAddress(method.xpub, index, method.addressType, encodingParams);
+
+    // Plugin-driven encoding: look up the plugin, use its encoder.
+    // Falls back to legacy deriveAddress() when no registry or no matching plugin.
+    let address: string;
+    const pluginId = method.pluginId ?? (method.watcherType === "utxo" ? "bitcoin" : method.watcherType);
+    const plugin = registry?.get(pluginId ?? "");
+    const encodingKey = method.encoding ?? method.addressType;
+    const encoder = plugin?.encoders[encodingKey];
+
+    if (encoder) {
+      const master = HDKey.fromExtendedKey(method.xpub);
+      const child = master.deriveChild(0).deriveChild(index);
+      if (!child.publicKey) throw new Error("Failed to derive public key");
+      address = encoder.encode(child.publicKey, encodingParams as Record<string, string | undefined>);
+    } else {
+      address = deriveAddress(method.xpub, index, method.addressType, encodingParams);
+    }
 
     // Step 2: Record in immutable log. If this address was already derived by a
     // sibling chain (shared xpub), the unique constraint fires and we retry
@@ -146,7 +168,7 @@ export function createKeyServerApp(deps: KeyServerDeps): Hono {
     if (!body.chain) return c.json({ error: "chain is required" }, 400);
 
     const tenantId = c.req.header("X-Tenant-Id");
-    const result = await deriveNextAddress(deps.db, body.chain, tenantId ?? undefined);
+    const result = await deriveNextAddress(deps.db, body.chain, tenantId ?? undefined, deps.registry);
     return c.json(result, 201);
   });
 
@@ -164,7 +186,7 @@ export function createKeyServerApp(deps: KeyServerDeps): Hono {
     }
 
     const tenantId = c.req.header("X-Tenant-Id") ?? "unknown";
-    const { address, index, chain, token } = await deriveNextAddress(deps.db, body.chain, tenantId);
+    const { address, index, chain, token } = await deriveNextAddress(deps.db, body.chain, tenantId, deps.registry);
 
     // Look up payment method for decimals + oracle config
     const method = await deps.methodStore.getById(body.chain);

package/src/billing/crypto/plugin-watcher-service.ts

@@ -0,0 +1,148 @@
+/**
+ * Plugin-driven watcher service — replaces the hardcoded watcher-service.ts.
+ *
+ * Instead of importing BtcWatcher/EvmWatcher/EthWatcher directly,
+ * this delegates to IChainPlugin.createWatcher() from the plugin registry.
+ * Adding a new chain = register a plugin + INSERT a payment_methods row.
+ *
+ * Payment flow is unchanged:
+ *   plugin.poll() -> PaymentEvent[] -> handlePayment() -> credit + webhook
+ */
+
+import type { DrizzleDb } from "../../db/index.js";
+import type { ICryptoChargeRepository } from "./charge-store.js";
+import type { IWatcherCursorStore } from "./cursor-store.js";
+import type { IPriceOracle } from "./oracle/types.js";
+import type { IPaymentMethodStore, PaymentMethodRecord } from "./payment-method-store.js";
+import type { IChainPlugin, IChainWatcher } from "./plugin/interfaces.js";
+import type { PluginRegistry } from "./plugin/registry.js";
+import { handlePayment } from "./watcher-service.js";
+
+export interface PluginWatcherServiceOpts {
+  db: DrizzleDb;
+  chargeStore: ICryptoChargeRepository;
+  methodStore: IPaymentMethodStore;
+  cursorStore: IWatcherCursorStore;
+  oracle: IPriceOracle;
+  registry: PluginRegistry;
+  pollIntervalMs?: number;
+  log?: (msg: string, meta?: Record<string, unknown>) => void;
+}
+
+/** Map legacy watcher_type values to plugin IDs for backward compatibility. */
+const WATCHER_TYPE_TO_PLUGIN: Record<string, string> = {
+  utxo: "bitcoin",
+  evm: "evm",
+};
+
+function resolvePlugin(registry: PluginRegistry, method: PaymentMethodRecord): IChainPlugin | undefined {
+  // Prefer explicit plugin_id, fall back to watcher_type mapping
+  const id = method.pluginId ?? WATCHER_TYPE_TO_PLUGIN[method.watcherType];
+  return id ? registry.get(id) : undefined;
+}
+
+/**
+ * Boot plugin-driven watchers for all enabled payment methods.
+ *
+ * Returns a cleanup function that stops all poll timers and watchers.
+ */
+export async function startPluginWatchers(opts: PluginWatcherServiceOpts): Promise<() => void> {
+  const { db, chargeStore, methodStore, cursorStore, oracle, registry } = opts;
+  const pollMs = opts.pollIntervalMs ?? 15_000;
+  const log = opts.log ?? (() => {});
+
+  const methods = await methodStore.listEnabled();
+  const timers: ReturnType<typeof setInterval>[] = [];
+  const watchers: IChainWatcher[] = [];
+
+  for (const method of methods) {
+    if (!method.rpcUrl) continue;
+
+    const plugin = resolvePlugin(registry, method);
+    if (!plugin) {
+      log("No plugin found, skipping method", { id: method.id, chain: method.chain, watcherType: method.watcherType });
+      continue;
+    }
+
+    const watcher = plugin.createWatcher({
+      rpcUrl: method.rpcUrl,
+      rpcHeaders: JSON.parse(method.rpcHeaders ?? "{}"),
+      oracle,
+      cursorStore,
+      token: method.token,
+      chain: method.chain,
+      contractAddress: method.contractAddress ?? undefined,
+      decimals: method.decimals,
+      confirmations: method.confirmations,
+    });
+
+    try {
+      await watcher.init();
+    } catch (err) {
+      log("Watcher init failed, skipping", { chain: method.chain, token: method.token, error: String(err) });
+      continue;
+    }
+
+    // Seed watched addresses from active charges
+    const active = await chargeStore.listActiveDepositAddresses();
+    const addrs = active.filter((a) => a.chain === method.chain && a.token === method.token).map((a) => a.address);
+    watcher.setWatchedAddresses(addrs);
+
+    watchers.push(watcher);
+    log(`Plugin watcher started (${method.chain}:${method.token})`, {
+      plugin: plugin.pluginId,
+      addresses: addrs.length,
+    });
+
+    let polling = false;
+    timers.push(
+      setInterval(async () => {
+        if (polling) return;
+        polling = true;
+        try {
+          // Refresh watched addresses each cycle
+          const fresh = await chargeStore.listActiveDepositAddresses();
+          const freshAddrs = fresh
+            .filter((a) => a.chain === method.chain && a.token === method.token)
+            .map((a) => a.address);
+          watcher.setWatchedAddresses(freshAddrs);
+
+          const events = await watcher.poll();
+          for (const ev of events) {
+            log("Plugin payment", {
+              chain: ev.chain,
+              token: ev.token,
+              to: ev.to,
+              txHash: ev.txHash,
+              confirmations: ev.confirmations,
+            });
+            await handlePayment(
+              db,
+              chargeStore,
+              ev.to,
+              ev.rawAmount,
+              {
+                txHash: ev.txHash,
+                confirmations: ev.confirmations,
+                confirmationsRequired: ev.confirmationsRequired,
+                amountReceivedCents: ev.amountUsdCents,
+              },
+              log,
+            );
+          }
+        } catch (err) {
+          log("Plugin poll error", { chain: method.chain, token: method.token, error: String(err) });
+        } finally {
+          polling = false;
+        }
+      }, pollMs),
+    );
+  }
+
+  log("All plugin watchers started", { count: watchers.length, pollMs });
+
+  return () => {
+    for (const t of timers) clearInterval(t);
+    for (const w of watchers) w.stop();
+  };
+}