@wopr-network/platform-core 1.63.0 → 1.63.2

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

@@ -13,6 +13,7 @@ function createMockDb() {
         addressType: "bech32",
         encodingParams: '{"hrp":"bc"}',
         watcherType: "utxo",
+        oracleAssetId: "bitcoin",
         confirmations: 6,
     };
     const db = {
@@ -182,6 +183,7 @@ describe("key-server routes", () => {
             addressType: "evm",
             encodingParams: "{}",
             watcherType: "evm",
+            oracleAssetId: "ethereum",
             confirmations: 1,
         };
         const db = {
@@ -242,6 +244,7 @@ describe("key-server routes", () => {
             addressType: "evm",
             encodingParams: "{}",
             watcherType: "evm",
+            oracleAssetId: "ethereum",
             confirmations: 1,
         };
         const db = {

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

@@ -47,5 +47,5 @@ export declare class EvmWatcher {
     poll(): Promise<void>;
 }
 /** Create an RPC caller for a given URL (plain JSON-RPC over fetch). */
-export declare function createRpcCaller(rpcUrl: string): RpcCall;
+export declare function createRpcCaller(rpcUrl: string, extraHeaders?: Record<string, string>): RpcCall;
 export {};

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

@@ -133,12 +133,23 @@ export class EvmWatcher {
     }
 }
 /** Create an RPC caller for a given URL (plain JSON-RPC over fetch). */
-export function createRpcCaller(rpcUrl) {
+export function createRpcCaller(rpcUrl, extraHeaders) {
     let id = 0;
+    // Extract apikey query param and pass as TRON-PRO-API-KEY header (TronGrid JSON-RPC ignores query params)
+    const headers = { "Content-Type": "application/json", ...extraHeaders };
+    try {
+        const url = new URL(rpcUrl);
+        const apiKey = url.searchParams.get("apikey");
+        if (apiKey)
+            headers["TRON-PRO-API-KEY"] = apiKey;
+    }
+    catch {
+        // Not a valid URL — proceed without extra headers
+    }
     return async (method, params) => {
         const res = await fetch(rpcUrl, {
             method: "POST",
-            headers: { "Content-Type": "application/json" },
+            headers,
             body: JSON.stringify({ jsonrpc: "2.0", id: ++id, method, params }),
         });
         if (!res.ok)

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

@@ -48,7 +48,14 @@ async function main() {
     const chainlink = BASE_RPC_URL
         ? new ChainlinkOracle({ rpcCall: createRpcCaller(BASE_RPC_URL) })
         : new FixedPriceOracle();
-    const coingecko = new CoinGeckoOracle();
+    // Build token→CoinGecko ID map from DB (zero-deploy chain additions)
+    const allMethods = await methodStore.listAll();
+    const dbTokenIds = {};
+    for (const m of allMethods) {
+        if (m.oracleAssetId)
+            dbTokenIds[m.token] = m.oracleAssetId;
+    }
+    const coingecko = new CoinGeckoOracle({ tokenIds: dbTokenIds });
     const oracle = new CompositeOracle(chainlink, coingecko);
     const app = createKeyServerApp({
         db,

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

@@ -257,19 +257,6 @@ export function createKeyServerApp(deps) {
         if (!body.id || !body.xpub || !body.token) {
             return c.json({ error: "id, xpub, and token are required" }, 400);
         }
-        // Record the path allocation (idempotent — ignore if already exists)
-        const inserted = (await deps.db
-            .insert(pathAllocations)
-            .values({
-            coinType: body.coin_type,
-            accountIndex: body.account_index,
-            chainId: body.id,
-            xpub: body.xpub,
-        })
-            .onConflictDoNothing());
-        if (inserted.rowCount === 0) {
-            return c.json({ error: "Path allocation already exists", path: `m/44'/${body.coin_type}'/${body.account_index}'` }, 409);
-        }
         // Validate encoding_params match address_type requirements
         const addrType = body.address_type ?? "evm";
         const encParams = body.encoding_params ?? {};
@@ -279,7 +266,7 @@ export function createKeyServerApp(deps) {
         if (addrType === "p2pkh" && !encParams.version) {
             return c.json({ error: "p2pkh address_type requires encoding_params.version" }, 400);
         }
-        // Upsert the payment method
+        // Upsert payment method FIRST (path_allocations has FK to payment_methods.id)
         await deps.methodStore.upsert({
             id: body.id,
             type: body.type ?? "native",
@@ -297,8 +284,25 @@ export function createKeyServerApp(deps) {
             addressType: body.address_type ?? "evm",
             encodingParams: JSON.stringify(body.encoding_params ?? {}),
             watcherType: body.watcher_type ?? "evm",
+            oracleAssetId: body.oracle_asset_id ?? null,
             confirmations: body.confirmations ?? 6,
         });
+        // Record the path allocation (idempotent — ignore if already exists)
+        const inserted = (await deps.db
+            .insert(pathAllocations)
+            .values({
+            coinType: body.coin_type,
+            accountIndex: body.account_index,
+            chainId: body.id,
+            xpub: body.xpub,
+        })
+            .onConflictDoNothing());
+        if (inserted.rowCount === 0) {
+            return c.json({
+                message: "Path allocation already exists, payment method updated",
+                path: `m/44'/${body.coin_type}'/${body.account_index}'`,
+            }, 200);
+        }
         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) */

package/dist/billing/crypto/oracle/coingecko.js

@@ -13,6 +13,9 @@ const COINGECKO_IDS = {
     UNI: "uniswap",
     AERO: "aerodrome-finance",
     TRX: "tron",
+    BNB: "binancecoin",
+    POL: "matic-network",
+    AVAX: "avalanche-2",
 };
 /** Default cache TTL: 60 seconds. CoinGecko free tier allows 10-30 req/min. */
 const DEFAULT_CACHE_TTL_MS = 60_000;

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

@@ -16,6 +16,7 @@ export interface PaymentMethodRecord {
     addressType: string;
     encodingParams: string;
     watcherType: string;
+    oracleAssetId: string | null;
     confirmations: number;
 }
 export interface IPaymentMethodStore {

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

@@ -49,6 +49,7 @@ export class DrizzlePaymentMethodStore {
             addressType: method.addressType,
             encodingParams: method.encodingParams,
             watcherType: method.watcherType,
+            oracleAssetId: method.oracleAssetId,
             confirmations: method.confirmations,
         })
             .onConflictDoUpdate({
@@ -69,6 +70,7 @@ export class DrizzlePaymentMethodStore {
                 addressType: method.addressType,
                 encodingParams: method.encodingParams,
                 watcherType: method.watcherType,
+                oracleAssetId: method.oracleAssetId,
                 confirmations: method.confirmations,
             },
         });
@@ -108,6 +110,7 @@ function toRecord(row) {
         addressType: row.addressType,
         encodingParams: row.encodingParams,
         watcherType: row.watcherType,
+        oracleAssetId: row.oracleAssetId,
         confirmations: row.confirmations,
     };
 }

package/dist/billing/crypto/tron/address-convert.js

@@ -8,6 +8,13 @@
 import { sha256 } from "@noble/hashes/sha2.js";
 const BASE58_ALPHABET = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
 function base58decode(s) {
+    // Count leading '1' characters (each represents a 0x00 byte)
+    let leadingZeros = 0;
+    for (const ch of s) {
+        if (ch !== "1")
+            break;
+        leadingZeros++;
+    }
     let num = 0n;
     for (const ch of s) {
         const idx = BASE58_ALPHABET.indexOf(ch);
@@ -15,11 +22,14 @@ function base58decode(s) {
             throw new Error(`Invalid base58 character: ${ch}`);
         num = num * 58n + BigInt(idx);
     }
-    const hex = num.toString(16).padStart(50, "0"); // 25 bytes = 50 hex chars
-    const bytes = new Uint8Array(25);
-    for (let i = 0; i < 25; i++)
-        bytes[i] = Number.parseInt(hex.slice(i * 2, i * 2 + 2), 16);
-    return bytes;
+    const hex = num.toString(16).padStart(2, "0");
+    const dataBytes = new Uint8Array(hex.length / 2);
+    for (let i = 0; i < dataBytes.length; i++)
+        dataBytes[i] = Number.parseInt(hex.slice(i * 2, i * 2 + 2), 16);
+    // Prepend leading zero bytes
+    const result = new Uint8Array(leadingZeros + dataBytes.length);
+    result.set(dataBytes, leadingZeros);
+    return result;
 }
 /**
  * Convert a Tron T... address to 0x hex (20 bytes, no 0x41 prefix).

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

@@ -274,12 +274,12 @@ export async function startWatchers(opts) {
     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
-    // Address conversion helpers for chains with non-EVM address formats (e.g. Tron T...).
-    // The EVM watcher uses 0x hex addresses; the DB stores native format (T... for Tron).
-    // Determined by addressType from the DB — not by inspecting addresses at runtime.
-    const needsAddrConvert = (method) => method.addressType === "p2pkh";
-    const toWatcherAddr = (addr, method) => needsAddrConvert(method) && isTronAddress(addr) ? tronToHex(addr) : addr;
-    const fromWatcherAddr = (addr, method) => needsAddrConvert(method) ? hexToTron(addr) : addr;
+    // Address conversion for EVM-watched chains with non-0x address formats (Tron T...).
+    // Only applies to chains routed through the EVM watcher but storing non-hex addresses.
+    // UTXO chains (DOGE p2pkh) never enter this path — they use the UTXO watcher.
+    const isTronMethod = (method) => method.addressType === "p2pkh" && method.chain === "tron";
+    const toWatcherAddr = (addr, method) => isTronMethod(method) && isTronAddress(addr) ? tronToHex(addr) : addr;
+    const fromWatcherAddr = (addr, method) => isTronMethod(method) ? hexToTron(addr) : addr;
     for (const method of nativeEvmMethods) {
         if (!method.rpcUrl)
             continue;

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

@@ -716,6 +716,23 @@ export declare const paymentMethods: import("drizzle-orm/pg-core").PgTableWithCo
             identity: undefined;
             generated: undefined;
         }, {}, {}>;
+        oracleAssetId: import("drizzle-orm/pg-core").PgColumn<{
+            name: "oracle_asset_id";
+            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;
+        }, {}, {}>;
         confirmations: import("drizzle-orm/pg-core").PgColumn<{
             name: "confirmations";
             tableName: "payment_methods";

package/dist/db/schema/crypto.js

@@ -75,9 +75,10 @@ export const paymentMethods = pgTable("payment_methods", {
     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
-    addressType: text("address_type").notNull().default("evm"), // "bech32" (BTC/LTC), "p2pkh" (DOGE), "evm" (ETH/ERC20)
+    addressType: text("address_type").notNull().default("evm"), // "bech32" (BTC/LTC), "p2pkh" (DOGE/TRX), "evm" (ETH/ERC20)
     encodingParams: text("encoding_params").notNull().default("{}"), // JSON: {"hrp":"bc"}, {"version":"0x1e"}, etc.
     watcherType: text("watcher_type").notNull().default("evm"), // "utxo" (BTC/LTC/DOGE) or "evm" (ETH/ERC20/TRX)
+    oracleAssetId: text("oracle_asset_id"), // CoinGecko slug (e.g. "bitcoin", "tron"). Null = stablecoin (1:1 USD) or use token symbol fallback.
     confirmations: integer("confirmations").notNull().default(1),
     nextIndex: integer("next_index").notNull().default(0), // atomic derivation counter, never reuses
     createdAt: text("created_at").notNull().default(sql `(now())`),

package/drizzle/migrations/0022_oracle_asset_id_column.sql

@@ -0,0 +1,23 @@
+ALTER TABLE "payment_methods" ADD COLUMN "oracle_asset_id" text;
+--> statement-breakpoint
+UPDATE "payment_methods" SET "oracle_asset_id" = 'bitcoin' WHERE "token" = 'BTC';
+--> statement-breakpoint
+UPDATE "payment_methods" SET "oracle_asset_id" = 'ethereum' WHERE "token" = 'ETH';
+--> statement-breakpoint
+UPDATE "payment_methods" SET "oracle_asset_id" = 'dogecoin' WHERE "token" = 'DOGE';
+--> statement-breakpoint
+UPDATE "payment_methods" SET "oracle_asset_id" = 'litecoin' WHERE "token" = 'LTC';
+--> statement-breakpoint
+UPDATE "payment_methods" SET "oracle_asset_id" = 'tron' WHERE "token" = 'TRX';
+--> statement-breakpoint
+UPDATE "payment_methods" SET "oracle_asset_id" = 'binancecoin' WHERE "token" = 'BNB';
+--> statement-breakpoint
+UPDATE "payment_methods" SET "oracle_asset_id" = 'matic-network' WHERE "token" = 'POL';
+--> statement-breakpoint
+UPDATE "payment_methods" SET "oracle_asset_id" = 'avalanche-2' WHERE "token" = 'AVAX';
+--> statement-breakpoint
+UPDATE "payment_methods" SET "oracle_asset_id" = 'chainlink' WHERE "token" = 'LINK';
+--> statement-breakpoint
+UPDATE "payment_methods" SET "oracle_asset_id" = 'uniswap' WHERE "token" = 'UNI';
+--> statement-breakpoint
+UPDATE "payment_methods" SET "oracle_asset_id" = 'aerodrome-finance' WHERE "token" = 'AERO';

package/package.json

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

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

@@ -17,6 +17,7 @@ function createMockDb() {
     addressType: "bech32",
     encodingParams: '{"hrp":"bc"}',
     watcherType: "utxo",
+    oracleAssetId: "bitcoin",
     confirmations: 6,
   };
 
@@ -199,6 +200,7 @@ describe("key-server routes", () => {
       addressType: "evm",
       encodingParams: "{}",
       watcherType: "evm",
+      oracleAssetId: "ethereum",
       confirmations: 1,
     };
 
@@ -264,6 +266,7 @@ describe("key-server routes", () => {
       addressType: "evm",
       encodingParams: "{}",
       watcherType: "evm",
+      oracleAssetId: "ethereum",
       confirmations: 1,
     };
 

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

@@ -180,12 +180,21 @@ export class EvmWatcher {
 }
 
 /** Create an RPC caller for a given URL (plain JSON-RPC over fetch). */
-export function createRpcCaller(rpcUrl: string): RpcCall {
+export function createRpcCaller(rpcUrl: string, extraHeaders?: Record<string, string>): RpcCall {
   let id = 0;
+  // Extract apikey query param and pass as TRON-PRO-API-KEY header (TronGrid JSON-RPC ignores query params)
+  const headers: Record<string, string> = { "Content-Type": "application/json", ...extraHeaders };
+  try {
+    const url = new URL(rpcUrl);
+    const apiKey = url.searchParams.get("apikey");
+    if (apiKey) headers["TRON-PRO-API-KEY"] = apiKey;
+  } catch {
+    // Not a valid URL — proceed without extra headers
+  }
   return async (method: string, params: unknown[]): Promise<unknown> => {
     const res = await fetch(rpcUrl, {
       method: "POST",
-      headers: { "Content-Type": "application/json" },
+      headers,
       body: JSON.stringify({ jsonrpc: "2.0", id: ++id, method, params }),
     });
     if (!res.ok) throw new Error(`RPC ${method} failed: ${res.status}`);

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

@@ -55,7 +55,13 @@ async function main(): Promise<void> {
   const chainlink = BASE_RPC_URL
     ? new ChainlinkOracle({ rpcCall: createRpcCaller(BASE_RPC_URL) })
     : new FixedPriceOracle();
-  const coingecko = new CoinGeckoOracle();
+  // Build token→CoinGecko ID map from DB (zero-deploy chain additions)
+  const allMethods = await methodStore.listAll();
+  const dbTokenIds: Record<string, string> = {};
+  for (const m of allMethods) {
+    if (m.oracleAssetId) dbTokenIds[m.token] = m.oracleAssetId;
+  }
+  const coingecko = new CoinGeckoOracle({ tokenIds: dbTokenIds });
   const oracle = new CompositeOracle(chainlink, coingecko);
 
   const app = createKeyServerApp({

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

@@ -323,6 +323,7 @@ export function createKeyServerApp(deps: KeyServerDeps): Hono {
       address_type?: string;
       encoding_params?: Record<string, string>;
       watcher_type?: string;
+      oracle_asset_id?: string;
       icon_url?: string;
       display_order?: number;
     }>();
@@ -331,24 +332,6 @@ export function createKeyServerApp(deps: KeyServerDeps): Hono {
       return c.json({ error: "id, xpub, and token are required" }, 400);
     }
 
-    // Record the path allocation (idempotent — ignore if already exists)
-    const inserted = (await deps.db
-      .insert(pathAllocations)
-      .values({
-        coinType: body.coin_type,
-        accountIndex: body.account_index,
-        chainId: body.id,
-        xpub: body.xpub,
-      })
-      .onConflictDoNothing()) as { rowCount: number };
-
-    if (inserted.rowCount === 0) {
-      return c.json(
-        { error: "Path allocation already exists", path: `m/44'/${body.coin_type}'/${body.account_index}'` },
-        409,
-      );
-    }
-
     // Validate encoding_params match address_type requirements
     const addrType = body.address_type ?? "evm";
     const encParams = body.encoding_params ?? {};
@@ -359,7 +342,7 @@ export function createKeyServerApp(deps: KeyServerDeps): Hono {
       return c.json({ error: "p2pkh address_type requires encoding_params.version" }, 400);
     }
 
-    // Upsert the payment method
+    // Upsert payment method FIRST (path_allocations has FK to payment_methods.id)
     await deps.methodStore.upsert({
       id: body.id,
       type: body.type ?? "native",
@@ -377,9 +360,31 @@ export function createKeyServerApp(deps: KeyServerDeps): Hono {
       addressType: body.address_type ?? "evm",
       encodingParams: JSON.stringify(body.encoding_params ?? {}),
       watcherType: body.watcher_type ?? "evm",
+      oracleAssetId: body.oracle_asset_id ?? null,
       confirmations: body.confirmations ?? 6,
     });
 
+    // Record the path allocation (idempotent — ignore if already exists)
+    const inserted = (await deps.db
+      .insert(pathAllocations)
+      .values({
+        coinType: body.coin_type,
+        accountIndex: body.account_index,
+        chainId: body.id,
+        xpub: body.xpub,
+      })
+      .onConflictDoNothing()) as { rowCount: number };
+
+    if (inserted.rowCount === 0) {
+      return c.json(
+        {
+          message: "Path allocation already exists, payment method updated",
+          path: `m/44'/${body.coin_type}'/${body.account_index}'`,
+        },
+        200,
+      );
+    }
+
     return c.json({ id: body.id, path: `m/44'/${body.coin_type}'/${body.account_index}'` }, 201);
   });
 

package/src/billing/crypto/oracle/coingecko.ts

@@ -15,6 +15,9 @@ const COINGECKO_IDS: Record<string, string> = {
   UNI: "uniswap",
   AERO: "aerodrome-finance",
   TRX: "tron",
+  BNB: "binancecoin",
+  POL: "matic-network",
+  AVAX: "avalanche-2",
 };
 
 /** Default cache TTL: 60 seconds. CoinGecko free tier allows 10-30 req/min. */

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

@@ -19,6 +19,7 @@ export interface PaymentMethodRecord {
   addressType: string;
   encodingParams: string;
   watcherType: string;
+  oracleAssetId: string | null;
   confirmations: number;
 }
 
@@ -93,6 +94,7 @@ export class DrizzlePaymentMethodStore implements IPaymentMethodStore {
         addressType: method.addressType,
         encodingParams: method.encodingParams,
         watcherType: method.watcherType,
+        oracleAssetId: method.oracleAssetId,
         confirmations: method.confirmations,
       })
       .onConflictDoUpdate({
@@ -113,6 +115,7 @@ export class DrizzlePaymentMethodStore implements IPaymentMethodStore {
           addressType: method.addressType,
           encodingParams: method.encodingParams,
           watcherType: method.watcherType,
+          oracleAssetId: method.oracleAssetId,
           confirmations: method.confirmations,
         },
       });
@@ -156,6 +159,7 @@ function toRecord(row: typeof paymentMethods.$inferSelect): PaymentMethodRecord
     addressType: row.addressType,
     encodingParams: row.encodingParams,
     watcherType: row.watcherType,
+    oracleAssetId: row.oracleAssetId,
     confirmations: row.confirmations,
   };
 }

package/src/billing/crypto/tron/address-convert.ts

@@ -10,16 +10,25 @@ import { sha256 } from "@noble/hashes/sha2.js";
 const BASE58_ALPHABET = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
 
 function base58decode(s: string): Uint8Array {
+  // Count leading '1' characters (each represents a 0x00 byte)
+  let leadingZeros = 0;
+  for (const ch of s) {
+    if (ch !== "1") break;
+    leadingZeros++;
+  }
   let num = 0n;
   for (const ch of s) {
     const idx = BASE58_ALPHABET.indexOf(ch);
     if (idx < 0) throw new Error(`Invalid base58 character: ${ch}`);
     num = num * 58n + BigInt(idx);
   }
-  const hex = num.toString(16).padStart(50, "0"); // 25 bytes = 50 hex chars
-  const bytes = new Uint8Array(25);
-  for (let i = 0; i < 25; i++) bytes[i] = Number.parseInt(hex.slice(i * 2, i * 2 + 2), 16);
-  return bytes;
+  const hex = num.toString(16).padStart(2, "0");
+  const dataBytes = new Uint8Array(hex.length / 2);
+  for (let i = 0; i < dataBytes.length; i++) dataBytes[i] = Number.parseInt(hex.slice(i * 2, i * 2 + 2), 16);
+  // Prepend leading zero bytes
+  const result = new Uint8Array(leadingZeros + dataBytes.length);
+  result.set(dataBytes, leadingZeros);
+  return result;
 }
 
 /**

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

@@ -360,14 +360,15 @@ export async function startWatchers(opts: WatcherServiceOpts): Promise<() => voi
 
   const BACKFILL_BLOCKS = 1000; // Scan ~30min of blocks on first deploy to catch missed deposits
 
-  // Address conversion helpers for chains with non-EVM address formats (e.g. Tron T...).
-  // The EVM watcher uses 0x hex addresses; the DB stores native format (T... for Tron).
-  // Determined by addressType from the DB — not by inspecting addresses at runtime.
-  const needsAddrConvert = (method: { addressType: string }): boolean => method.addressType === "p2pkh";
-  const toWatcherAddr = (addr: string, method: { addressType: string }): string =>
-    needsAddrConvert(method) && isTronAddress(addr) ? tronToHex(addr) : addr;
-  const fromWatcherAddr = (addr: string, method: { addressType: string }): string =>
-    needsAddrConvert(method) ? hexToTron(addr) : addr;
+  // Address conversion for EVM-watched chains with non-0x address formats (Tron T...).
+  // Only applies to chains routed through the EVM watcher but storing non-hex addresses.
+  // UTXO chains (DOGE p2pkh) never enter this path — they use the UTXO watcher.
+  const isTronMethod = (method: { addressType: string; chain: string }): boolean =>
+    method.addressType === "p2pkh" && method.chain === "tron";
+  const toWatcherAddr = (addr: string, method: { addressType: string; chain: string }): string =>
+    isTronMethod(method) && isTronAddress(addr) ? tronToHex(addr) : addr;
+  const fromWatcherAddr = (addr: string, method: { addressType: string; chain: string }): string =>
+    isTronMethod(method) ? hexToTron(addr) : addr;
 
   for (const method of nativeEvmMethods) {
     if (!method.rpcUrl) continue;

package/src/db/schema/crypto.ts

@@ -82,9 +82,10 @@ export const paymentMethods = pgTable("payment_methods", {
   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
-  addressType: text("address_type").notNull().default("evm"), // "bech32" (BTC/LTC), "p2pkh" (DOGE), "evm" (ETH/ERC20)
+  addressType: text("address_type").notNull().default("evm"), // "bech32" (BTC/LTC), "p2pkh" (DOGE/TRX), "evm" (ETH/ERC20)
   encodingParams: text("encoding_params").notNull().default("{}"), // JSON: {"hrp":"bc"}, {"version":"0x1e"}, etc.
   watcherType: text("watcher_type").notNull().default("evm"), // "utxo" (BTC/LTC/DOGE) or "evm" (ETH/ERC20/TRX)
+  oracleAssetId: text("oracle_asset_id"), // CoinGecko slug (e.g. "bitcoin", "tron"). Null = stablecoin (1:1 USD) or use token symbol fallback.
   confirmations: integer("confirmations").notNull().default(1),
   nextIndex: integer("next_index").notNull().default(0), // atomic derivation counter, never reuses
   createdAt: text("created_at").notNull().default(sql`(now())`),