@pump-fun/pump-sdk 1.18.2 → 1.18.4

package/dist/esm/index.js

@@ -4777,8 +4777,9 @@ function getBuyTokenAmountFromSolAmount({
     return new BN(0);
   }
   let isNewBondingCurve = false;
-  if (bondingCurve === null) {
+  if (bondingCurve === null || mintSupply === null) {
     bondingCurve = newBondingCurve(global);
+    mintSupply = global.tokenTotalSupply;
     isNewBondingCurve = true;
   }
   if (bondingCurve.virtualTokenReserves.eq(new BN(0))) {
@@ -4814,8 +4815,9 @@ function getBuySolAmountFromTokenAmount({
     return new BN(0);
   }
   let isNewBondingCurve = false;
-  if (bondingCurve === null) {
+  if (bondingCurve === null || mintSupply === null) {
     bondingCurve = newBondingCurve(global);
+    mintSupply = global.tokenTotalSupply;
     isNewBondingCurve = true;
   }
   if (bondingCurve.virtualTokenReserves.eq(new BN(0))) {
@@ -4827,14 +4829,16 @@ function getBuySolAmountFromTokenAmount({
     virtualTokenReserves: bondingCurve.virtualTokenReserves,
     virtualSolReserves: bondingCurve.virtualSolReserves
   });
-  return solCost.add(getFee({
-    global,
-    feeConfig,
-    mintSupply,
-    bondingCurve,
-    amount: solCost,
-    isNewBondingCurve
-  }));
+  return solCost.add(
+    getFee({
+      global,
+      feeConfig,
+      mintSupply,
+      bondingCurve,
+      amount: solCost,
+      isNewBondingCurve
+    })
+  );
 }
 function getSellSolAmountFromTokenAmount({
   global,
@@ -4854,14 +4858,16 @@ function getSellSolAmountFromTokenAmount({
     virtualTokenReserves: bondingCurve.virtualTokenReserves,
     virtualSolReserves: bondingCurve.virtualSolReserves
   });
-  return solCost.sub(getFee({
-    global,
-    feeConfig,
-    mintSupply,
-    bondingCurve,
-    amount: solCost,
-    isNewBondingCurve: false
-  }));
+  return solCost.sub(
+    getFee({
+      global,
+      feeConfig,
+      mintSupply,
+      bondingCurve,
+      amount: solCost,
+      isNewBondingCurve: false
+    })
+  );
 }
 function getStaticRandomFeeRecipient() {
   const randomIndex = Math.floor(Math.random() * CURRENT_FEE_RECIPIENTS.length);
@@ -4935,7 +4941,7 @@ function computeFeesBps({
   virtualSolReserves,
   virtualTokenReserves
 }) {
-  if (feeConfig != null && mintSupply != null) {
+  if (feeConfig != null) {
     const marketCap = bondingCurveMarketCap({
       mintSupply,
       virtualSolReserves,
@@ -4951,7 +4957,10 @@ function computeFeesBps({
     creatorFeeBps: global.creatorFeeBasisPoints
   };
 }
-function calculateFeeTier({ feeTiers, marketCap }) {
+function calculateFeeTier({
+  feeTiers,
+  marketCap
+}) {
   const firstTier = feeTiers[0];
   if (marketCap.lt(firstTier.marketCapLamportsThreshold)) {
     return firstTier.fees;
@@ -5102,6 +5111,14 @@ var PumpSdk = class {
       accountInfo.data
     );
   }
+  decodeBondingCurveNullable(accountInfo) {
+    try {
+      return this.decodeBondingCurve(accountInfo);
+    } catch (e) {
+      console.warn("Failed to decode bonding curve", e);
+      return null;
+    }
+  }
   decodeGlobalVolumeAccumulator(accountInfo) {
     return this.offlinePumpProgram.coder.accounts.decode(
       "globalVolumeAccumulator",
@@ -5114,6 +5131,14 @@ var PumpSdk = class {
       accountInfo.data
     );
   }
+  decodeUserVolumeAccumulatorNullable(accountInfo) {
+    try {
+      return this.decodeUserVolumeAccumulator(accountInfo);
+    } catch (e) {
+      console.warn("Failed to decode user volume accumulator", e);
+      return null;
+    }
+  }
   async fetchGlobal() {
     return await this.pumpProgram.account.global.fetch(globalPda());
   }

package/dist/index.d.mts

@@ -9579,7 +9579,7 @@ declare function getBuySolAmountFromTokenAmount({ global, feeConfig, mintSupply,
 declare function getSellSolAmountFromTokenAmount({ global, feeConfig, mintSupply, bondingCurve, amount, }: {
     global: Global;
     feeConfig: FeeConfig | null;
-    mintSupply: BN | null;
+    mintSupply: BN;
     bondingCurve: BondingCurve;
     amount: BN;
 }): BN;
@@ -9614,8 +9614,10 @@ declare class PumpSdk {
     decodeGlobal(accountInfo: AccountInfo<Buffer>): Global;
     decodeFeeConfig(accountInfo: AccountInfo<Buffer>): FeeConfig;
     decodeBondingCurve(accountInfo: AccountInfo<Buffer>): BondingCurve;
+    decodeBondingCurveNullable(accountInfo: AccountInfo<Buffer>): BondingCurve | null;
     decodeGlobalVolumeAccumulator(accountInfo: AccountInfo<Buffer>): GlobalVolumeAccumulator;
     decodeUserVolumeAccumulator(accountInfo: AccountInfo<Buffer>): UserVolumeAccumulator;
+    decodeUserVolumeAccumulatorNullable(accountInfo: AccountInfo<Buffer>): UserVolumeAccumulator | null;
     fetchGlobal(): Promise<Global>;
     fetchFeeConfig(): Promise<FeeConfig>;
     fetchBondingCurve(mint: PublicKeyInitData): Promise<BondingCurve>;

package/dist/index.d.ts

@@ -9579,7 +9579,7 @@ declare function getBuySolAmountFromTokenAmount({ global, feeConfig, mintSupply,
 declare function getSellSolAmountFromTokenAmount({ global, feeConfig, mintSupply, bondingCurve, amount, }: {
     global: Global;
     feeConfig: FeeConfig | null;
-    mintSupply: BN | null;
+    mintSupply: BN;
     bondingCurve: BondingCurve;
     amount: BN;
 }): BN;
@@ -9614,8 +9614,10 @@ declare class PumpSdk {
     decodeGlobal(accountInfo: AccountInfo<Buffer>): Global;
     decodeFeeConfig(accountInfo: AccountInfo<Buffer>): FeeConfig;
     decodeBondingCurve(accountInfo: AccountInfo<Buffer>): BondingCurve;
+    decodeBondingCurveNullable(accountInfo: AccountInfo<Buffer>): BondingCurve | null;
     decodeGlobalVolumeAccumulator(accountInfo: AccountInfo<Buffer>): GlobalVolumeAccumulator;
     decodeUserVolumeAccumulator(accountInfo: AccountInfo<Buffer>): UserVolumeAccumulator;
+    decodeUserVolumeAccumulatorNullable(accountInfo: AccountInfo<Buffer>): UserVolumeAccumulator | null;
     fetchGlobal(): Promise<Global>;
     fetchFeeConfig(): Promise<FeeConfig>;
     fetchBondingCurve(mint: PublicKeyInitData): Promise<BondingCurve>;

package/dist/index.js

@@ -4838,8 +4838,9 @@ function getBuyTokenAmountFromSolAmount({
     return new import_bn.default(0);
   }
   let isNewBondingCurve = false;
-  if (bondingCurve === null) {
+  if (bondingCurve === null || mintSupply === null) {
     bondingCurve = newBondingCurve(global);
+    mintSupply = global.tokenTotalSupply;
     isNewBondingCurve = true;
   }
   if (bondingCurve.virtualTokenReserves.eq(new import_bn.default(0))) {
@@ -4875,8 +4876,9 @@ function getBuySolAmountFromTokenAmount({
     return new import_bn.default(0);
   }
   let isNewBondingCurve = false;
-  if (bondingCurve === null) {
+  if (bondingCurve === null || mintSupply === null) {
     bondingCurve = newBondingCurve(global);
+    mintSupply = global.tokenTotalSupply;
     isNewBondingCurve = true;
   }
   if (bondingCurve.virtualTokenReserves.eq(new import_bn.default(0))) {
@@ -4888,14 +4890,16 @@ function getBuySolAmountFromTokenAmount({
     virtualTokenReserves: bondingCurve.virtualTokenReserves,
     virtualSolReserves: bondingCurve.virtualSolReserves
   });
-  return solCost.add(getFee({
-    global,
-    feeConfig,
-    mintSupply,
-    bondingCurve,
-    amount: solCost,
-    isNewBondingCurve
-  }));
+  return solCost.add(
+    getFee({
+      global,
+      feeConfig,
+      mintSupply,
+      bondingCurve,
+      amount: solCost,
+      isNewBondingCurve
+    })
+  );
 }
 function getSellSolAmountFromTokenAmount({
   global,
@@ -4915,14 +4919,16 @@ function getSellSolAmountFromTokenAmount({
     virtualTokenReserves: bondingCurve.virtualTokenReserves,
     virtualSolReserves: bondingCurve.virtualSolReserves
   });
-  return solCost.sub(getFee({
-    global,
-    feeConfig,
-    mintSupply,
-    bondingCurve,
-    amount: solCost,
-    isNewBondingCurve: false
-  }));
+  return solCost.sub(
+    getFee({
+      global,
+      feeConfig,
+      mintSupply,
+      bondingCurve,
+      amount: solCost,
+      isNewBondingCurve: false
+    })
+  );
 }
 function getStaticRandomFeeRecipient() {
   const randomIndex = Math.floor(Math.random() * CURRENT_FEE_RECIPIENTS.length);
@@ -4996,7 +5002,7 @@ function computeFeesBps({
   virtualSolReserves,
   virtualTokenReserves
 }) {
-  if (feeConfig != null && mintSupply != null) {
+  if (feeConfig != null) {
     const marketCap = bondingCurveMarketCap({
       mintSupply,
       virtualSolReserves,
@@ -5012,7 +5018,10 @@ function computeFeesBps({
     creatorFeeBps: global.creatorFeeBasisPoints
   };
 }
-function calculateFeeTier({ feeTiers, marketCap }) {
+function calculateFeeTier({
+  feeTiers,
+  marketCap
+}) {
   const firstTier = feeTiers[0];
   if (marketCap.lt(firstTier.marketCapLamportsThreshold)) {
     return firstTier.fees;
@@ -5155,6 +5164,14 @@ var PumpSdk = class {
       accountInfo.data
     );
   }
+  decodeBondingCurveNullable(accountInfo) {
+    try {
+      return this.decodeBondingCurve(accountInfo);
+    } catch (e) {
+      console.warn("Failed to decode bonding curve", e);
+      return null;
+    }
+  }
   decodeGlobalVolumeAccumulator(accountInfo) {
     return this.offlinePumpProgram.coder.accounts.decode(
       "globalVolumeAccumulator",
@@ -5167,6 +5184,14 @@ var PumpSdk = class {
       accountInfo.data
     );
   }
+  decodeUserVolumeAccumulatorNullable(accountInfo) {
+    try {
+      return this.decodeUserVolumeAccumulator(accountInfo);
+    } catch (e) {
+      console.warn("Failed to decode user volume accumulator", e);
+      return null;
+    }
+  }
   async fetchGlobal() {
     return await this.pumpProgram.account.global.fetch(globalPda());
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pump-fun/pump-sdk",
-  "version": "1.18.2",
+  "version": "1.18.4",
   "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": "^1.7.0",
+    "@pump-fun/pump-swap-sdk": "^1.7.1",
     "@solana/spl-token": "^0.4.13",
     "@solana/web3.js": "^1.98.2",
     "bn.js": "^5.2.2",

package/src/bondingCurve.ts

@@ -77,8 +77,9 @@ export function getBuyTokenAmountFromSolAmount({
 
   let isNewBondingCurve = false;
 
-  if (bondingCurve === null) {
+  if (bondingCurve === null || mintSupply === null) {
     bondingCurve = newBondingCurve(global);
+    mintSupply = global.tokenTotalSupply;
     isNewBondingCurve = true;
   }
 
@@ -132,8 +133,9 @@ export function getBuySolAmountFromTokenAmount({
 
   let isNewBondingCurve = false;
 
-  if (bondingCurve === null) {
+  if (bondingCurve === null || mintSupply === null) {
     bondingCurve = newBondingCurve(global);
+    mintSupply = global.tokenTotalSupply;
     isNewBondingCurve = true;
   }
 
@@ -150,14 +152,16 @@ export function getBuySolAmountFromTokenAmount({
     virtualSolReserves: bondingCurve.virtualSolReserves,
   });
 
-  return solCost.add(getFee({
-    global,
-    feeConfig,
-    mintSupply,
-    bondingCurve,
-    amount: solCost,
-    isNewBondingCurve,
-  }));
+  return solCost.add(
+    getFee({
+      global,
+      feeConfig,
+      mintSupply,
+      bondingCurve,
+      amount: solCost,
+      isNewBondingCurve,
+    }),
+  );
 }
 
 export function getSellSolAmountFromTokenAmount({
@@ -169,7 +173,7 @@ export function getSellSolAmountFromTokenAmount({
 }: {
   global: Global;
   feeConfig: FeeConfig | null;
-  mintSupply: BN | null;
+  mintSupply: BN;
   bondingCurve: BondingCurve;
   amount: BN;
 }): BN {
@@ -188,14 +192,16 @@ export function getSellSolAmountFromTokenAmount({
     virtualSolReserves: bondingCurve.virtualSolReserves,
   });
 
-  return solCost.sub(getFee({
-    global,
-    feeConfig,
-    mintSupply,
-    bondingCurve,
-    amount: solCost,
-    isNewBondingCurve: false,
-  }));
+  return solCost.sub(
+    getFee({
+      global,
+      feeConfig,
+      mintSupply,
+      bondingCurve,
+      amount: solCost,
+      isNewBondingCurve: false,
+    }),
+  );
 }
 
 export function getStaticRandomFeeRecipient(): PublicKey {

package/src/fees.ts

@@ -4,115 +4,125 @@ import { FeeConfig, Global, Fees, BondingCurve, FeeTier } from "./state";
 import { bondingCurveMarketCap } from "./bondingCurve";
 
 export interface CalculatedFeesBps {
-    protocolFeeBps: BN;
-    creatorFeeBps: BN;
+  protocolFeeBps: BN;
+  creatorFeeBps: BN;
 }
 
 export interface CalculatedFees {
-    protocolFee: BN;
-    creatorFee: BN;
+  protocolFee: BN;
+  creatorFee: BN;
 }
 
-export function createFeeConfigFromGlobalConfig(globalConfig: Global): FeeConfig {
-    let fees: Fees = {
-        lpFeeBps: new BN(0), // unused for pump
-        protocolFeeBps: globalConfig.feeBasisPoints,
-        creatorFeeBps: globalConfig.creatorFeeBasisPoints,
-    };
-    return {
-        admin: globalConfig.authority,
-        flatFees: fees,
-        feeTiers: [
-            {
-                marketCapLamportsThreshold: new BN(0), // unused for pump
-                fees,
-            },
-        ],
-    };
+export function createFeeConfigFromGlobalConfig(
+  globalConfig: Global,
+): FeeConfig {
+  let fees: Fees = {
+    lpFeeBps: new BN(0), // unused for pump
+    protocolFeeBps: globalConfig.feeBasisPoints,
+    creatorFeeBps: globalConfig.creatorFeeBasisPoints,
+  };
+  return {
+    admin: globalConfig.authority,
+    flatFees: fees,
+    feeTiers: [
+      {
+        marketCapLamportsThreshold: new BN(0), // unused for pump
+        fees,
+      },
+    ],
+  };
 }
 
 export function getFee({
-    global,
-    feeConfig,
-    mintSupply,
-    bondingCurve,
-    amount,
-    isNewBondingCurve,
+  global,
+  feeConfig,
+  mintSupply,
+  bondingCurve,
+  amount,
+  isNewBondingCurve,
 }: {
-    global: Global;
-    feeConfig: FeeConfig | null;
-    mintSupply: BN | null;
-    bondingCurve: BondingCurve;
-    amount: BN;
-    isNewBondingCurve: boolean;
+  global: Global;
+  feeConfig: FeeConfig | null;
+  mintSupply: BN;
+  bondingCurve: BondingCurve;
+  amount: BN;
+  isNewBondingCurve: boolean;
 }) {
-    const { virtualSolReserves, virtualTokenReserves } = bondingCurve;
-    const { protocolFeeBps, creatorFeeBps } = computeFeesBps({
-        global,
-        feeConfig,
-        mintSupply,
-        virtualSolReserves,
-        virtualTokenReserves,
-    });
-
-    return fee(amount, protocolFeeBps).add(
-        isNewBondingCurve || !PublicKey.default.equals(bondingCurve.creator) ? fee(amount, creatorFeeBps) : new BN(0)
-    );
-}
-
-export function computeFeesBps({
+  const { virtualSolReserves, virtualTokenReserves } = bondingCurve;
+  const { protocolFeeBps, creatorFeeBps } = computeFeesBps({
     global,
     feeConfig,
     mintSupply,
     virtualSolReserves,
     virtualTokenReserves,
+  });
+
+  return fee(amount, protocolFeeBps).add(
+    isNewBondingCurve || !PublicKey.default.equals(bondingCurve.creator)
+      ? fee(amount, creatorFeeBps)
+      : new BN(0),
+  );
+}
+
+export function computeFeesBps({
+  global,
+  feeConfig,
+  mintSupply,
+  virtualSolReserves,
+  virtualTokenReserves,
 }: {
-    global: Global;
-    feeConfig: FeeConfig | null;
-    mintSupply: BN | null;
-    virtualSolReserves: BN;
-    virtualTokenReserves: BN;
+  global: Global;
+  feeConfig: FeeConfig | null;
+  mintSupply: BN;
+  virtualSolReserves: BN;
+  virtualTokenReserves: BN;
 }): CalculatedFeesBps {
-    if (feeConfig != null && mintSupply != null) {
-        const marketCap = bondingCurveMarketCap({
-            mintSupply,
-            virtualSolReserves,
-            virtualTokenReserves,
-        });
+  if (feeConfig != null) {
+    const marketCap = bondingCurveMarketCap({
+      mintSupply,
+      virtualSolReserves,
+      virtualTokenReserves,
+    });
 
-        return calculateFeeTier({
-            feeTiers: feeConfig.feeTiers,
-            marketCap,
-        });
-    }
+    return calculateFeeTier({
+      feeTiers: feeConfig.feeTiers,
+      marketCap,
+    });
+  }
 
-    return {
-        protocolFeeBps: global.feeBasisPoints,
-        creatorFeeBps: global.creatorFeeBasisPoints,
-    };
+  return {
+    protocolFeeBps: global.feeBasisPoints,
+    creatorFeeBps: global.creatorFeeBasisPoints,
+  };
 }
 
 /// rust reference: pump-fees-math::calculate_fee_tier()
-export function calculateFeeTier({ feeTiers, marketCap }: { feeTiers: FeeTier[]; marketCap: BN }): Fees {
-    const firstTier = feeTiers[0];
+export function calculateFeeTier({
+  feeTiers,
+  marketCap,
+}: {
+  feeTiers: FeeTier[];
+  marketCap: BN;
+}): Fees {
+  const firstTier = feeTiers[0];
 
-    if (marketCap.lt(firstTier.marketCapLamportsThreshold)) {
-        return firstTier.fees;
-    }
+  if (marketCap.lt(firstTier.marketCapLamportsThreshold)) {
+    return firstTier.fees;
+  }
 
-    for (const tier of feeTiers.slice().reverse()) {
-        if (marketCap.gte(tier.marketCapLamportsThreshold)) {
-            return tier.fees;
-        }
+  for (const tier of feeTiers.slice().reverse()) {
+    if (marketCap.gte(tier.marketCapLamportsThreshold)) {
+      return tier.fees;
     }
+  }
 
-    return firstTier.fees;
+  return firstTier.fees;
 }
 
 function fee(amount: BN, feeBasisPoints: BN): BN {
-    return ceilDiv(amount.mul(feeBasisPoints), new BN(10_000));
+  return ceilDiv(amount.mul(feeBasisPoints), new BN(10_000));
 }
 
 function ceilDiv(a: BN, b: BN): BN {
-    return a.add(b.subn(1)).div(b);
+  return a.add(b.subn(1)).div(b);
 }

package/src/pda.ts

@@ -1,7 +1,11 @@
 import { PublicKey, PublicKeyInitData } from "@solana/web3.js";
 import { NATIVE_MINT } from "@solana/spl-token";
 import { poolPda } from "@pump-fun/pump-swap-sdk";
-import { PUMP_AMM_PROGRAM_ID, PUMP_FEE_PROGRAM_ID, PUMP_PROGRAM_ID } from "./sdk";
+import {
+  PUMP_AMM_PROGRAM_ID,
+  PUMP_FEE_PROGRAM_ID,
+  PUMP_PROGRAM_ID,
+} from "./sdk";
 
 export function globalPda(): PublicKey {
   const [globalPda] = PublicKey.findProgramAddressSync(

package/src/sdk.ts

@@ -104,6 +104,17 @@ export class PumpSdk {
     );
   }
 
+  decodeBondingCurveNullable(
+    accountInfo: AccountInfo<Buffer>,
+  ): BondingCurve | null {
+    try {
+      return this.decodeBondingCurve(accountInfo);
+    } catch (e) {
+      console.warn("Failed to decode bonding curve", e);
+      return null;
+    }
+  }
+
   decodeGlobalVolumeAccumulator(
     accountInfo: AccountInfo<Buffer>,
   ): GlobalVolumeAccumulator {
@@ -121,6 +132,18 @@ export class PumpSdk {
       accountInfo.data,
     );
   }
+
+  decodeUserVolumeAccumulatorNullable(
+    accountInfo: AccountInfo<Buffer>,
+  ): UserVolumeAccumulator | null {
+    try {
+      return this.decodeUserVolumeAccumulator(accountInfo);
+    } catch (e) {
+      console.warn("Failed to decode user volume accumulator", e);
+      return null;
+    }
+  }
+
   async fetchGlobal(): Promise<Global> {
     return await this.pumpProgram.account.global.fetch(globalPda());
   }