pump-trader 1.0.1 → 1.0.3

package/index.js

@@ -838,7 +838,7 @@ export class PumpTrader {
     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 = [];
     const failedTransactions = [];
 
@@ -859,7 +859,7 @@ export class PumpTrader {
           ComputeBudgetProgram.setComputeUnitPrice({ microLamports: priority })
         );
 
-        const userBaseAta = await this.ensureAta(tx, poolInfo.poolKeys.baseMint);
+        const userBaseAta = await this.ensureAta(tx, poolInfo.poolKeys.baseMint, tokenProgram.programId);
         const userQuoteAta = await this.ensureWSOLAta(
           tx,
           this.wallet.publicKey,
@@ -872,7 +872,8 @@ export class PumpTrader {
           userBaseAta,
           userQuoteAta,
           baseAmountOut,
-          maxQuoteIn
+          maxQuoteIn,
+          tokenProgram.programId
         );
 
         tx.add(buyIx);
@@ -916,6 +917,7 @@ export class PumpTrader {
     const poolInfo = await this.getAmmPoolInfo(mint);
     const reserves = await this.getAmmPoolReserves(poolInfo.poolKeys);
     const totalSolOut = this.calculateAmmSellOutput(totalTokenIn, reserves);
+    const tokenProgram = await this.detectTokenProgram(tokenAddr);
 
     const tokenChunks = totalSolOut <= tradeOpt.maxSolPerTx
       ? [totalTokenIn]
@@ -944,7 +946,7 @@ export class PumpTrader {
           ComputeBudgetProgram.setComputeUnitPrice({ microLamports: priority })
         );
 
-        const userBaseAta = await this.ensureAta(tx, poolInfo.poolKeys.baseMint);
+        const userBaseAta = await this.ensureAta(tx, poolInfo.poolKeys.baseMint, tokenProgram.programId);
         const userQuoteAta = await this.ensureWSOLAta(tx, this.wallet.publicKey, "sell");
 
         const sellIx = this.createAmmSellInstruction(
@@ -952,7 +954,8 @@ export class PumpTrader {
           userBaseAta,
           userQuoteAta,
           tokenIn,
-          minQuoteOut
+          minQuoteOut,
+          tokenProgram.programId
         );
 
         tx.add(sellIx);
@@ -1063,7 +1066,7 @@ export class PumpTrader {
 
   /* ---------- AMM 指令构建 ---------- */
 
-  createAmmBuyInstruction(poolInfo, userBaseAta, userQuoteAta, baseAmountOut, maxQuoteAmountIn) {
+  createAmmBuyInstruction(poolInfo, userBaseAta, userQuoteAta, baseAmountOut, maxQuoteAmountIn, tokenProgramId) {
     const { pool, poolKeys, globalConfig } = poolInfo;
 
     const [eventAuthority] = PublicKey.findProgramAddressSync(
@@ -1122,7 +1125,7 @@ export class PumpTrader {
         { pubkey: poolKeys.poolQuoteTokenAccount, isSigner: false, isWritable: true },
         { pubkey: protocolFeeRecipient, isSigner: false, isWritable: false },
         { pubkey: protocolFeeRecipientTokenAccount, isSigner: false, isWritable: true },
-        { pubkey: TOKEN_2022_PROGRAM_ID, isSigner: false, isWritable: false },
+        { pubkey: tokenProgramId, isSigner: false, isWritable: false },
         { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
         { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
         { pubkey: ASSOCIATED_TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
@@ -1144,7 +1147,7 @@ export class PumpTrader {
     });
   }
 
-  createAmmSellInstruction(poolInfo, userBaseAta, userQuoteAta, baseAmountIn, minQuoteAmountOut) {
+  createAmmSellInstruction(poolInfo, userBaseAta, userQuoteAta, baseAmountIn, minQuoteAmountOut, tokenProgramId) {
     const { pool, poolKeys, globalConfig } = poolInfo;
 
     const [eventAuthority] = PublicKey.findProgramAddressSync(
@@ -1193,7 +1196,7 @@ export class PumpTrader {
         { pubkey: poolKeys.poolQuoteTokenAccount, isSigner: false, isWritable: true },
         { pubkey: protocolFeeRecipient, isSigner: false, isWritable: false },
         { pubkey: protocolFeeRecipientTokenAccount, isSigner: false, isWritable: true },
-        { pubkey: TOKEN_2022_PROGRAM_ID, isSigner: false, isWritable: false },
+        { pubkey: tokenProgramId, isSigner: false, isWritable: false },
         { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
         { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
         { pubkey: ASSOCIATED_TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },

package/index.ts

@@ -945,7 +945,7 @@ export class PumpTrader {
     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[] = [];
     const failedTransactions: FailedTransaction[] = [];
 
@@ -966,7 +966,7 @@ export class PumpTrader {
           ComputeBudgetProgram.setComputeUnitPrice({ microLamports: priority })
         );
 
-        const userBaseAta = await this.ensureAta(tx, poolInfo.poolKeys.baseMint);
+        const userBaseAta = await this.ensureAta(tx, poolInfo.poolKeys.baseMint, tokenProgram.programId);
         const userQuoteAta = await this.ensureWSOLAta(
           tx,
           this.wallet.publicKey,
@@ -979,7 +979,8 @@ export class PumpTrader {
           userBaseAta,
           userQuoteAta,
           baseAmountOut,
-          maxQuoteIn
+          maxQuoteIn,
+          tokenProgram.programId
         );
 
         tx.add(buyIx);
@@ -1023,7 +1024,7 @@ export class PumpTrader {
     const poolInfo = await this.getAmmPoolInfo(mint);
     const reserves = await this.getAmmPoolReserves(poolInfo.poolKeys);
     const totalSolOut = this.calculateAmmSellOutput(totalTokenIn, reserves);
-
+    const tokenProgram = await this.detectTokenProgram(tokenAddr);
     const tokenChunks = totalSolOut <= tradeOpt.maxSolPerTx
       ? [totalTokenIn]
       : this.splitIntoN(
@@ -1051,7 +1052,7 @@ export class PumpTrader {
           ComputeBudgetProgram.setComputeUnitPrice({ microLamports: priority })
         );
 
-        const userBaseAta = await this.ensureAta(tx, poolInfo.poolKeys.baseMint);
+        const userBaseAta = await this.ensureAta(tx, poolInfo.poolKeys.baseMint, tokenProgram.programId);
         const userQuoteAta = await this.ensureWSOLAta(tx, this.wallet.publicKey, "sell");
 
         const sellIx = this.createAmmSellInstruction(
@@ -1059,7 +1060,8 @@ export class PumpTrader {
           userBaseAta,
           userQuoteAta,
           tokenIn,
-          minQuoteOut
+          minQuoteOut,
+          tokenProgram.programId
         );
 
         tx.add(sellIx);
@@ -1175,7 +1177,8 @@ export class PumpTrader {
     userBaseAta: PublicKey,
     userQuoteAta: PublicKey,
     baseAmountOut: bigint,
-    maxQuoteAmountIn: bigint
+    maxQuoteAmountIn: bigint,
+    tokenProgramId: PublicKey
   ): TransactionInstruction {
     const { pool, poolKeys, globalConfig } = poolInfo;
 
@@ -1235,7 +1238,7 @@ export class PumpTrader {
         { pubkey: poolKeys.poolQuoteTokenAccount, isSigner: false, isWritable: true },
         { pubkey: protocolFeeRecipient, isSigner: false, isWritable: false },
         { pubkey: protocolFeeRecipientTokenAccount, isSigner: false, isWritable: true },
-        { pubkey: TOKEN_2022_PROGRAM_ID, isSigner: false, isWritable: false },
+        { pubkey: tokenProgramId, isSigner: false, isWritable: false },
         { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
         { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
         { pubkey: ASSOCIATED_TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
@@ -1262,7 +1265,8 @@ export class PumpTrader {
     userBaseAta: PublicKey,
     userQuoteAta: PublicKey,
     baseAmountIn: bigint,
-    minQuoteAmountOut: bigint
+    minQuoteAmountOut: bigint,
+    tokenProgramId: PublicKey
   ): TransactionInstruction {
     const { pool, poolKeys, globalConfig } = poolInfo;
 
@@ -1312,7 +1316,7 @@ export class PumpTrader {
         { pubkey: poolKeys.poolQuoteTokenAccount, isSigner: false, isWritable: true },
         { pubkey: protocolFeeRecipient, isSigner: false, isWritable: false },
         { pubkey: protocolFeeRecipientTokenAccount, isSigner: false, isWritable: true },
-        { pubkey: TOKEN_2022_PROGRAM_ID, isSigner: false, isWritable: false },
+        { pubkey: tokenProgramId, isSigner: false, isWritable: false },
         { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
         { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
         { pubkey: ASSOCIATED_TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },

package/package.json

@@ -1,31 +1,17 @@
 {
   "name": "pump-trader",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "PumpFun 交易库 - 自动判断 Token Program 和内盘/外盘",
-  "type": "module",
-  "main": "./index.js",
-  "types": "./index.ts",
-  "exports": {
-    ".": {
-      "import": "./index.js",
-      "require": "./index.js",
-      "types": "./index.ts"
-    }
-  },
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "scripts": {
-    "build": "tsc --noEmit",
+    "build": "tsc",
     "format": "prettier --write ."
   },
   "keywords": [
     "solana",
-    "pump",
     "pumpfun",
-    "trading",
-    "token",
-    "bonding-curve",
-    "amm",
-    "token-program",
-    "token-2022"
+    "trading"
   ],
   "author": "Sylor",
   "license": "MIT",

package/tsconfig.json

@@ -1,20 +1,14 @@
 {
   "compilerOptions": {
-    "target": "ES2020",
-    "module": "ESNext",
-    "lib": ["ES2020"],
-    "declaration": true,
-    "declarationMap": true,
-    "sourceMap": true,
-    "outDir": "./dist",
-    "strict": true,
+    "target": "ES2021",
+    "module": "CommonJS",
     "esModuleInterop": true,
-    "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true,
-    "resolveJsonModule": true,
-    "moduleResolution": "node",
-    "allowSyntheticDefaultImports": true,
-    "types": ["node"]
+    "strict": true,
+    "outDir": "./dist",
+    "declaration": true,
+    "skipLibCheck": true,
+    "resolveJsonModule": true
   },
   "include": [
     "index.ts"
@@ -22,4 +16,4 @@
   "exclude": [
     "node_modules"
   ]
-}
+}