@wopr-network/platform-core 1.49.4 → 1.50.0

package/dist/billing/crypto/__tests__/key-server.test.js

@@ -67,6 +67,7 @@ function mockDeps() {
                 displayName: "Bitcoin",
                 contractAddress: null,
                 confirmations: 6,
+                iconUrl: null,
             },
             {
                 id: "base-usdc",
@@ -76,6 +77,7 @@ function mockDeps() {
                 displayName: "USDC on Base",
                 contractAddress: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
                 confirmations: 12,
+                iconUrl: null,
             },
         ]),
         listAll: vi.fn(),
@@ -91,12 +93,14 @@ function mockDeps() {
             oracleAddress: "0x64c911996D3c6aC71f9b455B1E8E7266BcbD848F",
             xpub: null,
             displayOrder: 0,
+            iconUrl: null,
             enabled: true,
             rpcUrl: null,
         }),
         listByType: vi.fn(),
         upsert: vi.fn().mockResolvedValue(undefined),
         setEnabled: vi.fn().mockResolvedValue(undefined),
+        patchMetadata: vi.fn().mockResolvedValue(true),
     };
     return {
         db: createMockDb(),

package/dist/billing/crypto/charge-store.d.ts

@@ -59,6 +59,7 @@ export interface ICryptoChargeRepository {
     listActiveDepositAddresses(): Promise<{
         chain: string;
         address: string;
+        token: string;
     }[]>;
 }
 /**
@@ -102,6 +103,7 @@ export declare class DrizzleCryptoChargeRepository implements ICryptoChargeRepos
     listActiveDepositAddresses(): Promise<{
         chain: string;
         address: string;
+        token: string;
     }[]>;
     /** Get the next available HD derivation index (max + 1, or 0 if empty). */
     getNextDerivationIndex(): Promise<number>;

package/dist/billing/crypto/charge-store.js

@@ -173,10 +173,14 @@ export class DrizzleCryptoChargeRepository {
     /** List deposit addresses with pending (uncredited) charges. */
     async listActiveDepositAddresses() {
         const rows = await this.db
-            .select({ chain: cryptoCharges.chain, address: cryptoCharges.depositAddress })
+            .select({
+            chain: cryptoCharges.chain,
+            address: cryptoCharges.depositAddress,
+            token: cryptoCharges.token,
+        })
             .from(cryptoCharges)
             .where(and(isNull(cryptoCharges.creditedAt), isNotNull(cryptoCharges.depositAddress), isNotNull(cryptoCharges.chain)));
-        return rows.filter((r) => r.chain !== null && r.address !== null);
+        return rows.filter((r) => r.chain !== null && r.address !== null && r.token !== null);
     }
     /** Get the next available HD derivation index (max + 1, or 0 if empty). */
     async getNextDerivationIndex() {

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

@@ -46,6 +46,7 @@ export interface ChainInfo {
     displayName: string;
     contractAddress: string | null;
     confirmations: number;
+    iconUrl: string | null;
 }
 /**
  * Client for the shared crypto key server.

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

@@ -27,6 +27,7 @@ describe("EthWatcher", () => {
             rpcCall: rpc,
             oracle: mockOracle,
             fromBlock: 10,
+            confirmations: 1,
             onPayment,
             watchedAddresses: ["0xDeposit"],
         });
@@ -53,6 +54,7 @@ describe("EthWatcher", () => {
             rpcCall: rpc,
             oracle: mockOracle,
             fromBlock: 10,
+            confirmations: 1,
             onPayment,
             watchedAddresses: ["0xDeposit"],
         });
@@ -72,6 +74,7 @@ describe("EthWatcher", () => {
             rpcCall: rpc,
             oracle: mockOracle,
             fromBlock: 10,
+            confirmations: 1,
             onPayment,
             watchedAddresses: ["0xDeposit"],
         });
@@ -104,6 +107,7 @@ describe("EthWatcher", () => {
             rpcCall: rpc,
             oracle: mockOracle,
             fromBlock: 10,
+            confirmations: 1,
             onPayment,
             watchedAddresses: ["0xDeposit"],
             cursorStore,
@@ -121,6 +125,7 @@ describe("EthWatcher", () => {
             rpcCall: rpc,
             oracle: mockOracle,
             fromBlock: 10,
+            confirmations: 1,
             onPayment,
             watchedAddresses: [],
         });
@@ -149,6 +154,7 @@ describe("EthWatcher", () => {
             rpcCall: rpc,
             oracle: mockOracle,
             fromBlock: 10,
+            confirmations: 1,
             onPayment,
             watchedAddresses: ["0xDeposit"],
             cursorStore,

package/dist/billing/crypto/evm/__tests__/watcher-confirmations.test.js

@@ -40,6 +40,9 @@ describe("EvmWatcher — intermediate confirmations", () => {
         const watcher = new EvmWatcher({
             chain: "base",
             token: "USDC",
+            contractAddress: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+            decimals: 6,
+            confirmations: 1,
             rpcCall: mockRpc,
             fromBlock: 100,
             watchedAddresses: [toAddr],
@@ -65,6 +68,9 @@ describe("EvmWatcher — intermediate confirmations", () => {
         const watcher = new EvmWatcher({
             chain: "base",
             token: "USDC",
+            contractAddress: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+            decimals: 6,
+            confirmations: 1,
             rpcCall: mockRpc,
             fromBlock: 100,
             watchedAddresses: [toAddr],
@@ -88,6 +94,9 @@ describe("EvmWatcher — intermediate confirmations", () => {
         const watcher = new EvmWatcher({
             chain: "base",
             token: "USDC",
+            contractAddress: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+            decimals: 6,
+            confirmations: 1,
             rpcCall: mockRpc,
             fromBlock: 100,
             watchedAddresses: [toAddr],
@@ -110,6 +119,9 @@ describe("EvmWatcher — intermediate confirmations", () => {
         const watcher = new EvmWatcher({
             chain: "base",
             token: "USDC",
+            contractAddress: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+            decimals: 6,
+            confirmations: 1,
             rpcCall: mockRpc,
             fromBlock: 100,
             watchedAddresses: [toAddr],
@@ -132,6 +144,9 @@ describe("EvmWatcher — intermediate confirmations", () => {
         const watcher = new EvmWatcher({
             chain: "base",
             token: "USDC",
+            contractAddress: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+            decimals: 6,
+            confirmations: 1,
             rpcCall: mockRpc,
             fromBlock: 100,
             watchedAddresses: [toAddr],

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

@@ -26,6 +26,9 @@ describe("EvmWatcher", () => {
         const watcher = new EvmWatcher({
             chain: "base",
             token: "USDC",
+            contractAddress: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+            decimals: 6,
+            confirmations: 1,
             rpcCall: mockRpc,
             fromBlock: 99,
             watchedAddresses: [toAddr],
@@ -46,6 +49,9 @@ describe("EvmWatcher", () => {
         const watcher = new EvmWatcher({
             chain: "base",
             token: "USDC",
+            contractAddress: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+            decimals: 6,
+            confirmations: 1,
             rpcCall: mockRpc,
             fromBlock: 100,
             watchedAddresses: ["0xdeadbeef"],
@@ -65,6 +71,9 @@ describe("EvmWatcher", () => {
         const watcher = new EvmWatcher({
             chain: "base",
             token: "USDC",
+            contractAddress: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+            decimals: 6,
+            confirmations: 1,
             rpcCall: mockRpc,
             fromBlock: 50,
             watchedAddresses: ["0xdeadbeef"],
@@ -86,6 +95,9 @@ describe("EvmWatcher", () => {
         const watcher = new EvmWatcher({
             chain: "base",
             token: "USDC",
+            contractAddress: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+            decimals: 6,
+            confirmations: 1,
             rpcCall: mockRpc,
             fromBlock: 100,
             watchedAddresses: [addr1, addr2],
@@ -103,6 +115,9 @@ describe("EvmWatcher", () => {
         const watcher = new EvmWatcher({
             chain: "base",
             token: "USDC",
+            contractAddress: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+            decimals: 6,
+            confirmations: 1,
             rpcCall: mockRpc,
             fromBlock: 100,
             watchedAddresses: ["0xdeadbeef"],
@@ -117,6 +132,9 @@ describe("EvmWatcher", () => {
         const watcher = new EvmWatcher({
             chain: "base",
             token: "USDC",
+            contractAddress: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+            decimals: 6,
+            confirmations: 1,
             rpcCall: mockRpc,
             fromBlock: 0,
             onPayment: vi.fn(),

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

@@ -26,6 +26,8 @@ export interface EthWatcherOpts {
     onPayment: (event: EthPaymentEvent) => void | Promise<void>;
     watchedAddresses?: string[];
     cursorStore?: IWatcherCursorStore;
+    /** Required confirmations (from DB). */
+    confirmations: number;
 }
 /**
  * Native ETH transfer watcher.

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

@@ -1,5 +1,4 @@
 import { nativeToCents } from "../oracle/convert.js";
-import { getChainConfig } from "./config.js";
 /**
  * Native ETH transfer watcher.
  *
@@ -27,7 +26,7 @@ export class EthWatcher {
         this.oracle = opts.oracle;
         this._cursor = opts.fromBlock;
         this.onPayment = opts.onPayment;
-        this.confirmations = getChainConfig(opts.chain).confirmations;
+        this.confirmations = opts.confirmations;
         this.cursorStore = opts.cursorStore;
         this.watcherId = `eth:${opts.chain}`;
         this._watchedAddresses = new Set((opts.watchedAddresses ?? []).map((a) => a.toLowerCase()));

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

@@ -1,5 +1,5 @@
 /** Supported EVM chains. */
-export type EvmChain = "base" | "ethereum" | "arbitrum" | "polygon";
+export type EvmChain = "base" | "ethereum" | "arbitrum" | "polygon" | (string & {});
 /** Supported stablecoin tokens. */
 export type StablecoinToken = "USDC" | "USDT" | "DAI";
 /** Chain configuration. */

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

@@ -10,6 +10,12 @@ export interface EvmWatcherOpts {
     /** Active deposit addresses to watch. Filters eth_getLogs by topic[2] (to address). */
     watchedAddresses?: string[];
     cursorStore?: IWatcherCursorStore;
+    /** Contract address for the ERC20 token (from DB). */
+    contractAddress: string;
+    /** Token decimals (from DB). */
+    decimals: number;
+    /** Required confirmations (from DB). */
+    confirmations: number;
 }
 export declare class EvmWatcher {
     private _cursor;

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

@@ -1,4 +1,4 @@
-import { centsFromTokenAmount, getChainConfig, getTokenConfig } from "./config.js";
+import { centsFromTokenAmount } from "./config.js";
 const TRANSFER_TOPIC = "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef";
 export class EvmWatcher {
     _cursor;
@@ -21,11 +21,9 @@ export class EvmWatcher {
         this.cursorStore = opts.cursorStore;
         this.watcherId = `evm:${opts.chain}:${opts.token}`;
         this._watchedAddresses = (opts.watchedAddresses ?? []).map((a) => a.toLowerCase());
-        const chainCfg = getChainConfig(opts.chain);
-        const tokenCfg = getTokenConfig(opts.token, opts.chain);
-        this.confirmations = chainCfg.confirmations;
-        this.contractAddress = tokenCfg.contractAddress.toLowerCase();
-        this.decimals = tokenCfg.decimals;
+        this.confirmations = opts.confirmations;
+        this.contractAddress = opts.contractAddress.toLowerCase();
+        this.decimals = opts.decimals;
     }
     /** Load cursor from DB. Call once at startup before first poll. */
     async init() {

package/dist/billing/crypto/key-server.js

@@ -218,6 +218,7 @@ export function createKeyServerApp(deps) {
             displayName: m.displayName,
             contractAddress: m.contractAddress,
             confirmations: m.confirmations,
+            iconUrl: m.iconUrl,
         })));
     });
     // --- Admin API ---
@@ -282,7 +283,8 @@ export function createKeyServerApp(deps) {
             decimals: body.decimals,
             displayName: body.display_name ?? `${body.token} on ${body.network}`,
             enabled: true,
-            displayOrder: 0,
+            displayOrder: body.display_order ?? 0,
+            iconUrl: body.icon_url ?? null,
             rpcUrl: body.rpc_url,
             oracleAddress: body.oracle_address ?? null,
             xpub: body.xpub,
@@ -291,6 +293,19 @@ export function createKeyServerApp(deps) {
         });
         return c.json({ id: body.id, path: `m/44'/${body.coin_type}'/${body.account_index}'` }, 201);
     });
+    /** PATCH /admin/chains/:id — update metadata (icon_url, display_order, display_name) */
+    app.patch("/admin/chains/:id", async (c) => {
+        const id = c.req.param("id");
+        const body = await c.req.json();
+        const updated = await deps.methodStore.patchMetadata(id, {
+            iconUrl: body.icon_url,
+            displayOrder: body.display_order,
+            displayName: body.display_name,
+        });
+        if (!updated)
+            return c.json({ id, updated: false }, 200);
+        return c.json({ id, updated: true });
+    });
     /** DELETE /admin/chains/:id — soft disable */
     app.delete("/admin/chains/:id", async (c) => {
         await deps.methodStore.setEnabled(c.req.param("id"), false);

package/dist/billing/crypto/payment-method-store.d.ts

@@ -9,6 +9,7 @@ export interface PaymentMethodRecord {
     displayName: string;
     enabled: boolean;
     displayOrder: number;
+    iconUrl: string | null;
     rpcUrl: string | null;
     oracleAddress: string | null;
     xpub: string | null;
@@ -28,6 +29,12 @@ export interface IPaymentMethodStore {
     upsert(method: PaymentMethodRecord): Promise<void>;
     /** Enable or disable a payment method (admin). */
     setEnabled(id: string, enabled: boolean): Promise<void>;
+    /** Partial update of metadata fields (no read-modify-write needed). */
+    patchMetadata(id: string, patch: {
+        iconUrl?: string | null;
+        displayOrder?: number;
+        displayName?: string;
+    }): Promise<boolean>;
 }
 export declare class DrizzlePaymentMethodStore implements IPaymentMethodStore {
     private readonly db;
@@ -38,4 +45,9 @@ export declare class DrizzlePaymentMethodStore implements IPaymentMethodStore {
     listByType(type: string): Promise<PaymentMethodRecord[]>;
     upsert(method: PaymentMethodRecord): Promise<void>;
     setEnabled(id: string, enabled: boolean): Promise<void>;
+    patchMetadata(id: string, patch: {
+        iconUrl?: string | null;
+        displayOrder?: number;
+        displayName?: string;
+    }): Promise<boolean>;
 }

package/dist/billing/crypto/payment-method-store.js

@@ -42,6 +42,7 @@ export class DrizzlePaymentMethodStore {
             displayName: method.displayName,
             enabled: method.enabled,
             displayOrder: method.displayOrder,
+            iconUrl: method.iconUrl,
             rpcUrl: method.rpcUrl,
             oracleAddress: method.oracleAddress,
             xpub: method.xpub,
@@ -59,6 +60,7 @@ export class DrizzlePaymentMethodStore {
                 displayName: method.displayName,
                 enabled: method.enabled,
                 displayOrder: method.displayOrder,
+                iconUrl: method.iconUrl,
                 rpcUrl: method.rpcUrl,
                 oracleAddress: method.oracleAddress,
                 xpub: method.xpub,
@@ -70,6 +72,19 @@ export class DrizzlePaymentMethodStore {
     async setEnabled(id, enabled) {
         await this.db.update(paymentMethods).set({ enabled }).where(eq(paymentMethods.id, id));
     }
+    async patchMetadata(id, patch) {
+        const set = {};
+        if (patch.iconUrl !== undefined)
+            set.iconUrl = patch.iconUrl;
+        if (patch.displayOrder !== undefined)
+            set.displayOrder = patch.displayOrder;
+        if (patch.displayName !== undefined)
+            set.displayName = patch.displayName;
+        if (Object.keys(set).length === 0)
+            return false;
+        const result = (await this.db.update(paymentMethods).set(set).where(eq(paymentMethods.id, id)));
+        return result.rowCount > 0;
+    }
 }
 function toRecord(row) {
     return {
@@ -82,6 +97,7 @@ function toRecord(row) {
         displayName: row.displayName,
         enabled: row.enabled,
         displayOrder: row.displayOrder,
+        iconUrl: row.iconUrl,
         rpcUrl: row.rpcUrl,
         oracleAddress: row.oracleAddress,
         xpub: row.xpub,

package/dist/billing/crypto/watcher-service.js

@@ -14,6 +14,7 @@
 import { and, eq, isNull, lte, or } from "drizzle-orm";
 import { cryptoCharges, webhookDeliveries } from "../../db/schema/crypto.js";
 import { BtcWatcher, createBitcoindRpc } from "./btc/watcher.js";
+import { EthWatcher } from "./evm/eth-watcher.js";
 import { createRpcCaller, EvmWatcher } from "./evm/watcher.js";
 const MAX_DELIVERY_ATTEMPTS = 10;
 const BACKOFF_BASE_MS = 5_000;
@@ -263,8 +264,72 @@ export async function startWatchers(opts) {
             }
         }, pollMs));
     }
-    // --- EVM Watchers ---
-    for (const method of evmMethods) {
+    // --- Native ETH Watchers (block-scanning for value transfers) ---
+    const nativeEvmMethods = evmMethods.filter((m) => m.type === "native");
+    const erc20Methods = evmMethods.filter((m) => m.type === "erc20" && m.contractAddress);
+    const BACKFILL_BLOCKS = 1000; // Scan ~30min of blocks on first deploy to catch missed deposits
+    for (const method of nativeEvmMethods) {
+        if (!method.rpcUrl)
+            continue;
+        const rpcCall = createRpcCaller(method.rpcUrl);
+        const latestHex = (await rpcCall("eth_blockNumber", []));
+        const latestBlock = Number.parseInt(latestHex, 16);
+        const backfillStart = Math.max(0, latestBlock - BACKFILL_BLOCKS);
+        const activeAddresses = await chargeStore.listActiveDepositAddresses();
+        // Only watch addresses for native charges on this chain (not ERC20 charges)
+        const chainAddresses = activeAddresses
+            .filter((a) => a.chain === method.chain && a.token === method.token)
+            .map((a) => a.address);
+        const watcher = new EthWatcher({
+            chain: method.chain,
+            rpcCall,
+            oracle,
+            fromBlock: backfillStart,
+            watchedAddresses: chainAddresses,
+            cursorStore,
+            confirmations: method.confirmations,
+            onPayment: async (event) => {
+                log("ETH payment", {
+                    chain: event.chain,
+                    to: event.to,
+                    txHash: event.txHash,
+                    valueWei: event.valueWei,
+                    confirmations: event.confirmations,
+                    confirmationsRequired: event.confirmationsRequired,
+                });
+                await handlePayment(db, chargeStore, event.to, event.valueWei, {
+                    txHash: event.txHash,
+                    confirmations: event.confirmations,
+                    confirmationsRequired: event.confirmationsRequired,
+                    amountReceivedCents: event.amountUsdCents,
+                }, log);
+            },
+        });
+        await watcher.init();
+        log(`ETH watcher started (${method.chain}:${method.token})`, { addresses: chainAddresses.length });
+        let ethPolling = false;
+        timers.push(setInterval(async () => {
+            if (ethPolling)
+                return;
+            ethPolling = true;
+            try {
+                const fresh = await chargeStore.listActiveDepositAddresses();
+                const freshNative = fresh
+                    .filter((a) => a.chain === method.chain && a.token === method.token)
+                    .map((a) => a.address);
+                watcher.setWatchedAddresses(freshNative);
+                await watcher.poll();
+            }
+            catch (err) {
+                log("ETH poll error", { chain: method.chain, error: String(err) });
+            }
+            finally {
+                ethPolling = false;
+            }
+        }, pollMs));
+    }
+    // --- ERC20 Watchers (log-based Transfer event scanning) ---
+    for (const method of erc20Methods) {
         if (!method.rpcUrl || !method.contractAddress)
             continue;
         const rpcCall = createRpcCaller(method.rpcUrl);
@@ -278,6 +343,9 @@ export async function startWatchers(opts) {
             rpcCall,
             fromBlock: latestBlock,
             watchedAddresses: chainAddresses,
+            contractAddress: method.contractAddress,
+            decimals: method.decimals,
+            confirmations: method.confirmations,
             cursorStore,
             onPayment: async (event) => {
                 log("EVM payment", {
@@ -301,7 +369,7 @@ export async function startWatchers(opts) {
         let evmPolling = false;
         timers.push(setInterval(async () => {
             if (evmPolling)
-                return; // Prevent overlapping polls
+                return;
             evmPolling = true;
             try {
                 const fresh = await chargeStore.listActiveDepositAddresses();
@@ -328,7 +396,13 @@ export async function startWatchers(opts) {
             log("Delivery loop error", { error: String(err) });
         }
     }, deliveryMs));
-    log("All watchers started", { utxo: utxoMethods.length, evm: evmMethods.length, pollMs, deliveryMs });
+    log("All watchers started", {
+        utxo: utxoMethods.length,
+        evm: erc20Methods.length,
+        eth: nativeEvmMethods.length,
+        pollMs,
+        deliveryMs,
+    });
     return () => {
         for (const t of timers)
             clearInterval(t);

package/dist/db/schema/crypto.d.ts

@@ -597,6 +597,23 @@ export declare const paymentMethods: import("drizzle-orm/pg-core").PgTableWithCo
             identity: undefined;
             generated: undefined;
         }, {}, {}>;
+        iconUrl: import("drizzle-orm/pg-core").PgColumn<{
+            name: "icon_url";
+            tableName: "payment_methods";
+            dataType: "string";
+            columnType: "PgText";
+            data: string;
+            driverParam: string;
+            notNull: false;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
         rpcUrl: import("drizzle-orm/pg-core").PgColumn<{
             name: "rpc_url";
             tableName: "payment_methods";

package/dist/db/schema/crypto.js

@@ -71,6 +71,7 @@ export const paymentMethods = pgTable("payment_methods", {
     displayName: text("display_name").notNull(),
     enabled: boolean("enabled").notNull().default(true),
     displayOrder: integer("display_order").notNull().default(0),
+    iconUrl: text("icon_url"),
     rpcUrl: text("rpc_url"), // chain node RPC endpoint
     oracleAddress: text("oracle_address"), // Chainlink feed address for price (null = 1:1 stablecoin)
     xpub: text("xpub"), // HD wallet extended public key for deposit address derivation

package/drizzle/migrations/0019_icon_url_column.sql

@@ -0,0 +1,4 @@
+-- Add icon_url column to payment_methods.
+-- Stores URL for chain/token icon displayed in checkout UI.
+
+ALTER TABLE "payment_methods" ADD COLUMN IF NOT EXISTS "icon_url" text;

package/drizzle/migrations/meta/_journal.json

@@ -134,6 +134,13 @@
       "when": 1743177600000,
       "tag": "0018_address_type_column",
       "breakpoints": true
+    },
+    {
+      "idx": 19,
+      "version": "7",
+      "when": 1743264000000,
+      "tag": "0019_icon_url_column",
+      "breakpoints": true
     }
   ]
 }

package/package.json

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

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

@@ -76,6 +76,7 @@ function mockDeps(): KeyServerDeps & {
         displayName: "Bitcoin",
         contractAddress: null,
         confirmations: 6,
+        iconUrl: null,
       },
       {
         id: "base-usdc",
@@ -85,6 +86,7 @@ function mockDeps(): KeyServerDeps & {
         displayName: "USDC on Base",
         contractAddress: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
         confirmations: 12,
+        iconUrl: null,
       },
     ]),
     listAll: vi.fn(),
@@ -100,12 +102,14 @@ function mockDeps(): KeyServerDeps & {
       oracleAddress: "0x64c911996D3c6aC71f9b455B1E8E7266BcbD848F",
       xpub: null,
       displayOrder: 0,
+      iconUrl: null,
       enabled: true,
       rpcUrl: null,
     }),
     listByType: vi.fn(),
     upsert: vi.fn().mockResolvedValue(undefined),
     setEnabled: vi.fn().mockResolvedValue(undefined),
+    patchMetadata: vi.fn().mockResolvedValue(true),
   };
   return {
     db: createMockDb() as never,

package/src/billing/crypto/charge-store.ts

@@ -67,7 +67,7 @@ export interface ICryptoChargeRepository {
   getByDepositAddress(address: string): Promise<CryptoChargeRecord | null>;
   getNextDerivationIndex(): Promise<number>;
   /** List deposit addresses with pending (uncredited) charges, grouped by chain. */
-  listActiveDepositAddresses(): Promise<{ chain: string; address: string }[]>;
+  listActiveDepositAddresses(): Promise<{ chain: string; address: string; token: string }[]>;
 }
 
 /**
@@ -255,14 +255,21 @@ export class DrizzleCryptoChargeRepository implements ICryptoChargeRepository {
   }
 
   /** List deposit addresses with pending (uncredited) charges. */
-  async listActiveDepositAddresses(): Promise<{ chain: string; address: string }[]> {
+  async listActiveDepositAddresses(): Promise<{ chain: string; address: string; token: string }[]> {
     const rows = await this.db
-      .select({ chain: cryptoCharges.chain, address: cryptoCharges.depositAddress })
+      .select({
+        chain: cryptoCharges.chain,
+        address: cryptoCharges.depositAddress,
+        token: cryptoCharges.token,
+      })
       .from(cryptoCharges)
       .where(
         and(isNull(cryptoCharges.creditedAt), isNotNull(cryptoCharges.depositAddress), isNotNull(cryptoCharges.chain)),
       );
-    return rows.filter((r): r is { chain: string; address: string } => r.chain !== null && r.address !== null);
+    return rows.filter(
+      (r): r is { chain: string; address: string; token: string } =>
+        r.chain !== null && r.address !== null && r.token !== null,
+    );
   }
 
   /** Get the next available HD derivation index (max + 1, or 0 if empty). */

package/src/billing/crypto/client.ts

@@ -51,6 +51,7 @@ export interface ChainInfo {
   displayName: string;
   contractAddress: string | null;
   confirmations: number;
+  iconUrl: string | null;
 }
 
 /**

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

@@ -31,6 +31,7 @@ describe("EthWatcher", () => {
       rpcCall: rpc,
       oracle: mockOracle,
       fromBlock: 10,
+      confirmations: 1,
       onPayment,
       watchedAddresses: ["0xDeposit"],
     });
@@ -61,6 +62,7 @@ describe("EthWatcher", () => {
       rpcCall: rpc,
       oracle: mockOracle,
       fromBlock: 10,
+      confirmations: 1,
       onPayment,
       watchedAddresses: ["0xDeposit"],
     });
@@ -83,6 +85,7 @@ describe("EthWatcher", () => {
       rpcCall: rpc,
       oracle: mockOracle,
       fromBlock: 10,
+      confirmations: 1,
       onPayment,
       watchedAddresses: ["0xDeposit"],
     });
@@ -118,6 +121,7 @@ describe("EthWatcher", () => {
       rpcCall: rpc,
       oracle: mockOracle,
       fromBlock: 10,
+      confirmations: 1,
       onPayment,
       watchedAddresses: ["0xDeposit"],
       cursorStore,
@@ -139,6 +143,7 @@ describe("EthWatcher", () => {
       rpcCall: rpc,
       oracle: mockOracle,
       fromBlock: 10,
+      confirmations: 1,
       onPayment,
       watchedAddresses: [],
     });
@@ -170,6 +175,7 @@ describe("EthWatcher", () => {
       rpcCall: rpc,
       oracle: mockOracle,
       fromBlock: 10,
+      confirmations: 1,
       onPayment,
       watchedAddresses: ["0xDeposit"],
       cursorStore,

package/src/billing/crypto/evm/__tests__/watcher-confirmations.test.ts

@@ -46,6 +46,9 @@ describe("EvmWatcher — intermediate confirmations", () => {
     const watcher = new EvmWatcher({
       chain: "base",
       token: "USDC",
+      contractAddress: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+      decimals: 6,
+      confirmations: 1,
       rpcCall: mockRpc,
       fromBlock: 100,
       watchedAddresses: [toAddr],
@@ -76,6 +79,9 @@ describe("EvmWatcher — intermediate confirmations", () => {
     const watcher = new EvmWatcher({
       chain: "base",
       token: "USDC",
+      contractAddress: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+      decimals: 6,
+      confirmations: 1,
       rpcCall: mockRpc,
       fromBlock: 100,
       watchedAddresses: [toAddr],
@@ -104,6 +110,9 @@ describe("EvmWatcher — intermediate confirmations", () => {
     const watcher = new EvmWatcher({
       chain: "base",
       token: "USDC",
+      contractAddress: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+      decimals: 6,
+      confirmations: 1,
       rpcCall: mockRpc,
       fromBlock: 100,
       watchedAddresses: [toAddr],
@@ -131,6 +140,9 @@ describe("EvmWatcher — intermediate confirmations", () => {
     const watcher = new EvmWatcher({
       chain: "base",
       token: "USDC",
+      contractAddress: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+      decimals: 6,
+      confirmations: 1,
       rpcCall: mockRpc,
       fromBlock: 100,
       watchedAddresses: [toAddr],
@@ -158,6 +170,9 @@ describe("EvmWatcher — intermediate confirmations", () => {
     const watcher = new EvmWatcher({
       chain: "base",
       token: "USDC",
+      contractAddress: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+      decimals: 6,
+      confirmations: 1,
       rpcCall: mockRpc,
       fromBlock: 100,
       watchedAddresses: [toAddr],

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

@@ -30,6 +30,9 @@ describe("EvmWatcher", () => {
     const watcher = new EvmWatcher({
       chain: "base",
       token: "USDC",
+      contractAddress: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+      decimals: 6,
+      confirmations: 1,
       rpcCall: mockRpc,
       fromBlock: 99,
       watchedAddresses: [toAddr],
@@ -54,6 +57,9 @@ describe("EvmWatcher", () => {
     const watcher = new EvmWatcher({
       chain: "base",
       token: "USDC",
+      contractAddress: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+      decimals: 6,
+      confirmations: 1,
       rpcCall: mockRpc,
       fromBlock: 100,
       watchedAddresses: ["0xdeadbeef"],
@@ -76,6 +82,9 @@ describe("EvmWatcher", () => {
     const watcher = new EvmWatcher({
       chain: "base",
       token: "USDC",
+      contractAddress: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+      decimals: 6,
+      confirmations: 1,
       rpcCall: mockRpc,
       fromBlock: 50,
       watchedAddresses: ["0xdeadbeef"],
@@ -100,6 +109,9 @@ describe("EvmWatcher", () => {
     const watcher = new EvmWatcher({
       chain: "base",
       token: "USDC",
+      contractAddress: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+      decimals: 6,
+      confirmations: 1,
       rpcCall: mockRpc,
       fromBlock: 100,
       watchedAddresses: [addr1, addr2],
@@ -121,6 +133,9 @@ describe("EvmWatcher", () => {
     const watcher = new EvmWatcher({
       chain: "base",
       token: "USDC",
+      contractAddress: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+      decimals: 6,
+      confirmations: 1,
       rpcCall: mockRpc,
       fromBlock: 100,
       watchedAddresses: ["0xdeadbeef"],
@@ -138,6 +153,9 @@ describe("EvmWatcher", () => {
     const watcher = new EvmWatcher({
       chain: "base",
       token: "USDC",
+      contractAddress: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+      decimals: 6,
+      confirmations: 1,
       rpcCall: mockRpc,
       fromBlock: 0,
       onPayment: vi.fn(),

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

@@ -1,7 +1,6 @@
 import type { IWatcherCursorStore } from "../cursor-store.js";
 import { nativeToCents } from "../oracle/convert.js";
 import type { IPriceOracle } from "../oracle/types.js";
-import { getChainConfig } from "./config.js";
 import type { EvmChain } from "./types.js";
 
 type RpcCall = (method: string, params: unknown[]) => Promise<unknown>;
@@ -31,6 +30,8 @@ export interface EthWatcherOpts {
   onPayment: (event: EthPaymentEvent) => void | Promise<void>;
   watchedAddresses?: string[];
   cursorStore?: IWatcherCursorStore;
+  /** Required confirmations (from DB). */
+  confirmations: number;
 }
 
 interface RpcTransaction {
@@ -69,7 +70,7 @@ export class EthWatcher {
     this.oracle = opts.oracle;
     this._cursor = opts.fromBlock;
     this.onPayment = opts.onPayment;
-    this.confirmations = getChainConfig(opts.chain).confirmations;
+    this.confirmations = opts.confirmations;
     this.cursorStore = opts.cursorStore;
     this.watcherId = `eth:${opts.chain}`;
     this._watchedAddresses = new Set((opts.watchedAddresses ?? []).map((a) => a.toLowerCase()));

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

@@ -1,5 +1,5 @@
 /** Supported EVM chains. */
-export type EvmChain = "base" | "ethereum" | "arbitrum" | "polygon";
+export type EvmChain = "base" | "ethereum" | "arbitrum" | "polygon" | (string & {});
 
 /** Supported stablecoin tokens. */
 export type StablecoinToken = "USDC" | "USDT" | "DAI";

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

@@ -1,5 +1,5 @@
 import type { IWatcherCursorStore } from "../cursor-store.js";
-import { centsFromTokenAmount, getChainConfig, getTokenConfig } from "./config.js";
+import { centsFromTokenAmount } from "./config.js";
 import type { EvmChain, EvmPaymentEvent, StablecoinToken } from "./types.js";
 
 const TRANSFER_TOPIC = "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef";
@@ -15,6 +15,12 @@ export interface EvmWatcherOpts {
   /** Active deposit addresses to watch. Filters eth_getLogs by topic[2] (to address). */
   watchedAddresses?: string[];
   cursorStore?: IWatcherCursorStore;
+  /** Contract address for the ERC20 token (from DB). */
+  contractAddress: string;
+  /** Token decimals (from DB). */
+  decimals: number;
+  /** Required confirmations (from DB). */
+  confirmations: number;
 }
 
 interface RpcLog {
@@ -49,11 +55,9 @@ export class EvmWatcher {
     this.watcherId = `evm:${opts.chain}:${opts.token}`;
     this._watchedAddresses = (opts.watchedAddresses ?? []).map((a) => a.toLowerCase());
 
-    const chainCfg = getChainConfig(opts.chain);
-    const tokenCfg = getTokenConfig(opts.token, opts.chain);
-    this.confirmations = chainCfg.confirmations;
-    this.contractAddress = tokenCfg.contractAddress.toLowerCase();
-    this.decimals = tokenCfg.decimals;
+    this.confirmations = opts.confirmations;
+    this.contractAddress = opts.contractAddress.toLowerCase();
+    this.decimals = opts.decimals;
   }
 
   /** Load cursor from DB. Call once at startup before first poll. */

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

@@ -266,6 +266,7 @@ export function createKeyServerApp(deps: KeyServerDeps): Hono {
         displayName: m.displayName,
         contractAddress: m.contractAddress,
         confirmations: m.confirmations,
+        iconUrl: m.iconUrl,
       })),
     );
   });
@@ -328,6 +329,8 @@ export function createKeyServerApp(deps: KeyServerDeps): Hono {
       display_name?: string;
       oracle_address?: string;
       address_type?: string;
+      icon_url?: string;
+      display_order?: number;
     }>();
 
     if (!body.id || !body.xpub || !body.token) {
@@ -362,7 +365,8 @@ export function createKeyServerApp(deps: KeyServerDeps): Hono {
       decimals: body.decimals,
       displayName: body.display_name ?? `${body.token} on ${body.network}`,
       enabled: true,
-      displayOrder: 0,
+      displayOrder: body.display_order ?? 0,
+      iconUrl: body.icon_url ?? null,
       rpcUrl: body.rpc_url,
       oracleAddress: body.oracle_address ?? null,
       xpub: body.xpub,
@@ -373,6 +377,25 @@ export function createKeyServerApp(deps: KeyServerDeps): Hono {
     return c.json({ id: body.id, path: `m/44'/${body.coin_type}'/${body.account_index}'` }, 201);
   });
 
+  /** PATCH /admin/chains/:id — update metadata (icon_url, display_order, display_name) */
+  app.patch("/admin/chains/:id", async (c) => {
+    const id = c.req.param("id");
+    const body = await c.req.json<{
+      icon_url?: string | null;
+      display_order?: number;
+      display_name?: string;
+    }>();
+
+    const updated = await deps.methodStore.patchMetadata(id, {
+      iconUrl: body.icon_url,
+      displayOrder: body.display_order,
+      displayName: body.display_name,
+    });
+
+    if (!updated) return c.json({ id, updated: false }, 200);
+    return c.json({ id, updated: true });
+  });
+
   /** DELETE /admin/chains/:id — soft disable */
   app.delete("/admin/chains/:id", async (c) => {
     await deps.methodStore.setEnabled(c.req.param("id"), false);

package/src/billing/crypto/payment-method-store.ts

@@ -12,6 +12,7 @@ export interface PaymentMethodRecord {
   displayName: string;
   enabled: boolean;
   displayOrder: number;
+  iconUrl: string | null;
   rpcUrl: string | null;
   oracleAddress: string | null;
   xpub: string | null;
@@ -32,6 +33,11 @@ export interface IPaymentMethodStore {
   upsert(method: PaymentMethodRecord): Promise<void>;
   /** Enable or disable a payment method (admin). */
   setEnabled(id: string, enabled: boolean): Promise<void>;
+  /** Partial update of metadata fields (no read-modify-write needed). */
+  patchMetadata(
+    id: string,
+    patch: { iconUrl?: string | null; displayOrder?: number; displayName?: string },
+  ): Promise<boolean>;
 }
 
 export class DrizzlePaymentMethodStore implements IPaymentMethodStore {
@@ -78,6 +84,7 @@ export class DrizzlePaymentMethodStore implements IPaymentMethodStore {
         displayName: method.displayName,
         enabled: method.enabled,
         displayOrder: method.displayOrder,
+        iconUrl: method.iconUrl,
         rpcUrl: method.rpcUrl,
         oracleAddress: method.oracleAddress,
         xpub: method.xpub,
@@ -95,6 +102,7 @@ export class DrizzlePaymentMethodStore implements IPaymentMethodStore {
           displayName: method.displayName,
           enabled: method.enabled,
           displayOrder: method.displayOrder,
+          iconUrl: method.iconUrl,
           rpcUrl: method.rpcUrl,
           oracleAddress: method.oracleAddress,
           xpub: method.xpub,
@@ -107,6 +115,21 @@ export class DrizzlePaymentMethodStore implements IPaymentMethodStore {
   async setEnabled(id: string, enabled: boolean): Promise<void> {
     await this.db.update(paymentMethods).set({ enabled }).where(eq(paymentMethods.id, id));
   }
+
+  async patchMetadata(
+    id: string,
+    patch: { iconUrl?: string | null; displayOrder?: number; displayName?: string },
+  ): Promise<boolean> {
+    const set: Record<string, unknown> = {};
+    if (patch.iconUrl !== undefined) set.iconUrl = patch.iconUrl;
+    if (patch.displayOrder !== undefined) set.displayOrder = patch.displayOrder;
+    if (patch.displayName !== undefined) set.displayName = patch.displayName;
+    if (Object.keys(set).length === 0) return false;
+    const result = (await this.db.update(paymentMethods).set(set).where(eq(paymentMethods.id, id))) as {
+      rowCount: number;
+    };
+    return result.rowCount > 0;
+  }
 }
 
 function toRecord(row: typeof paymentMethods.$inferSelect): PaymentMethodRecord {
@@ -120,6 +143,7 @@ function toRecord(row: typeof paymentMethods.$inferSelect): PaymentMethodRecord
     displayName: row.displayName,
     enabled: row.enabled,
     displayOrder: row.displayOrder,
+    iconUrl: row.iconUrl,
     rpcUrl: row.rpcUrl,
     oracleAddress: row.oracleAddress,
     xpub: row.xpub,

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

@@ -19,6 +19,8 @@ import type { BtcPaymentEvent } from "./btc/types.js";
 import { BtcWatcher, createBitcoindRpc } from "./btc/watcher.js";
 import type { ICryptoChargeRepository } from "./charge-store.js";
 import type { IWatcherCursorStore } from "./cursor-store.js";
+import type { EthPaymentEvent } from "./evm/eth-watcher.js";
+import { EthWatcher } from "./evm/eth-watcher.js";
 import type { EvmChain, EvmPaymentEvent, StablecoinToken } from "./evm/types.js";
 import { createRpcCaller, EvmWatcher } from "./evm/watcher.js";
 import type { IPriceOracle } from "./oracle/types.js";
@@ -349,8 +351,85 @@ export async function startWatchers(opts: WatcherServiceOpts): Promise<() => voi
     );
   }
 
-  // --- EVM Watchers ---
-  for (const method of evmMethods) {
+  // --- Native ETH Watchers (block-scanning for value transfers) ---
+  const nativeEvmMethods = evmMethods.filter((m) => m.type === "native");
+  const erc20Methods = evmMethods.filter((m) => m.type === "erc20" && m.contractAddress);
+
+  const BACKFILL_BLOCKS = 1000; // Scan ~30min of blocks on first deploy to catch missed deposits
+
+  for (const method of nativeEvmMethods) {
+    if (!method.rpcUrl) continue;
+
+    const rpcCall = createRpcCaller(method.rpcUrl);
+    const latestHex = (await rpcCall("eth_blockNumber", [])) as string;
+    const latestBlock = Number.parseInt(latestHex, 16);
+    const backfillStart = Math.max(0, latestBlock - BACKFILL_BLOCKS);
+
+    const activeAddresses = await chargeStore.listActiveDepositAddresses();
+    // Only watch addresses for native charges on this chain (not ERC20 charges)
+    const chainAddresses = activeAddresses
+      .filter((a) => a.chain === method.chain && a.token === method.token)
+      .map((a) => a.address);
+
+    const watcher = new EthWatcher({
+      chain: method.chain as EvmChain,
+      rpcCall,
+      oracle,
+      fromBlock: backfillStart,
+      watchedAddresses: chainAddresses,
+      cursorStore,
+      confirmations: method.confirmations,
+      onPayment: async (event: EthPaymentEvent) => {
+        log("ETH payment", {
+          chain: event.chain,
+          to: event.to,
+          txHash: event.txHash,
+          valueWei: event.valueWei,
+          confirmations: event.confirmations,
+          confirmationsRequired: event.confirmationsRequired,
+        });
+        await handlePayment(
+          db,
+          chargeStore,
+          event.to,
+          event.valueWei,
+          {
+            txHash: event.txHash,
+            confirmations: event.confirmations,
+            confirmationsRequired: event.confirmationsRequired,
+            amountReceivedCents: event.amountUsdCents,
+          },
+          log,
+        );
+      },
+    });
+
+    await watcher.init();
+    log(`ETH watcher started (${method.chain}:${method.token})`, { addresses: chainAddresses.length });
+
+    let ethPolling = false;
+    timers.push(
+      setInterval(async () => {
+        if (ethPolling) return;
+        ethPolling = true;
+        try {
+          const fresh = await chargeStore.listActiveDepositAddresses();
+          const freshNative = fresh
+            .filter((a) => a.chain === method.chain && a.token === method.token)
+            .map((a) => a.address);
+          watcher.setWatchedAddresses(freshNative);
+          await watcher.poll();
+        } catch (err) {
+          log("ETH poll error", { chain: method.chain, error: String(err) });
+        } finally {
+          ethPolling = false;
+        }
+      }, pollMs),
+    );
+  }
+
+  // --- ERC20 Watchers (log-based Transfer event scanning) ---
+  for (const method of erc20Methods) {
     if (!method.rpcUrl || !method.contractAddress) continue;
 
     const rpcCall = createRpcCaller(method.rpcUrl);
@@ -366,6 +445,9 @@ export async function startWatchers(opts: WatcherServiceOpts): Promise<() => voi
       rpcCall,
       fromBlock: latestBlock,
       watchedAddresses: chainAddresses,
+      contractAddress: method.contractAddress,
+      decimals: method.decimals,
+      confirmations: method.confirmations,
       cursorStore,
       onPayment: async (event: EvmPaymentEvent) => {
         log("EVM payment", {
@@ -398,7 +480,7 @@ export async function startWatchers(opts: WatcherServiceOpts): Promise<() => voi
     let evmPolling = false;
     timers.push(
       setInterval(async () => {
-        if (evmPolling) return; // Prevent overlapping polls
+        if (evmPolling) return;
         evmPolling = true;
         try {
           const fresh = await chargeStore.listActiveDepositAddresses();
@@ -426,7 +508,13 @@ export async function startWatchers(opts: WatcherServiceOpts): Promise<() => voi
     }, deliveryMs),
   );
 
-  log("All watchers started", { utxo: utxoMethods.length, evm: evmMethods.length, pollMs, deliveryMs });
+  log("All watchers started", {
+    utxo: utxoMethods.length,
+    evm: erc20Methods.length,
+    eth: nativeEvmMethods.length,
+    pollMs,
+    deliveryMs,
+  });
 
   return () => {
     for (const t of timers) clearInterval(t);

package/src/db/schema/crypto.ts

@@ -78,6 +78,7 @@ export const paymentMethods = pgTable("payment_methods", {
   displayName: text("display_name").notNull(),
   enabled: boolean("enabled").notNull().default(true),
   displayOrder: integer("display_order").notNull().default(0),
+  iconUrl: text("icon_url"),
   rpcUrl: text("rpc_url"), // chain node RPC endpoint
   oracleAddress: text("oracle_address"), // Chainlink feed address for price (null = 1:1 stablecoin)
   xpub: text("xpub"), // HD wallet extended public key for deposit address derivation