@pump-fun/pump-sdk 1.7.0-devnet.1 → 1.8.0-devnet.1

package/dist/esm/index.js

@@ -3959,20 +3959,64 @@ import BN3 from "bn.js";
 
 // src/tokenIncentives.ts
 import BN2 from "bn.js";
+function totalUnclaimedTokens(globalVolumeAccumulator, userVolumeAccumulator, currentTimestamp = Date.now() / 1e3) {
+  const { startTime, endTime, secondsInADay, totalTokenSupply, solVolumes } = globalVolumeAccumulator;
+  const { totalUnclaimedTokens: totalUnclaimedTokens2, currentSolVolume, lastUpdateTimestamp } = userVolumeAccumulator;
+  const result = totalUnclaimedTokens2;
+  if (startTime.eqn(0) || endTime.eqn(0) || secondsInADay.eqn(0)) {
+    return result;
+  }
+  let currentTimestampBn = new BN2(currentTimestamp);
+  if (currentTimestampBn.lt(startTime)) {
+    return result;
+  }
+  const currentDayIndex = currentTimestampBn.sub(startTime).div(secondsInADay).toNumber();
+  if (lastUpdateTimestamp.lt(startTime)) {
+    return result;
+  }
+  const lastUpdatedIndex = lastUpdateTimestamp.sub(startTime).div(secondsInADay).toNumber();
+  if (endTime.lt(startTime)) {
+    return result;
+  }
+  const endDayIndex = endTime.sub(startTime).div(secondsInADay).toNumber();
+  if (currentDayIndex > lastUpdatedIndex && lastUpdatedIndex <= endDayIndex) {
+    const lastUpdatedDayTokenSupply = totalTokenSupply[lastUpdatedIndex];
+    const lastUpdatedDaySolVolume = solVolumes[lastUpdatedIndex];
+    if (lastUpdatedDaySolVolume.eqn(0)) {
+      return result;
+    }
+    return result.add(
+      currentSolVolume.mul(lastUpdatedDayTokenSupply).div(lastUpdatedDaySolVolume)
+    );
+  }
+  return result;
+}
 function currentDayTokens(globalVolumeAccumulator, userVolumeAccumulator, currentTimestamp = Date.now() / 1e3) {
-  const { startTime, endTime } = globalVolumeAccumulator;
+  const { startTime, endTime, secondsInADay, totalTokenSupply, solVolumes } = globalVolumeAccumulator;
+  const { currentSolVolume, lastUpdateTimestamp } = userVolumeAccumulator;
+  if (startTime.eqn(0) || endTime.eqn(0) || secondsInADay.eqn(0)) {
+    return new BN2(0);
+  }
   let currentTimestampBn = new BN2(currentTimestamp);
   if (currentTimestampBn.lt(startTime) || currentTimestampBn.gt(endTime)) {
     return new BN2(0);
   }
-  const { secondsInADay, totalTokenSupply, solVolumes } = globalVolumeAccumulator;
-  let currentDayIndex = currentTimestampBn.sub(startTime).div(secondsInADay).toNumber();
-  let currentDayTokenSupply = totalTokenSupply[currentDayIndex];
-  let currentDaySolVolume = solVolumes[currentDayIndex];
+  const currentDayIndex = currentTimestampBn.sub(startTime).div(secondsInADay).toNumber();
+  if (lastUpdateTimestamp.lt(startTime)) {
+    return new BN2(0);
+  }
+  const lastUpdatedIndex = lastUpdateTimestamp.sub(startTime).div(secondsInADay).toNumber();
+  if (endTime.lt(startTime)) {
+    return new BN2(0);
+  }
+  if (currentDayIndex !== lastUpdatedIndex) {
+    return new BN2(0);
+  }
+  const currentDayTokenSupply = totalTokenSupply[currentDayIndex];
+  const currentDaySolVolume = solVolumes[currentDayIndex];
   if (currentDaySolVolume.eqn(0)) {
     return new BN2(0);
   }
-  const { currentSolVolume } = userVolumeAccumulator;
   return currentSolVolume.mul(currentDayTokenSupply).div(currentDaySolVolume);
 }
 
@@ -4384,6 +4428,28 @@ var PumpSdk = class {
       )
     ];
   }
+  async getTotalUnclaimedTokens(user) {
+    const [
+      globalVolumeAccumulatorAccountInfo,
+      userVolumeAccumulatorAccountInfo
+    ] = await this.connection.getMultipleAccountsInfo([
+      globalVolumeAccumulatorPda()[0],
+      userVolumeAccumulatorPda(user)[0]
+    ]);
+    if (!globalVolumeAccumulatorAccountInfo || !userVolumeAccumulatorAccountInfo) {
+      return new BN3(0);
+    }
+    const globalVolumeAccumulator = this.decodeGlobalVolumeAccumulator(
+      globalVolumeAccumulatorAccountInfo
+    );
+    const userVolumeAccumulator = this.decodeUserVolumeAccumulator(
+      userVolumeAccumulatorAccountInfo
+    );
+    return totalUnclaimedTokens(
+      globalVolumeAccumulator,
+      userVolumeAccumulator
+    ).add(await this.pumpAmmSdk.getCurrentDayTokens(user));
+  }
   async getCurrentDayTokens(user) {
     const [
       globalVolumeAccumulatorAccountInfo,
@@ -4471,6 +4537,7 @@ export {
   bondingCurvePda,
   canonicalPumpPoolPda,
   creatorVaultPda,
+  currentDayTokens,
   getBuySolAmountFromTokenAmount,
   getBuyTokenAmountFromSolAmount,
   getPumpProgram,
@@ -4480,5 +4547,6 @@ export {
   newBondingCurve,
   pump_default as pumpIdl,
   pumpPoolAuthorityPda,
+  totalUnclaimedTokens,
   userVolumeAccumulatorPda
 };

package/dist/index.d.mts

@@ -7904,7 +7904,11 @@ 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[]>;
     claimTokenIncentives(user: PublicKey, payer: PublicKey, mint?: PublicKey, tokenProgram?: PublicKey): Promise<TransactionInstruction[]>;
+    getTotalUnclaimedTokens(user: PublicKey): Promise<BN>;
     getCurrentDayTokens(user: PublicKey): Promise<BN>;
 }
 
-export { BONDING_CURVE_NEW_SIZE, type BondingCurve, CANONICAL_POOL_INDEX, type Global, PUMP_AMM_PROGRAM_ID, PUMP_PROGRAM_ID, type Pump, PumpSdk, bondingCurvePda, canonicalPumpPoolPda, creatorVaultPda, getBuySolAmountFromTokenAmount, getBuyTokenAmountFromSolAmount, getPumpProgram, getSellSolAmountFromTokenAmount, globalPda, globalVolumeAccumulatorPda, newBondingCurve, pump as pumpIdl, pumpPoolAuthorityPda, userVolumeAccumulatorPda };
+declare function totalUnclaimedTokens(globalVolumeAccumulator: GlobalVolumeAccumulator, userVolumeAccumulator: UserVolumeAccumulator, currentTimestamp?: number): BN;
+declare function currentDayTokens(globalVolumeAccumulator: GlobalVolumeAccumulator, userVolumeAccumulator: UserVolumeAccumulator, currentTimestamp?: number): BN;
+
+export { BONDING_CURVE_NEW_SIZE, type BondingCurve, CANONICAL_POOL_INDEX, type Global, PUMP_AMM_PROGRAM_ID, PUMP_PROGRAM_ID, type Pump, PumpSdk, bondingCurvePda, canonicalPumpPoolPda, creatorVaultPda, currentDayTokens, getBuySolAmountFromTokenAmount, getBuyTokenAmountFromSolAmount, getPumpProgram, getSellSolAmountFromTokenAmount, globalPda, globalVolumeAccumulatorPda, newBondingCurve, pump as pumpIdl, pumpPoolAuthorityPda, totalUnclaimedTokens, userVolumeAccumulatorPda };

package/dist/index.d.ts

@@ -7904,7 +7904,11 @@ 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[]>;
     claimTokenIncentives(user: PublicKey, payer: PublicKey, mint?: PublicKey, tokenProgram?: PublicKey): Promise<TransactionInstruction[]>;
+    getTotalUnclaimedTokens(user: PublicKey): Promise<BN>;
     getCurrentDayTokens(user: PublicKey): Promise<BN>;
 }
 
-export { BONDING_CURVE_NEW_SIZE, type BondingCurve, CANONICAL_POOL_INDEX, type Global, PUMP_AMM_PROGRAM_ID, PUMP_PROGRAM_ID, type Pump, PumpSdk, bondingCurvePda, canonicalPumpPoolPda, creatorVaultPda, getBuySolAmountFromTokenAmount, getBuyTokenAmountFromSolAmount, getPumpProgram, getSellSolAmountFromTokenAmount, globalPda, globalVolumeAccumulatorPda, newBondingCurve, pump as pumpIdl, pumpPoolAuthorityPda, userVolumeAccumulatorPda };
+declare function totalUnclaimedTokens(globalVolumeAccumulator: GlobalVolumeAccumulator, userVolumeAccumulator: UserVolumeAccumulator, currentTimestamp?: number): BN;
+declare function currentDayTokens(globalVolumeAccumulator: GlobalVolumeAccumulator, userVolumeAccumulator: UserVolumeAccumulator, currentTimestamp?: number): BN;
+
+export { BONDING_CURVE_NEW_SIZE, type BondingCurve, CANONICAL_POOL_INDEX, type Global, PUMP_AMM_PROGRAM_ID, PUMP_PROGRAM_ID, type Pump, PumpSdk, bondingCurvePda, canonicalPumpPoolPda, creatorVaultPda, currentDayTokens, getBuySolAmountFromTokenAmount, getBuyTokenAmountFromSolAmount, getPumpProgram, getSellSolAmountFromTokenAmount, globalPda, globalVolumeAccumulatorPda, newBondingCurve, pump as pumpIdl, pumpPoolAuthorityPda, totalUnclaimedTokens, userVolumeAccumulatorPda };

package/dist/index.js

@@ -38,6 +38,7 @@ __export(index_exports, {
   bondingCurvePda: () => bondingCurvePda,
   canonicalPumpPoolPda: () => canonicalPumpPoolPda,
   creatorVaultPda: () => creatorVaultPda,
+  currentDayTokens: () => currentDayTokens,
   getBuySolAmountFromTokenAmount: () => getBuySolAmountFromTokenAmount,
   getBuyTokenAmountFromSolAmount: () => getBuyTokenAmountFromSolAmount,
   getPumpProgram: () => getPumpProgram,
@@ -47,6 +48,7 @@ __export(index_exports, {
   newBondingCurve: () => newBondingCurve,
   pumpIdl: () => pump_default,
   pumpPoolAuthorityPda: () => pumpPoolAuthorityPda,
+  totalUnclaimedTokens: () => totalUnclaimedTokens,
   userVolumeAccumulatorPda: () => userVolumeAccumulatorPda
 });
 module.exports = __toCommonJS(index_exports);
@@ -4004,20 +4006,64 @@ var import_bn3 = __toESM(require("bn.js"));
 
 // src/tokenIncentives.ts
 var import_bn2 = __toESM(require("bn.js"));
+function totalUnclaimedTokens(globalVolumeAccumulator, userVolumeAccumulator, currentTimestamp = Date.now() / 1e3) {
+  const { startTime, endTime, secondsInADay, totalTokenSupply, solVolumes } = globalVolumeAccumulator;
+  const { totalUnclaimedTokens: totalUnclaimedTokens2, currentSolVolume, lastUpdateTimestamp } = userVolumeAccumulator;
+  const result = totalUnclaimedTokens2;
+  if (startTime.eqn(0) || endTime.eqn(0) || secondsInADay.eqn(0)) {
+    return result;
+  }
+  let currentTimestampBn = new import_bn2.default(currentTimestamp);
+  if (currentTimestampBn.lt(startTime)) {
+    return result;
+  }
+  const currentDayIndex = currentTimestampBn.sub(startTime).div(secondsInADay).toNumber();
+  if (lastUpdateTimestamp.lt(startTime)) {
+    return result;
+  }
+  const lastUpdatedIndex = lastUpdateTimestamp.sub(startTime).div(secondsInADay).toNumber();
+  if (endTime.lt(startTime)) {
+    return result;
+  }
+  const endDayIndex = endTime.sub(startTime).div(secondsInADay).toNumber();
+  if (currentDayIndex > lastUpdatedIndex && lastUpdatedIndex <= endDayIndex) {
+    const lastUpdatedDayTokenSupply = totalTokenSupply[lastUpdatedIndex];
+    const lastUpdatedDaySolVolume = solVolumes[lastUpdatedIndex];
+    if (lastUpdatedDaySolVolume.eqn(0)) {
+      return result;
+    }
+    return result.add(
+      currentSolVolume.mul(lastUpdatedDayTokenSupply).div(lastUpdatedDaySolVolume)
+    );
+  }
+  return result;
+}
 function currentDayTokens(globalVolumeAccumulator, userVolumeAccumulator, currentTimestamp = Date.now() / 1e3) {
-  const { startTime, endTime } = globalVolumeAccumulator;
+  const { startTime, endTime, secondsInADay, totalTokenSupply, solVolumes } = globalVolumeAccumulator;
+  const { currentSolVolume, lastUpdateTimestamp } = userVolumeAccumulator;
+  if (startTime.eqn(0) || endTime.eqn(0) || secondsInADay.eqn(0)) {
+    return new import_bn2.default(0);
+  }
   let currentTimestampBn = new import_bn2.default(currentTimestamp);
   if (currentTimestampBn.lt(startTime) || currentTimestampBn.gt(endTime)) {
     return new import_bn2.default(0);
   }
-  const { secondsInADay, totalTokenSupply, solVolumes } = globalVolumeAccumulator;
-  let currentDayIndex = currentTimestampBn.sub(startTime).div(secondsInADay).toNumber();
-  let currentDayTokenSupply = totalTokenSupply[currentDayIndex];
-  let currentDaySolVolume = solVolumes[currentDayIndex];
+  const currentDayIndex = currentTimestampBn.sub(startTime).div(secondsInADay).toNumber();
+  if (lastUpdateTimestamp.lt(startTime)) {
+    return new import_bn2.default(0);
+  }
+  const lastUpdatedIndex = lastUpdateTimestamp.sub(startTime).div(secondsInADay).toNumber();
+  if (endTime.lt(startTime)) {
+    return new import_bn2.default(0);
+  }
+  if (currentDayIndex !== lastUpdatedIndex) {
+    return new import_bn2.default(0);
+  }
+  const currentDayTokenSupply = totalTokenSupply[currentDayIndex];
+  const currentDaySolVolume = solVolumes[currentDayIndex];
   if (currentDaySolVolume.eqn(0)) {
     return new import_bn2.default(0);
   }
-  const { currentSolVolume } = userVolumeAccumulator;
   return currentSolVolume.mul(currentDayTokenSupply).div(currentDaySolVolume);
 }
 
@@ -4429,6 +4475,28 @@ var PumpSdk = class {
       )
     ];
   }
+  async getTotalUnclaimedTokens(user) {
+    const [
+      globalVolumeAccumulatorAccountInfo,
+      userVolumeAccumulatorAccountInfo
+    ] = await this.connection.getMultipleAccountsInfo([
+      globalVolumeAccumulatorPda()[0],
+      userVolumeAccumulatorPda(user)[0]
+    ]);
+    if (!globalVolumeAccumulatorAccountInfo || !userVolumeAccumulatorAccountInfo) {
+      return new import_bn3.default(0);
+    }
+    const globalVolumeAccumulator = this.decodeGlobalVolumeAccumulator(
+      globalVolumeAccumulatorAccountInfo
+    );
+    const userVolumeAccumulator = this.decodeUserVolumeAccumulator(
+      userVolumeAccumulatorAccountInfo
+    );
+    return totalUnclaimedTokens(
+      globalVolumeAccumulator,
+      userVolumeAccumulator
+    ).add(await this.pumpAmmSdk.getCurrentDayTokens(user));
+  }
   async getCurrentDayTokens(user) {
     const [
       globalVolumeAccumulatorAccountInfo,

package/package.json

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

package/src/index.ts

@@ -24,3 +24,4 @@ export {
   PumpSdk,
 } from "./sdk";
 export { Global, BondingCurve } from "./state";
+export { totalUnclaimedTokens, currentDayTokens } from "./tokenIncentives";

package/src/sdk.ts

@@ -33,7 +33,7 @@ import {
   GlobalVolumeAccumulator,
   UserVolumeAccumulator,
 } from "./state";
-import { currentDayTokens } from "./tokenIncentives";
+import { currentDayTokens, totalUnclaimedTokens } from "./tokenIncentives";
 
 export function getPumpProgram(
   connection: Connection,
@@ -623,6 +623,35 @@ export class PumpSdk {
     ];
   }
 
+  async getTotalUnclaimedTokens(user: PublicKey): Promise<BN> {
+    const [
+      globalVolumeAccumulatorAccountInfo,
+      userVolumeAccumulatorAccountInfo,
+    ] = await this.connection.getMultipleAccountsInfo([
+      globalVolumeAccumulatorPda()[0],
+      userVolumeAccumulatorPda(user)[0],
+    ]);
+
+    if (
+      !globalVolumeAccumulatorAccountInfo ||
+      !userVolumeAccumulatorAccountInfo
+    ) {
+      return new BN(0);
+    }
+
+    const globalVolumeAccumulator = this.decodeGlobalVolumeAccumulator(
+      globalVolumeAccumulatorAccountInfo,
+    );
+    const userVolumeAccumulator = this.decodeUserVolumeAccumulator(
+      userVolumeAccumulatorAccountInfo,
+    );
+
+    return totalUnclaimedTokens(
+      globalVolumeAccumulator,
+      userVolumeAccumulator,
+    ).add(await this.pumpAmmSdk.getCurrentDayTokens(user));
+  }
+
   async getCurrentDayTokens(user: PublicKey): Promise<BN> {
     const [
       globalVolumeAccumulatorAccountInfo,

package/src/tokenIncentives.ts

@@ -1,12 +1,78 @@
 import BN from "bn.js";
 import { GlobalVolumeAccumulator, UserVolumeAccumulator } from "./state";
 
+export function totalUnclaimedTokens(
+  globalVolumeAccumulator: GlobalVolumeAccumulator,
+  userVolumeAccumulator: UserVolumeAccumulator,
+  currentTimestamp: number = Date.now() / 1000,
+): BN {
+  const { startTime, endTime, secondsInADay, totalTokenSupply, solVolumes } =
+    globalVolumeAccumulator;
+  const { totalUnclaimedTokens, currentSolVolume, lastUpdateTimestamp } =
+    userVolumeAccumulator;
+
+  const result = totalUnclaimedTokens;
+
+  if (startTime.eqn(0) || endTime.eqn(0) || secondsInADay.eqn(0)) {
+    return result;
+  }
+
+  let currentTimestampBn = new BN(currentTimestamp);
+
+  if (currentTimestampBn.lt(startTime)) {
+    return result;
+  }
+
+  const currentDayIndex = currentTimestampBn
+    .sub(startTime)
+    .div(secondsInADay)
+    .toNumber();
+
+  if (lastUpdateTimestamp.lt(startTime)) {
+    return result;
+  }
+
+  const lastUpdatedIndex = lastUpdateTimestamp
+    .sub(startTime)
+    .div(secondsInADay)
+    .toNumber();
+
+  if (endTime.lt(startTime)) {
+    return result;
+  }
+
+  const endDayIndex = endTime.sub(startTime).div(secondsInADay).toNumber();
+
+  if (currentDayIndex > lastUpdatedIndex && lastUpdatedIndex <= endDayIndex) {
+    const lastUpdatedDayTokenSupply = totalTokenSupply[lastUpdatedIndex];
+    const lastUpdatedDaySolVolume = solVolumes[lastUpdatedIndex];
+
+    if (lastUpdatedDaySolVolume.eqn(0)) {
+      return result;
+    }
+
+    return result.add(
+      currentSolVolume
+        .mul(lastUpdatedDayTokenSupply)
+        .div(lastUpdatedDaySolVolume),
+    );
+  }
+
+  return result;
+}
+
 export function currentDayTokens(
   globalVolumeAccumulator: GlobalVolumeAccumulator,
   userVolumeAccumulator: UserVolumeAccumulator,
   currentTimestamp: number = Date.now() / 1000,
 ): BN {
-  const { startTime, endTime } = globalVolumeAccumulator;
+  const { startTime, endTime, secondsInADay, totalTokenSupply, solVolumes } =
+    globalVolumeAccumulator;
+  const { currentSolVolume, lastUpdateTimestamp } = userVolumeAccumulator;
+
+  if (startTime.eqn(0) || endTime.eqn(0) || secondsInADay.eqn(0)) {
+    return new BN(0);
+  }
 
   let currentTimestampBn = new BN(currentTimestamp);
 
@@ -14,22 +80,34 @@ export function currentDayTokens(
     return new BN(0);
   }
 
-  const { secondsInADay, totalTokenSupply, solVolumes } =
-    globalVolumeAccumulator;
+  const currentDayIndex = currentTimestampBn
+    .sub(startTime)
+    .div(secondsInADay)
+    .toNumber();
+
+  if (lastUpdateTimestamp.lt(startTime)) {
+    return new BN(0);
+  }
 
-  let currentDayIndex = currentTimestampBn
+  const lastUpdatedIndex = lastUpdateTimestamp
     .sub(startTime)
     .div(secondsInADay)
     .toNumber();
 
-  let currentDayTokenSupply = totalTokenSupply[currentDayIndex];
-  let currentDaySolVolume = solVolumes[currentDayIndex];
+  if (endTime.lt(startTime)) {
+    return new BN(0);
+  }
+
+  if (currentDayIndex !== lastUpdatedIndex) {
+    return new BN(0);
+  }
+
+  const currentDayTokenSupply = totalTokenSupply[currentDayIndex];
+  const currentDaySolVolume = solVolumes[currentDayIndex];
 
   if (currentDaySolVolume.eqn(0)) {
     return new BN(0);
   }
 
-  const { currentSolVolume } = userVolumeAccumulator;
-
   return currentSolVolume.mul(currentDayTokenSupply).div(currentDaySolVolume);
 }