@pump-fun/pump-sdk 1.9.0 → 1.9.1-devnet.1

package/dist/esm/index.js

@@ -4588,23 +4588,34 @@ var PumpSdk = class {
       )
     ];
   }
-  async claimTokenIncentives(user, payer, mint = PUMP_TOKEN_MINT, tokenProgram = TOKEN_2022_PROGRAM_ID) {
-    return await this.offlinePumpProgram.methods.claimTokenIncentives().accountsPartial({
-      user,
-      payer,
+  async claimTokenIncentives(user, payer) {
+    const { mint } = await this.fetchGlobalVolumeAccumulator();
+    if (mint.equals(PublicKey2.default)) {
+      return [];
+    }
+    const [mintAccountInfo, userAccumulatorAccountInfo] = await this.connection.getMultipleAccountsInfo([
       mint,
-      tokenProgram
-    }).instruction();
-  }
-  async claimTokenIncentivesBothPrograms(user, payer, mint = PUMP_TOKEN_MINT, tokenProgram = TOKEN_2022_PROGRAM_ID) {
+      userVolumeAccumulatorPda(user)[0]
+    ]);
+    if (!mintAccountInfo) {
+      return [];
+    }
+    if (!userAccumulatorAccountInfo) {
+      return [];
+    }
     return [
-      await this.claimTokenIncentives(user, payer, mint, tokenProgram),
-      await this.pumpAmmSdk.claimTokenIncentives(
+      await this.offlinePumpProgram.methods.claimTokenIncentives().accountsPartial({
         user,
         payer,
         mint,
-        tokenProgram
-      )
+        tokenProgram: mintAccountInfo.owner
+      }).instruction()
+    ];
+  }
+  async claimTokenIncentivesBothPrograms(user, payer) {
+    return [
+      ...await this.claimTokenIncentives(user, payer),
+      ...await this.pumpAmmSdk.claimTokenIncentives(user, payer)
     ];
   }
   async getTotalUnclaimedTokens(user) {

package/dist/index.d.mts

@@ -8235,8 +8235,8 @@ declare class PumpSdk {
     getCreatorVaultBalance(creator: PublicKey): Promise<BN>;
     adminUpdateTokenIncentives(startTime: BN, endTime: BN, dayNumber: BN, tokenSupplyPerDay: BN, secondsInADay?: BN, mint?: PublicKey, tokenProgram?: PublicKey): Promise<TransactionInstruction>;
     adminUpdateTokenIncentivesBothPrograms(startTime: BN, endTime: BN, dayNumber: BN, tokenSupplyPerDay: BN, secondsInADay?: BN, mint?: PublicKey, tokenProgram?: PublicKey): Promise<TransactionInstruction[]>;
-    claimTokenIncentives(user: PublicKey, payer: PublicKey, mint?: PublicKey, tokenProgram?: PublicKey): Promise<TransactionInstruction>;
-    claimTokenIncentivesBothPrograms(user: PublicKey, payer: PublicKey, mint?: PublicKey, tokenProgram?: PublicKey): Promise<TransactionInstruction[]>;
+    claimTokenIncentives(user: PublicKey, payer: PublicKey): Promise<TransactionInstruction[]>;
+    claimTokenIncentivesBothPrograms(user: PublicKey, payer: PublicKey): Promise<TransactionInstruction[]>;
     getTotalUnclaimedTokens(user: PublicKey): Promise<BN>;
     getTotalUnclaimedTokensBothPrograms(user: PublicKey): Promise<BN>;
     getCurrentDayTokens(user: PublicKey): Promise<BN>;

package/dist/index.d.ts

@@ -8235,8 +8235,8 @@ declare class PumpSdk {
     getCreatorVaultBalance(creator: PublicKey): Promise<BN>;
     adminUpdateTokenIncentives(startTime: BN, endTime: BN, dayNumber: BN, tokenSupplyPerDay: BN, secondsInADay?: BN, mint?: PublicKey, tokenProgram?: PublicKey): Promise<TransactionInstruction>;
     adminUpdateTokenIncentivesBothPrograms(startTime: BN, endTime: BN, dayNumber: BN, tokenSupplyPerDay: BN, secondsInADay?: BN, mint?: PublicKey, tokenProgram?: PublicKey): Promise<TransactionInstruction[]>;
-    claimTokenIncentives(user: PublicKey, payer: PublicKey, mint?: PublicKey, tokenProgram?: PublicKey): Promise<TransactionInstruction>;
-    claimTokenIncentivesBothPrograms(user: PublicKey, payer: PublicKey, mint?: PublicKey, tokenProgram?: PublicKey): Promise<TransactionInstruction[]>;
+    claimTokenIncentives(user: PublicKey, payer: PublicKey): Promise<TransactionInstruction[]>;
+    claimTokenIncentivesBothPrograms(user: PublicKey, payer: PublicKey): Promise<TransactionInstruction[]>;
     getTotalUnclaimedTokens(user: PublicKey): Promise<BN>;
     getTotalUnclaimedTokensBothPrograms(user: PublicKey): Promise<BN>;
     getCurrentDayTokens(user: PublicKey): Promise<BN>;

package/dist/index.js

@@ -4635,23 +4635,34 @@ var PumpSdk = class {
       )
     ];
   }
-  async claimTokenIncentives(user, payer, mint = PUMP_TOKEN_MINT, tokenProgram = import_spl_token.TOKEN_2022_PROGRAM_ID) {
-    return await this.offlinePumpProgram.methods.claimTokenIncentives().accountsPartial({
-      user,
-      payer,
+  async claimTokenIncentives(user, payer) {
+    const { mint } = await this.fetchGlobalVolumeAccumulator();
+    if (mint.equals(import_web32.PublicKey.default)) {
+      return [];
+    }
+    const [mintAccountInfo, userAccumulatorAccountInfo] = await this.connection.getMultipleAccountsInfo([
       mint,
-      tokenProgram
-    }).instruction();
-  }
-  async claimTokenIncentivesBothPrograms(user, payer, mint = PUMP_TOKEN_MINT, tokenProgram = import_spl_token.TOKEN_2022_PROGRAM_ID) {
+      userVolumeAccumulatorPda(user)[0]
+    ]);
+    if (!mintAccountInfo) {
+      return [];
+    }
+    if (!userAccumulatorAccountInfo) {
+      return [];
+    }
     return [
-      await this.claimTokenIncentives(user, payer, mint, tokenProgram),
-      await this.pumpAmmSdk.claimTokenIncentives(
+      await this.offlinePumpProgram.methods.claimTokenIncentives().accountsPartial({
         user,
         payer,
         mint,
-        tokenProgram
-      )
+        tokenProgram: mintAccountInfo.owner
+      }).instruction()
+    ];
+  }
+  async claimTokenIncentivesBothPrograms(user, payer) {
+    return [
+      ...await this.claimTokenIncentives(user, payer),
+      ...await this.pumpAmmSdk.claimTokenIncentives(user, payer)
     ];
   }
   async getTotalUnclaimedTokens(user) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pump-fun/pump-sdk",
-  "version": "1.9.0",
+  "version": "1.9.1-devnet.1",
   "description": "Pump Bonding Curve SDK",
   "keywords": [],
   "homepage": "https://github.com/pump-fun/pump-sdk#readme",
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@coral-xyz/anchor": "^0.31.1",
-    "@pump-fun/pump-swap-sdk": "^0.0.1-beta.87",
+    "@pump-fun/pump-swap-sdk": "^0.0.1-beta.88",
     "@solana/spl-token": "^0.4.13",
     "@solana/web3.js": "^1.98.2",
     "bn.js": "^5.2.2",

package/src/sdk.ts

@@ -622,34 +622,47 @@ export class PumpSdk {
   async claimTokenIncentives(
     user: PublicKey,
     payer: PublicKey,
-    mint: PublicKey = PUMP_TOKEN_MINT,
-    tokenProgram: PublicKey = TOKEN_2022_PROGRAM_ID,
-  ): Promise<TransactionInstruction> {
-    return await this.offlinePumpProgram.methods
-      .claimTokenIncentives()
-      .accountsPartial({
-        user,
-        payer,
+  ): Promise<TransactionInstruction[]> {
+    const { mint } = await this.fetchGlobalVolumeAccumulator();
+
+    if (mint.equals(PublicKey.default)) {
+      return [];
+    }
+
+    const [mintAccountInfo, userAccumulatorAccountInfo] =
+      await this.connection.getMultipleAccountsInfo([
         mint,
-        tokenProgram,
-      })
-      .instruction();
+        userVolumeAccumulatorPda(user)[0],
+      ]);
+
+    if (!mintAccountInfo) {
+      return [];
+    }
+
+    if (!userAccumulatorAccountInfo) {
+      return [];
+    }
+
+    return [
+      await this.offlinePumpProgram.methods
+        .claimTokenIncentives()
+        .accountsPartial({
+          user,
+          payer,
+          mint,
+          tokenProgram: mintAccountInfo.owner,
+        })
+        .instruction(),
+    ];
   }
 
   async claimTokenIncentivesBothPrograms(
     user: PublicKey,
     payer: PublicKey,
-    mint: PublicKey = PUMP_TOKEN_MINT,
-    tokenProgram: PublicKey = TOKEN_2022_PROGRAM_ID,
   ): Promise<TransactionInstruction[]> {
     return [
-      await this.claimTokenIncentives(user, payer, mint, tokenProgram),
-      await this.pumpAmmSdk.claimTokenIncentives(
-        user,
-        payer,
-        mint,
-        tokenProgram,
-      ),
+      ...(await this.claimTokenIncentives(user, payer)),
+      ...(await this.pumpAmmSdk.claimTokenIncentives(user, payer)),
     ];
   }
 
@@ -718,7 +731,7 @@ export class PumpSdk {
   }
 
   async syncUserVolumeAccumulator(
-    user: PublicKey
+    user: PublicKey,
   ): Promise<TransactionInstruction> {
     return await this.offlinePumpProgram.methods
       .syncUserVolumeAccumulator()
@@ -727,7 +740,7 @@ export class PumpSdk {
   }
 
   async syncUserVolumeAccumulatorBothPrograms(
-    user: PublicKey,    
+    user: PublicKey,
   ): Promise<TransactionInstruction[]> {
     return [
       await this.syncUserVolumeAccumulator(user),