pump-trader 1.1.4 → 1.1.5

package/dist/index.d.ts

@@ -33,6 +33,7 @@ interface BondingCurveState {
     realSolReserves: bigint;
     tokenTotalSupply: bigint;
     complete: boolean;
+    quoteMint?: PublicKey;
     isMayhemMode?: boolean;
     isCashbackCoin?: boolean;
 }
@@ -116,7 +117,9 @@ export declare class PumpTrader {
         price: number;
         completed: boolean;
     }>;
-    getAmmPrice(mint: PublicKey): Promise<number>;
+    getAmmPrice(mint: PublicKey, quoteMint?: PublicKey): Promise<number>;
+    private getEffectiveQuoteMint;
+    private getMintDecimals;
     /**
      * 查询代币余额
      * @param tokenAddr - 代币地址（可选），如果不传则返回所有代币

package/dist/index.js

@@ -304,6 +304,10 @@ class PumpTrader {
         offset += 1;
         const creator = new web3_js_1.PublicKey(data.slice(offset, offset + 32));
         offset += 32;
+        if (offset + 32 <= data.length - 2) {
+            state.quoteMint = new web3_js_1.PublicKey(data.slice(offset, offset + 32));
+            offset += 32;
+        }
         state.isMayhemMode = offset < data.length ? data[offset] === 1 : false;
         offset += 1;
         state.isCashbackCoin = offset < data.length ? data[offset] === 1 : false;
@@ -336,19 +340,21 @@ class PumpTrader {
     async getPriceAndStatus(tokenAddr) {
         const mint = new web3_js_1.PublicKey(tokenAddr);
         const { state } = await this.loadBonding(mint);
+        const quoteMint = this.getEffectiveQuoteMint(state.quoteMint);
         if (state.complete) {
-            const price = await this.getAmmPrice(mint);
+            const price = await this.getAmmPrice(mint, quoteMint);
             return { price, completed: true };
         }
         const oneToken = BigInt(1_000_000);
-        const solOut = this.calcSell(oneToken, state);
-        const price = Number(solOut) / 1e9;
+        const quoteOut = this.calcSell(oneToken, state);
+        const quoteDecimals = await this.getMintDecimals(quoteMint);
+        const price = Number(quoteOut) / 10 ** quoteDecimals;
         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([Buffer.from("pool"), indexBuffer, poolCreator.toBuffer(), mint.toBuffer(), SOL_MINT.toBuffer()], PROGRAM_IDS.PUMP_AMM);
+        const [pool] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("pool"), indexBuffer, poolCreator.toBuffer(), mint.toBuffer(), quoteMint.toBuffer()], PROGRAM_IDS.PUMP_AMM);
         const acc = await this.connection.getAccountInfo(pool);
         if (!acc)
             throw new Error("Pool not found");
@@ -359,6 +365,23 @@ class PumpTrader {
         ]);
         return quoteInfo.value.uiAmount / baseInfo.value.uiAmount;
     }
+    getEffectiveQuoteMint(quoteMint) {
+        if (!quoteMint || quoteMint.equals(web3_js_1.PublicKey.default)) {
+            return SOL_MINT;
+        }
+        return quoteMint;
+    }
+    async getMintDecimals(mint) {
+        if (mint.equals(SOL_MINT)) {
+            return 9;
+        }
+        const mintInfo = await this.connection.getParsedAccountInfo(mint);
+        const parsedData = mintInfo.value?.data;
+        if (parsedData && "parsed" in parsedData) {
+            return parsedData.parsed.info.decimals;
+        }
+        throw new Error(`Unable to determine mint decimals for ${mint.toBase58()}`);
+    }
     /* ---------- 余额查询 ---------- */
     /**
      * 查询代币余额

package/index.js

@@ -383,6 +383,12 @@ export class PumpTrader {
 
     const creator = new PublicKey(data.slice(offset, offset + 32));
     offset += 32;
+
+    if (offset + 32 <= data.length - 2) {
+      state.quoteMint = new PublicKey(data.slice(offset, offset + 32));
+      offset += 32;
+    }
+
     state.isMayhemMode = offset < data.length ? data[offset] === 1 : false;
     offset += 1;
     state.isCashbackCoin = offset < data.length ? data[offset] === 1 : false;
@@ -423,19 +429,21 @@ export class PumpTrader {
   async getPriceAndStatus(tokenAddr) {
     const mint = new PublicKey(tokenAddr);
     const { state } = await this.loadBonding(mint);
+    const quoteMint = this.getEffectiveQuoteMint(state.quoteMint);
 
     if (state.complete) {
-      const price = await this.getAmmPrice(mint);
+      const price = await this.getAmmPrice(mint, quoteMint);
       return { price, completed: true };
     }
 
     const oneToken = BigInt(1_000_000);
-    const solOut = this.calcSell(oneToken, state);
-    const price = Number(solOut) / 1e9;
+    const quoteOut = this.calcSell(oneToken, state);
+    const quoteDecimals = await this.getMintDecimals(quoteMint);
+    const price = Number(quoteOut) / 10 ** quoteDecimals;
     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
@@ -443,7 +451,7 @@ export class PumpTrader {
 
     const indexBuffer = new BN(0).toArrayLike(Buffer, "le", 2);
     const [pool] = PublicKey.findProgramAddressSync(
-      [Buffer.from("pool"), indexBuffer, poolCreator.toBuffer(), mint.toBuffer(), SOL_MINT.toBuffer()],
+      [Buffer.from("pool"), indexBuffer, poolCreator.toBuffer(), mint.toBuffer(), quoteMint.toBuffer()],
       PROGRAM_IDS.PUMP_AMM
     );
 
@@ -459,6 +467,28 @@ export class PumpTrader {
     return quoteInfo.value.uiAmount / baseInfo.value.uiAmount;
   }
 
+  getEffectiveQuoteMint(quoteMint) {
+    if (!quoteMint || quoteMint.equals(PublicKey.default)) {
+      return SOL_MINT;
+    }
+    return quoteMint;
+  }
+
+  async getMintDecimals(mint) {
+    if (mint.equals(SOL_MINT)) {
+      return 9;
+    }
+
+    const mintInfo = await this.connection.getParsedAccountInfo(mint);
+    const parsedData = mintInfo.value?.data;
+
+    if (parsedData && "parsed" in parsedData) {
+      return parsedData.parsed.info.decimals;
+    }
+
+    throw new Error(`Unable to determine mint decimals for ${mint.toBase58()}`);
+  }
+
   /* ---------- 余额查询 ---------- */
 
   /**

package/index.ts

@@ -64,6 +64,7 @@ interface BondingCurveState {
   realSolReserves: bigint;
   tokenTotalSupply: bigint;
   complete: boolean;
+  quoteMint?: PublicKey;
   isMayhemMode?: boolean;
   isCashbackCoin?: boolean;
 }
@@ -521,6 +522,11 @@ export class PumpTrader {
     const creator = new PublicKey(data.slice(offset, offset + 32));
     offset += 32;
 
+    if (offset + 32 <= data.length - 2) {
+      state.quoteMint = new PublicKey(data.slice(offset, offset + 32));
+      offset += 32;
+    }
+
     state.isMayhemMode = offset < data.length ? data[offset] === 1 : false;
     offset += 1;
     state.isCashbackCoin = offset < data.length ? data[offset] === 1 : false;
@@ -561,19 +567,21 @@ export class PumpTrader {
   async getPriceAndStatus(tokenAddr: string): Promise<{ price: number; completed: boolean }> {
     const mint = new PublicKey(tokenAddr);
     const { state } = await this.loadBonding(mint);
+    const quoteMint = this.getEffectiveQuoteMint(state.quoteMint);
 
     if (state.complete) {
-      const price = await this.getAmmPrice(mint);
+      const price = await this.getAmmPrice(mint, quoteMint);
       return { price, completed: true };
     }
 
     const oneToken = BigInt(1_000_000);
-    const solOut = this.calcSell(oneToken, state);
-    const price = Number(solOut) / 1e9;
+    const quoteOut = this.calcSell(oneToken, state);
+    const quoteDecimals = await this.getMintDecimals(quoteMint);
+    const price = Number(quoteOut) / 10 ** quoteDecimals;
     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
@@ -581,7 +589,7 @@ export class PumpTrader {
 
     const indexBuffer = new BN(0).toArrayLike(Buffer, "le", 2);
     const [pool] = PublicKey.findProgramAddressSync(
-      [Buffer.from("pool"), indexBuffer, poolCreator.toBuffer(), mint.toBuffer(), SOL_MINT.toBuffer()],
+      [Buffer.from("pool"), indexBuffer, poolCreator.toBuffer(), mint.toBuffer(), quoteMint.toBuffer()],
       PROGRAM_IDS.PUMP_AMM
     );
 
@@ -597,6 +605,28 @@ export class PumpTrader {
     return quoteInfo.value.uiAmount! / baseInfo.value.uiAmount!;
   }
 
+  private getEffectiveQuoteMint(quoteMint?: PublicKey): PublicKey {
+    if (!quoteMint || quoteMint.equals(PublicKey.default)) {
+      return SOL_MINT;
+    }
+    return quoteMint;
+  }
+
+  private async getMintDecimals(mint: PublicKey): Promise<number> {
+    if (mint.equals(SOL_MINT)) {
+      return 9;
+    }
+
+    const mintInfo = await this.connection.getParsedAccountInfo(mint);
+    const parsedData = mintInfo.value?.data;
+
+    if (parsedData && "parsed" in parsedData) {
+      return parsedData.parsed.info.decimals;
+    }
+
+    throw new Error(`Unable to determine mint decimals for ${mint.toBase58()}`);
+  }
+
   /* ---------- 余额查询 ---------- */
 
   /**

package/package.json

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

package/tests/instruction-accounts.test.ts

@@ -8,6 +8,7 @@ import { ASSOCIATED_TOKEN_PROGRAM_ID, getAssociatedTokenAddressSync, TOKEN_PROGR
 import { PumpTrader } from "../index";
 
 const SOL_MINT = new PublicKey("So11111111111111111111111111111111111111112");
+const USDC_MINT = new PublicKey("EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v");
 const FEE_RECIPIENTS = [
   "5YxQFdt3Tr9zJLvkFccqXVUwhdTWJQc1fFg2YPbxvxeD",
   "9M4giFFMxmFGXtc3feFzRai56WbBqehoSeRE5GK7gf7",
@@ -207,3 +208,94 @@ test("amm sell places cashback accounts before poolV2 and fee recipient tail", (
   ).toBase58());
   assert.equal(instruction.keys.at(-1)?.isWritable, true);
 });
+
+test("loadBonding parses quote mint from v2 bonding curve accounts", async () => {
+  const trader = createTrader() as any;
+  const mint = Keypair.generate().publicKey;
+  const creator = Keypair.generate().publicKey;
+  const data = Buffer.alloc(115);
+
+  let offset = 8;
+  data.writeBigUInt64LE(11n, offset);
+  offset += 8;
+  data.writeBigUInt64LE(22n, offset);
+  offset += 8;
+  data.writeBigUInt64LE(33n, offset);
+  offset += 8;
+  data.writeBigUInt64LE(44n, offset);
+  offset += 8;
+  data.writeBigUInt64LE(55n, offset);
+  offset += 8;
+  data[offset] = 1;
+  offset += 1;
+  creator.toBuffer().copy(data, offset);
+  offset += 32;
+  USDC_MINT.toBuffer().copy(data, offset);
+  offset += 32;
+  data[offset] = 1;
+  offset += 1;
+  data[offset] = 0;
+
+  trader.connection.getAccountInfo = async () => ({ data });
+
+  const result = await trader.loadBonding(mint);
+
+  assert.equal(result.creator.toBase58(), creator.toBase58());
+  assert.equal(result.state.quoteMint?.toBase58(), USDC_MINT.toBase58());
+  assert.equal(result.state.isMayhemMode, true);
+  assert.equal(result.state.isCashbackCoin, false);
+});
+
+test("getPriceAndStatus uses quote mint decimals for incomplete bonding curves", async () => {
+  const trader = createTrader() as any;
+  trader.loadBonding = async () => ({
+    bonding: Keypair.generate().publicKey,
+    creator: Keypair.generate().publicKey,
+    state: {
+      complete: false,
+      quoteMint: USDC_MINT
+    }
+  });
+  trader.calcSell = () => 1_234_567n;
+  trader.connection.getParsedAccountInfo = async () => ({
+    value: {
+      data: {
+        parsed: {
+          info: {
+            decimals: 6
+          }
+        }
+      }
+    }
+  });
+
+  const result = await trader.getPriceAndStatus(Keypair.generate().publicKey.toBase58());
+
+  assert.equal(result.completed, false);
+  assert.equal(result.price, 1.234567);
+});
+
+test("getPriceAndStatus forwards quote mint to AMM pricing for completed curves", async () => {
+  const trader = createTrader() as any;
+  const calls: PublicKey[][] = [];
+
+  trader.loadBonding = async () => ({
+    bonding: Keypair.generate().publicKey,
+    creator: Keypair.generate().publicKey,
+    state: {
+      complete: true,
+      quoteMint: USDC_MINT
+    }
+  });
+  trader.getAmmPrice = async (...args: PublicKey[]) => {
+    calls.push(args);
+    return 0.42;
+  };
+
+  const result = await trader.getPriceAndStatus(Keypair.generate().publicKey.toBase58());
+
+  assert.equal(result.completed, true);
+  assert.equal(result.price, 0.42);
+  assert.equal(calls.length, 1);
+  assert.equal(calls[0][1]?.toBase58(), USDC_MINT.toBase58());
+});