pyre-world-kit 1.0.4 → 1.0.5

package/dist/actions.js

@@ -76,25 +76,25 @@ async function getMembers(connection, mint, limit) {
 /** Get faction comms (trade-bundled messages, including post-ascension DEX messages) */
 async function getComms(connection, mint, limit) {
     const safeLimit = Math.min(limit || 50, 100);
-    // Fetch bonding curve messages
-    const result = await (0, torchsdk_1.getMessages)(connection, mint, safeLimit);
-    const commsResult = (0, mappers_1.mapMessagesResult)(result);
-    // Also scan Raydium pool state for post-ascension DEX messages
-    try {
-        const mintPubkey = new web3_js_1.PublicKey(mint);
-        const { poolState } = (0, torchsdk_1.getRaydiumMigrationAccounts)(mintPubkey);
-        const signatures = await connection.getSignaturesForAddress(poolState, { limit: Math.min(safeLimit, 50) }, 'confirmed');
-        if (signatures.length > 0) {
+    const MEMO_PROGRAM = 'MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr';
+    // Fetch bonding curve messages AND pool state messages in parallel
+    const bondingCommsPromise = (0, torchsdk_1.getMessages)(connection, mint, safeLimit)
+        .then(r => (0, mappers_1.mapMessagesResult)(r))
+        .catch(() => ({ comms: [], total: 0 }));
+    const poolCommsPromise = (async () => {
+        try {
+            const mintPubkey = new web3_js_1.PublicKey(mint);
+            const { poolState } = (0, torchsdk_1.getRaydiumMigrationAccounts)(mintPubkey);
+            const signatures = await connection.getSignaturesForAddress(poolState, { limit: Math.min(safeLimit, 50) }, 'confirmed');
+            if (signatures.length === 0)
+                return { comms: [], total: 0 };
             const txs = await connection.getParsedTransactions(signatures.map(s => s.signature), { maxSupportedTransactionVersion: 0 });
-            const MEMO_PROGRAM = 'MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr';
-            const existingSigs = new Set(commsResult.comms.map(c => c.signature));
+            const comms = [];
             for (let i = 0; i < txs.length; i++) {
                 const tx = txs[i];
                 if (!tx?.meta || tx.meta.err)
                     continue;
                 const sig = signatures[i];
-                if (existingSigs.has(sig.signature))
-                    continue;
                 // Check top-level and inner instructions for memo
                 const allInstructions = [
                     ...tx.transaction.message.instructions,
@@ -119,7 +119,7 @@ async function getComms(connection, mint, limit) {
                         }
                         if (memoText && memoText.trim()) {
                             const sender = tx.transaction.message.accountKeys[0]?.pubkey?.toString() || 'Unknown';
-                            commsResult.comms.push({
+                            comms.push({
                                 signature: sig.signature,
                                 memo: memoText.trim(),
                                 sender,
@@ -130,16 +130,27 @@ async function getComms(connection, mint, limit) {
                     }
                 }
             }
-            // Re-sort by timestamp descending and trim to limit
-            commsResult.comms.sort((a, b) => b.timestamp - a.timestamp);
-            commsResult.comms = commsResult.comms.slice(0, safeLimit);
-            commsResult.total = commsResult.comms.length;
+            return { comms, total: comms.length };
+        }
+        catch {
+            return { comms: [], total: 0 };
+        }
+    })();
+    const [bondingResult, poolResult] = await Promise.all([bondingCommsPromise, poolCommsPromise]);
+    // Merge, dedupe by signature, sort newest first, trim to limit
+    const seen = new Set();
+    const allComms = [];
+    for (const c of [...bondingResult.comms, ...poolResult.comms]) {
+        if (!seen.has(c.signature)) {
+            seen.add(c.signature);
+            allComms.push(c);
         }
     }
-    catch {
-        // Pool may not exist for non-ascended factions — ignore
-    }
-    return commsResult;
+    allComms.sort((a, b) => b.timestamp - a.timestamp);
+    return {
+        comms: allComms.slice(0, safeLimit),
+        total: allComms.length,
+    };
 }
 /** Get a quote for joining a faction (buying tokens) */
 async function getJoinQuote(connection, mint, amountSolLamports) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pyre-world-kit",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Agent-first faction warfare kit — game-semantic wrapper over torchsdk",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/actions.ts

@@ -148,37 +148,38 @@ export async function getComms(
   limit?: number,
 ): Promise<CommsResult> {
   const safeLimit = Math.min(limit || 50, 100);
+  const MEMO_PROGRAM = 'MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr';
+
+  // Fetch bonding curve messages AND pool state messages in parallel
+  const bondingCommsPromise = getMessages(connection, mint, safeLimit)
+    .then(r => mapMessagesResult(r))
+    .catch(() => ({ comms: [], total: 0 } as CommsResult));
+
+  const poolCommsPromise = (async (): Promise<CommsResult> => {
+    try {
+      const mintPubkey = new PublicKey(mint);
+      const { poolState } = getRaydiumMigrationAccounts(mintPubkey);
+
+      const signatures = await connection.getSignaturesForAddress(
+        poolState,
+        { limit: Math.min(safeLimit, 50) },
+        'confirmed',
+      );
 
-  // Fetch bonding curve messages
-  const result = await getMessages(connection, mint, safeLimit);
-  const commsResult = mapMessagesResult(result);
-
-  // Also scan Raydium pool state for post-ascension DEX messages
-  try {
-    const mintPubkey = new PublicKey(mint);
-    const { poolState } = getRaydiumMigrationAccounts(mintPubkey);
-
-    const signatures = await connection.getSignaturesForAddress(
-      poolState,
-      { limit: Math.min(safeLimit, 50) },
-      'confirmed',
-    );
+      if (signatures.length === 0) return { comms: [], total: 0 };
 
-    if (signatures.length > 0) {
       const txs = await connection.getParsedTransactions(
         signatures.map(s => s.signature),
         { maxSupportedTransactionVersion: 0 },
       );
 
-      const MEMO_PROGRAM = 'MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr';
-      const existingSigs = new Set(commsResult.comms.map(c => c.signature));
+      const comms: CommsResult['comms'] = [];
 
       for (let i = 0; i < txs.length; i++) {
         const tx = txs[i];
         if (!tx?.meta || tx.meta.err) continue;
 
         const sig = signatures[i];
-        if (existingSigs.has(sig.signature)) continue;
 
         // Check top-level and inner instructions for memo
         const allInstructions = [
@@ -205,7 +206,7 @@ export async function getComms(
 
             if (memoText && memoText.trim()) {
               const sender = tx.transaction.message.accountKeys[0]?.pubkey?.toString() || 'Unknown';
-              commsResult.comms.push({
+              comms.push({
                 signature: sig.signature,
                 memo: memoText.trim(),
                 sender,
@@ -217,16 +218,31 @@ export async function getComms(
         }
       }
 
-      // Re-sort by timestamp descending and trim to limit
-      commsResult.comms.sort((a, b) => b.timestamp - a.timestamp);
-      commsResult.comms = commsResult.comms.slice(0, safeLimit);
-      commsResult.total = commsResult.comms.length;
+      return { comms, total: comms.length };
+    } catch {
+      return { comms: [], total: 0 };
+    }
+  })();
+
+  const [bondingResult, poolResult] = await Promise.all([bondingCommsPromise, poolCommsPromise]);
+
+  // Merge, dedupe by signature, sort newest first, trim to limit
+  const seen = new Set<string>();
+  const allComms: CommsResult['comms'] = [];
+
+  for (const c of [...bondingResult.comms, ...poolResult.comms]) {
+    if (!seen.has(c.signature)) {
+      seen.add(c.signature);
+      allComms.push(c);
     }
-  } catch {
-    // Pool may not exist for non-ascended factions — ignore
   }
 
-  return commsResult;
+  allComms.sort((a, b) => b.timestamp - a.timestamp);
+
+  return {
+    comms: allComms.slice(0, safeLimit),
+    total: allComms.length,
+  };
 }
 
 /** Get a quote for joining a faction (buying tokens) */