@wopr-network/platform-core 1.66.1 → 1.67.1

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

@@ -3,6 +3,10 @@ import type { BtcCheckoutOpts } from "./types.js";
 export declare const MIN_BTC_USD = 10;
 export interface BtcCheckoutDeps {
     chargeStore: Pick<ICryptoChargeRepository, "getNextDerivationIndex" | "createStablecoinCharge">;
+    /** HD key derivation function — injected from @wopr-network/platform-crypto-server. */
+    deriveAddress: (xpub: string, index: number, encoding: string, params?: {
+        hrp?: string;
+    }) => string;
     xpub: string;
     network?: "mainnet" | "testnet" | "regtest";
 }

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

@@ -1,5 +1,4 @@
 import { Credit } from "../../../credits/credit.js";
-import { deriveAddress } from "../address-gen.js";
 export const MIN_BTC_USD = 10;
 /**
  * Create a BTC checkout — derive a unique deposit address, store the charge.
@@ -18,7 +17,7 @@ export async function createBtcCheckout(deps, opts) {
     for (let attempt = 0; attempt <= maxRetries; attempt++) {
         const derivationIndex = await deps.chargeStore.getNextDerivationIndex();
         const hrpMap = { mainnet: "bc", testnet: "tb", regtest: "bcrt" };
-        const depositAddress = deriveAddress(deps.xpub, derivationIndex, "bech32", {
+        const depositAddress = deps.deriveAddress(deps.xpub, derivationIndex, "bech32", {
             hrp: hrpMap[network],
         });
         const referenceId = `btc:${depositAddress}`;

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

@@ -1,10 +1,6 @@
-export type { EncodingParams } from "../address-gen.js";
-export { deriveAddress, deriveTreasury, isValidXpub } from "../address-gen.js";
 export type { BtcCheckoutDeps, BtcCheckoutResult } from "./checkout.js";
 export { createBtcCheckout, MIN_BTC_USD } from "./checkout.js";
 export { centsToSats, loadBitcoindConfig, satsToCents } from "./config.js";
 export type { BtcSettlerDeps } from "./settler.js";
 export { settleBtcPayment } from "./settler.js";
 export type { BitcoindConfig, BtcCheckoutOpts, BtcPaymentEvent } from "./types.js";
-export type { BtcWatcherOpts } from "./watcher.js";
-export { BtcWatcher, createBitcoindRpc } from "./watcher.js";

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

@@ -1,5 +1,3 @@
-export { deriveAddress, deriveTreasury, isValidXpub } from "../address-gen.js";
 export { createBtcCheckout, MIN_BTC_USD } from "./checkout.js";
 export { centsToSats, loadBitcoindConfig, satsToCents } from "./config.js";
 export { settleBtcPayment } from "./settler.js";
-export { BtcWatcher, createBitcoindRpc } from "./watcher.js";

package/dist/billing/crypto/evm/__tests__/checkout.test.js

@@ -1,20 +1,17 @@
-import { HDKey } from "@scure/bip32";
 import { describe, expect, it, vi } from "vitest";
 import { createStablecoinCheckout } from "../checkout.js";
-function makeTestXpub() {
-    const seed = new Uint8Array(32);
-    seed[0] = 1;
-    const master = HDKey.fromMasterSeed(seed);
-    return master.derive("m/44'/60'/0'").publicExtendedKey;
+const TEST_XPUB = "xpub661MyMwAqRbcFtXgS5sYJABqqG9YLmC4Q1Rdap9gSE8NqtwybGhePY2gZ29ESFjqJoCu1Rupje8YtGqsefD265TMg7usUDFdp6W1EGMcet8";
+/** Deterministic mock — returns a valid-looking EVM address for any index. */
+function mockDeriveAddress(_xpub, index, _encoding) {
+    return `0x${index.toString(16).padStart(40, "0")}`;
 }
-const TEST_XPUB = makeTestXpub();
 describe("createStablecoinCheckout", () => {
     it("derives address and creates charge", async () => {
         const mockChargeStore = {
             getNextDerivationIndex: vi.fn().mockResolvedValue(42),
             createStablecoinCharge: vi.fn().mockResolvedValue(undefined),
         };
-        const result = await createStablecoinCheckout({ chargeStore: mockChargeStore, xpub: TEST_XPUB }, { tenant: "t1", amountUsd: 10, chain: "base", token: "USDC" });
+        const result = await createStablecoinCheckout({ chargeStore: mockChargeStore, deriveAddress: mockDeriveAddress, xpub: TEST_XPUB }, { tenant: "t1", amountUsd: 10, chain: "base", token: "USDC" });
         expect(result.depositAddress).toMatch(/^0x[0-9a-fA-F]{40}$/);
         expect(result.amountRaw).toBe("10000000"); // 10 USDC = 10 * 10^6
         expect(result.chain).toBe("base");
@@ -30,14 +27,14 @@ describe("createStablecoinCheckout", () => {
             getNextDerivationIndex: vi.fn().mockResolvedValue(0),
             createStablecoinCharge: vi.fn().mockResolvedValue(undefined),
         };
-        await expect(createStablecoinCheckout({ chargeStore: mockChargeStore, xpub: TEST_XPUB }, { tenant: "t1", amountUsd: 5, chain: "base", token: "USDC" })).rejects.toThrow("Minimum");
+        await expect(createStablecoinCheckout({ chargeStore: mockChargeStore, deriveAddress: mockDeriveAddress, xpub: TEST_XPUB }, { tenant: "t1", amountUsd: 5, chain: "base", token: "USDC" })).rejects.toThrow("Minimum");
     });
     it("stores deposit address in lowercase", async () => {
         const mockChargeStore = {
             getNextDerivationIndex: vi.fn().mockResolvedValue(0),
             createStablecoinCharge: vi.fn().mockResolvedValue(undefined),
         };
-        await createStablecoinCheckout({ chargeStore: mockChargeStore, xpub: TEST_XPUB }, { tenant: "t1", amountUsd: 10, chain: "base", token: "USDC" });
+        await createStablecoinCheckout({ chargeStore: mockChargeStore, deriveAddress: mockDeriveAddress, xpub: TEST_XPUB }, { tenant: "t1", amountUsd: 10, chain: "base", token: "USDC" });
         const chargeInput = mockChargeStore.createStablecoinCharge.mock.calls[0][0];
         expect(chargeInput.depositAddress).toBe(chargeInput.depositAddress.toLowerCase());
     });
@@ -46,7 +43,7 @@ describe("createStablecoinCheckout", () => {
             getNextDerivationIndex: vi.fn().mockResolvedValue(0),
             createStablecoinCharge: vi.fn().mockResolvedValue(undefined),
         };
-        const result = await createStablecoinCheckout({ chargeStore: mockChargeStore, xpub: TEST_XPUB }, { tenant: "t1", amountUsd: 25, chain: "base", token: "USDC" });
+        const result = await createStablecoinCheckout({ chargeStore: mockChargeStore, deriveAddress: mockDeriveAddress, xpub: TEST_XPUB }, { tenant: "t1", amountUsd: 25, chain: "base", token: "USDC" });
         expect(result.amountRaw).toBe("25000000"); // 25 * 10^6
         const chargeInput = mockChargeStore.createStablecoinCharge.mock.calls[0][0];
         expect(chargeInput.amountUsdCents).toBe(2500);

package/dist/billing/crypto/evm/__tests__/eth-checkout.test.js

@@ -1,6 +1,18 @@
 import { describe, expect, it, vi } from "vitest";
 import { createEthCheckout, MIN_ETH_USD } from "../eth-checkout.js";
 const mockOracle = { getPrice: vi.fn().mockResolvedValue({ priceMicros: 3_500_000_000, updatedAt: new Date() }) };
+/** Deterministic mock — returns a valid-looking EVM address for any index. */
+function mockDeriveAddress(_xpub, index, _encoding) {
+    return `0x${index.toString(16).padStart(40, "0")}`;
+}
+/**
+ * centsToNative: Convert USD cents to native token base units.
+ * Formula: (cents * 10_000 * 10^decimals) / priceMicros
+ * This mirrors the real oracle/convert.ts logic.
+ */
+function mockCentsToNative(cents, priceMicros, decimals) {
+    return (BigInt(cents) * 10000n * 10n ** BigInt(decimals)) / BigInt(priceMicros);
+}
 function makeDeps(derivationIndex = 0) {
     return {
         chargeStore: {
@@ -8,6 +20,8 @@ function makeDeps(derivationIndex = 0) {
             createStablecoinCharge: vi.fn().mockResolvedValue(undefined),
         },
         oracle: mockOracle,
+        deriveAddress: mockDeriveAddress,
+        centsToNative: mockCentsToNative,
         xpub: "xpub661MyMwAqRbcFtXgS5sYJABqqG9YLmC4Q1Rdap9gSE8NqtwybGhePY2gZ29ESFjqJoCu1Rupje8YtGqsefD265TMg7usUDFdp6W1EGMcet8",
     };
 }
@@ -18,7 +32,7 @@ describe("createEthCheckout", () => {
         expect(result.amountUsd).toBe(50);
         expect(result.priceMicros).toBe(3_500_000_000);
         expect(result.chain).toBe("base");
-        // $50 = 5000 cents × 10000 micros/cent × 10^18 / 3_500_000_000 micros = 14285714285714285n
+        // $50 = 5000 cents * 10000 micros/cent * 10^18 / 3_500_000_000 micros = 14285714285714285n
         expect(result.expectedWei).toBe("14285714285714285");
         expect(result.depositAddress).toMatch(/^0x/);
         expect(result.referenceId).toMatch(/^eth:base:0x/);

package/dist/billing/crypto/evm/checkout.d.ts

@@ -3,6 +3,8 @@ import type { StablecoinCheckoutOpts } from "./types.js";
 export declare const MIN_STABLECOIN_USD = 10;
 export interface StablecoinCheckoutDeps {
     chargeStore: Pick<ICryptoChargeRepository, "getNextDerivationIndex" | "createStablecoinCharge">;
+    /** HD key derivation function — injected from @wopr-network/platform-crypto-server. */
+    deriveAddress: (xpub: string, index: number, encoding: string) => string;
     xpub: string;
 }
 export interface StablecoinCheckoutResult {

package/dist/billing/crypto/evm/checkout.js

@@ -1,5 +1,4 @@
 import { Credit } from "../../../credits/credit.js";
-import { deriveAddress } from "../address-gen.js";
 import { getTokenConfig, tokenAmountFromCents } from "./config.js";
 export const MIN_STABLECOIN_USD = 10;
 /**
@@ -23,7 +22,7 @@ export async function createStablecoinCheckout(deps, opts) {
     const maxRetries = 3;
     for (let attempt = 0; attempt <= maxRetries; attempt++) {
         const derivationIndex = await deps.chargeStore.getNextDerivationIndex();
-        const depositAddress = deriveAddress(deps.xpub, derivationIndex, "evm");
+        const depositAddress = deps.deriveAddress(deps.xpub, derivationIndex, "evm");
         const referenceId = `sc:${opts.chain}:${opts.token.toLowerCase()}:${depositAddress.toLowerCase()}`;
         try {
             await deps.chargeStore.createStablecoinCharge({

package/dist/billing/crypto/evm/eth-checkout.d.ts

@@ -1,10 +1,21 @@
 import type { ICryptoChargeRepository } from "../charge-store.js";
-import type { IPriceOracle } from "../oracle/types.js";
 import type { EvmChain } from "./types.js";
 export declare const MIN_ETH_USD = 10;
+/** Price oracle interface — injected from @wopr-network/platform-crypto-server. */
+export interface EthPriceOracle {
+    getPrice(asset: string): Promise<{
+        priceMicros: number;
+    }>;
+}
+/** Convert USD cents to native token base units (e.g. wei for ETH). */
+export type CentsToNativeFn = (cents: number, priceMicros: number, decimals: number) => bigint;
 export interface EthCheckoutDeps {
     chargeStore: Pick<ICryptoChargeRepository, "getNextDerivationIndex" | "createStablecoinCharge">;
-    oracle: IPriceOracle;
+    oracle: EthPriceOracle;
+    /** HD key derivation function — injected from @wopr-network/platform-crypto-server. */
+    deriveAddress: (xpub: string, index: number, encoding: string) => string;
+    /** Convert cents to native base units — injected from @wopr-network/platform-crypto-server. */
+    centsToNative: CentsToNativeFn;
     xpub: string;
 }
 export interface EthCheckoutOpts {

package/dist/billing/crypto/evm/eth-checkout.js

@@ -1,6 +1,4 @@
 import { Credit } from "../../../credits/credit.js";
-import { deriveAddress } from "../address-gen.js";
-import { centsToNative } from "../oracle/convert.js";
 export const MIN_ETH_USD = 10;
 /**
  * Create an ETH checkout — derive deposit address, lock price, store charge.
@@ -17,11 +15,11 @@ export async function createEthCheckout(deps, opts) {
     }
     const amountUsdCents = Credit.fromDollars(opts.amountUsd).toCentsRounded();
     const { priceMicros } = await deps.oracle.getPrice("ETH");
-    const expectedWei = centsToNative(amountUsdCents, priceMicros, 18);
+    const expectedWei = deps.centsToNative(amountUsdCents, priceMicros, 18);
     const maxRetries = 3;
     for (let attempt = 0; attempt <= maxRetries; attempt++) {
         const derivationIndex = await deps.chargeStore.getNextDerivationIndex();
-        const depositAddress = deriveAddress(deps.xpub, derivationIndex, "evm");
+        const depositAddress = deps.deriveAddress(deps.xpub, derivationIndex, "evm");
         const referenceId = `eth:${opts.chain}:${depositAddress}`;
         try {
             await deps.chargeStore.createStablecoinCharge({

package/dist/billing/crypto/evm/eth-settler.d.ts

@@ -1,7 +1,7 @@
 import type { ILedger } from "../../../credits/ledger.js";
 import type { ICryptoChargeRepository } from "../charge-store.js";
 import type { CryptoWebhookResult } from "../types.js";
-import type { EthPaymentEvent } from "./eth-watcher.js";
+import type { EthPaymentEvent } from "./types.js";
 export interface EthSettlerDeps {
     chargeStore: Pick<ICryptoChargeRepository, "getByDepositAddress" | "updateStatus" | "markCredited">;
     creditLedger: Pick<ILedger, "credit" | "hasReferenceId">;

package/dist/billing/crypto/evm/index.d.ts

@@ -1,16 +1,10 @@
-export type { EncodingParams } from "../address-gen.js";
-export { deriveAddress, isValidXpub } from "../address-gen.js";
 export type { StablecoinCheckoutDeps, StablecoinCheckoutResult } from "./checkout.js";
 export { createStablecoinCheckout, MIN_STABLECOIN_USD } from "./checkout.js";
 export { centsFromTokenAmount, getChainConfig, getTokenConfig, tokenAmountFromCents } from "./config.js";
-export type { EthCheckoutDeps, EthCheckoutOpts, EthCheckoutResult } from "./eth-checkout.js";
+export type { CentsToNativeFn, EthCheckoutDeps, EthCheckoutOpts, EthCheckoutResult, EthPriceOracle, } from "./eth-checkout.js";
 export { createEthCheckout, MIN_ETH_USD } from "./eth-checkout.js";
 export type { EthSettlerDeps } from "./eth-settler.js";
 export { settleEthPayment } from "./eth-settler.js";
-export type { EthPaymentEvent, EthWatcherOpts } from "./eth-watcher.js";
-export { EthWatcher } from "./eth-watcher.js";
 export type { EvmSettlerDeps } from "./settler.js";
 export { settleEvmPayment } from "./settler.js";
-export type { ChainConfig, EvmChain, EvmPaymentEvent, StablecoinCheckoutOpts, StablecoinToken, TokenConfig, } from "./types.js";
-export type { EvmWatcherOpts } from "./watcher.js";
-export { createRpcCaller, EvmWatcher } from "./watcher.js";
+export type { ChainConfig, EthPaymentEvent, EvmChain, EvmPaymentEvent, StablecoinCheckoutOpts, StablecoinToken, TokenConfig, } from "./types.js";

package/dist/billing/crypto/evm/index.js

@@ -1,8 +1,5 @@
-export { deriveAddress, isValidXpub } from "../address-gen.js";
 export { createStablecoinCheckout, MIN_STABLECOIN_USD } from "./checkout.js";
 export { centsFromTokenAmount, getChainConfig, getTokenConfig, tokenAmountFromCents } from "./config.js";
 export { createEthCheckout, MIN_ETH_USD } from "./eth-checkout.js";
 export { settleEthPayment } from "./eth-settler.js";
-export { EthWatcher } from "./eth-watcher.js";
 export { settleEvmPayment } from "./settler.js";
-export { createRpcCaller, EvmWatcher } from "./watcher.js";

package/dist/billing/crypto/evm/types.d.ts

@@ -35,6 +35,22 @@ export interface EvmPaymentEvent {
     /** Required confirmations for this chain. */
     readonly confirmationsRequired: number;
 }
+/** Event emitted on each confirmation increment for a native ETH deposit. */
+export interface EthPaymentEvent {
+    readonly chain: EvmChain;
+    readonly from: string;
+    readonly to: string;
+    /** Raw value in wei (BigInt as string for serialization). */
+    readonly valueWei: string;
+    /** USD cents equivalent at detection time (integer). */
+    readonly amountUsdCents: number;
+    readonly txHash: string;
+    readonly blockNumber: number;
+    /** Current confirmation count (latest block - tx block). */
+    readonly confirmations: number;
+    /** Required confirmations for this chain. */
+    readonly confirmationsRequired: number;
+}
 /** Options for creating a stablecoin checkout. */
 export interface StablecoinCheckoutOpts {
     tenant: string;

package/dist/billing/crypto/index.d.ts

@@ -6,15 +6,10 @@ export { CryptoServiceClient, loadCryptoConfig } from "./client.js";
 export type { IWatcherCursorStore } from "./cursor-store.js";
 export { DrizzleWatcherCursorStore } from "./cursor-store.js";
 export * from "./evm/index.js";
-export type { KeyServerDeps } from "./key-server.js";
-export { createKeyServerApp } from "./key-server.js";
 export type { KeyServerWebhookDeps as CryptoWebhookDeps, KeyServerWebhookPayload as CryptoWebhookPayload, KeyServerWebhookResult as CryptoWebhookResult, } from "./key-server-webhook.js";
 export { handleKeyServerWebhook, handleKeyServerWebhook as handleCryptoWebhook, normalizeStatus, } from "./key-server-webhook.js";
-export * from "./oracle/index.js";
 export type { IPaymentMethodStore, PaymentMethodRecord } from "./payment-method-store.js";
 export { DrizzlePaymentMethodStore } from "./payment-method-store.js";
-export type { IAddressEncoder, IChainPlugin, IChainWatcher, ICurveDeriver, ISweepStrategy, PaymentEvent, } from "./plugin/index.js";
-export { PluginRegistry } from "./plugin/index.js";
-export type { CryptoCharge, CryptoChargeStatus, CryptoPaymentState } from "./types.js";
+export type { CryptoCharge, CryptoChargeStatus, CryptoPaymentState, CryptoWebhookResult as SettlerWebhookResult, } from "./types.js";
 export type { UnifiedCheckoutDeps, UnifiedCheckoutResult } from "./unified-checkout.js";
 export { createUnifiedCheckout, MIN_CHECKOUT_USD as MIN_PAYMENT_USD, MIN_CHECKOUT_USD } from "./unified-checkout.js";

package/dist/billing/crypto/index.js

@@ -1,11 +1,10 @@
+// Client
+// Chain-specific settlers + checkouts
 export * from "./btc/index.js";
 export { CryptoChargeRepository, DrizzleCryptoChargeRepository } from "./charge-store.js";
 export { CryptoServiceClient, loadCryptoConfig } from "./client.js";
 export { DrizzleWatcherCursorStore } from "./cursor-store.js";
 export * from "./evm/index.js";
-export { createKeyServerApp } from "./key-server.js";
 export { handleKeyServerWebhook, handleKeyServerWebhook as handleCryptoWebhook, normalizeStatus, } from "./key-server-webhook.js";
-export * from "./oracle/index.js";
 export { DrizzlePaymentMethodStore } from "./payment-method-store.js";
-export { PluginRegistry } from "./plugin/index.js";
 export { createUnifiedCheckout, MIN_CHECKOUT_USD as MIN_PAYMENT_USD, MIN_CHECKOUT_USD } from "./unified-checkout.js";

package/dist/billing/crypto/types.d.ts

@@ -23,42 +23,6 @@ export interface CryptoCheckoutOpts {
     /** Amount in USD (minimum $10). */
     amountUsd: number;
 }
-/** Webhook payload received from BTCPay Server (InvoiceSettled event). */
-export interface CryptoWebhookPayload {
-    /** BTCPay delivery ID (for deduplication). */
-    deliveryId: string;
-    /** Webhook ID. */
-    webhookId: string;
-    /** Original delivery ID (same as deliveryId on first delivery). */
-    originalDeliveryId: string;
-    /** Whether this is a redelivery. */
-    isRedelivery: boolean;
-    /** Event type (e.g. "InvoiceSettled", "InvoiceProcessing", "InvoiceExpired"). */
-    type: string;
-    /** Unix timestamp. */
-    timestamp: number;
-    /** BTCPay store ID. */
-    storeId: string;
-    /** BTCPay invoice ID. */
-    invoiceId: string;
-    /** Invoice metadata (echoed from creation). */
-    metadata: Record<string, unknown>;
-    /** Whether admin manually marked as settled (InvoiceSettled only). */
-    manuallyMarked?: boolean;
-    /** Whether customer overpaid (InvoiceSettled only). */
-    overPaid?: boolean;
-    /** Whether invoice was partially paid (InvoiceExpired only). */
-    partiallyPaid?: boolean;
-}
-/** Configuration for BTCPay Server integration. */
-export interface CryptoBillingConfig {
-    /** BTCPay API key (from Account > API keys). */
-    apiKey: string;
-    /** BTCPay Server base URL. */
-    baseUrl: string;
-    /** BTCPay store ID. */
-    storeId: string;
-}
 /** Result of processing a crypto webhook event. */
 export interface CryptoWebhookResult {
     handled: boolean;
@@ -68,10 +32,3 @@ export interface CryptoWebhookResult {
     reactivatedBots?: string[];
     duplicate?: boolean;
 }
-/**
- * Map BTCPay webhook event type string to a CryptoPaymentState.
- *
- * Shared between the core (billing) and consumer (monetization) webhook handlers.
- * Throws on unrecognized event types to surface integration errors early.
- */
-export declare function mapBtcPayEventToStatus(eventType: string): CryptoPaymentState;

package/dist/billing/crypto/types.js

@@ -1,24 +1 @@
-/**
- * Map BTCPay webhook event type string to a CryptoPaymentState.
- *
- * Shared between the core (billing) and consumer (monetization) webhook handlers.
- * Throws on unrecognized event types to surface integration errors early.
- */
-export function mapBtcPayEventToStatus(eventType) {
-    switch (eventType) {
-        case "InvoiceCreated":
-            return "New";
-        case "InvoiceReceivedPayment":
-        case "InvoiceProcessing":
-            return "Processing";
-        case "InvoiceSettled":
-        case "InvoicePaymentSettled":
-            return "Settled";
-        case "InvoiceExpired":
-            return "Expired";
-        case "InvoiceInvalid":
-            return "Invalid";
-        default:
-            throw new Error(`Unknown BTCPay event type: ${eventType}`);
-    }
-}
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wopr-network/platform-core",
-  "version": "1.66.1",
+  "version": "1.67.1",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -72,10 +72,6 @@
     "./api/routes/verify-email": "./dist/api/routes/verify-email.js",
     "./api/routes/ws-auth": "./dist/api/routes/ws-auth.js",
     "./trpc": "./dist/trpc/index.js",
-    "./crypto-plugin": {
-      "import": "./dist/billing/crypto/plugin/index.js",
-      "types": "./dist/billing/crypto/plugin/index.d.ts"
-    },
     "./*": "./dist/*.js"
   },
   "scripts": {

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

@@ -1,5 +1,4 @@
 import { Credit } from "../../../credits/credit.js";
-import { deriveAddress } from "../address-gen.js";
 import type { ICryptoChargeRepository } from "../charge-store.js";
 import type { BtcCheckoutOpts } from "./types.js";
 
@@ -7,6 +6,8 @@ export const MIN_BTC_USD = 10;
 
 export interface BtcCheckoutDeps {
   chargeStore: Pick<ICryptoChargeRepository, "getNextDerivationIndex" | "createStablecoinCharge">;
+  /** HD key derivation function — injected from @wopr-network/platform-crypto-server. */
+  deriveAddress: (xpub: string, index: number, encoding: string, params?: { hrp?: string }) => string;
   xpub: string;
   network?: "mainnet" | "testnet" | "regtest";
 }
@@ -36,7 +37,7 @@ export async function createBtcCheckout(deps: BtcCheckoutDeps, opts: BtcCheckout
   for (let attempt = 0; attempt <= maxRetries; attempt++) {
     const derivationIndex = await deps.chargeStore.getNextDerivationIndex();
     const hrpMap = { mainnet: "bc", testnet: "tb", regtest: "bcrt" } as const;
-    const depositAddress = deriveAddress(deps.xpub, derivationIndex, "bech32", {
+    const depositAddress = deps.deriveAddress(deps.xpub, derivationIndex, "bech32", {
       hrp: hrpMap[network],
     });
     const referenceId = `btc:${depositAddress}`;

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

@@ -1,10 +1,6 @@
-export type { EncodingParams } from "../address-gen.js";
-export { deriveAddress, deriveTreasury, isValidXpub } from "../address-gen.js";
 export type { BtcCheckoutDeps, BtcCheckoutResult } from "./checkout.js";
 export { createBtcCheckout, MIN_BTC_USD } from "./checkout.js";
 export { centsToSats, loadBitcoindConfig, satsToCents } from "./config.js";
 export type { BtcSettlerDeps } from "./settler.js";
 export { settleBtcPayment } from "./settler.js";
 export type { BitcoindConfig, BtcCheckoutOpts, BtcPaymentEvent } from "./types.js";
-export type { BtcWatcherOpts } from "./watcher.js";
-export { BtcWatcher, createBitcoindRpc } from "./watcher.js";

package/src/billing/crypto/evm/__tests__/checkout.test.ts

@@ -1,15 +1,13 @@
-import { HDKey } from "@scure/bip32";
 import { describe, expect, it, vi } from "vitest";
 import { createStablecoinCheckout } from "../checkout.js";
 
-function makeTestXpub(): string {
-  const seed = new Uint8Array(32);
-  seed[0] = 1;
-  const master = HDKey.fromMasterSeed(seed);
-  return master.derive("m/44'/60'/0'").publicExtendedKey;
-}
+const TEST_XPUB =
+  "xpub661MyMwAqRbcFtXgS5sYJABqqG9YLmC4Q1Rdap9gSE8NqtwybGhePY2gZ29ESFjqJoCu1Rupje8YtGqsefD265TMg7usUDFdp6W1EGMcet8";
 
-const TEST_XPUB = makeTestXpub();
+/** Deterministic mock — returns a valid-looking EVM address for any index. */
+function mockDeriveAddress(_xpub: string, index: number, _encoding: string): string {
+  return `0x${index.toString(16).padStart(40, "0")}`;
+}
 
 describe("createStablecoinCheckout", () => {
   it("derives address and creates charge", async () => {
@@ -19,7 +17,7 @@ describe("createStablecoinCheckout", () => {
     };
 
     const result = await createStablecoinCheckout(
-      { chargeStore: mockChargeStore as never, xpub: TEST_XPUB },
+      { chargeStore: mockChargeStore as never, deriveAddress: mockDeriveAddress, xpub: TEST_XPUB },
       { tenant: "t1", amountUsd: 10, chain: "base", token: "USDC" },
     );
 
@@ -43,7 +41,7 @@ describe("createStablecoinCheckout", () => {
 
     await expect(
       createStablecoinCheckout(
-        { chargeStore: mockChargeStore as never, xpub: TEST_XPUB },
+        { chargeStore: mockChargeStore as never, deriveAddress: mockDeriveAddress, xpub: TEST_XPUB },
         { tenant: "t1", amountUsd: 5, chain: "base", token: "USDC" },
       ),
     ).rejects.toThrow("Minimum");
@@ -56,7 +54,7 @@ describe("createStablecoinCheckout", () => {
     };
 
     await createStablecoinCheckout(
-      { chargeStore: mockChargeStore as never, xpub: TEST_XPUB },
+      { chargeStore: mockChargeStore as never, deriveAddress: mockDeriveAddress, xpub: TEST_XPUB },
       { tenant: "t1", amountUsd: 10, chain: "base", token: "USDC" },
     );
 
@@ -71,7 +69,7 @@ describe("createStablecoinCheckout", () => {
     };
 
     const result = await createStablecoinCheckout(
-      { chargeStore: mockChargeStore as never, xpub: TEST_XPUB },
+      { chargeStore: mockChargeStore as never, deriveAddress: mockDeriveAddress, xpub: TEST_XPUB },
       { tenant: "t1", amountUsd: 25, chain: "base", token: "USDC" },
     );
 

package/src/billing/crypto/evm/__tests__/eth-checkout.test.ts

@@ -3,6 +3,20 @@ import { createEthCheckout, MIN_ETH_USD } from "../eth-checkout.js";
 
 const mockOracle = { getPrice: vi.fn().mockResolvedValue({ priceMicros: 3_500_000_000, updatedAt: new Date() }) };
 
+/** Deterministic mock — returns a valid-looking EVM address for any index. */
+function mockDeriveAddress(_xpub: string, index: number, _encoding: string): string {
+  return `0x${index.toString(16).padStart(40, "0")}`;
+}
+
+/**
+ * centsToNative: Convert USD cents to native token base units.
+ * Formula: (cents * 10_000 * 10^decimals) / priceMicros
+ * This mirrors the real oracle/convert.ts logic.
+ */
+function mockCentsToNative(cents: number, priceMicros: number, decimals: number): bigint {
+  return (BigInt(cents) * 10_000n * 10n ** BigInt(decimals)) / BigInt(priceMicros);
+}
+
 function makeDeps(derivationIndex = 0) {
   return {
     chargeStore: {
@@ -10,6 +24,8 @@ function makeDeps(derivationIndex = 0) {
       createStablecoinCharge: vi.fn().mockResolvedValue(undefined),
     },
     oracle: mockOracle,
+    deriveAddress: mockDeriveAddress,
+    centsToNative: mockCentsToNative,
     xpub: "xpub661MyMwAqRbcFtXgS5sYJABqqG9YLmC4Q1Rdap9gSE8NqtwybGhePY2gZ29ESFjqJoCu1Rupje8YtGqsefD265TMg7usUDFdp6W1EGMcet8",
   };
 }
@@ -22,7 +38,7 @@ describe("createEthCheckout", () => {
     expect(result.amountUsd).toBe(50);
     expect(result.priceMicros).toBe(3_500_000_000);
     expect(result.chain).toBe("base");
-    // $50 = 5000 cents × 10000 micros/cent × 10^18 / 3_500_000_000 micros = 14285714285714285n
+    // $50 = 5000 cents * 10000 micros/cent * 10^18 / 3_500_000_000 micros = 14285714285714285n
     expect(result.expectedWei).toBe("14285714285714285");
     expect(result.depositAddress).toMatch(/^0x/);
     expect(result.referenceId).toMatch(/^eth:base:0x/);

package/src/billing/crypto/evm/__tests__/eth-settler.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it, vi } from "vitest";
 import { settleEthPayment } from "../eth-settler.js";
-import type { EthPaymentEvent } from "../eth-watcher.js";
+import type { EthPaymentEvent } from "../types.js";
 
 function makeEvent(overrides: Partial<EthPaymentEvent> = {}): EthPaymentEvent {
   return {

package/src/billing/crypto/evm/checkout.ts

@@ -1,5 +1,4 @@
 import { Credit } from "../../../credits/credit.js";
-import { deriveAddress } from "../address-gen.js";
 import type { ICryptoChargeRepository } from "../charge-store.js";
 import { getTokenConfig, tokenAmountFromCents } from "./config.js";
 import type { StablecoinCheckoutOpts } from "./types.js";
@@ -8,6 +7,8 @@ export const MIN_STABLECOIN_USD = 10;
 
 export interface StablecoinCheckoutDeps {
   chargeStore: Pick<ICryptoChargeRepository, "getNextDerivationIndex" | "createStablecoinCharge">;
+  /** HD key derivation function — injected from @wopr-network/platform-crypto-server. */
+  deriveAddress: (xpub: string, index: number, encoding: string) => string;
   xpub: string;
 }
 
@@ -47,7 +48,7 @@ export async function createStablecoinCheckout(
   const maxRetries = 3;
   for (let attempt = 0; attempt <= maxRetries; attempt++) {
     const derivationIndex = await deps.chargeStore.getNextDerivationIndex();
-    const depositAddress = deriveAddress(deps.xpub, derivationIndex, "evm");
+    const depositAddress = deps.deriveAddress(deps.xpub, derivationIndex, "evm");
     const referenceId = `sc:${opts.chain}:${opts.token.toLowerCase()}:${depositAddress.toLowerCase()}`;
 
     try {

package/src/billing/crypto/evm/eth-checkout.ts

@@ -1,15 +1,24 @@
 import { Credit } from "../../../credits/credit.js";
-import { deriveAddress } from "../address-gen.js";
 import type { ICryptoChargeRepository } from "../charge-store.js";
-import { centsToNative } from "../oracle/convert.js";
-import type { IPriceOracle } from "../oracle/types.js";
 import type { EvmChain } from "./types.js";
 
 export const MIN_ETH_USD = 10;
 
+/** Price oracle interface — injected from @wopr-network/platform-crypto-server. */
+export interface EthPriceOracle {
+  getPrice(asset: string): Promise<{ priceMicros: number }>;
+}
+
+/** Convert USD cents to native token base units (e.g. wei for ETH). */
+export type CentsToNativeFn = (cents: number, priceMicros: number, decimals: number) => bigint;
+
 export interface EthCheckoutDeps {
   chargeStore: Pick<ICryptoChargeRepository, "getNextDerivationIndex" | "createStablecoinCharge">;
-  oracle: IPriceOracle;
+  oracle: EthPriceOracle;
+  /** HD key derivation function — injected from @wopr-network/platform-crypto-server. */
+  deriveAddress: (xpub: string, index: number, encoding: string) => string;
+  /** Convert cents to native base units — injected from @wopr-network/platform-crypto-server. */
+  centsToNative: CentsToNativeFn;
   xpub: string;
 }
 
@@ -46,12 +55,12 @@ export async function createEthCheckout(deps: EthCheckoutDeps, opts: EthCheckout
 
   const amountUsdCents = Credit.fromDollars(opts.amountUsd).toCentsRounded();
   const { priceMicros } = await deps.oracle.getPrice("ETH");
-  const expectedWei = centsToNative(amountUsdCents, priceMicros, 18);
+  const expectedWei = deps.centsToNative(amountUsdCents, priceMicros, 18);
   const maxRetries = 3;
 
   for (let attempt = 0; attempt <= maxRetries; attempt++) {
     const derivationIndex = await deps.chargeStore.getNextDerivationIndex();
-    const depositAddress = deriveAddress(deps.xpub, derivationIndex, "evm") as `0x${string}`;
+    const depositAddress = deps.deriveAddress(deps.xpub, derivationIndex, "evm") as `0x${string}`;
     const referenceId = `eth:${opts.chain}:${depositAddress}`;
 
     try {

package/src/billing/crypto/evm/eth-settler.ts

@@ -2,7 +2,7 @@ import { Credit } from "../../../credits/credit.js";
 import type { ILedger } from "../../../credits/ledger.js";
 import type { ICryptoChargeRepository } from "../charge-store.js";
 import type { CryptoWebhookResult } from "../types.js";
-import type { EthPaymentEvent } from "./eth-watcher.js";
+import type { EthPaymentEvent } from "./types.js";
 
 export interface EthSettlerDeps {
   chargeStore: Pick<ICryptoChargeRepository, "getByDepositAddress" | "updateStatus" | "markCredited">;