pyre-world-kit 1.0.15 → 1.0.17

package/dist/actions.d.ts

@@ -37,17 +37,7 @@ export declare function getWarChest(connection: Connection, mint: string): Promi
 export declare function getWarLoan(connection: Connection, mint: string, wallet: string): Promise<WarLoan>;
 /** Get all war loans for a faction */
 export declare function getAllWarLoans(connection: Connection, mint: string): Promise<AllWarLoansResult>;
-/**
- * Compute max borrowable SOL for a given collateral amount.
- *
- * Mirrors the burnfun LendingDashboard logic — effective max borrow is the
- * minimum of three caps:
- *   1. LTV limit: collateral_value_sol * (max_ltv_bps / 10000)
- *   2. Pool available: treasury_sol * utilization_cap - total_lent
- *   3. Per-user cap: (collateral / total_supply) * borrow_share_multiplier * max_lendable
- *
- * All values in lamports. Accounts for Token-2022 transfer fee (4 bps).
- */
+/** Compute max borrowable SOL for a given collateral amount */
 export declare function getMaxWarLoan(connection: Connection, mint: string, collateralAmount: number): Promise<WarLoanQuote>;
 /** Launch a new faction (create token) */
 export declare function launchFaction(connection: Connection, params: LaunchFactionParams): Promise<LaunchFactionResult>;

package/dist/actions.js

@@ -5,9 +5,6 @@
  * Thin wrappers that call torchsdk functions and map params/results
  * into game-semantic Pyre types. No new on-chain logic.
  */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createEphemeralAgent = void 0;
 exports.blacklistMints = blacklistMints;
@@ -54,7 +51,6 @@ exports.confirmAction = confirmAction;
 exports.getDexPool = getDexPool;
 exports.getDexVaults = getDexVaults;
 const web3_js_1 = require("@solana/web3.js");
-const bs58_1 = __importDefault(require("bs58"));
 const torchsdk_1 = require("torchsdk");
 const mappers_1 = require("./mappers");
 const vanity_1 = require("./vanity");
@@ -124,82 +120,8 @@ 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);
-    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 comms = [];
-            for (let i = 0; i < txs.length; i++) {
-                const tx = txs[i];
-                if (!tx?.meta || tx.meta.err)
-                    continue;
-                const sig = signatures[i];
-                // Check top-level and inner instructions for memo
-                const allInstructions = [
-                    ...tx.transaction.message.instructions,
-                    ...(tx.meta.innerInstructions || []).flatMap(inner => inner.instructions),
-                ];
-                for (const ix of allInstructions) {
-                    const programId = 'programId' in ix ? ix.programId.toString() : '';
-                    const programName = 'program' in ix ? ix.program : '';
-                    const isMemo = programId === MEMO_PROGRAM || programName === 'spl-memo';
-                    if (isMemo) {
-                        let memoText = '';
-                        if ('parsed' in ix) {
-                            memoText = typeof ix.parsed === 'string' ? ix.parsed : JSON.stringify(ix.parsed);
-                        }
-                        else if ('data' in ix && typeof ix.data === 'string') {
-                            try {
-                                memoText = new TextDecoder().decode(bs58_1.default.decode(ix.data));
-                            }
-                            catch {
-                                memoText = ix.data;
-                            }
-                        }
-                        if (memoText && memoText.trim()) {
-                            const sender = tx.transaction.message.accountKeys[0]?.pubkey?.toString() || 'Unknown';
-                            comms.push({
-                                signature: sig.signature,
-                                memo: memoText.trim(),
-                                sender,
-                                timestamp: sig.blockTime || 0,
-                            });
-                            break;
-                        }
-                    }
-                }
-            }
-            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);
-        }
-    }
-    allComms.sort((a, b) => b.timestamp - a.timestamp);
-    return {
-        comms: allComms.slice(0, safeLimit),
-        total: allComms.length,
-    };
+    const result = await (0, torchsdk_1.getMessages)(connection, mint, limit);
+    return (0, mappers_1.mapMessagesResult)(result);
 }
 /** Get a quote for joining a faction (buying tokens) */
 async function getJoinQuote(connection, mint, amountSolLamports) {
@@ -239,52 +161,9 @@ async function getAllWarLoans(connection, mint) {
     const result = await (0, torchsdk_1.getAllLoanPositions)(connection, mint);
     return (0, mappers_1.mapAllLoansResult)(result);
 }
-/**
- * Compute max borrowable SOL for a given collateral amount.
- *
- * Mirrors the burnfun LendingDashboard logic — effective max borrow is the
- * minimum of three caps:
- *   1. LTV limit: collateral_value_sol * (max_ltv_bps / 10000)
- *   2. Pool available: treasury_sol * utilization_cap - total_lent
- *   3. Per-user cap: (collateral / total_supply) * borrow_share_multiplier * max_lendable
- *
- * All values in lamports. Accounts for Token-2022 transfer fee (4 bps).
- */
+/** Compute max borrowable SOL for a given collateral amount */
 async function getMaxWarLoan(connection, mint, collateralAmount) {
-    const TOTAL_SUPPLY = 1_000_000_000_000_000; // 1B tokens * 1e6 multiplier (base units)
-    const TRANSFER_FEE_BPS = 4;
-    const LAMPORTS_PER_SOL = 1_000_000_000;
-    const [lending, detail] = await Promise.all([
-        (0, torchsdk_1.getLendingInfo)(connection, mint),
-        (0, torchsdk_1.getToken)(connection, mint),
-    ]);
-    // Price per base-unit token in SOL (lamports)
-    const pricePerToken = detail.price_sol; // SOL per display token
-    const TOKEN_MULTIPLIER = 1_000_000;
-    // Collateral value in SOL (lamports)
-    const collateralDisplayTokens = collateralAmount / TOKEN_MULTIPLIER;
-    const collateralValueSol = collateralDisplayTokens * pricePerToken * LAMPORTS_PER_SOL;
-    // 1. LTV cap
-    const ltvMaxSol = collateralValueSol * (lending.max_ltv_bps / 10000);
-    // 2. Pool available
-    const treasurySol = detail.treasury_sol_balance * LAMPORTS_PER_SOL;
-    const maxLendableSol = treasurySol * lending.utilization_cap_bps / 10000;
-    const totalLent = (lending.total_sol_lent ?? 0);
-    const poolAvailableSol = Math.max(0, maxLendableSol - totalLent);
-    // 3. Per-user cap (accounts for transfer fee reducing net collateral)
-    const netCollateral = collateralAmount * (1 - TRANSFER_FEE_BPS / 10000);
-    const borrowMultiplier = lending.borrow_share_multiplier || 3;
-    const perUserCapSol = maxLendableSol * netCollateral * borrowMultiplier / TOTAL_SUPPLY;
-    const maxBorrowSol = Math.max(0, Math.min(ltvMaxSol, poolAvailableSol, perUserCapSol));
-    return {
-        max_borrow_sol: Math.floor(maxBorrowSol),
-        collateral_value_sol: Math.floor(collateralValueSol),
-        ltv_max_sol: Math.floor(ltvMaxSol),
-        pool_available_sol: Math.floor(poolAvailableSol),
-        per_user_cap_sol: Math.floor(perUserCapSol),
-        interest_rate_bps: lending.interest_rate_bps,
-        liquidation_threshold_bps: lending.liquidation_threshold_bps,
-    };
+    return (0, torchsdk_1.getBorrowQuote)(connection, mint, collateralAmount);
 }
 // ─── Faction Operations (controller) ───────────────────────────────
 /** Launch a new faction (create token) */
@@ -355,7 +234,7 @@ async function messageFaction(connection, params) {
         amount_sol: MICRO_BUY_LAMPORTS,
         message: params.message,
         vault: params.stronghold,
-        vote: (0, mappers_1.mapVote)(Math.random() > 0.5 ? 'fortify' : 'scorched_earth'),
+        vote: params.first_buy ? (0, mappers_1.mapVote)(Math.random() > 0.5 ? 'fortify' : 'scorched_earth') : undefined,
     });
     return (0, mappers_1.mapBuyResult)(result);
 }

package/dist/types.d.ts

@@ -193,6 +193,7 @@ export interface MessageFactionParams {
     message: string;
     stronghold: string;
     ascended?: boolean;
+    first_buy?: boolean;
 }
 /** "Argued in" — micro sell + negative message (sells 100 tokens) */
 export interface FudFactionParams {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pyre-world-kit",
-  "version": "1.0.15",
+  "version": "1.0.17",
   "description": "Agent-first faction warfare kit — game-semantic wrapper over torchsdk",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -15,7 +15,7 @@
     "@solana/spl-token": "^0.4.6",
     "@solana/web3.js": "^1.98.4",
     "bs58": "^6.0.0",
-    "torchsdk": "^3.7.34"
+    "torchsdk": "^3.7.35"
   },
   "devDependencies": {
     "@types/node": "^22.15.0",

package/src/actions.ts

@@ -6,7 +6,6 @@
  */
 
 import { Connection, PublicKey } from '@solana/web3.js';
-import bs58 from 'bs58';
 import {
   // Read operations
   getTokens,
@@ -15,6 +14,7 @@ import {
   getMessages,
   getBuyQuote,
   getSellQuote,
+  getBorrowQuote,
   getVault,
   getVaultForWallet,
   getVaultWalletLink,
@@ -197,102 +197,8 @@ export async function getComms(
   mint: string,
   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',
-      );
-
-      if (signatures.length === 0) return { comms: [], total: 0 };
-
-      const txs = await connection.getParsedTransactions(
-        signatures.map(s => s.signature),
-        { maxSupportedTransactionVersion: 0 },
-      );
-
-      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];
-
-        // Check top-level and inner instructions for memo
-        const allInstructions = [
-          ...tx.transaction.message.instructions,
-          ...(tx.meta.innerInstructions || []).flatMap(inner => inner.instructions),
-        ];
-
-        for (const ix of allInstructions) {
-          const programId = 'programId' in ix ? ix.programId.toString() : '';
-          const programName = 'program' in ix ? (ix as { program: string }).program : '';
-          const isMemo = programId === MEMO_PROGRAM || programName === 'spl-memo';
-
-          if (isMemo) {
-            let memoText = '';
-            if ('parsed' in ix) {
-              memoText = typeof ix.parsed === 'string' ? ix.parsed : JSON.stringify(ix.parsed);
-            } else if ('data' in ix && typeof ix.data === 'string') {
-              try {
-                memoText = new TextDecoder().decode(bs58.decode(ix.data));
-              } catch {
-                memoText = ix.data;
-              }
-            }
-
-            if (memoText && memoText.trim()) {
-              const sender = tx.transaction.message.accountKeys[0]?.pubkey?.toString() || 'Unknown';
-              comms.push({
-                signature: sig.signature,
-                memo: memoText.trim(),
-                sender,
-                timestamp: sig.blockTime || 0,
-              });
-              break;
-            }
-          }
-        }
-      }
-
-      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);
-    }
-  }
-
-  allComms.sort((a, b) => b.timestamp - a.timestamp);
-
-  return {
-    comms: allComms.slice(0, safeLimit),
-    total: allComms.length,
-  };
+  const result = await getMessages(connection, mint, limit);
+  return mapMessagesResult(result);
 }
 
 /** Get a quote for joining a faction (buying tokens) */
@@ -368,64 +274,13 @@ export async function getAllWarLoans(
   return mapAllLoansResult(result);
 }
 
-/**
- * Compute max borrowable SOL for a given collateral amount.
- *
- * Mirrors the burnfun LendingDashboard logic — effective max borrow is the
- * minimum of three caps:
- *   1. LTV limit: collateral_value_sol * (max_ltv_bps / 10000)
- *   2. Pool available: treasury_sol * utilization_cap - total_lent
- *   3. Per-user cap: (collateral / total_supply) * borrow_share_multiplier * max_lendable
- *
- * All values in lamports. Accounts for Token-2022 transfer fee (4 bps).
- */
+/** Compute max borrowable SOL for a given collateral amount */
 export async function getMaxWarLoan(
   connection: Connection,
   mint: string,
   collateralAmount: number,
 ): Promise<WarLoanQuote> {
-  const TOTAL_SUPPLY = 1_000_000_000_000_000; // 1B tokens * 1e6 multiplier (base units)
-  const TRANSFER_FEE_BPS = 4;
-  const LAMPORTS_PER_SOL = 1_000_000_000;
-
-  const [lending, detail] = await Promise.all([
-    getLendingInfo(connection, mint),
-    getToken(connection, mint),
-  ]);
-
-  // Price per base-unit token in SOL (lamports)
-  const pricePerToken = detail.price_sol; // SOL per display token
-  const TOKEN_MULTIPLIER = 1_000_000;
-
-  // Collateral value in SOL (lamports)
-  const collateralDisplayTokens = collateralAmount / TOKEN_MULTIPLIER;
-  const collateralValueSol = collateralDisplayTokens * pricePerToken * LAMPORTS_PER_SOL;
-
-  // 1. LTV cap
-  const ltvMaxSol = collateralValueSol * (lending.max_ltv_bps / 10000);
-
-  // 2. Pool available
-  const treasurySol = detail.treasury_sol_balance * LAMPORTS_PER_SOL;
-  const maxLendableSol = treasurySol * lending.utilization_cap_bps / 10000;
-  const totalLent = (lending.total_sol_lent ?? 0);
-  const poolAvailableSol = Math.max(0, maxLendableSol - totalLent);
-
-  // 3. Per-user cap (accounts for transfer fee reducing net collateral)
-  const netCollateral = collateralAmount * (1 - TRANSFER_FEE_BPS / 10000);
-  const borrowMultiplier = lending.borrow_share_multiplier || 3;
-  const perUserCapSol = maxLendableSol * netCollateral * borrowMultiplier / TOTAL_SUPPLY;
-
-  const maxBorrowSol = Math.max(0, Math.min(ltvMaxSol, poolAvailableSol, perUserCapSol));
-
-  return {
-    max_borrow_sol: Math.floor(maxBorrowSol),
-    collateral_value_sol: Math.floor(collateralValueSol),
-    ltv_max_sol: Math.floor(ltvMaxSol),
-    pool_available_sol: Math.floor(poolAvailableSol),
-    per_user_cap_sol: Math.floor(perUserCapSol),
-    interest_rate_bps: lending.interest_rate_bps,
-    liquidation_threshold_bps: lending.liquidation_threshold_bps,
-  };
+  return getBorrowQuote(connection, mint, collateralAmount);
 }
 
 // ─── Faction Operations (controller) ───────────────────────────────
@@ -517,7 +372,7 @@ export async function messageFaction(
     amount_sol: MICRO_BUY_LAMPORTS,
     message: params.message,
     vault: params.stronghold,
-    vote: mapVote(Math.random() > 0.5 ? 'fortify' : 'scorched_earth'),
+    vote: params.first_buy ? mapVote(Math.random() > 0.5 ? 'fortify' : 'scorched_earth') : undefined,
   });
   return mapBuyResult(result);
 }

package/src/types.ts

@@ -231,6 +231,7 @@ export interface MessageFactionParams {
   message: string;
   stronghold: string;
   ascended?: boolean;
+  first_buy?: boolean;
 }
 
 /** "Argued in" — micro sell + negative message (sells 100 tokens) */