@velocity-exchange/sdk 0.0.5 → 0.2.0

package/lib/browser/math/superStake.d.ts

@@ -5,6 +5,7 @@ import { VelocityClient } from '../velocityClient';
 import { BN } from '../isomorphic/anchor';
 import { User } from '../user';
 import { DepositRecord } from '../types';
+import fetch from 'node-fetch';
 export type BSOL_STATS_API_RESPONSE = {
     success: boolean;
     stats?: {
@@ -27,15 +28,13 @@ export type BSOL_EMISSIONS_API_RESPONSE = {
         lend: number;
     };
 };
-export declare function fetchBSolMetrics(): Promise<any>;
-export declare function fetchBSolVelocityEmissions(): Promise<any>;
-/** @deprecated Use `fetchBSolVelocityEmissions` instead. `fetchBSolDriftEmissions` will be removed in a future major. */
-export declare const fetchBSolDriftEmissions: typeof fetchBSolVelocityEmissions;
-export declare function findBestSuperStakeIxs({ marketIndex, amount, jupiterClient, driftClient, userAccountPublicKey, price, forceMarinade, onlyDirectRoutes, jupiterQuote, }: {
+export declare function fetchBSolMetrics(): Promise<fetch.Response>;
+export declare function fetchBSolVelocityEmissions(): Promise<fetch.Response>;
+export declare function findBestSuperStakeIxs({ marketIndex, amount, jupiterClient, velocityClient, userAccountPublicKey, price, forceMarinade, onlyDirectRoutes, jupiterQuote, }: {
     marketIndex: number;
     amount: BN;
     jupiterClient: JupiterClient;
-    driftClient: VelocityClient;
+    velocityClient: VelocityClient;
     price?: number;
     userAccountPublicKey?: PublicKey;
     forceMarinade?: boolean;
@@ -47,10 +46,10 @@ export declare function findBestSuperStakeIxs({ marketIndex, amount, jupiterClie
     method: 'jupiter' | 'marinade';
     price?: number;
 }>;
-export declare function findBestMSolSuperStakeIxs({ amount, jupiterClient, driftClient, userAccountPublicKey, price, forceMarinade, onlyDirectRoutes, jupiterQuote, }: {
+export declare function findBestMSolSuperStakeIxs({ amount, jupiterClient, velocityClient, userAccountPublicKey, price, forceMarinade, onlyDirectRoutes, jupiterQuote, }: {
     amount: BN;
     jupiterClient: JupiterClient;
-    driftClient: VelocityClient;
+    velocityClient: VelocityClient;
     price?: number;
     userAccountPublicKey?: PublicKey;
     forceMarinade?: boolean;
@@ -62,10 +61,10 @@ export declare function findBestMSolSuperStakeIxs({ amount, jupiterClient, drift
     method: 'jupiter' | 'marinade';
     price: number;
 }>;
-export declare function findBestJitoSolSuperStakeIxs({ amount, jupiterClient, driftClient, userAccountPublicKey, onlyDirectRoutes, jupiterQuote, }: {
+export declare function findBestJitoSolSuperStakeIxs({ amount, jupiterClient, velocityClient, userAccountPublicKey, onlyDirectRoutes, jupiterQuote, }: {
     amount: BN;
     jupiterClient: JupiterClient;
-    driftClient: VelocityClient;
+    velocityClient: VelocityClient;
     userAccountPublicKey?: PublicKey;
     onlyDirectRoutes?: boolean;
     jupiterQuote?: QuoteResponse;
@@ -80,12 +79,12 @@ export declare function findBestJitoSolSuperStakeIxs({ amount, jupiterClient, dr
  *
  * Without doing any extra steps like checking if you can get a better rate by staking directly with that LST platform
  */
-export declare function findBestLstSuperStakeIxs({ amount, jupiterClient, driftClient, userAccountPublicKey, onlyDirectRoutes, lstMarketIndex, jupiterQuote, }: {
+export declare function findBestLstSuperStakeIxs({ amount, jupiterClient, velocityClient, userAccountPublicKey, onlyDirectRoutes, lstMarketIndex, jupiterQuote, }: {
     amount: BN;
     lstMint: PublicKey;
     lstMarketIndex: number;
     jupiterClient: JupiterClient;
-    driftClient: VelocityClient;
+    velocityClient: VelocityClient;
     userAccountPublicKey?: PublicKey;
     onlyDirectRoutes?: boolean;
     jupiterQuote?: QuoteResponse;
@@ -109,57 +108,6 @@ export type JITO_SOL_METRICS_ENDPOINT_RESPONSE = {
     }[];
 };
 export declare function fetchJitoSolMetrics(): Promise<JITO_SOL_METRICS_ENDPOINT_RESPONSE>;
-export type MSOL_METRICS_ENDPOINT_RESPONSE = {
-    total_active_balance: number;
-    available_reserve_balance: number;
-    emergency_cooling_down: number;
-    tvl_sol: number;
-    msol_directed_stake_sol: number;
-    msol_directed_stake_msol: number;
-    mnde_total_supply: number;
-    mnde_circulating_supply: number;
-    validators_count: number;
-    stake_accounts: number;
-    staking_sol_cap: number;
-    m_sol_price: number;
-    avg_staking_apy: number;
-    msol_price_apy_14d: number;
-    msol_price_apy_30d: number;
-    msol_price_apy_90d: number;
-    msol_price_apy_365d: number;
-    reserve_pda: number;
-    treasury_m_sol_amount: number;
-    m_sol_mint_supply: number;
-    m_sol_supply_state: number;
-    liq_pool_sol: number;
-    liq_pool_m_sol: number;
-    liq_pool_value: number;
-    liq_pool_token_supply: number;
-    liq_pool_token_price: number;
-    liq_pool_target: number;
-    liq_pool_min_fee: number;
-    liq_pool_max_fee: number;
-    liq_pool_current_fee: number;
-    liq_pool_treasury_cut: number;
-    liq_pool_cap: number;
-    total_cooling_down: number;
-    last_stake_delta_epoch: number;
-    circulating_ticket_count: number;
-    circulating_ticket_balance: number;
-    reward_fee_bp: number;
-    lido_staking: number;
-    lido_st_sol_price: number;
-    lido_stsol_price_apy_14d: number;
-    lido_stsol_price_apy_30d: number;
-    lido_stsol_price_apy_90d: number;
-    lido_stsol_price_apy_365d: number;
-    stake_delta: number;
-    bot_balance: number;
-    treasury_farm_claim_mnde_balance: number;
-    last_3_epochs_avg_duration_hs: number;
-    mnde_votes_validators: number;
-};
-export declare const fetchMSolMetrics: () => Promise<MSOL_METRICS_ENDPOINT_RESPONSE>;
 export declare function calculateSolEarned({ marketIndex, user, depositRecords, }: {
     marketIndex: number;
     user: User;

package/lib/browser/math/superStake.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateEstimatedSuperStakeLiquidationPrice = exports.calculateSolEarned = exports.fetchMSolMetrics = exports.fetchJitoSolMetrics = exports.findBestLstSuperStakeIxs = exports.findBestJitoSolSuperStakeIxs = exports.findBestMSolSuperStakeIxs = exports.findBestSuperStakeIxs = exports.fetchBSolDriftEmissions = exports.fetchBSolVelocityEmissions = exports.fetchBSolMetrics = void 0;
+exports.calculateEstimatedSuperStakeLiquidationPrice = exports.calculateSolEarned = exports.fetchJitoSolMetrics = exports.findBestLstSuperStakeIxs = exports.findBestJitoSolSuperStakeIxs = exports.findBestMSolSuperStakeIxs = exports.findBestSuperStakeIxs = exports.fetchBSolVelocityEmissions = exports.fetchBSolMetrics = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const marinade_1 = require("../marinade");
 const anchor_1 = require("../isomorphic/anchor");
@@ -16,17 +16,15 @@ async function fetchBSolMetrics() {
 }
 exports.fetchBSolMetrics = fetchBSolMetrics;
 async function fetchBSolVelocityEmissions() {
-    return await (0, node_fetch_1.default)('https://stake.solblaze.org/api/v1/drift_emissions');
+    return await (0, node_fetch_1.default)('https://stake.solblaze.org/api/v1/velocity_emissions');
 }
 exports.fetchBSolVelocityEmissions = fetchBSolVelocityEmissions;
-/** @deprecated Use `fetchBSolVelocityEmissions` instead. `fetchBSolDriftEmissions` will be removed in a future major. */
-exports.fetchBSolDriftEmissions = fetchBSolVelocityEmissions;
-async function findBestSuperStakeIxs({ marketIndex, amount, jupiterClient, driftClient, userAccountPublicKey, price, forceMarinade, onlyDirectRoutes, jupiterQuote, }) {
+async function findBestSuperStakeIxs({ marketIndex, amount, jupiterClient, velocityClient, userAccountPublicKey, price, forceMarinade, onlyDirectRoutes, jupiterQuote, }) {
     if (marketIndex === 2) {
         return findBestMSolSuperStakeIxs({
             amount,
             jupiterClient,
-            driftClient,
+            velocityClient,
             userAccountPublicKey,
             price,
             forceMarinade,
@@ -38,7 +36,7 @@ async function findBestSuperStakeIxs({ marketIndex, amount, jupiterClient, drift
         return findBestJitoSolSuperStakeIxs({
             amount,
             jupiterClient,
-            driftClient,
+            velocityClient,
             userAccountPublicKey,
             onlyDirectRoutes,
             jupiterQuote,
@@ -47,10 +45,10 @@ async function findBestSuperStakeIxs({ marketIndex, amount, jupiterClient, drift
     else if (marketIndex === 8) {
         return findBestLstSuperStakeIxs({
             amount,
-            lstMint: driftClient.getSpotMarketAccount(8).mint,
+            lstMint: velocityClient.getSpotMarketAccountOrThrow(8).mint,
             lstMarketIndex: 8,
             jupiterClient,
-            driftClient,
+            velocityClient,
             userAccountPublicKey,
             onlyDirectRoutes,
             jupiterQuote,
@@ -61,13 +59,13 @@ async function findBestSuperStakeIxs({ marketIndex, amount, jupiterClient, drift
     }
 }
 exports.findBestSuperStakeIxs = findBestSuperStakeIxs;
-async function findBestMSolSuperStakeIxs({ amount, jupiterClient, driftClient, userAccountPublicKey, price, forceMarinade, onlyDirectRoutes, jupiterQuote, }) {
+async function findBestMSolSuperStakeIxs({ amount, jupiterClient, velocityClient, userAccountPublicKey, price, forceMarinade, onlyDirectRoutes, jupiterQuote, }) {
     if (!price) {
-        const marinadeProgram = (0, marinade_1.getMarinadeFinanceProgram)(driftClient.provider);
+        const marinadeProgram = (0, marinade_1.getMarinadeFinanceProgram)(velocityClient.provider);
         price = await (0, marinade_1.getMarinadeMSolPrice)(marinadeProgram);
     }
-    const solSpotMarketAccount = driftClient.getSpotMarketAccount(1);
-    const mSolSpotMarketAccount = driftClient.getSpotMarketAccount(2);
+    const solSpotMarketAccount = velocityClient.getSpotMarketAccountOrThrow(1);
+    const mSolSpotMarketAccount = velocityClient.getSpotMarketAccountOrThrow(2);
     let jupiterPrice;
     let quote = jupiterQuote;
     if (!jupiterQuote) {
@@ -79,7 +77,7 @@ async function findBestMSolSuperStakeIxs({ amount, jupiterClient, driftClient, u
                 slippageBps: 1000,
                 onlyDirectRoutes,
             });
-            jupiterPrice = +quote.outAmount / +quote.inAmount;
+            jupiterPrice = +fetchedQuote.outAmount / +fetchedQuote.inAmount;
             quote = fetchedQuote;
         }
         catch (e) {
@@ -87,7 +85,7 @@ async function findBestMSolSuperStakeIxs({ amount, jupiterClient, driftClient, u
         }
     }
     if (!jupiterPrice || price <= jupiterPrice || forceMarinade) {
-        const ixs = await driftClient.getStakeForMSOLIx({
+        const ixs = await velocityClient.getStakeForMSOLIx({
             amount,
             userAccountPublicKey,
         });
@@ -99,7 +97,7 @@ async function findBestMSolSuperStakeIxs({ amount, jupiterClient, driftClient, u
         };
     }
     else {
-        const { ixs, lookupTables } = await driftClient.getJupiterSwapIxV6({
+        const { ixs, lookupTables } = await velocityClient.getJupiterSwapIxV6({
             inMarketIndex: 1,
             outMarketIndex: 2,
             jupiterClient,
@@ -117,14 +115,14 @@ async function findBestMSolSuperStakeIxs({ amount, jupiterClient, driftClient, u
     }
 }
 exports.findBestMSolSuperStakeIxs = findBestMSolSuperStakeIxs;
-async function findBestJitoSolSuperStakeIxs({ amount, jupiterClient, driftClient, userAccountPublicKey, onlyDirectRoutes, jupiterQuote, }) {
+async function findBestJitoSolSuperStakeIxs({ amount, jupiterClient, velocityClient, userAccountPublicKey, onlyDirectRoutes, jupiterQuote, }) {
     return await findBestLstSuperStakeIxs({
         amount,
         jupiterClient,
-        driftClient,
+        velocityClient,
         userAccountPublicKey,
         onlyDirectRoutes,
-        lstMint: driftClient.getSpotMarketAccount(6).mint,
+        lstMint: velocityClient.getSpotMarketAccountOrThrow(6).mint,
         lstMarketIndex: 6,
         jupiterQuote,
     });
@@ -135,8 +133,8 @@ exports.findBestJitoSolSuperStakeIxs = findBestJitoSolSuperStakeIxs;
  *
  * Without doing any extra steps like checking if you can get a better rate by staking directly with that LST platform
  */
-async function findBestLstSuperStakeIxs({ amount, jupiterClient, driftClient, userAccountPublicKey, onlyDirectRoutes, lstMarketIndex, jupiterQuote, }) {
-    const { ixs, lookupTables } = await driftClient.getJupiterSwapIxV6({
+async function findBestLstSuperStakeIxs({ amount, jupiterClient, velocityClient, userAccountPublicKey, onlyDirectRoutes, lstMarketIndex, jupiterQuote, }) {
+    const { ixs, lookupTables } = await velocityClient.getJupiterSwapIxV6({
         inMarketIndex: 1,
         outMarketIndex: lstMarketIndex,
         jupiterClient,
@@ -189,12 +187,6 @@ async function fetchJitoSolMetrics() {
     return data;
 }
 exports.fetchJitoSolMetrics = fetchJitoSolMetrics;
-const fetchMSolMetrics = async () => {
-    const res = await (0, node_fetch_1.default)('https://api2.marinade.finance/metrics_json');
-    const data = await res.json();
-    return data;
-};
-exports.fetchMSolMetrics = fetchMSolMetrics;
 const getJitoSolHistoricalPriceMap = async (timestamps) => {
     try {
         const data = await fetchJitoSolMetrics();
@@ -260,7 +252,10 @@ async function calculateSolEarned({ marketIndex, user, depositRecords, }) {
         await Promise.all(timestamps.map(getMsolPrice));
     }
     else if (marketIndex === 6) {
-        lstRatios = await getJitoSolHistoricalPriceMap(timestamps);
+        const jitoSolRatios = await getJitoSolHistoricalPriceMap(timestamps);
+        if (jitoSolRatios) {
+            lstRatios = jitoSolRatios;
+        }
     }
     else if (marketIndex === 8) {
         await getBSolPrice(timestamps);
@@ -279,6 +274,9 @@ async function calculateSolEarned({ marketIndex, user, depositRecords, }) {
             record.marketIndex === 6 ||
             record.marketIndex === 8) {
             const lstRatio = lstRatios.get(record.ts.toNumber());
+            if (lstRatio === undefined) {
+                throw new Error(`Missing LST/SOL ratio for deposit record at timestamp ${record.ts.toNumber()}`);
+            }
             const lstRatioBN = new anchor_1.BN(lstRatio * web3_js_1.LAMPORTS_PER_SOL);
             const solAmount = record.amount.mul(lstRatioBN).div(numericConstants_1.LAMPORTS_PRECISION);
             if ((0, types_1.isVariant)(record.direction, 'deposit')) {
@@ -291,6 +289,9 @@ async function calculateSolEarned({ marketIndex, user, depositRecords, }) {
     }
     const currentLstTokenAmount = await user.getTokenAmount(marketIndex);
     const currentLstRatio = lstRatios.get(now);
+    if (currentLstRatio === undefined) {
+        throw new Error(`Missing current LST/SOL ratio for timestamp ${now}`);
+    }
     const currentLstRatioBN = new anchor_1.BN(currentLstRatio * web3_js_1.LAMPORTS_PER_SOL);
     solEarned = solEarned.add(currentLstTokenAmount.mul(currentLstRatioBN).div(numericConstants_1.LAMPORTS_PRECISION));
     const currentSOLTokenAmount = await user.getTokenAmount(1);

package/lib/browser/math/trade.js

@@ -53,7 +53,7 @@ function calculateTradeSlippage(direction, amount, market, inputAssetType = 'quo
         .div(acquiredBaseReserve.abs());
     let amm;
     if (useSpread && market.amm.baseSpread > 0) {
-        const { baseAssetReserve, quoteAssetReserve, sqrtK, newPeg } = (0, amm_1.calculateUpdatedAMMSpreadReserves)(market.amm, direction, mmOraclePriceData, latestSlot);
+        const { baseAssetReserve, quoteAssetReserve, sqrtK, newPeg } = (0, amm_1.calculateUpdatedAMMSpreadReserves)(market.amm, market.marketStats, direction, mmOraclePriceData, latestSlot);
         amm = {
             baseAssetReserve,
             quoteAssetReserve,
@@ -102,7 +102,7 @@ function calculateTradeAcquiredAmounts(direction, amount, market, inputAssetType
     const swapDirection = (0, amm_1.getSwapDirection)(inputAssetType, direction);
     let amm;
     if (useSpread && market.amm.baseSpread > 0) {
-        const { baseAssetReserve, quoteAssetReserve, sqrtK, newPeg } = (0, amm_1.calculateUpdatedAMMSpreadReserves)(market.amm, direction, mmOraclePriceData, latestSlot);
+        const { baseAssetReserve, quoteAssetReserve, sqrtK, newPeg } = (0, amm_1.calculateUpdatedAMMSpreadReserves)(market.amm, market.marketStats, direction, mmOraclePriceData, latestSlot);
         amm = {
             baseAssetReserve,
             quoteAssetReserve,
@@ -166,7 +166,7 @@ function calculateTargetPriceTrade(market, targetPrice, pct = MAXPCT, outputAsse
     let quoteAssetReserveBefore;
     let peg = market.amm.pegMultiplier;
     if (useSpread && market.amm.baseSpread > 0) {
-        const { baseAssetReserve, quoteAssetReserve, newPeg } = (0, amm_1.calculateUpdatedAMMSpreadReserves)(market.amm, direction, mmOraclePriceData, latestSlot);
+        const { baseAssetReserve, quoteAssetReserve, newPeg } = (0, amm_1.calculateUpdatedAMMSpreadReserves)(market.amm, market.marketStats, direction, mmOraclePriceData, latestSlot);
         baseAssetReserveBefore = baseAssetReserve;
         quoteAssetReserveBefore = quoteAssetReserve;
         peg = newPeg;
@@ -239,7 +239,7 @@ function calculateTargetPriceTrade(market, targetPrice, pct = MAXPCT, outputAsse
         .mul(numericConstants_1.PRICE_PRECISION)
         .div(baseSize.abs());
     (0, assert_1.assert)(tp1.sub(tp2).lte(originalDiff), 'Target Price Calculation incorrect');
-    (0, assert_1.assert)(tp2.lte(tp1) || tp2.sub(tp1).abs() < 100000, 'Target Price Calculation incorrect' +
+    (0, assert_1.assert)(tp2.lte(tp1) || tp2.sub(tp1).abs().ltn(100000), 'Target Price Calculation incorrect' +
         tp2.toString() +
         '>=' +
         tp1.toString() +
@@ -280,14 +280,14 @@ function calculateEstimatedPerpEntryPrice(assetType, amount, direction, market,
     const takerIsLong = (0, types_2.isVariant)(direction, 'long');
     const limitOrders = dlob[takerIsLong ? 'getRestingLimitAsks' : 'getRestingLimitBids'](market.marketIndex, slot, types_1.MarketType.PERP, mmOraclePriceData);
     const swapDirection = (0, amm_1.getSwapDirection)(assetType, direction);
-    const { baseAssetReserve, quoteAssetReserve, sqrtK, newPeg } = (0, amm_1.calculateUpdatedAMMSpreadReserves)(market.amm, direction, mmOraclePriceData, new anchor_1.BN(slot));
+    const { baseAssetReserve, quoteAssetReserve, sqrtK, newPeg } = (0, amm_1.calculateUpdatedAMMSpreadReserves)(market.amm, market.marketStats, direction, mmOraclePriceData, new anchor_1.BN(slot));
     const amm = {
         baseAssetReserve,
         quoteAssetReserve,
         sqrtK: sqrtK,
         pegMultiplier: newPeg,
     };
-    const [ammBids, ammAsks] = (0, amm_1.calculateMarketOpenBidAsk)(market.amm.baseAssetReserve, market.amm.minBaseAssetReserve, market.amm.maxBaseAssetReserve, market.amm.orderStepSize);
+    const [ammBids, ammAsks] = (0, amm_1.calculateMarketOpenBidAsk)(market.amm.baseAssetReserve, market.amm.minBaseAssetReserve, market.amm.maxBaseAssetReserve, market.orderStepSize);
     let ammLiquidity;
     if (assetType === 'base') {
         ammLiquidity = takerIsLong ? ammAsks.abs() : ammBids;
@@ -302,7 +302,7 @@ function calculateEstimatedPerpEntryPrice(assetType, amount, direction, market,
     let cumulativeQuoteFilled = numericConstants_1.ZERO;
     let limitOrder = limitOrders.next().value;
     if (limitOrder) {
-        const limitOrderPrice = limitOrder.getPrice(mmOraclePriceData, slot);
+        const limitOrderPrice = limitOrder.getPriceOrThrow(mmOraclePriceData, slot);
         bestPrice = takerIsLong
             ? anchor_1.BN.min(limitOrderPrice, bestPrice)
             : anchor_1.BN.max(limitOrderPrice, bestPrice);

package/lib/browser/math/utils.d.ts

@@ -18,6 +18,6 @@ export declare function isBNSafe(number: number): boolean;
 /**
  * Converts a number to BN makes sure the number is safe to convert to BN (that it does not overflow number after multiplying by precision)
  * @param number the number to convert to BN
- * @param precision the BN precision to use (i.e. QUOTE_PRECISION and BASE_PRECISION from drift sdk)
+ * @param precision the BN precision to use (i.e. QUOTE_PRECISION and BASE_PRECISION from velocity sdk)
  */
 export declare function numberToSafeBN(number: number, precision: BN): BN;

package/lib/browser/math/utils.js

@@ -93,7 +93,7 @@ exports.isBNSafe = isBNSafe;
 /**
  * Converts a number to BN makes sure the number is safe to convert to BN (that it does not overflow number after multiplying by precision)
  * @param number the number to convert to BN
- * @param precision the BN precision to use (i.e. QUOTE_PRECISION and BASE_PRECISION from drift sdk)
+ * @param precision the BN precision to use (i.e. QUOTE_PRECISION and BASE_PRECISION from velocity sdk)
  */
 function numberToSafeBN(number, precision) {
     // check if number has decimals

package/lib/browser/memcmp.d.ts

@@ -4,7 +4,6 @@ export declare function getNonIdleUserFilter(): MemcmpFilter;
 export declare function getUserWithOrderFilter(): MemcmpFilter;
 export declare function getUserWithoutOrderFilter(): MemcmpFilter;
 export declare function getUserWithAuctionFilter(): MemcmpFilter;
-export declare function getUserThatHasBeenLP(): MemcmpFilter;
 export declare function getUserWithName(name: string): MemcmpFilter;
 export declare function getUsersWithPoolId(poolId: number): MemcmpFilter;
 export declare function getUserStatsFilter(): MemcmpFilter;

package/lib/browser/memcmp.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getConstituentLpPoolFilter = exports.getConstituentFilter = exports.getRevenueShareEscrowFilter = exports.getSpotMarketAccountsFilter = exports.getPerpMarketAccountsFilter = exports.getSignedMsgUserOrdersFilter = exports.getUserStatsIsReferredOrReferrerFilter = exports.getUserStatsIsReferredFilter = exports.getUserStatsFilter = exports.getUsersWithPoolId = exports.getUserWithName = exports.getUserThatHasBeenLP = exports.getUserWithAuctionFilter = exports.getUserWithoutOrderFilter = exports.getUserWithOrderFilter = exports.getNonIdleUserFilter = exports.getUserFilter = void 0;
+exports.getConstituentLpPoolFilter = exports.getConstituentFilter = exports.getRevenueShareEscrowFilter = exports.getSpotMarketAccountsFilter = exports.getPerpMarketAccountsFilter = exports.getSignedMsgUserOrdersFilter = exports.getUserStatsIsReferredOrReferrerFilter = exports.getUserStatsIsReferredFilter = exports.getUserStatsFilter = exports.getUsersWithPoolId = exports.getUserWithName = exports.getUserWithAuctionFilter = exports.getUserWithoutOrderFilter = exports.getUserWithOrderFilter = exports.getNonIdleUserFilter = exports.getUserFilter = void 0;
 const bs58_1 = __importDefault(require("bs58"));
 const anchor29_1 = require("./isomorphic/anchor29");
 const userName_1 = require("./userName");
@@ -52,15 +52,6 @@ function getUserWithAuctionFilter() {
     };
 }
 exports.getUserWithAuctionFilter = getUserWithAuctionFilter;
-function getUserThatHasBeenLP() {
-    return {
-        memcmp: {
-            offset: 4267,
-            bytes: bs58_1.default.encode(Uint8Array.from([99])),
-        },
-    };
-}
-exports.getUserThatHasBeenLP = getUserThatHasBeenLP;
 function getUserWithName(name) {
     return {
         memcmp: {

package/lib/browser/oracles/prelaunchOracleClient.js

@@ -1,14 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PrelaunchOracleClient = void 0;
+const utils_1 = require("./utils");
 class PrelaunchOracleClient {
     constructor(connection, program) {
         this.connection = connection;
         this.program = program;
     }
     async getOraclePriceData(pricePublicKey) {
-        const accountInfo = await this.connection.getAccountInfo(pricePublicKey);
-        return this.getOraclePriceDataFromBuffer(accountInfo.data);
+        const data = await (0, utils_1.getOracleAccountDataOrThrow)(this.connection, pricePublicKey, 'Prelaunch oracle');
+        return this.getOraclePriceDataFromBuffer(data);
     }
     getOraclePriceDataFromBuffer(buffer) {
         const prelaunchOracle = this.program.account.prelaunchOracle.coder.accounts.decodeUnchecked('prelaunchOracle', buffer);

package/lib/browser/oracles/pythClient.js

@@ -4,6 +4,7 @@ exports.PythClient = void 0;
 const client_1 = require("@pythnetwork/client");
 const anchor_1 = require("../isomorphic/anchor");
 const numericConstants_1 = require("../constants/numericConstants");
+const utils_1 = require("./utils");
 class PythClient {
     constructor(connection, multiple = numericConstants_1.ONE, stableCoin = false) {
         this.connection = connection;
@@ -11,12 +12,17 @@ class PythClient {
         this.stableCoin = stableCoin;
     }
     async getOraclePriceData(pricePublicKey) {
-        const accountInfo = await this.connection.getAccountInfo(pricePublicKey);
-        return this.getOraclePriceDataFromBuffer(accountInfo.data);
+        const data = await (0, utils_1.getOracleAccountDataOrThrow)(this.connection, pricePublicKey, 'Pyth oracle');
+        return this.getOraclePriceDataFromBuffer(data);
     }
     getOraclePriceDataFromBuffer(buffer) {
+        var _a;
         const priceData = (0, client_1.parsePriceData)(buffer);
-        const confidence = convertPythPrice(priceData.confidence, priceData.exponent, this.multiple);
+        // `confidence` is absent on uninitialized/invalid price accounts. Base passed it
+        // straight into convertPythPrice, where `undefined * 10**exponent` is `NaN` and
+        // `new BN(NaN)` coerces to 0 — so base already yielded a zero-confidence price.
+        // `?? 0` makes that explicit and type-checks, preserving the same result.
+        const confidence = convertPythPrice((_a = priceData.confidence) !== null && _a !== void 0 ? _a : 0, priceData.exponent, this.multiple);
         const minPublishers = Math.min(priceData.numComponentPrices, 3);
         let price = convertPythPrice(priceData.aggregate.price, priceData.exponent, this.multiple);
         if (this.stableCoin) {

package/lib/browser/oracles/pythLazerClient.js

@@ -8,7 +8,8 @@ const web3_js_1 = require("@solana/web3.js");
 const anchor_1 = require("../isomorphic/anchor");
 const numericConstants_1 = require("../constants/numericConstants");
 const wallet_1 = require("../wallet");
-const drift_json_1 = __importDefault(require("../idl/drift.json"));
+const velocity_json_1 = __importDefault(require("../idl/velocity.json"));
+const utils_1 = require("./utils");
 class PythLazerClient {
     constructor(connection, multiple = numericConstants_1.ONE, stableCoin = false) {
         this.connection = connection;
@@ -19,12 +20,12 @@ class PythLazerClient {
         new wallet_1.Wallet(new web3_js_1.Keypair()), {
             commitment: connection.commitment,
         });
-        this.program = new anchor_1.Program(drift_json_1.default, provider);
+        this.program = new anchor_1.Program(velocity_json_1.default, provider);
         this.decodeFunc = this.program.account.pythLazerOracle.coder.accounts.decodeUnchecked.bind(this.program.account.pythLazerOracle.coder.accounts);
     }
     async getOraclePriceData(pricePublicKey) {
-        const accountInfo = await this.connection.getAccountInfo(pricePublicKey);
-        return this.getOraclePriceDataFromBuffer(accountInfo.data);
+        const data = await (0, utils_1.getOracleAccountDataOrThrow)(this.connection, pricePublicKey, 'Pyth lazer oracle');
+        return this.getOraclePriceDataFromBuffer(data);
     }
     getOraclePriceDataFromBuffer(buffer) {
         const priceData = this.decodeFunc('pythLazerOracle', buffer);

package/lib/browser/oracles/utils.d.ts

@@ -1,4 +1,8 @@
+/// <reference types="node" />
+/// <reference types="node" />
 /// <reference types="bn.js" />
+import { Connection, PublicKey } from '@solana/web3.js';
 import { BN } from '../isomorphic/anchor';
 import { OraclePriceData } from './types';
+export declare function getOracleAccountDataOrThrow(connection: Connection, pricePublicKey: PublicKey, oracleName: string): Promise<Buffer>;
 export declare function getOracleConfidenceFromMMOracleData(mmOraclePrice: BN, oraclePriceData: OraclePriceData): BN;

package/lib/browser/oracles/utils.js

@@ -1,6 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getOracleConfidenceFromMMOracleData = void 0;
+exports.getOracleConfidenceFromMMOracleData = exports.getOracleAccountDataOrThrow = void 0;
+async function getOracleAccountDataOrThrow(connection, pricePublicKey, oracleName) {
+    const accountInfo = await connection.getAccountInfo(pricePublicKey);
+    if (!accountInfo) {
+        throw new Error(`${oracleName} account not found: ${pricePublicKey.toBase58()}`);
+    }
+    return accountInfo.data;
+}
+exports.getOracleAccountDataOrThrow = getOracleAccountDataOrThrow;
 function getOracleConfidenceFromMMOracleData(mmOraclePrice, oraclePriceData) {
     const mmOracleDiffPremium = mmOraclePrice.sub(oraclePriceData.price).abs();
     return oraclePriceData.confidence.add(mmOracleDiffPremium);

package/lib/browser/orderSubscriber/OrderSubscriber.d.ts

@@ -14,8 +14,6 @@ import { EventEmitter } from 'events';
 import { grpcSubscription } from './grpcSubscription';
 export declare class OrderSubscriber {
     velocityClient: VelocityClient;
-    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
-    get driftClient(): VelocityClient;
     usersAccounts: Map<string, {
         slot: number;
         userAccount: UserAccount;
@@ -24,7 +22,7 @@ export declare class OrderSubscriber {
     commitment: Commitment;
     eventEmitter: StrictEventEmitter<EventEmitter, OrderSubscriberEvents>;
     fetchPromise?: Promise<void>;
-    fetchPromiseResolver: () => void;
+    private fetchPromiseResolver;
     mostRecentSlot: number;
     decodeFn: (name: string, data: Buffer) => UserAccount;
     decodeData?: boolean;

package/lib/browser/orderSubscriber/OrderSubscriber.js

@@ -14,16 +14,14 @@ const grpcSubscription_1 = require("./grpcSubscription");
 const orders_1 = require("../math/orders");
 const numericConstants_1 = require("../constants/numericConstants");
 class OrderSubscriber {
-    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
-    get driftClient() {
-        return this.velocityClient;
-    }
     constructor(config) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e;
         this.usersAccounts = new Map();
-        const velocityClient = (_a = config.velocityClient) !== null && _a !== void 0 ? _a : config.driftClient;
+        this.fetchPromiseResolver = () => { };
+        this.mostRecentSlot = 0;
+        const velocityClient = config.velocityClient;
         if (!velocityClient) {
-            throw new Error('OrderSubscriber: velocityClient (or deprecated driftClient) must be provided');
+            throw new Error('OrderSubscriber: velocityClient must be provided');
         }
         this.velocityClient = velocityClient;
         this.commitment = config.subscriptionConfig.commitment || 'processed';
@@ -39,8 +37,8 @@ class OrderSubscriber {
                 grpcConfigs: config.subscriptionConfig.grpcConfigs,
                 skipInitialLoad: config.subscriptionConfig.skipInitialLoad,
                 resubOpts: {
-                    resubTimeoutMs: (_b = config.subscriptionConfig) === null || _b === void 0 ? void 0 : _b.resubTimeoutMs,
-                    logResubMessages: (_c = config.subscriptionConfig) === null || _c === void 0 ? void 0 : _c.logResubMessages,
+                    resubTimeoutMs: (_a = config.subscriptionConfig) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs,
+                    logResubMessages: (_b = config.subscriptionConfig) === null || _b === void 0 ? void 0 : _b.logResubMessages,
                 },
                 resyncIntervalMs: config.subscriptionConfig.resyncIntervalMs,
                 decoded: config.decodeData,
@@ -52,14 +50,14 @@ class OrderSubscriber {
                 commitment: this.commitment,
                 skipInitialLoad: config.subscriptionConfig.skipInitialLoad,
                 resubOpts: {
-                    resubTimeoutMs: (_d = config.subscriptionConfig) === null || _d === void 0 ? void 0 : _d.resubTimeoutMs,
-                    logResubMessages: (_e = config.subscriptionConfig) === null || _e === void 0 ? void 0 : _e.logResubMessages,
+                    resubTimeoutMs: (_c = config.subscriptionConfig) === null || _c === void 0 ? void 0 : _c.resubTimeoutMs,
+                    logResubMessages: (_d = config.subscriptionConfig) === null || _d === void 0 ? void 0 : _d.logResubMessages,
                 },
                 resyncIntervalMs: config.subscriptionConfig.resyncIntervalMs,
                 decoded: config.decodeData,
             });
         }
-        if ((_f = config.fastDecode) !== null && _f !== void 0 ? _f : true) {
+        if ((_e = config.fastDecode) !== null && _e !== void 0 ? _e : true) {
             this.decodeFn = (name, data) => (0, user_1.decodeUser)(data);
         }
         else {
@@ -183,7 +181,7 @@ class OrderSubscriber {
     }
     async addPubkey(userAccountPublicKey) {
         const accountInfo = await this.velocityClient.connection.getAccountInfoAndContext(userAccountPublicKey, this.commitment);
-        if (accountInfo) {
+        if (accountInfo.value) {
             this.tryUpdateUserAccount(userAccountPublicKey.toString(), 'buffer', accountInfo.value.data, accountInfo.context.slot);
         }
     }
@@ -191,7 +189,11 @@ class OrderSubscriber {
         if (!this.usersAccounts.has(key)) {
             await this.addPubkey(new web3_js_1.PublicKey(key));
         }
-        return this.usersAccounts.get(key).userAccount;
+        const slotAndUserAccount = this.usersAccounts.get(key);
+        if (!slotAndUserAccount) {
+            throw new Error(`OrderSubscriber: user account ${key} not found after addPubkey`);
+        }
+        return slotAndUserAccount.userAccount;
     }
     async unsubscribe() {
         this.usersAccounts.clear();

package/lib/browser/orderSubscriber/WebsocketSubscription.js

@@ -16,7 +16,7 @@ class WebsocketSubscription {
         if (this.subscriber) {
             return;
         }
-        this.subscriber = new webSocketProgramAccountSubscriber_1.WebSocketProgramAccountSubscriber('OrderSubscriber', 'user', this.orderSubscriber.driftClient.program, this.orderSubscriber.decodeFn, {
+        this.subscriber = new webSocketProgramAccountSubscriber_1.WebSocketProgramAccountSubscriber('OrderSubscriber', 'user', this.orderSubscriber.velocityClient.program, this.orderSubscriber.decodeFn, {
             filters: [(0, memcmp_1.getUserFilter)(), (0, memcmp_1.getNonIdleUserFilter)()],
             commitment: this.commitment,
         }, this.resubOpts);

package/lib/browser/orderSubscriber/grpcSubscription.js

@@ -19,12 +19,12 @@ class grpcSubscription {
         }
         if (this.grpcConfigs.client === 'laser') {
             this.subscriber =
-                await laserProgramAccountSubscriber_1.LaserstreamProgramAccountSubscriber.create(this.grpcConfigs, 'OrderSubscriber', 'user', this.orderSubscriber.driftClient.program, this.orderSubscriber.decodeFn, {
+                await laserProgramAccountSubscriber_1.LaserstreamProgramAccountSubscriber.create(this.grpcConfigs, 'OrderSubscriber', 'user', this.orderSubscriber.velocityClient.program, this.orderSubscriber.decodeFn, {
                     filters: [(0, memcmp_1.getUserFilter)(), (0, memcmp_1.getNonIdleUserFilter)()],
                 }, this.resubOpts);
         }
         else {
-            this.subscriber = await grpcProgramAccountSubscriber_1.grpcProgramAccountSubscriber.create(this.grpcConfigs, 'OrderSubscriber', 'user', this.orderSubscriber.driftClient.program, this.orderSubscriber.decodeFn, {
+            this.subscriber = await grpcProgramAccountSubscriber_1.grpcProgramAccountSubscriber.create(this.grpcConfigs, 'OrderSubscriber', 'user', this.orderSubscriber.velocityClient.program, this.orderSubscriber.decodeFn, {
                 filters: [(0, memcmp_1.getUserFilter)(), (0, memcmp_1.getNonIdleUserFilter)()],
             }, this.resubOpts);
         }

package/lib/browser/orderSubscriber/types.d.ts

@@ -4,8 +4,6 @@ import { VelocityClient } from '../velocityClient';
 import { GrpcConfigs } from '../accounts/types';
 export type OrderSubscriberConfig = {
     velocityClient?: VelocityClient;
-    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
-    driftClient?: VelocityClient;
     subscriptionConfig: {
         type: 'polling';
         frequency: number;