@solard/cli 0.2.23 → 0.2.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solard/cli",
-  "version": "0.2.23",
+  "version": "0.2.25",
   "description": "Command-line interface for the Solard SDK.",
   "type": "module",
   "main": "./src/index.ts",
@@ -19,8 +19,8 @@
   },
   "dependencies": {
     "@solana/web3.js": "^1.98.4",
-    "@solard/core": "0.2.23",
-    "@solard/sdk": "0.2.23",
+    "@solard/core": "0.2.25",
+    "@solard/sdk": "0.2.25",
     "bs58": "^6.0.0",
     "measure-fn": "5.2.0"
   },

package/src/launch-watch-command.ts

@@ -22,9 +22,6 @@ type WatchState = {
   lastNotifiedAthUsd: number | null;
 };
 
-const WSOL_MINT = "So11111111111111111111111111111111111111112";
-const USDC_MINT = "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v";
-
 function flag(flags: Flags, key: string): string | undefined {
   const value = flags.get(key);
   return value && value !== "true" ? value : undefined;
@@ -87,38 +84,6 @@ function wsUrl(flags: Flags): string | undefined {
   );
 }
 
-async function fetchJson(url: string): Promise<unknown> {
-  const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(), 5_000);
-  try {
-    const response = await fetch(url, {
-      headers: { accept: "application/json" },
-      signal: controller.signal,
-    });
-    if (!response.ok) throw new Error(`HTTP ${response.status}`);
-    return await response.json();
-  } finally {
-    clearTimeout(timer);
-  }
-}
-
-async function loadSolUsd(): Promise<number> {
-  try {
-    const raw = (await fetchJson(
-      "https://api.coinbase.com/v2/prices/SOL-USD/spot",
-    )) as { data?: { amount?: unknown } };
-    const value = Number(raw.data?.amount);
-    if (Number.isFinite(value) && value > 0) return value;
-  } catch {}
-  const raw = (await fetchJson(
-    "https://api.coingecko.com/api/v3/simple/price?ids=solana&vs_currencies=usd",
-  )) as { solana?: { usd?: unknown } };
-  const value = Number(raw.solana?.usd);
-  if (!Number.isFinite(value) || value <= 0)
-    throw new Error("SOL/USD unavailable");
-  return value;
-}
-
 export async function runLaunchWatchCommand(args: {
   flags: Flags;
   emit: Emit;
@@ -166,21 +131,9 @@ export async function runLaunchWatchCommand(args: {
   let thresholdNotifications = 0;
   let athNotifications = 0;
   let ignoredMayhem = 0;
-  let solUsd: number | null = null;
   let stopped = false;
   let tradeSubscription: TradeSubscription | null = null;
 
-  const refreshSolUsd = async () => {
-    try {
-      solUsd = await loadSolUsd();
-    } catch (error) {
-      report("sol/usd unavailable", {
-        error: error instanceof Error ? error.message : String(error),
-        cached: solUsd,
-      });
-    }
-  };
-
   const onLaunch = (event: LaunchEvent) => {
     if (!venues.includes(event.venue)) return;
     if (event.isMayhemMode === true) {
@@ -212,18 +165,11 @@ export async function runLaunchWatchCommand(args: {
 
   const onTrade = (event: TradeEvent) => {
     const state = states.get(event.mint);
-    if (!state || event.priceQuote == null) return;
+    if (!state) return;
     state.lastSeenAtMs = event.atMs;
-    let priceSol: number | null = null;
-    let priceUsd: number | null = null;
-    if (event.quoteMint === WSOL_MINT) {
-      priceSol = event.priceQuote;
-      priceUsd = solUsd == null ? null : event.priceQuote * solUsd;
-    } else if (event.quoteMint === USDC_MINT) {
-      priceUsd = event.priceQuote;
-      priceSol = solUsd == null ? null : event.priceQuote / solUsd;
-    }
-    const marketCapUsd = priceUsd == null ? null : priceUsd * state.supplyUi;
+    const priceSol = event.market.priceSol;
+    const priceUsd = event.market.priceUsd;
+    const marketCapUsd = event.market.marketCapUsd;
     prices += 1;
     if (showPrices)
       report("price", {
@@ -317,8 +263,6 @@ export async function runLaunchWatchCommand(args: {
     },
   });
 
-  await refreshSolUsd();
-  const solTimer = setInterval(() => void refreshSolUsd(), 60_000);
   const stop = () => {
     stopped = true;
     controller.abort();
@@ -353,7 +297,6 @@ export async function runLaunchWatchCommand(args: {
         thresholdNotifications,
         athNotifications,
         watchedTokens: tradeSubscription?.listTokens().length ?? 0,
-        solUsd,
       });
     },
     Math.max(1_000, Math.trunc(numberFlag(args.flags, "heartbeat-ms", 15_000))),
@@ -362,7 +305,6 @@ export async function runLaunchWatchCommand(args: {
   try {
     while (!stopped) await new Promise((resolve) => setTimeout(resolve, 250));
   } finally {
-    clearInterval(solTimer);
     clearInterval(heartbeat);
     controller.abort();
     await launchSubscription.close();

package/src/price-feed-server.ts

@@ -1,6 +1,7 @@
 import { configure, createMeasure } from "measure-fn";
 import { Connection } from "@solana/web3.js";
 import {
+  getSolUsdPrice,
   subscribeLaunches,
   subscribeTrades,
   type LaunchEvent,
@@ -26,9 +27,6 @@ type MintState = {
   isMayhemMode: boolean | null;
 };
 
-const WSOL_MINT = "So11111111111111111111111111111111111111112";
-const USDC_MINT = "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v";
-
 function flag(flags: Flags, key: string): string | undefined {
   const value = flags.get(key);
   return value && value !== "true" ? value : undefined;
@@ -92,39 +90,6 @@ function errorText(error: unknown): string {
   return error instanceof Error ? error.message : String(error);
 }
 
-async function fetchJson(url: string): Promise<unknown> {
-  const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(), 5_000);
-  try {
-    const response = await fetch(url, {
-      headers: { accept: "application/json" },
-      signal: controller.signal,
-    });
-    if (!response.ok) throw new Error(`HTTP ${response.status}`);
-    return await response.json();
-  } finally {
-    clearTimeout(timer);
-  }
-}
-
-async function loadSolUsd(): Promise<number> {
-  try {
-    const raw = (await fetchJson(
-      "https://api.coinbase.com/v2/prices/SOL-USD/spot",
-    )) as { data?: { amount?: unknown } };
-    const value = Number(raw.data?.amount);
-    if (Number.isFinite(value) && value > 0) return value;
-  } catch {}
-  const raw = (await fetchJson(
-    "https://api.coingecko.com/api/v3/simple/price?ids=solana&vs_currencies=usd",
-  )) as { solana?: { usd?: unknown } };
-  const value = Number(raw.solana?.usd);
-  if (!Number.isFinite(value) || value <= 0) {
-    throw new Error("SOL/USD unavailable");
-  }
-  return value;
-}
-
 export async function runPriceFeedServerCommand(args: {
   flags: Flags;
   emit: Emit;
@@ -159,6 +124,13 @@ export async function runPriceFeedServerCommand(args: {
   let tradeSubscription: TradeSubscription | null = null;
   let allPriceClients = 0;
   let solUsd: number | null = null;
+  try {
+    const quote = await getSolUsdPrice();
+    solUsd = quote.price;
+    report("sol-usd", quote);
+  } catch (error) {
+    report("sol-usd-unavailable", { error: errorText(error) });
+  }
   let launchCount = 0;
   let tradeCount = 0;
   let priceCount = 0;
@@ -237,18 +209,9 @@ export async function runPriceFeedServerCommand(args: {
 
   const onTrade = (event: TradeEvent): void => {
     tradeCount += 1;
-    if (event.priceQuote == null) return;
     const state = mintState.get(event.mint);
     if (state?.isMayhemMode === true && !includeMayhem) return;
-    let priceSol: number | null = null;
-    let priceUsd: number | null = null;
-    if (event.quoteMint === WSOL_MINT) {
-      priceSol = event.priceQuote;
-      priceUsd = solUsd == null ? null : event.priceQuote * solUsd;
-    } else if (event.quoteMint === USDC_MINT) {
-      priceUsd = event.priceQuote;
-      priceSol = solUsd == null ? null : event.priceQuote / solUsd;
-    }
+    solUsd = event.market.solUsd ?? solUsd;
     const value: PriceFeedPrice = {
       type: "price",
       atMs: event.atMs,
@@ -256,13 +219,10 @@ export async function runPriceFeedServerCommand(args: {
       slot: event.slot,
       mint: event.mint,
       venue: event.venue,
-      priceSol,
-      priceUsd,
-      marketCapUsd:
-        priceUsd != null && state?.supplyUi != null
-          ? priceUsd * state.supplyUi
-          : null,
-      source: `${event.venue}-trade-event`,
+      priceSol: event.market.priceSol,
+      priceUsd: event.market.priceUsd,
+      marketCapUsd: event.market.marketCapUsd,
+      source: `${event.venue}-trade`,
     };
     latest.set(event.mint, value);
     priceCount += 1;
@@ -344,7 +304,6 @@ export async function runPriceFeedServerCommand(args: {
     connection,
     tokens: [],
     commitment: "confirmed",
-    metadata: false,
     signal: controller.signal,
     onTrade,
     onStatus(event, data) {
@@ -428,19 +387,6 @@ export async function runPriceFeedServerCommand(args: {
     },
   });
 
-  const refreshSolUsd = async (): Promise<void> => {
-    try {
-      solUsd = await loadSolUsd();
-    } catch (error) {
-      report("sol/usd unavailable", {
-        error: errorText(error),
-        cached: solUsd,
-      });
-    }
-  };
-
-  await refreshSolUsd();
-  const solTimer = setInterval(() => void refreshSolUsd(), 60_000);
   const heartbeat = setInterval(
     () =>
       report("heartbeat", {
@@ -478,7 +424,6 @@ export async function runPriceFeedServerCommand(args: {
   try {
     await Promise.all([launchSubscription.closed, tradeSubscription.closed]);
   } finally {
-    clearInterval(solTimer);
     clearInterval(heartbeat);
     process.removeListener("SIGINT", stop);
     process.removeListener("SIGTERM", stop);

package/src/trade-strategy-command.ts

@@ -476,23 +476,6 @@ async function fetchJson(url: string): Promise<any> {
   }
 }
 
-async function fetchSolUsd(): Promise<number> {
-  try {
-    const raw = await fetchJson(
-      "https://api.coinbase.com/v2/prices/SOL-USD/spot",
-    );
-    const value = Number(raw?.data?.amount);
-    if (Number.isFinite(value) && value > 0) return value;
-  } catch {}
-  const raw = await fetchJson(
-    "https://api.coingecko.com/api/v3/simple/price?ids=solana&vs_currencies=usd",
-  );
-  const value = Number(raw?.solana?.usd);
-  if (!Number.isFinite(value) || value <= 0)
-    throw new Error("SOL/USD price unavailable");
-  return value;
-}
-
 async function discoverRaydiumPools(mint: string): Promise<string[]> {
   const query = new URLSearchParams({
     mint1: mint,
@@ -1017,7 +1000,7 @@ export async function runTradeStrategyCommand(args: {
   let priceCount = 0;
   let lastPrice: StrategyPriceTick | null = null;
   let callbackErrors = 0;
-  let marketErrors = 0;
+  let tradeErrors = 0;
   let callbackQueue: Promise<void> = Promise.resolve();
 
   try {
@@ -1135,18 +1118,17 @@ export async function runTradeStrategyCommand(args: {
     };
 
     const onPrice = async (event: TradeEvent) => {
-      if (event.mint !== mint || stopped || event.priceQuote == null) return;
-      const priceSol = event.quoteMint === WSOL_MINT ? event.priceQuote : null;
-      const priceUsd = event.quoteMint === USDC_MINT ? event.priceQuote : null;
-      if (priceSol == null && priceUsd == null) return;
+      if (event.mint !== mint || stopped) return;
+      if (event.market.priceSol == null && event.market.priceUsd == null)
+        return;
       const price: StrategyPriceTick = {
         signature: event.signature,
         slot: event.slot,
         atMs: event.atMs,
         mint,
-        priceSol,
-        priceUsd,
-        marketCapUsd: null,
+        priceSol: event.market.priceSol,
+        priceUsd: event.market.priceUsd,
+        marketCapUsd: event.market.marketCapUsd,
       };
       priceCount += 1;
       lastPrice = price;
@@ -1159,7 +1141,7 @@ export async function runTradeStrategyCommand(args: {
     };
 
     const controller = new AbortController();
-    const marketSubscription = await subscribeTrades({
+    const tradeSubscription = await subscribeTrades({
       connection: slrd.connection(),
       tokens: [mint],
       signal: controller.signal,
@@ -1167,8 +1149,8 @@ export async function runTradeStrategyCommand(args: {
         callbackQueue = callbackQueue.then(() => onPrice(event));
       },
       onStatus(event, data) {
-        if (event.includes("error")) marketErrors += 1;
-        report(`market ${event}`, data ?? {});
+        if (event.includes("error")) tradeErrors += 1;
+        report(`trades ${event}`, data ?? {});
       },
     });
 
@@ -1179,7 +1161,7 @@ export async function runTradeStrategyCommand(args: {
       walletAddress,
       live,
       event: "direct-trade-subscription",
-      upstreamMarketSubscriptions: marketSubscription.listTokens().length,
+      upstreamTradeSubscriptions: tradeSubscription.listTokens().length,
     });
 
     if (strategy.onStart) {
@@ -1201,8 +1183,8 @@ export async function runTradeStrategyCommand(args: {
       report("strategy heartbeat", {
         prices: priceCount,
         callbackErrors,
-        marketErrors,
-        upstreamMarketSubscriptions: marketSubscription.listTokens().length,
+        tradeErrors,
+        upstreamTradeSubscriptions: tradeSubscription.listTokens().length,
         executionVenue: executor.venue ?? "unresolved",
       });
     }, heartbeatMs);
@@ -1214,7 +1196,7 @@ export async function runTradeStrategyCommand(args: {
       process.removeListener("SIGINT", stopSignal);
       process.removeListener("SIGTERM", stopSignal);
       controller.abort();
-      await marketSubscription.close();
+      await tradeSubscription.close();
       await callbackQueue.catch(() => undefined);
       if (strategy.onStop) {
         try {
@@ -1228,7 +1210,7 @@ export async function runTradeStrategyCommand(args: {
         reason: stopReason,
         prices: priceCount,
         callbackErrors,
-        marketErrors,
+        tradeErrors,
       });
     }
   } finally {