@wopr-network/platform-core 1.61.0 → 1.61.2

package/dist/billing/crypto/address-gen.js

@@ -10,6 +10,7 @@
  *   - p2pkh:   DOGE (D...), TRON (T...) — params: { version }
  *   - evm:     ETH, ERC-20 (0x...) — params: {}
  */
+import { secp256k1 } from "@noble/curves/secp256k1.js";
 import { ripemd160 } from "@noble/hashes/legacy.js";
 import { sha256 } from "@noble/hashes/sha2.js";
 import { bech32 } from "@scure/base";
@@ -53,7 +54,13 @@ function encodeP2pkh(pubkey, versionByte) {
     return base58encode(full);
 }
 function encodeEvm(pubkey) {
-    const hexPubKey = `0x${Array.from(pubkey, (b) => b.toString(16).padStart(2, "0")).join("")}`;
+    // HDKey.publicKey is SEC1 compressed (33 bytes, 02/03 prefix).
+    // Ethereum addresses = keccak256(uncompressed_pubkey[1:]).slice(-20).
+    // viem's publicKeyToAddress expects uncompressed (65 bytes, 04 prefix).
+    // Decompress via secp256k1 point recovery before hashing.
+    const hexKey = Array.from(pubkey, (b) => b.toString(16).padStart(2, "0")).join("");
+    const uncompressed = secp256k1.Point.fromHex(hexKey).toBytes(false);
+    const hexPubKey = `0x${Array.from(uncompressed, (b) => b.toString(16).padStart(2, "0")).join("")}`;
     return publicKeyToAddress(hexPubKey);
 }
 // ---------- public API ----------

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

@@ -284,8 +284,15 @@ export async function startWatchers(opts) {
         if (!method.rpcUrl)
             continue;
         const rpcCall = createRpcCaller(method.rpcUrl);
-        const latestHex = (await rpcCall("eth_blockNumber", []));
-        const latestBlock = Number.parseInt(latestHex, 16);
+        let latestBlock;
+        try {
+            const latestHex = (await rpcCall("eth_blockNumber", []));
+            latestBlock = Number.parseInt(latestHex, 16);
+        }
+        catch (err) {
+            log("Skipping ETH watcher — RPC unreachable", { chain: method.chain, token: method.token, error: String(err) });
+            continue;
+        }
         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)
@@ -346,8 +353,15 @@ export async function startWatchers(opts) {
         if (!method.rpcUrl || !method.contractAddress)
             continue;
         const rpcCall = createRpcCaller(method.rpcUrl);
-        const latestHex = (await rpcCall("eth_blockNumber", []));
-        const latestBlock = Number.parseInt(latestHex, 16);
+        let latestBlock;
+        try {
+            const latestHex = (await rpcCall("eth_blockNumber", []));
+            latestBlock = Number.parseInt(latestHex, 16);
+        }
+        catch (err) {
+            log("Skipping EVM watcher — RPC unreachable", { chain: method.chain, token: method.token, error: String(err) });
+            continue;
+        }
         const activeAddresses = await chargeStore.listActiveDepositAddresses();
         const chainAddresses = activeAddresses.filter((a) => a.chain === method.chain).map((a) => a.address);
         const watcher = new EvmWatcher({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wopr-network/platform-core",
-  "version": "1.61.0",
+  "version": "1.61.2",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -131,6 +131,7 @@
   "dependencies": {
     "@aws-sdk/client-ses": "^3.1014.0",
     "@hono/node-server": "^1.19.11",
+    "@noble/curves": "^2.0.1",
     "@noble/hashes": "^2.0.1",
     "@scure/base": "^2.0.0",
     "@scure/bip32": "^2.0.1",

package/src/billing/crypto/address-gen.ts

@@ -10,6 +10,7 @@
  *   - p2pkh:   DOGE (D...), TRON (T...) — params: { version }
  *   - evm:     ETH, ERC-20 (0x...) — params: {}
  */
+import { secp256k1 } from "@noble/curves/secp256k1.js";
 import { ripemd160 } from "@noble/hashes/legacy.js";
 import { sha256 } from "@noble/hashes/sha2.js";
 import { bech32 } from "@scure/base";
@@ -64,7 +65,14 @@ function encodeP2pkh(pubkey: Uint8Array, versionByte: number): string {
 }
 
 function encodeEvm(pubkey: Uint8Array): string {
-  const hexPubKey = `0x${Array.from(pubkey, (b) => b.toString(16).padStart(2, "0")).join("")}` as `0x${string}`;
+  // HDKey.publicKey is SEC1 compressed (33 bytes, 02/03 prefix).
+  // Ethereum addresses = keccak256(uncompressed_pubkey[1:]).slice(-20).
+  // viem's publicKeyToAddress expects uncompressed (65 bytes, 04 prefix).
+  // Decompress via secp256k1 point recovery before hashing.
+  const hexKey = Array.from(pubkey, (b) => b.toString(16).padStart(2, "0")).join("");
+  const uncompressed = secp256k1.Point.fromHex(hexKey).toBytes(false);
+  const hexPubKey =
+    `0x${Array.from(uncompressed, (b: number) => b.toString(16).padStart(2, "0")).join("")}` as `0x${string}`;
   return publicKeyToAddress(hexPubKey);
 }
 

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

@@ -373,8 +373,14 @@ export async function startWatchers(opts: WatcherServiceOpts): Promise<() => voi
     if (!method.rpcUrl) continue;
 
     const rpcCall = createRpcCaller(method.rpcUrl);
-    const latestHex = (await rpcCall("eth_blockNumber", [])) as string;
-    const latestBlock = Number.parseInt(latestHex, 16);
+    let latestBlock: number;
+    try {
+      const latestHex = (await rpcCall("eth_blockNumber", [])) as string;
+      latestBlock = Number.parseInt(latestHex, 16);
+    } catch (err) {
+      log("Skipping ETH watcher — RPC unreachable", { chain: method.chain, token: method.token, error: String(err) });
+      continue;
+    }
     const backfillStart = Math.max(0, latestBlock - BACKFILL_BLOCKS);
 
     const activeAddresses = await chargeStore.listActiveDepositAddresses();
@@ -446,8 +452,14 @@ export async function startWatchers(opts: WatcherServiceOpts): Promise<() => voi
     if (!method.rpcUrl || !method.contractAddress) continue;
 
     const rpcCall = createRpcCaller(method.rpcUrl);
-    const latestHex = (await rpcCall("eth_blockNumber", [])) as string;
-    const latestBlock = Number.parseInt(latestHex, 16);
+    let latestBlock: number;
+    try {
+      const latestHex = (await rpcCall("eth_blockNumber", [])) as string;
+      latestBlock = Number.parseInt(latestHex, 16);
+    } catch (err) {
+      log("Skipping EVM watcher — RPC unreachable", { chain: method.chain, token: method.token, error: String(err) });
+      continue;
+    }
 
     const activeAddresses = await chargeStore.listActiveDepositAddresses();
     const chainAddresses = activeAddresses.filter((a) => a.chain === method.chain).map((a) => a.address);