Open-source platform for 3D AI agents. Turn text or a photo into a rigged, animated GLB avatar, give it an LLM brain, memory and a wallet, and embed it anywhere with one web component. Remote MCP server, x402 payments, Three.js, browser-native.
JavaScript 3d-generationai-agentsanimationavatardigital-humangenerative-aiglbgltfimage-to-3dllmmcpmcp-servermodel-context-protocolsolanatext-to-3dthreejsweb-componentswebglwebxrx402
fix(pump-trades): count the pool part of a curve-completing buy in trade feeds
nirholasa17331fbe14d
diff --git a/api/_lib/pump-onchain-trades.js b/api/_lib/pump-onchain-trades.jsindex d66d909a3..a62d05979 100644--- a/api/_lib/pump-onchain-trades.js+++ b/api/_lib/pump-onchain-trades.js@@ -21,6 +21,7 @@// so a quiet minute always means a dead socket, not a quiet market.import { solanaRpcEndpoints, resolveWsEndpoint } from './solana/connection.js';+import { pumpTradesFromEvents } from '../../src/pump/trade-events.js';const LAMPORTS_PER_SOL = 1_000_000_000;const PUMP_TOKEN_DECIMALS = 1_000_000; // pump.fun tokens are minted with 6 decimals@@ -203,18 +204,21 @@ export function eventField(data, camel) {return data[camel.replace(/[A-Z]/g, (c) => `_${c.toLowerCase()}`)];}-/** Normalize an Anchor TradeEvent into the PumpPortal wire shape. */-function normalizeTradeEvent(data, signature) {- const isBuy = eventField(data, 'isBuy');- const solAmount = eventField(data, 'solAmount');- const tokenAmount = eventField(data, 'tokenAmount');+/**+ * Normalize one pump trade (a TradeEvent with any synthetic-migration pool part+ * already folded in, see src/pump/trade-events.js) into the PumpPortal wire shape.+ * @param {import('../../src/pump/trade-events.js').PumpTrade} trade+ * @param {string} signature+ */+function normalizeTradeEvent(trade, signature) {+ const { data } = trade;const timestamp = eventField(data, 'timestamp');return {- txType: isBuy ? 'buy' : 'sell',+ txType: trade.isBuy ? 'buy' : 'sell',mint: data.mint.toString(),traderPublicKey: data.user.toString(),- solAmount: Number(solAmount.toString()) / LAMPORTS_PER_SOL,- tokenAmount: Number(tokenAmount.toString()) / PUMP_TOKEN_DECIMALS,+ solAmount: Number(trade.solAmount) / LAMPORTS_PER_SOL,+ tokenAmount: Number(trade.tokenAmount) / PUMP_TOKEN_DECIMALS,signature,// Chain time when present; consumers that want wall-clock use their own.timestampMs: Number(timestamp?.toString?.() ?? 0) * 1000 || Date.now(),@@ -278,13 +282,12 @@ async function startSubscription(state) {return;}if (process.env.PUMP_ONCHAIN_DEBUG && parsed.length && !state._dbgEv) { state._dbgEv = 1; console.log('[pump-onchain-trades] first events:', parsed.map((e) => e.name).join(',')); }- for (const event of parsed) {- if (event.name !== 'TradeEvent') continue;+ for (const trade of pumpTradesFromEvents(parsed)) {state.lastEventAt = Date.now();state.everReceived = true;let msg;- try { msg = normalizeTradeEvent(event.data, logInfo.signature); } catch (e) {- if (process.env.PUMP_ONCHAIN_DEBUG && !state._dbgNormErr) { state._dbgNormErr = 1; console.log('[pump-onchain-trades] normalize error:', e?.message, 'keys:', Object.keys(event.data || {}).join(',')); }+ try { msg = normalizeTradeEvent(trade, logInfo.signature); } catch (e) {+ if (process.env.PUMP_ONCHAIN_DEBUG && !state._dbgNormErr) { state._dbgNormErr = 1; console.log('[pump-onchain-trades] normalize error:', e?.message, 'keys:', Object.keys(trade.data || {}).join(',')); }continue;}if (process.env.PUMP_ONCHAIN_DEBUG && !state._dbgDispatch) { state._dbgDispatch = 1; console.log('[pump-onchain-trades] dispatching to', state.listeners.size, 'listeners'); }diff --git a/api/pump-fun-mcp.js b/api/pump-fun-mcp.jsindex 06eb5d44f..b56f33ad1 100644--- a/api/pump-fun-mcp.js+++ b/api/pump-fun-mcp.js@@ -54,6 +54,7 @@ import bs58 from 'bs58';import { resolveSnsName, reverseLookupAddress } from '../src/solana/sns.js';import { scanFirstClaims } from './_lib/pump-claims.js';import { eventField } from './_lib/pump-onchain-trades.js';+import { pumpTradesFromEvents } from '../src/pump/trade-events.js';import { getSolPriceUsd } from '../src/shared/usd-price.js';import { pinToIPFS, ipfsPinningConfigured } from './_lib/ipfs-pin.js';@@ -665,18 +666,16 @@ async function handleWatchWhales({ mint, minUsd = 5000, durationMs = 5000 }) {(logInfo) => {if (logInfo.err) return;try {- for (const event of parser.parseLogs(logInfo.logs)) {- if (event.name !== 'TradeEvent') continue;- const d = event.data;- if (d.mint?.toString() !== mintStr) continue;- const sol =- Number(eventField(d, 'solAmount')?.toString() ?? '0') / 1_000_000_000;+ for (const trade of pumpTradesFromEvents(parser.parseLogs(logInfo.logs))) {+ const d = trade.data;+ if (trade.mint !== mintStr) continue;+ const sol = Number(trade.solAmount) / 1_000_000_000;const usd = sol * solPrice;if (usd < minUsdNum) continue;trades.push({signature: logInfo.signature,wallet: d.user?.toString() ?? null,- sideBuy: !!eventField(d, 'isBuy'),+ sideBuy: trade.isBuy,usd,sol,ts:@@ -760,7 +759,7 @@ async function readTradesFromChain({ mint, limit, network }) {const blockTime = tx.blockTime ? tx.blockTime * 1000 : Date.now();let parsed;try {- parsed = parser.parseLogs(logs);+ parsed = [...parser.parseLogs(logs)];} catch {return null;}@@ -787,23 +786,23 @@ async function readTradesFromChain({ mint, limit, network }) {timestamp: ts ? Number(ts.toString()) : Math.floor(blockTime / 1000),};}- if (!isAmm && event.name === 'TradeEvent') {- const d = event.data;- if (d.mint?.toString() !== mintStr) continue;- const sol = Number(eventField(d, 'solAmount')?.toString() ?? '0') / 1e9;- const ts = eventField(d, 'timestamp');- return {- signature,- isBuy: !!eventField(d, 'isBuy'),- solAmount: sol,- tokenAmount: eventField(d, 'tokenAmount')?.toString() ?? '0',- usdValue: sol * solPrice,- wallet: d.user?.toString() ?? null,- timestamp: ts ? Number(ts.toString()) : Math.floor(blockTime / 1000),- };- }}- return null;+ if (isAmm) return null;+ // A buy that completed the curve also carries its synthetic-migration pool+ // part; pumpTradesFromEvents folds it in.+ const trade = pumpTradesFromEvents(parsed).find((t) => t.mint === mintStr);+ if (!trade) return null;+ const sol = Number(trade.solAmount) / 1e9;+ const ts = eventField(trade.data, 'timestamp');+ return {+ signature,+ isBuy: trade.isBuy,+ solAmount: sol,+ tokenAmount: trade.tokenAmount.toString(),+ usdValue: sol * solPrice,+ wallet: trade.user || null,+ timestamp: ts ? Number(ts.toString()) : Math.floor(blockTime / 1000),+ };}// Fetch in small chunks and stop as soon as we have enough trades. Mostdiff --git a/src/pump/pumpkit-whale.js b/src/pump/pumpkit-whale.jsindex 4ac9a767b..522f551c5 100644--- a/src/pump/pumpkit-whale.js+++ b/src/pump/pumpkit-whale.js@@ -7,6 +7,7 @@// All heavy imports are lazy so the module cold-starts cheaply.import { getSolPriceUsd } from '../shared/usd-price.js';+import { pumpTradesFromEvents } from './trade-events.js';// api.mainnet-beta.solana.com refuses most browser origins outright, so the// whale feed used to be dead on arrival with nothing on screen saying why. Every@@ -190,23 +191,20 @@ export async function watchWhaleTrades({ mint, minUsd = 5000, onTrade, onStatus,}if (logInfo.err) return;try {- for (const event of parser.parseLogs(logInfo.logs)) {- if (event.name !== 'TradeEvent') continue;- const d = event.data;- // Anchor's coder emits snake_case fields with the current pump- // IDL; older toolchains camelCased them — read both.- const f = (a, b) => (d[a] !== undefined ? d[a] : d[b]);- if (d.mint?.toString() !== mintStr) continue;- const sol = Number(f('sol_amount', 'solAmount')?.toString() ?? '0') / LAMPORTS_PER_SOL;+ // The buy that completes a curve carries its synthetic-migration+ // pool part in a second event; pumpTradesFromEvents folds it in.+ for (const trade of pumpTradesFromEvents(parser.parseLogs(logInfo.logs))) {+ if (trade.mint !== mintStr) continue;+ const sol = Number(trade.solAmount) / LAMPORTS_PER_SOL;const usd = sol * solPrice;if (usd < minUsd) continue;onTrade({signature: logInfo.signature,- wallet: d.user?.toString() ?? null,- sideBuy: !!f('is_buy', 'isBuy'),+ wallet: trade.user || null,+ sideBuy: trade.isBuy,usd,sol,- ts: Number(f('timestamp', 'timestamp')?.toString() ?? '0') * 1000 || Date.now(),+ ts: Number(trade.data.timestamp?.toString() ?? '0') * 1000 || Date.now(),});}} catch {}