pump-trader 1.1.8 → 1.2.1

package/index.js

@@ -21,7 +21,6 @@ import {
 } from "@solana/spl-token";
 
 import BN from "bn.js";
-import bs58 from "bs58";
 
 /* ================= 常量定义 ================= */
 
@@ -179,15 +178,26 @@ function parsePoolKeys(data) {
 /* ================= PumpTrader 类 ================= */
 
 export class PumpTrader {
-  constructor(rpc, privateKey) {
+  constructor(rpc, wallet) {
     this.connection = new Connection(rpc, "confirmed");
-    this.wallet = Keypair.fromSecretKey(bs58.decode(privateKey));
+    this._wallet = wallet;
+    this.publicKey = wallet.publicKey;
     this.global = PublicKey.findProgramAddressSync(
       [SEEDS.GLOBAL],
       PROGRAM_IDS.PUMP,
     )[0];
     this.globalState = null;
-    this.tokenProgramCache = new Map(); // 缓存token program检测结果
+    this.tokenProgramCache = new Map();
+  }
+
+  async signTx(tx) {
+    if (this._wallet instanceof Keypair) {
+      tx.sign(this._wallet);
+    } 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 检测 ---------- */
@@ -539,7 +549,7 @@ export class PumpTrader {
       // 查询单个代币
       const mint = new PublicKey(tokenAddr);
       const tokenAccounts = await this.connection.getParsedTokenAccountsByOwner(
-        this.wallet.publicKey,
+        this.publicKey,
         { mint },
       );
       return (
@@ -558,7 +568,7 @@ export class PumpTrader {
    */
   async getAllTokenBalances() {
     const tokenAccounts = await this.connection.getParsedTokenAccountsByOwner(
-      this.wallet.publicKey,
+      this.publicKey,
       { programId: TOKEN_PROGRAM_ID },
     );
 
@@ -582,7 +592,7 @@ export class PumpTrader {
     // 同时查询 TOKEN_2022_PROGRAM_ID
     const token2022Accounts =
       await this.connection.getParsedTokenAccountsByOwner(
-        this.wallet.publicKey,
+        this.publicKey,
         { programId: TOKEN_2022_PROGRAM_ID },
       );
 
@@ -623,7 +633,7 @@ export class PumpTrader {
   }
 
   async solBalance() {
-    const balance = await this.connection.getBalance(this.wallet.publicKey);
+    const balance = await this.connection.getBalance(this.publicKey);
     return balance / 1e9;
   }
 
@@ -633,7 +643,7 @@ export class PumpTrader {
     const program = tokenProgram || TOKEN_2022_PROGRAM_ID;
     const ata = getAssociatedTokenAddressSync(
       mint,
-      this.wallet.publicKey,
+      this.publicKey,
       false,
       program,
       ASSOCIATED_TOKEN_PROGRAM_ID,
@@ -643,9 +653,9 @@ export class PumpTrader {
     if (!acc) {
       tx.add(
         createAssociatedTokenAccountInstruction(
-          this.wallet.publicKey,
+          this.publicKey,
           ata,
-          this.wallet.publicKey,
+          this.publicKey,
           mint,
           program,
           ASSOCIATED_TOKEN_PROGRAM_ID,
@@ -827,7 +837,7 @@ export class PumpTrader {
     const [userVolumeAccumulator] = PublicKey.findProgramAddressSync(
       [
         Buffer.from("user_volume_accumulator"),
-        this.wallet.publicKey.toBuffer(),
+        this.publicKey.toBuffer(),
       ],
       PROGRAM_IDS.PUMP,
     );
@@ -867,7 +877,7 @@ export class PumpTrader {
               bonding,
               associatedBondingCurve,
               userAta,
-              wallet: this.wallet.publicKey,
+              wallet: this.publicKey,
               creatorVault,
               eventAuthority: PROGRAM_IDS.EVENT_AUTHORITY,
               pumpProgram: PROGRAM_IDS.PUMP,
@@ -890,8 +900,8 @@ export class PumpTrader {
         const { blockhash, lastValidBlockHeight } =
           await this.connection.getLatestBlockhash("finalized");
         tx.recentBlockhash = blockhash;
-        tx.feePayer = this.wallet.publicKey;
-        tx.sign(this.wallet);
+        tx.feePayer = this.publicKey;
+        await this.signTx(tx);
 
         const signature = await this.connection.sendRawTransaction(
           tx.serialize(),
@@ -932,11 +942,11 @@ export class PumpTrader {
       totalSolOut <= tradeOpt.maxSolPerTx
         ? [totalTokenIn]
         : this.splitIntoN(
-            totalTokenIn,
-            Number(
-              (totalSolOut + tradeOpt.maxSolPerTx - 1n) / tradeOpt.maxSolPerTx,
-            ),
-          );
+          totalTokenIn,
+          Number(
+            (totalSolOut + tradeOpt.maxSolPerTx - 1n) / tradeOpt.maxSolPerTx,
+          ),
+        );
 
     const pendingTransactions = []; // 待确认的交易
     const failedTransactions = []; // 发送失败的交易
@@ -951,7 +961,7 @@ export class PumpTrader {
 
     const userAta = getAssociatedTokenAddressSync(
       mint,
-      this.wallet.publicKey,
+      this.publicKey,
       false,
       tokenProgram.programId,
       ASSOCIATED_TOKEN_PROGRAM_ID,
@@ -969,7 +979,7 @@ export class PumpTrader {
     const [userVolumeAccumulator] = PublicKey.findProgramAddressSync(
       [
         Buffer.from("user_volume_accumulator"),
-        this.wallet.publicKey.toBuffer(),
+        this.publicKey.toBuffer(),
       ],
       PROGRAM_IDS.PUMP,
     );
@@ -1002,7 +1012,7 @@ export class PumpTrader {
               bonding,
               associatedBondingCurve,
               userAta,
-              wallet: this.wallet.publicKey,
+              wallet: this.publicKey,
               creatorVault,
               eventAuthority: PROGRAM_IDS.EVENT_AUTHORITY,
               pumpProgram: PROGRAM_IDS.PUMP,
@@ -1025,8 +1035,8 @@ export class PumpTrader {
         const { blockhash, lastValidBlockHeight } =
           await this.connection.getLatestBlockhash("finalized");
         tx.recentBlockhash = blockhash;
-        tx.feePayer = this.wallet.publicKey;
-        tx.sign(this.wallet);
+        tx.feePayer = this.publicKey;
+        await this.signTx(tx);
 
         const signature = await this.connection.sendRawTransaction(
           tx.serialize(),
@@ -1086,11 +1096,11 @@ export class PumpTrader {
         );
         const userQuoteAta = isSolQuote
           ? await this.ensureWSOLAta(
-              tx,
-              this.wallet.publicKey,
-              "buy",
-              maxQuoteIn,
-            )
+            tx,
+            this.publicKey,
+            "buy",
+            maxQuoteIn,
+          )
           : await this.ensureAta(tx, quoteMint, quoteTokenProgramId);
 
         const buyIx = this.createAmmBuyInstruction(
@@ -1107,8 +1117,8 @@ export class PumpTrader {
           tx.add(
             createCloseAccountInstruction(
               userQuoteAta,
-              this.wallet.publicKey,
-              this.wallet.publicKey,
+              this.publicKey,
+              this.publicKey,
             ),
           );
         }
@@ -1116,8 +1126,8 @@ export class PumpTrader {
         const { blockhash, lastValidBlockHeight } =
           await this.connection.getLatestBlockhash("finalized");
         tx.recentBlockhash = blockhash;
-        tx.feePayer = this.wallet.publicKey;
-        tx.sign(this.wallet);
+        tx.feePayer = this.publicKey;
+        await this.signTx(tx);
 
         const signature = await this.connection.sendRawTransaction(
           tx.serialize(),
@@ -1158,11 +1168,11 @@ export class PumpTrader {
       totalSolOut <= tradeOpt.maxSolPerTx
         ? [totalTokenIn]
         : this.splitIntoN(
-            totalTokenIn,
-            Number(
-              (totalSolOut + tradeOpt.maxSolPerTx - 1n) / tradeOpt.maxSolPerTx,
-            ),
-          );
+          totalTokenIn,
+          Number(
+            (totalSolOut + tradeOpt.maxSolPerTx - 1n) / tradeOpt.maxSolPerTx,
+          ),
+        );
 
     const pendingTransactions = [];
     const failedTransactions = [];
@@ -1190,7 +1200,7 @@ export class PumpTrader {
           tokenProgram.programId,
         );
         const userQuoteAta = isSolQuote
-          ? await this.ensureWSOLAta(tx, this.wallet.publicKey, "sell")
+          ? await this.ensureWSOLAta(tx, this.publicKey, "sell")
           : await this.ensureAta(tx, quoteMint, quoteTokenProgramId);
 
         const sellIx = this.createAmmSellInstruction(
@@ -1207,8 +1217,8 @@ export class PumpTrader {
           tx.add(
             createCloseAccountInstruction(
               userQuoteAta,
-              this.wallet.publicKey,
-              this.wallet.publicKey,
+              this.publicKey,
+              this.publicKey,
             ),
           );
         }
@@ -1216,8 +1226,8 @@ export class PumpTrader {
         const { blockhash, lastValidBlockHeight } =
           await this.connection.getLatestBlockhash("finalized");
         tx.recentBlockhash = blockhash;
-        tx.feePayer = this.wallet.publicKey;
-        tx.sign(this.wallet);
+        tx.feePayer = this.publicKey;
+        await this.signTx(tx);
 
         const signature = await this.connection.sendRawTransaction(
           tx.serialize(),
@@ -1365,7 +1375,7 @@ export class PumpTrader {
     const [userVolumeAccumulator] = PublicKey.findProgramAddressSync(
       [
         Buffer.from("user_volume_accumulator"),
-        this.wallet.publicKey.toBuffer(),
+        this.publicKey.toBuffer(),
       ],
       PROGRAM_IDS.PUMP_AMM,
     );
@@ -1421,7 +1431,7 @@ export class PumpTrader {
       programId: PROGRAM_IDS.PUMP_AMM,
       keys: [
         { pubkey: pool, isSigner: false, isWritable: true },
-        { pubkey: this.wallet.publicKey, isSigner: true, isWritable: true },
+        { pubkey: this.publicKey, isSigner: true, isWritable: true },
         { pubkey: globalConfig.address, isSigner: false, isWritable: false },
         { pubkey: poolKeys.baseMint, isSigner: false, isWritable: false },
         { pubkey: poolKeys.quoteMint, isSigner: false, isWritable: false },
@@ -1528,7 +1538,7 @@ export class PumpTrader {
     const [userVolumeAccumulator] = PublicKey.findProgramAddressSync(
       [
         Buffer.from("user_volume_accumulator"),
-        this.wallet.publicKey.toBuffer(),
+        this.publicKey.toBuffer(),
       ],
       PROGRAM_IDS.PUMP_AMM,
     );
@@ -1566,7 +1576,7 @@ export class PumpTrader {
       programId: PROGRAM_IDS.PUMP_AMM,
       keys: [
         { pubkey: pool, isSigner: false, isWritable: true },
-        { pubkey: this.wallet.publicKey, isSigner: true, isWritable: true },
+        { pubkey: this.publicKey, isSigner: true, isWritable: true },
         { pubkey: globalConfig.address, isSigner: false, isWritable: false },
         { pubkey: poolKeys.baseMint, isSigner: false, isWritable: false },
         { pubkey: poolKeys.quoteMint, isSigner: false, isWritable: false },
@@ -1759,10 +1769,14 @@ export class PumpTrader {
   /* ---------- 辅助方法 ---------- */
 
   /**
-   * 获取钱包信息
+   * 获取原始 wallet 对象（Keypair 或前端 WalletAdapter）
    */
   getWallet() {
-    return this.wallet;
+    return this._wallet;
+  }
+
+  getPublicKey() {
+    return this.publicKey;
   }
 
   /**