@wopr-network/platform-core 1.63.1 → 1.64.0

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

@@ -44,11 +44,13 @@ export class DrizzlePaymentMethodStore {
             displayOrder: method.displayOrder,
             iconUrl: method.iconUrl,
             rpcUrl: method.rpcUrl,
+            rpcHeaders: method.rpcHeaders ?? "{}",
             oracleAddress: method.oracleAddress,
             xpub: method.xpub,
             addressType: method.addressType,
             encodingParams: method.encodingParams,
             watcherType: method.watcherType,
+            oracleAssetId: method.oracleAssetId,
             confirmations: method.confirmations,
         })
             .onConflictDoUpdate({
@@ -69,6 +71,7 @@ export class DrizzlePaymentMethodStore {
                 addressType: method.addressType,
                 encodingParams: method.encodingParams,
                 watcherType: method.watcherType,
+                oracleAssetId: method.oracleAssetId,
                 confirmations: method.confirmations,
             },
         });
@@ -103,11 +106,13 @@ function toRecord(row) {
         displayOrder: row.displayOrder,
         iconUrl: row.iconUrl,
         rpcUrl: row.rpcUrl,
+        rpcHeaders: row.rpcHeaders ?? "{}",
         oracleAddress: row.oracleAddress,
         xpub: row.xpub,
         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,16 +274,16 @@ 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.addressType === "keccak-b58check") && 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;
-        const rpcCall = createRpcCaller(method.rpcUrl);
+        const rpcCall = createRpcCaller(method.rpcUrl, JSON.parse(method.rpcHeaders ?? "{}"));
         let latestBlock;
         try {
             const latestHex = (await rpcCall("eth_blockNumber", []));
@@ -352,7 +352,7 @@ export async function startWatchers(opts) {
     for (const method of erc20Methods) {
         if (!method.rpcUrl || !method.contractAddress)
             continue;
-        const rpcCall = createRpcCaller(method.rpcUrl);
+        const rpcCall = createRpcCaller(method.rpcUrl, JSON.parse(method.rpcHeaders ?? "{}"));
         let latestBlock;
         try {
             const latestHex = (await rpcCall("eth_blockNumber", []));
@@ -370,7 +370,7 @@ export async function startWatchers(opts) {
             rpcCall,
             fromBlock: latestBlock,
             watchedAddresses: chainAddresses.map((a) => toWatcherAddr(a, method)),
-            contractAddress: method.contractAddress,
+            contractAddress: toWatcherAddr(method.contractAddress, method),
             decimals: method.decimals,
             confirmations: method.confirmations,
             cursorStore,

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

@@ -631,6 +631,23 @@ export declare const paymentMethods: import("drizzle-orm/pg-core").PgTableWithCo
             identity: undefined;
             generated: undefined;
         }, {}, {}>;
+        rpcHeaders: import("drizzle-orm/pg-core").PgColumn<{
+            name: "rpc_headers";
+            tableName: "payment_methods";
+            dataType: "string";
+            columnType: "PgText";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: true;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
         oracleAddress: import("drizzle-orm/pg-core").PgColumn<{
             name: "oracle_address";
             tableName: "payment_methods";
@@ -716,6 +733,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

@@ -73,11 +73,13 @@ export const paymentMethods = pgTable("payment_methods", {
     displayOrder: integer("display_order").notNull().default(0),
     iconUrl: text("icon_url"),
     rpcUrl: text("rpc_url"), // chain node RPC endpoint
+    rpcHeaders: text("rpc_headers").notNull().default("{}"), // JSON: extra headers for RPC calls (e.g. {"TRON-PRO-API-KEY":"xxx"})
     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())`),