pump-trader 1.1.9 → 1.2.3

package/dist/index.d.ts

@@ -126,11 +126,13 @@ export declare class PumpTrader {
     calcSell(tokenIn: bigint, state: BondingCurveState): bigint;
     calculateAmmBuyOutput(quoteIn: bigint, reserves: PoolReserves): bigint;
     calculateAmmSellOutput(baseIn: bigint, reserves: PoolReserves): bigint;
-    getPriceAndStatus(tokenAddr: string): Promise<{
+    private solPriceCache;
+    getSolPriceInUsdc(): Promise<number>;
+    getPriceAndStatus(tokenAddr: string, quoteMint?: PublicKey): Promise<{
         price: number;
         completed: boolean;
     }>;
-    getAmmPrice(mint: PublicKey): Promise<number>;
+    getAmmPrice(mint: PublicKey, quoteMint?: PublicKey): Promise<number>;
     /**
      * 查询代币余额
      * @param tokenAddr - 代币地址（可选），如果不传则返回所有代币

package/dist/index.js

@@ -153,15 +153,11 @@ function parsePoolKeys(data) {
 /* ================= PumpTrader 类 ================= */
 class PumpTrader {
     constructor(rpc, wallet) {
+        /* ---------- 价格查询 ---------- */
+        this.solPriceCache = null;
         this.connection = new web3_js_1.Connection(rpc, "confirmed");
-        if (wallet instanceof web3_js_1.Keypair) {
-            this._wallet = wallet;
-            this.publicKey = wallet.publicKey;
-        }
-        else {
-            this._wallet = wallet;
-            this.publicKey = wallet.publicKey;
-        }
+        this._wallet = wallet;
+        this.publicKey = wallet.publicKey;
         this.global = web3_js_1.PublicKey.findProgramAddressSync([SEEDS.GLOBAL], PROGRAM_IDS.PUMP)[0];
         this.globalState = null;
         this.tokenProgramCache = new Map();
@@ -169,9 +165,12 @@ class PumpTrader {
     async signTx(tx) {
         if (this._wallet instanceof web3_js_1.Keypair) {
             tx.sign(this._wallet);
-            return tx;
         }
-        return this._wallet.signTransaction(tx);
+        else {
+            const signed = await this._wallet.signTransaction(tx);
+            // Copy signatures back to the original tx (adapter returns a new tx)
+            tx.signatures = signed.signatures;
+        }
     }
     /* ---------- Token Program 检测 ---------- */
     /**
@@ -422,20 +421,77 @@ class PumpTrader {
         const denominator = reserves.baseAmount + baseInAfterFee;
         return numerator / denominator;
     }
-    /* ---------- 价格查询 ---------- */
-    async getPriceAndStatus(tokenAddr) {
+    async getSolPriceInUsdc() {
+        if (this.solPriceCache && Date.now() - this.solPriceCache.timestamp < 60000) {
+            return this.solPriceCache.price;
+        }
+        try {
+            // Use Orca USDC/SOL whirlpool (7qbRF6YsyGuLUVs6Y1q64bdVrfe4ZcUUz1JRdoVNUJnm)
+            // Read token vault balances directly to compute price
+            const poolAddr = new web3_js_1.PublicKey("7qbRF6YsyGuLUVs6Y1q64bdVrfe4ZcUUz1JRdoVNUJnm");
+            const acc = await this.connection.getAccountInfo(poolAddr);
+            if (!acc || acc.data.length < 304)
+                throw new Error("Invalid pool data");
+            // Whirlpool: tokenMintA at offset 40, tokenMintB at offset 72, vaultA at 104, vaultB at 136
+            const tokenMintA = new web3_js_1.PublicKey(acc.data.slice(40, 72));
+            const tokenVaultA = new web3_js_1.PublicKey(acc.data.slice(104, 136));
+            const tokenVaultB = new web3_js_1.PublicKey(acc.data.slice(136, 168));
+            const [balanceA, balanceB] = await Promise.all([
+                this.connection.getTokenAccountBalance(tokenVaultA),
+                this.connection.getTokenAccountBalance(tokenVaultB),
+            ]);
+            // Determine which vault holds SOL by checking tokenMintA
+            const SOL_ADDR = "So11111111111111111111111111111111111111112";
+            const solBalance = tokenMintA.toBase58() === SOL_ADDR
+                ? Number(balanceA.value.amount)
+                : Number(balanceB.value.amount);
+            const usdcBalance = tokenMintA.toBase58() === SOL_ADDR
+                ? Number(balanceB.value.amount)
+                : Number(balanceA.value.amount);
+            if (solBalance === 0)
+                throw new Error("Zero balance");
+            const price = usdcBalance / solBalance;
+            this.solPriceCache = { price, timestamp: Date.now() };
+            return price;
+        }
+        catch {
+            return 175;
+        }
+    }
+    async getPriceAndStatus(tokenAddr, quoteMint) {
         const mint = new web3_js_1.PublicKey(tokenAddr);
         const { state } = await this.loadBonding(mint);
         if (state.complete) {
-            const price = await this.getAmmPrice(mint);
+            const qm = quoteMint || (state.quoteMint && !state.quoteMint.equals(SOL_MINT) ? state.quoteMint : SOL_MINT);
+            const price = await this.getAmmPrice(mint, qm);
             return { price, completed: true };
         }
+        const qm = quoteMint || state.quoteMint || SOL_MINT;
+        const isSolQuote = qm.equals(SOL_MINT);
         const oneToken = BigInt(1_000_000);
-        const solOut = this.calcSell(oneToken, state);
-        const price = Number(solOut) / 1e9;
+        if (isSolQuote) {
+            const solOut = this.calcSell(oneToken, state);
+            const price = Number(solOut) / 1e9;
+            return { price, completed: false };
+        }
+        // USDC-paired bonding curve: pump stores USDC raw amount (6 decimals) in the
+        // virtualSolReserves field. calcSell returns USDC raw, divide by 1e6 for USDC price.
+        // Then convert to SOL using Orca USDC/SOL pool.
+        let quotePrice;
+        if (state.virtualQuoteReserves !== undefined) {
+            const newVirtualToken = state.virtualTokenReserves + oneToken;
+            const quoteOut = state.virtualQuoteReserves - (state.virtualQuoteReserves * state.virtualTokenReserves) / newVirtualToken;
+            quotePrice = Number(quoteOut) / 1e6;
+        }
+        else {
+            const rawOut = this.calcSell(oneToken, state);
+            quotePrice = Number(rawOut) / 1e6;
+        }
+        const solPrice = await this.getSolPriceInUsdc();
+        const price = quotePrice / solPrice;
         return { price, completed: false };
     }
-    async getAmmPrice(mint) {
+    async getAmmPrice(mint, quoteMint = SOL_MINT) {
         const [poolCreator] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("pool-authority"), mint.toBuffer()], PROGRAM_IDS.PUMP);
         const indexBuffer = new bn_js_1.default(0).toArrayLike(Buffer, "le", 2);
         const [pool] = web3_js_1.PublicKey.findProgramAddressSync([
@@ -443,7 +499,7 @@ class PumpTrader {
             indexBuffer,
             poolCreator.toBuffer(),
             mint.toBuffer(),
-            SOL_MINT.toBuffer(),
+            quoteMint.toBuffer(),
         ], PROGRAM_IDS.PUMP_AMM);
         const acc = await this.connection.getAccountInfo(pool);
         if (!acc)
@@ -453,7 +509,13 @@ class PumpTrader {
             this.connection.getTokenAccountBalance(poolKeys.poolBaseTokenAccount),
             this.connection.getTokenAccountBalance(poolKeys.poolQuoteTokenAccount),
         ]);
-        return quoteInfo.value.uiAmount / baseInfo.value.uiAmount;
+        let price = quoteInfo.value.uiAmount / baseInfo.value.uiAmount;
+        // If pool is not SOL-quoted, convert to SOL price
+        if (!quoteMint.equals(SOL_MINT)) {
+            const solPrice = await this.getSolPriceInUsdc();
+            price = price / solPrice;
+        }
+        return price;
     }
     /* ---------- 余额查询 ---------- */
     /**
@@ -997,7 +1059,17 @@ class PumpTrader {
                 isWritable: true,
             });
         }
-        remainingKeys.push({ pubkey: poolV2, isSigner: false, isWritable: false });
+        const POOL_DEFAULT_COIN_CREATOR = new web3_js_1.PublicKey("11111111111111111111111111111111");
+        if (poolKeys.coinCreator && !poolKeys.coinCreator.equals(POOL_DEFAULT_COIN_CREATOR)) {
+            remainingKeys.push({ pubkey: poolV2, isSigner: false, isWritable: false });
+        }
+        else {
+            remainingKeys.push({
+                pubkey: PUMP_BUYBACK_FEE_RECIPIENTS[0],
+                isSigner: false,
+                isWritable: true,
+            });
+        }
         remainingKeys.push({ pubkey: newFeeRecipient, isSigner: false, isWritable: false }, {
             pubkey: newFeeRecipientTokenAccount,
             isSigner: false,
@@ -1083,7 +1155,17 @@ class PumpTrader {
                 isWritable: true,
             }, { pubkey: userVolumeAccumulator, isSigner: false, isWritable: true });
         }
-        remainingKeys.push({ pubkey: poolV2, isSigner: false, isWritable: false });
+        const POOL_DEFAULT_COIN_CREATOR = new web3_js_1.PublicKey("11111111111111111111111111111111");
+        if (poolKeys.coinCreator && !poolKeys.coinCreator.equals(POOL_DEFAULT_COIN_CREATOR)) {
+            remainingKeys.push({ pubkey: poolV2, isSigner: false, isWritable: false });
+        }
+        else {
+            remainingKeys.push({
+                pubkey: PUMP_BUYBACK_FEE_RECIPIENTS[0],
+                isSigner: false,
+                isWritable: true,
+            });
+        }
         remainingKeys.push({ pubkey: newFeeRecipient, isSigner: false, isWritable: false }, {
             pubkey: newFeeRecipientTokenAccount,
             isSigner: false,

package/index.js

@@ -193,9 +193,11 @@ export class PumpTrader {
   async signTx(tx) {
     if (this._wallet instanceof Keypair) {
       tx.sign(this._wallet);
-      return tx;
+    } else {
+      const signed = await this._wallet.signTransaction(tx);
+      // Copy signatures back to the original tx (adapter returns a new tx)
+      tx.signatures = signed.signatures;
     }
-    return this._wallet.signTransaction(tx);
   }
 
   /* ---------- Token Program 检测 ---------- */
@@ -490,22 +492,74 @@ export class PumpTrader {
 
   /* ---------- 价格查询 ---------- */
 
-  async getPriceAndStatus(tokenAddr) {
+  async getSolPriceInUsdc() {
+    if (this._solPriceCache && Date.now() - this._solPriceCache.timestamp < 60000) {
+      return this._solPriceCache.price;
+    }
+    try {
+      const poolAddr = new PublicKey("7qbRF6YsyGuLUVs6Y1q64bdVrfe4ZcUUz1JRdoVNUJnm");
+      const acc = await this.connection.getAccountInfo(poolAddr);
+      if (!acc || acc.data.length < 304) throw new Error("Invalid pool data");
+      const tokenMintA = new PublicKey(acc.data.slice(40, 72));
+      const tokenVaultA = new PublicKey(acc.data.slice(104, 136));
+      const tokenVaultB = new PublicKey(acc.data.slice(136, 168));
+      const [balanceA, balanceB] = await Promise.all([
+        this.connection.getTokenAccountBalance(tokenVaultA),
+        this.connection.getTokenAccountBalance(tokenVaultB),
+      ]);
+      const SOL_ADDR = "So11111111111111111111111111111111111111112";
+      const solBalance = tokenMintA.toBase58() === SOL_ADDR
+        ? Number(balanceA.value.amount)
+        : Number(balanceB.value.amount);
+      const usdcBalance = tokenMintA.toBase58() === SOL_ADDR
+        ? Number(balanceB.value.amount)
+        : Number(balanceA.value.amount);
+      if (solBalance === 0) throw new Error("Zero balance");
+      const price = usdcBalance / solBalance;
+      this._solPriceCache = { price, timestamp: Date.now() };
+      return price;
+    } catch {
+      return 175;
+    }
+  }
+
+  async getPriceAndStatus(tokenAddr, quoteMint = null) {
     const mint = new PublicKey(tokenAddr);
     const { state } = await this.loadBonding(mint);
 
     if (state.complete) {
-      const price = await this.getAmmPrice(mint);
+      const qm = quoteMint || (state.quoteMint && !state.quoteMint.equals(SOL_MINT) ? state.quoteMint : SOL_MINT);
+      const price = await this.getAmmPrice(mint, qm);
       return { price, completed: true };
     }
 
+    const qm = quoteMint || state.quoteMint || SOL_MINT;
+    const isSolQuote = qm.equals(SOL_MINT);
+
     const oneToken = BigInt(1_000_000);
-    const solOut = this.calcSell(oneToken, state);
-    const price = Number(solOut) / 1e9;
+
+    if (isSolQuote) {
+      const solOut = this.calcSell(oneToken, state);
+      const price = Number(solOut) / 1e9;
+      return { price, completed: false };
+    }
+
+    let quotePrice;
+    if (state.virtualQuoteReserves !== undefined) {
+      const newVirtualToken = state.virtualTokenReserves + oneToken;
+      const quoteOut = state.virtualQuoteReserves - (state.virtualQuoteReserves * state.virtualTokenReserves) / newVirtualToken;
+      quotePrice = Number(quoteOut) / 1e6;
+    } else {
+      const rawOut = this.calcSell(oneToken, state);
+      quotePrice = Number(rawOut) / 1e6;
+    }
+
+    const solPrice = await this.getSolPriceInUsdc();
+    const price = quotePrice / solPrice;
     return { price, completed: false };
   }
 
-  async getAmmPrice(mint) {
+  async getAmmPrice(mint, quoteMint = SOL_MINT) {
     const [poolCreator] = PublicKey.findProgramAddressSync(
       [Buffer.from("pool-authority"), mint.toBuffer()],
       PROGRAM_IDS.PUMP,
@@ -518,7 +572,7 @@ export class PumpTrader {
         indexBuffer,
         poolCreator.toBuffer(),
         mint.toBuffer(),
-        SOL_MINT.toBuffer(),
+        quoteMint.toBuffer(),
       ],
       PROGRAM_IDS.PUMP_AMM,
     );
@@ -532,7 +586,14 @@ export class PumpTrader {
       this.connection.getTokenAccountBalance(poolKeys.poolQuoteTokenAccount),
     ]);
 
-    return quoteInfo.value.uiAmount / baseInfo.value.uiAmount;
+    let price = quoteInfo.value.uiAmount / baseInfo.value.uiAmount;
+
+    if (!quoteMint.equals(SOL_MINT)) {
+      const solPrice = await this.getSolPriceInUsdc();
+      price = price / solPrice;
+    }
+
+    return price;
   }
 
   /* ---------- 余额查询 ---------- */
@@ -1415,7 +1476,16 @@ export class PumpTrader {
         isWritable: true,
       });
     }
-    remainingKeys.push({ pubkey: poolV2, isSigner: false, isWritable: false });
+    const POOL_DEFAULT_COIN_CREATOR = new PublicKey("11111111111111111111111111111111");
+    if (poolKeys.coinCreator && !poolKeys.coinCreator.equals(POOL_DEFAULT_COIN_CREATOR)) {
+      remainingKeys.push({ pubkey: poolV2, isSigner: false, isWritable: false });
+    } else {
+      remainingKeys.push({
+        pubkey: PUMP_BUYBACK_FEE_RECIPIENTS[0],
+        isSigner: false,
+        isWritable: true,
+      });
+    }
     remainingKeys.push(
       { pubkey: newFeeRecipient, isSigner: false, isWritable: false },
       {

package/index.ts

@@ -335,12 +335,14 @@ export class PumpTrader {
     this.tokenProgramCache = new Map();
   }
 
-  private async signTx(tx: Transaction): Promise<Transaction> {
+  private async signTx(tx: Transaction): Promise<void> {
     if (this._wallet instanceof Keypair) {
       tx.sign(this._wallet);
-      return tx;
+    } else {
+      const signed = await this._wallet.signTransaction(tx);
+      // Copy signatures back to the original tx (adapter returns a new tx)
+      tx.signatures = signed.signatures;
     }
-    return this._wallet.signTransaction(tx);
   }
 
   /* ---------- Token Program 检测 ---------- */
@@ -698,24 +700,90 @@ export class PumpTrader {
 
   /* ---------- 价格查询 ---------- */
 
+  private solPriceCache: { price: number; timestamp: number } | null = null;
+
+  async getSolPriceInUsdc(): Promise<number> {
+    if (this.solPriceCache && Date.now() - this.solPriceCache.timestamp < 60000) {
+      return this.solPriceCache.price;
+    }
+    try {
+      // Use Orca USDC/SOL whirlpool (7qbRF6YsyGuLUVs6Y1q64bdVrfe4ZcUUz1JRdoVNUJnm)
+      // Read token vault balances directly to compute price
+      const poolAddr = new PublicKey("7qbRF6YsyGuLUVs6Y1q64bdVrfe4ZcUUz1JRdoVNUJnm");
+      const acc = await this.connection.getAccountInfo(poolAddr);
+      if (!acc || acc.data.length < 304) throw new Error("Invalid pool data");
+
+      // Whirlpool: tokenMintA at offset 40, tokenMintB at offset 72, vaultA at 104, vaultB at 136
+      const tokenMintA = new PublicKey(acc.data.slice(40, 72));
+      const tokenVaultA = new PublicKey(acc.data.slice(104, 136));
+      const tokenVaultB = new PublicKey(acc.data.slice(136, 168));
+
+      const [balanceA, balanceB] = await Promise.all([
+        this.connection.getTokenAccountBalance(tokenVaultA),
+        this.connection.getTokenAccountBalance(tokenVaultB),
+      ]);
+
+      // Determine which vault holds SOL by checking tokenMintA
+      const SOL_ADDR = "So11111111111111111111111111111111111111112";
+      const solBalance = tokenMintA.toBase58() === SOL_ADDR
+        ? Number(balanceA.value.amount)
+        : Number(balanceB.value.amount);
+      const usdcBalance = tokenMintA.toBase58() === SOL_ADDR
+        ? Number(balanceB.value.amount)
+        : Number(balanceA.value.amount);
+
+      if (solBalance === 0) throw new Error("Zero balance");
+      const price = usdcBalance / solBalance;
+      this.solPriceCache = { price, timestamp: Date.now() };
+      return price;
+    } catch {
+      return 175;
+    }
+  }
+
   async getPriceAndStatus(
     tokenAddr: string,
+    quoteMint?: PublicKey,
   ): Promise<{ price: number; completed: boolean }> {
     const mint = new PublicKey(tokenAddr);
     const { state } = await this.loadBonding(mint);
 
     if (state.complete) {
-      const price = await this.getAmmPrice(mint);
+      const qm = quoteMint || (state.quoteMint && !state.quoteMint.equals(SOL_MINT) ? state.quoteMint : SOL_MINT);
+      const price = await this.getAmmPrice(mint, qm);
       return { price, completed: true };
     }
 
+    const qm = quoteMint || state.quoteMint || SOL_MINT;
+    const isSolQuote = qm.equals(SOL_MINT);
+
     const oneToken = BigInt(1_000_000);
-    const solOut = this.calcSell(oneToken, state);
-    const price = Number(solOut) / 1e9;
+
+    if (isSolQuote) {
+      const solOut = this.calcSell(oneToken, state);
+      const price = Number(solOut) / 1e9;
+      return { price, completed: false };
+    }
+
+    // USDC-paired bonding curve: pump stores USDC raw amount (6 decimals) in the
+    // virtualSolReserves field. calcSell returns USDC raw, divide by 1e6 for USDC price.
+    // Then convert to SOL using Orca USDC/SOL pool.
+    let quotePrice: number;
+    if (state.virtualQuoteReserves !== undefined) {
+      const newVirtualToken = state.virtualTokenReserves + oneToken;
+      const quoteOut = state.virtualQuoteReserves - (state.virtualQuoteReserves * state.virtualTokenReserves) / newVirtualToken;
+      quotePrice = Number(quoteOut) / 1e6;
+    } else {
+      const rawOut = this.calcSell(oneToken, state);
+      quotePrice = Number(rawOut) / 1e6;
+    }
+
+    const solPrice = await this.getSolPriceInUsdc();
+    const price = quotePrice / solPrice;
     return { price, completed: false };
   }
 
-  async getAmmPrice(mint: PublicKey): Promise<number> {
+  async getAmmPrice(mint: PublicKey, quoteMint: PublicKey = SOL_MINT): Promise<number> {
     const [poolCreator] = PublicKey.findProgramAddressSync(
       [Buffer.from("pool-authority"), mint.toBuffer()],
       PROGRAM_IDS.PUMP,
@@ -728,7 +796,7 @@ export class PumpTrader {
         indexBuffer,
         poolCreator.toBuffer(),
         mint.toBuffer(),
-        SOL_MINT.toBuffer(),
+        quoteMint.toBuffer(),
       ],
       PROGRAM_IDS.PUMP_AMM,
     );
@@ -742,7 +810,15 @@ export class PumpTrader {
       this.connection.getTokenAccountBalance(poolKeys.poolQuoteTokenAccount),
     ]);
 
-    return quoteInfo.value.uiAmount! / baseInfo.value.uiAmount!;
+    let price = quoteInfo.value.uiAmount! / baseInfo.value.uiAmount!;
+
+    // If pool is not SOL-quoted, convert to SOL price
+    if (!quoteMint.equals(SOL_MINT)) {
+      const solPrice = await this.getSolPriceInUsdc();
+      price = price / solPrice;
+    }
+
+    return price;
   }
 
   /* ---------- 余额查询 ---------- */
@@ -1679,7 +1755,16 @@ export class PumpTrader {
         isWritable: true,
       });
     }
-    remainingKeys.push({ pubkey: poolV2, isSigner: false, isWritable: false });
+    const POOL_DEFAULT_COIN_CREATOR = new PublicKey("11111111111111111111111111111111");
+    if (poolKeys.coinCreator && !poolKeys.coinCreator.equals(POOL_DEFAULT_COIN_CREATOR)) {
+      remainingKeys.push({ pubkey: poolV2, isSigner: false, isWritable: false });
+    } else {
+      remainingKeys.push({
+        pubkey: PUMP_BUYBACK_FEE_RECIPIENTS[0],
+        isSigner: false,
+        isWritable: true,
+      });
+    }
     remainingKeys.push(
       { pubkey: newFeeRecipient, isSigner: false, isWritable: false },
       {
@@ -1824,7 +1909,16 @@ export class PumpTrader {
         { pubkey: userVolumeAccumulator, isSigner: false, isWritable: true },
       );
     }
-    remainingKeys.push({ pubkey: poolV2, isSigner: false, isWritable: false });
+    const POOL_DEFAULT_COIN_CREATOR = new PublicKey("11111111111111111111111111111111");
+    if (poolKeys.coinCreator && !poolKeys.coinCreator.equals(POOL_DEFAULT_COIN_CREATOR)) {
+      remainingKeys.push({ pubkey: poolV2, isSigner: false, isWritable: false });
+    } else {
+      remainingKeys.push({
+        pubkey: PUMP_BUYBACK_FEE_RECIPIENTS[0],
+        isSigner: false,
+        isWritable: true,
+      });
+    }
     remainingKeys.push(
       { pubkey: newFeeRecipient, isSigner: false, isWritable: false },
       {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pump-trader",
-  "version": "1.1.9",
+  "version": "1.2.3",
   "description": "PumpFun 交易库 - 自动判断 Token Program 和内盘/外盘",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",