pump-trader 1.0.9 → 1.1.0

package/dist/index.js

@@ -605,6 +605,7 @@ class PumpTrader {
     async ammBuy(tokenAddr, totalSolIn, tradeOpt) {
         const mint = new web3_js_1.PublicKey(tokenAddr);
         const poolInfo = await this.getAmmPoolInfo(mint);
+        const reserves = await this.getAmmPoolReserves(poolInfo.poolKeys);
         const solChunks = this.splitByMax(totalSolIn, tradeOpt.maxSolPerTx);
         const tokenProgram = await this.detectTokenProgram(tokenAddr);
         const pendingTransactions = [];
@@ -612,16 +613,13 @@ class PumpTrader {
         for (let i = 0; i < solChunks.length; i++) {
             try {
                 const solIn = solChunks[i];
-                const reserves = await this.getAmmPoolReserves(poolInfo.poolKeys);
-                const rawSlippageBps = this.calcSlippage({
+                const baseAmountOut = this.calculateAmmBuyOutput(solIn, reserves);
+                const slippageBps = this.calcSlippage({
                     tradeSize: solIn,
                     reserve: reserves.quoteAmount,
                     slippageOpt: tradeOpt.slippage
                 });
-                const slippageBps = Math.max(0, Math.min(rawSlippageBps, 9000));
                 const maxQuoteIn = (solIn * BigInt(10_000 + slippageBps)) / 10000n;
-                const estimatedBaseOut = this.calculateAmmBuyOutput(solIn, reserves);
-                const baseAmountOut = ((estimatedBaseOut * BigInt(10_000 - slippageBps)) / 10000n) || 1n;
                 const priority = this.genPriority(tradeOpt.priority);
                 const tx = new web3_js_1.Transaction().add(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: 300_000 }), web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: priority }));
                 const userBaseAta = await this.ensureAta(tx, poolInfo.poolKeys.baseMint, tokenProgram.programId);
@@ -797,8 +795,7 @@ class PumpTrader {
                 DISCRIMINATORS.BUY,
                 u64(baseAmountOut),
                 u64(maxQuoteAmountIn),
-                // Match Pump UI buy payload tail (1 byte)
-                Buffer.from([1])
+                Buffer.from([1, 1])
             ])
         });
     }

package/index.js

@@ -836,6 +836,7 @@ export class PumpTrader {
   async ammBuy(tokenAddr, totalSolIn, tradeOpt) {
     const mint = new PublicKey(tokenAddr);
     const poolInfo = await this.getAmmPoolInfo(mint);
+    const reserves = await this.getAmmPoolReserves(poolInfo.poolKeys);
     const solChunks = this.splitByMax(totalSolIn, tradeOpt.maxSolPerTx);
     const tokenProgram = await this.detectTokenProgram(tokenAddr);
     const pendingTransactions = [];
@@ -844,16 +845,13 @@ export class PumpTrader {
     for (let i = 0; i < solChunks.length; i++) {
       try {
         const solIn = solChunks[i];
-        const reserves = await this.getAmmPoolReserves(poolInfo.poolKeys);
-        const rawSlippageBps = this.calcSlippage({
+        const baseAmountOut = this.calculateAmmBuyOutput(solIn, reserves);
+        const slippageBps = this.calcSlippage({
           tradeSize: solIn,
           reserve: reserves.quoteAmount,
           slippageOpt: tradeOpt.slippage
         });
-        const slippageBps = Math.max(0, Math.min(rawSlippageBps, 9000));
         const maxQuoteIn = (solIn * BigInt(10_000 + slippageBps)) / 10_000n;
-        const estimatedBaseOut = this.calculateAmmBuyOutput(solIn, reserves);
-        const baseAmountOut = ((estimatedBaseOut * BigInt(10_000 - slippageBps)) / 10_000n) || 1n;
         const priority = this.genPriority(tradeOpt.priority);
 
         const tx = new Transaction().add(
@@ -1153,7 +1151,7 @@ export class PumpTrader {
         DISCRIMINATORS.BUY,
         u64(baseAmountOut),
         u64(maxQuoteAmountIn),
-        Buffer.from([1])
+        Buffer.from([1, 1])
       ])
     });
   }

package/index.ts

@@ -943,6 +943,7 @@ export class PumpTrader {
   async ammBuy(tokenAddr: string, totalSolIn: bigint, tradeOpt: TradeOptions): Promise<TradeResult> {
     const mint = new PublicKey(tokenAddr);
     const poolInfo = await this.getAmmPoolInfo(mint);
+    const reserves = await this.getAmmPoolReserves(poolInfo.poolKeys);
     const solChunks = this.splitByMax(totalSolIn, tradeOpt.maxSolPerTx);
     const tokenProgram = await this.detectTokenProgram(tokenAddr);
     const pendingTransactions: PendingTransaction[] = [];
@@ -951,16 +952,13 @@ export class PumpTrader {
     for (let i = 0; i < solChunks.length; i++) {
       try {
         const solIn = solChunks[i];
-        const reserves = await this.getAmmPoolReserves(poolInfo.poolKeys);
-        const rawSlippageBps = this.calcSlippage({
+        const baseAmountOut = this.calculateAmmBuyOutput(solIn, reserves);
+        const slippageBps = this.calcSlippage({
           tradeSize: solIn,
           reserve: reserves.quoteAmount,
           slippageOpt: tradeOpt.slippage
         });
-        const slippageBps = Math.max(0, Math.min(rawSlippageBps, 9000));
         const maxQuoteIn = (solIn * BigInt(10_000 + slippageBps)) / 10_000n;
-        const estimatedBaseOut = this.calculateAmmBuyOutput(solIn, reserves);
-        const baseAmountOut = ((estimatedBaseOut * BigInt(10_000 - slippageBps)) / 10_000n) || 1n;
         const priority = this.genPriority(tradeOpt.priority);
 
         const tx = new Transaction().add(
@@ -1266,8 +1264,7 @@ export class PumpTrader {
         DISCRIMINATORS.BUY,
         u64(baseAmountOut),
         u64(maxQuoteAmountIn),
-        // Match Pump UI buy payload tail (1 byte)
-        Buffer.from([1])
+        Buffer.from([1, 1])
       ])
     });
   }

package/package.json

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