@pump-fun/pump-sdk 1.8.0 → 1.8.1

package/dist/esm/index.js

@@ -4388,19 +4388,30 @@ var PumpSdk = class {
   }
   async adminUpdateTokenIncentives(startTime, endTime, dayNumber, tokenSupplyPerDay, secondsInADay = new BN3(86400), mint = PUMP_TOKEN_MINT, tokenProgram = TOKEN_2022_PROGRAM_ID) {
     const { authority } = await this.fetchGlobal();
+    return await this.offlinePumpProgram.methods.adminUpdateTokenIncentives(
+      startTime,
+      endTime,
+      secondsInADay,
+      dayNumber,
+      tokenSupplyPerDay
+    ).accountsPartial({
+      global: this.globalPda(),
+      authority,
+      mint,
+      tokenProgram
+    }).instruction();
+  }
+  async adminUpdateTokenIncentivesBothPrograms(startTime, endTime, dayNumber, tokenSupplyPerDay, secondsInADay = new BN3(86400), mint = PUMP_TOKEN_MINT, tokenProgram = TOKEN_2022_PROGRAM_ID) {
     return [
-      await this.offlinePumpProgram.methods.adminUpdateTokenIncentives(
+      await this.adminUpdateTokenIncentives(
         startTime,
         endTime,
-        secondsInADay,
         dayNumber,
-        tokenSupplyPerDay
-      ).accountsPartial({
-        global: this.globalPda(),
-        authority,
+        tokenSupplyPerDay,
+        secondsInADay,
         mint,
         tokenProgram
-      }).instruction(),
+      ),
       await this.pumpAmmAdminSdk.adminUpdateTokenIncentives(
         startTime,
         endTime,
@@ -4413,14 +4424,17 @@ 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,
+      mint,
+      tokenProgram
+    }).instruction();
+  }
+  async claimTokenIncentivesBothPrograms(user, payer, mint = PUMP_TOKEN_MINT, tokenProgram = TOKEN_2022_PROGRAM_ID) {
     return [
-      await this.offlinePumpProgram.methods.claimTokenIncentives().accountsPartial({
-        user,
-        payer,
-        mint,
-        tokenProgram
-      }).instruction(),
-      ...await this.pumpAmmSdk.claimTokenIncentives(
+      await this.claimTokenIncentives(user, payer, mint, tokenProgram),
+      await this.pumpAmmSdk.claimTokenIncentives(
         user,
         payer,
         mint,
@@ -4445,10 +4459,12 @@ var PumpSdk = class {
     const userVolumeAccumulator = this.decodeUserVolumeAccumulator(
       userVolumeAccumulatorAccountInfo
     );
-    return totalUnclaimedTokens(
-      globalVolumeAccumulator,
-      userVolumeAccumulator
-    ).add(await this.pumpAmmSdk.getCurrentDayTokens(user));
+    return totalUnclaimedTokens(globalVolumeAccumulator, userVolumeAccumulator);
+  }
+  async getTotalUnclaimedTokensBothPrograms(user) {
+    return (await this.getTotalUnclaimedTokens(user)).add(
+      await this.pumpAmmSdk.getTotalUnclaimedTokens(user)
+    );
   }
   async getCurrentDayTokens(user) {
     const [
@@ -4467,7 +4483,10 @@ var PumpSdk = class {
     const userVolumeAccumulator = this.decodeUserVolumeAccumulator(
       userVolumeAccumulatorAccountInfo
     );
-    return currentDayTokens(globalVolumeAccumulator, userVolumeAccumulator).add(
+    return currentDayTokens(globalVolumeAccumulator, userVolumeAccumulator);
+  }
+  async getCurrentDayTokensBothPrograms(user) {
+    return (await this.getCurrentDayTokens(user)).add(
       await this.pumpAmmSdk.getCurrentDayTokens(user)
     );
   }

package/dist/index.d.mts

@@ -7902,10 +7902,14 @@ declare class PumpSdk {
     collectCoinCreatorFeeInstructions(coinCreator: PublicKey): Promise<TransactionInstruction[]>;
     adminSetCoinCreatorInstructions(newCoinCreator: PublicKey, mint: PublicKey): Promise<TransactionInstruction[]>;
     getCreatorVaultBalance(creator: PublicKey): Promise<BN>;
-    adminUpdateTokenIncentives(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[]>;
+    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[]>;
     getTotalUnclaimedTokens(user: PublicKey): Promise<BN>;
+    getTotalUnclaimedTokensBothPrograms(user: PublicKey): Promise<BN>;
     getCurrentDayTokens(user: PublicKey): Promise<BN>;
+    getCurrentDayTokensBothPrograms(user: PublicKey): Promise<BN>;
 }
 
 declare function totalUnclaimedTokens(globalVolumeAccumulator: GlobalVolumeAccumulator, userVolumeAccumulator: UserVolumeAccumulator, currentTimestamp?: number): BN;

package/dist/index.d.ts

@@ -7902,10 +7902,14 @@ declare class PumpSdk {
     collectCoinCreatorFeeInstructions(coinCreator: PublicKey): Promise<TransactionInstruction[]>;
     adminSetCoinCreatorInstructions(newCoinCreator: PublicKey, mint: PublicKey): Promise<TransactionInstruction[]>;
     getCreatorVaultBalance(creator: PublicKey): Promise<BN>;
-    adminUpdateTokenIncentives(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[]>;
+    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[]>;
     getTotalUnclaimedTokens(user: PublicKey): Promise<BN>;
+    getTotalUnclaimedTokensBothPrograms(user: PublicKey): Promise<BN>;
     getCurrentDayTokens(user: PublicKey): Promise<BN>;
+    getCurrentDayTokensBothPrograms(user: PublicKey): Promise<BN>;
 }
 
 declare function totalUnclaimedTokens(globalVolumeAccumulator: GlobalVolumeAccumulator, userVolumeAccumulator: UserVolumeAccumulator, currentTimestamp?: number): BN;

package/dist/index.js

@@ -4435,19 +4435,30 @@ var PumpSdk = class {
   }
   async adminUpdateTokenIncentives(startTime, endTime, dayNumber, tokenSupplyPerDay, secondsInADay = new import_bn3.default(86400), mint = PUMP_TOKEN_MINT, tokenProgram = import_spl_token.TOKEN_2022_PROGRAM_ID) {
     const { authority } = await this.fetchGlobal();
+    return await this.offlinePumpProgram.methods.adminUpdateTokenIncentives(
+      startTime,
+      endTime,
+      secondsInADay,
+      dayNumber,
+      tokenSupplyPerDay
+    ).accountsPartial({
+      global: this.globalPda(),
+      authority,
+      mint,
+      tokenProgram
+    }).instruction();
+  }
+  async adminUpdateTokenIncentivesBothPrograms(startTime, endTime, dayNumber, tokenSupplyPerDay, secondsInADay = new import_bn3.default(86400), mint = PUMP_TOKEN_MINT, tokenProgram = import_spl_token.TOKEN_2022_PROGRAM_ID) {
     return [
-      await this.offlinePumpProgram.methods.adminUpdateTokenIncentives(
+      await this.adminUpdateTokenIncentives(
         startTime,
         endTime,
-        secondsInADay,
         dayNumber,
-        tokenSupplyPerDay
-      ).accountsPartial({
-        global: this.globalPda(),
-        authority,
+        tokenSupplyPerDay,
+        secondsInADay,
         mint,
         tokenProgram
-      }).instruction(),
+      ),
       await this.pumpAmmAdminSdk.adminUpdateTokenIncentives(
         startTime,
         endTime,
@@ -4460,14 +4471,17 @@ 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,
+      mint,
+      tokenProgram
+    }).instruction();
+  }
+  async claimTokenIncentivesBothPrograms(user, payer, mint = PUMP_TOKEN_MINT, tokenProgram = import_spl_token.TOKEN_2022_PROGRAM_ID) {
     return [
-      await this.offlinePumpProgram.methods.claimTokenIncentives().accountsPartial({
-        user,
-        payer,
-        mint,
-        tokenProgram
-      }).instruction(),
-      ...await this.pumpAmmSdk.claimTokenIncentives(
+      await this.claimTokenIncentives(user, payer, mint, tokenProgram),
+      await this.pumpAmmSdk.claimTokenIncentives(
         user,
         payer,
         mint,
@@ -4492,10 +4506,12 @@ var PumpSdk = class {
     const userVolumeAccumulator = this.decodeUserVolumeAccumulator(
       userVolumeAccumulatorAccountInfo
     );
-    return totalUnclaimedTokens(
-      globalVolumeAccumulator,
-      userVolumeAccumulator
-    ).add(await this.pumpAmmSdk.getCurrentDayTokens(user));
+    return totalUnclaimedTokens(globalVolumeAccumulator, userVolumeAccumulator);
+  }
+  async getTotalUnclaimedTokensBothPrograms(user) {
+    return (await this.getTotalUnclaimedTokens(user)).add(
+      await this.pumpAmmSdk.getTotalUnclaimedTokens(user)
+    );
   }
   async getCurrentDayTokens(user) {
     const [
@@ -4514,7 +4530,10 @@ var PumpSdk = class {
     const userVolumeAccumulator = this.decodeUserVolumeAccumulator(
       userVolumeAccumulatorAccountInfo
     );
-    return currentDayTokens(globalVolumeAccumulator, userVolumeAccumulator).add(
+    return currentDayTokens(globalVolumeAccumulator, userVolumeAccumulator);
+  }
+  async getCurrentDayTokensBothPrograms(user) {
+    return (await this.getCurrentDayTokens(user)).add(
       await this.pumpAmmSdk.getCurrentDayTokens(user)
     );
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pump-fun/pump-sdk",
-  "version": "1.8.0",
+  "version": "1.8.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.85",
+    "@pump-fun/pump-swap-sdk": "^0.0.1-beta.86",
     "@solana/spl-token": "^0.4.13",
     "@solana/web3.js": "^1.98.2",
     "bn.js": "^5.2.2",

package/src/sdk.ts

@@ -52,6 +52,7 @@ export function getPumpProgram(
 export const PUMP_PROGRAM_ID = new PublicKey(
   "6EF8rrecthR5Dkzon8Nwu78hRvfCKubJ14M5uBEwF6P",
 );
+
 export const PUMP_AMM_PROGRAM_ID = new PublicKey(
   "pAMMBay6oceH9fJKBRHGP5D4bD4sWpmSwMn52FMfXEA",
 );
@@ -564,28 +565,48 @@ export class PumpSdk {
     endTime: BN,
     dayNumber: BN,
     tokenSupplyPerDay: BN,
-    secondsInADay: BN = new BN(86400),
+    secondsInADay: BN = new BN(86_400),
     mint: PublicKey = PUMP_TOKEN_MINT,
     tokenProgram: PublicKey = TOKEN_2022_PROGRAM_ID,
-  ): Promise<TransactionInstruction[]> {
+  ): Promise<TransactionInstruction> {
     const { authority } = await this.fetchGlobal();
 
+    return await this.offlinePumpProgram.methods
+      .adminUpdateTokenIncentives(
+        startTime,
+        endTime,
+        secondsInADay,
+        dayNumber,
+        tokenSupplyPerDay,
+      )
+      .accountsPartial({
+        global: this.globalPda(),
+        authority,
+        mint,
+        tokenProgram,
+      })
+      .instruction();
+  }
+
+  async adminUpdateTokenIncentivesBothPrograms(
+    startTime: BN,
+    endTime: BN,
+    dayNumber: BN,
+    tokenSupplyPerDay: BN,
+    secondsInADay: BN = new BN(86_400),
+    mint: PublicKey = PUMP_TOKEN_MINT,
+    tokenProgram: PublicKey = TOKEN_2022_PROGRAM_ID,
+  ): Promise<TransactionInstruction[]> {
     return [
-      await this.offlinePumpProgram.methods
-        .adminUpdateTokenIncentives(
-          startTime,
-          endTime,
-          secondsInADay,
-          dayNumber,
-          tokenSupplyPerDay,
-        )
-        .accountsPartial({
-          global: this.globalPda(),
-          authority,
-          mint,
-          tokenProgram,
-        })
-        .instruction(),
+      await this.adminUpdateTokenIncentives(
+        startTime,
+        endTime,
+        dayNumber,
+        tokenSupplyPerDay,
+        secondsInADay,
+        mint,
+        tokenProgram,
+      ),
       await this.pumpAmmAdminSdk.adminUpdateTokenIncentives(
         startTime,
         endTime,
@@ -603,23 +624,32 @@ export class PumpSdk {
     payer: PublicKey,
     mint: PublicKey = PUMP_TOKEN_MINT,
     tokenProgram: PublicKey = TOKEN_2022_PROGRAM_ID,
+  ): Promise<TransactionInstruction> {
+    return await this.offlinePumpProgram.methods
+      .claimTokenIncentives()
+      .accountsPartial({
+        user,
+        payer,
+        mint,
+        tokenProgram,
+      })
+      .instruction();
+  }
+
+  async claimTokenIncentivesBothPrograms(
+    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,
-          mint,
-          tokenProgram,
-        })
-        .instruction(),
-      ...(await this.pumpAmmSdk.claimTokenIncentives(
+      await this.claimTokenIncentives(user, payer, mint, tokenProgram),
+      await this.pumpAmmSdk.claimTokenIncentives(
         user,
         payer,
         mint,
         tokenProgram,
-      )),
+      ),
     ];
   }
 
@@ -646,10 +676,13 @@ export class PumpSdk {
       userVolumeAccumulatorAccountInfo,
     );
 
-    return totalUnclaimedTokens(
-      globalVolumeAccumulator,
-      userVolumeAccumulator,
-    ).add(await this.pumpAmmSdk.getCurrentDayTokens(user));
+    return totalUnclaimedTokens(globalVolumeAccumulator, userVolumeAccumulator);
+  }
+
+  async getTotalUnclaimedTokensBothPrograms(user: PublicKey): Promise<BN> {
+    return (await this.getTotalUnclaimedTokens(user)).add(
+      await this.pumpAmmSdk.getTotalUnclaimedTokens(user),
+    );
   }
 
   async getCurrentDayTokens(user: PublicKey): Promise<BN> {
@@ -675,7 +708,11 @@ export class PumpSdk {
       userVolumeAccumulatorAccountInfo,
     );
 
-    return currentDayTokens(globalVolumeAccumulator, userVolumeAccumulator).add(
+    return currentDayTokens(globalVolumeAccumulator, userVolumeAccumulator);
+  }
+
+  async getCurrentDayTokensBothPrograms(user: PublicKey): Promise<BN> {
+    return (await this.getCurrentDayTokens(user)).add(
       await this.pumpAmmSdk.getCurrentDayTokens(user),
     );
   }