@velocity-exchange/sdk 0.1.0 → 0.2.0

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.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");
@@ -45,7 +45,7 @@ async function findBestSuperStakeIxs({ marketIndex, amount, jupiterClient, veloc
     else if (marketIndex === 8) {
         return findBestLstSuperStakeIxs({
             amount,
-            lstMint: velocityClient.getSpotMarketAccount(8).mint,
+            lstMint: velocityClient.getSpotMarketAccountOrThrow(8).mint,
             lstMarketIndex: 8,
             jupiterClient,
             velocityClient,
@@ -64,8 +64,8 @@ async function findBestMSolSuperStakeIxs({ amount, jupiterClient, velocityClient
         const marinadeProgram = (0, marinade_1.getMarinadeFinanceProgram)(velocityClient.provider);
         price = await (0, marinade_1.getMarinadeMSolPrice)(marinadeProgram);
     }
-    const solSpotMarketAccount = velocityClient.getSpotMarketAccount(1);
-    const mSolSpotMarketAccount = velocityClient.getSpotMarketAccount(2);
+    const solSpotMarketAccount = velocityClient.getSpotMarketAccountOrThrow(1);
+    const mSolSpotMarketAccount = velocityClient.getSpotMarketAccountOrThrow(2);
     let jupiterPrice;
     let quote = jupiterQuote;
     if (!jupiterQuote) {
@@ -77,7 +77,7 @@ async function findBestMSolSuperStakeIxs({ amount, jupiterClient, velocityClient
                 slippageBps: 1000,
                 onlyDirectRoutes,
             });
-            jupiterPrice = +quote.outAmount / +quote.inAmount;
+            jupiterPrice = +fetchedQuote.outAmount / +fetchedQuote.inAmount;
             quote = fetchedQuote;
         }
         catch (e) {
@@ -122,7 +122,7 @@ async function findBestJitoSolSuperStakeIxs({ amount, jupiterClient, velocityCli
         velocityClient,
         userAccountPublicKey,
         onlyDirectRoutes,
-        lstMint: velocityClient.getSpotMarketAccount(6).mint,
+        lstMint: velocityClient.getSpotMarketAccountOrThrow(6).mint,
         lstMarketIndex: 6,
         jupiterQuote,
     });
@@ -187,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();
@@ -258,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);
@@ -277,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')) {
@@ -289,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, market.marketStats, market.totalExchangeFee, 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, market.marketStats, market.totalExchangeFee, 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, market.marketStats, market.totalExchangeFee, 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,7 +280,7 @@ 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, market.marketStats, market.totalExchangeFee, 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,
@@ -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/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

@@ -9,6 +9,7 @@ const anchor_1 = require("../isomorphic/anchor");
 const numericConstants_1 = require("../constants/numericConstants");
 const wallet_1 = require("../wallet");
 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;
@@ -23,8 +24,8 @@ class PythLazerClient {
         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

@@ -22,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

@@ -17,6 +17,8 @@ class OrderSubscriber {
     constructor(config) {
         var _a, _b, _c, _d, _e;
         this.usersAccounts = new Map();
+        this.fetchPromiseResolver = () => { };
+        this.mostRecentSlot = 0;
         const velocityClient = config.velocityClient;
         if (!velocityClient) {
             throw new Error('OrderSubscriber: velocityClient must be provided');
@@ -179,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);
         }
     }
@@ -187,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/priorityFee/heliusPriorityFeeMethod.d.ts

@@ -17,4 +17,4 @@ export type HeliusPriorityFeeResponse = {
     };
     id: string;
 };
-export declare function fetchHeliusPriorityFee(heliusRpcUrl: string, lookbackDistance: number, addresses: string[]): Promise<HeliusPriorityFeeResponse>;
+export declare function fetchHeliusPriorityFee(heliusRpcUrl: string, lookbackDistance: number, addresses: string[]): Promise<HeliusPriorityFeeResponse | undefined>;

package/lib/browser/priorityFee/priorityFeeSubscriber.d.ts

@@ -5,7 +5,7 @@ import { MaxOverSlotsStrategy } from './maxOverSlotsStrategy';
 import { HeliusPriorityFeeLevels, HeliusPriorityLevel } from './heliusPriorityFeeMethod';
 import { VelocityMarketInfo } from './velocityPriorityFeeMethod';
 export declare class PriorityFeeSubscriber {
-    connection: Connection;
+    connection?: Connection;
     frequencyMs: number;
     addresses: string[];
     velocityMarkets?: VelocityMarketInfo[];

package/lib/browser/priorityFee/priorityFeeSubscriber.js

@@ -9,7 +9,7 @@ const heliusPriorityFeeMethod_1 = require("./heliusPriorityFeeMethod");
 const velocityPriorityFeeMethod_1 = require("./velocityPriorityFeeMethod");
 class PriorityFeeSubscriber {
     constructor(config) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         this.averageStrategy = new averageOverSlotsStrategy_1.AverageOverSlotsStrategy();
         this.maxStrategy = new maxOverSlotsStrategy_1.MaxOverSlotsStrategy();
         this.priorityFeeMethod = types_1.PriorityFeeMethod.SOLANA;
@@ -36,7 +36,7 @@ class PriorityFeeSubscriber {
             this.priorityFeeMethod = config.priorityFeeMethod;
             if (this.priorityFeeMethod === types_1.PriorityFeeMethod.HELIUS) {
                 if (config.heliusRpcUrl === undefined) {
-                    if (this.connection.rpcEndpoint.includes('helius')) {
+                    if ((_c = this.connection) === null || _c === void 0 ? void 0 : _c.rpcEndpoint.includes('helius')) {
                         this.heliusRpcUrl = this.connection.rpcEndpoint;
                     }
                     else {
@@ -49,7 +49,7 @@ class PriorityFeeSubscriber {
             }
             else if (this.priorityFeeMethod === types_1.PriorityFeeMethod.VELOCITY) {
                 this.velocityPriorityFeeEndpoint =
-                    (_c = config.velocityPriorityFeeEndpoint) !== null && _c !== void 0 ? _c : config.velocityPriorityFeeEndpoint;
+                    (_d = config.velocityPriorityFeeEndpoint) !== null && _d !== void 0 ? _d : config.velocityPriorityFeeEndpoint;
             }
         }
         if (this.priorityFeeMethod === types_1.PriorityFeeMethod.SOLANA) {
@@ -58,7 +58,7 @@ class PriorityFeeSubscriber {
             }
         }
         this.maxFeeMicroLamports = config.maxFeeMicroLamports;
-        this.priorityFeeMultiplier = (_d = config.priorityFeeMultiplier) !== null && _d !== void 0 ? _d : 1.0;
+        this.priorityFeeMultiplier = (_e = config.priorityFeeMultiplier) !== null && _e !== void 0 ? _e : 1.0;
     }
     async subscribe() {
         if (this.intervalId) {
@@ -68,7 +68,13 @@ class PriorityFeeSubscriber {
         await this.load();
     }
     async loadForSolana() {
+        if (this.connection === undefined) {
+            throw new Error('connection must be provided to use SOLANA priority fee API');
+        }
         const samples = await (0, solanaPriorityFeeMethod_1.fetchSolanaPriorityFee)(this.connection, this.lookbackDistance, this.addresses);
+        if (samples === undefined) {
+            throw new Error('fetchSolanaPriorityFee returned no samples');
+        }
         if (samples.length > 0) {
             this.latestPriorityFee = samples[0].prioritizationFee;
             this.lastSlotSeen = samples[0].slot;
@@ -81,9 +87,12 @@ class PriorityFeeSubscriber {
     }
     async loadForHelius() {
         var _a, _b;
+        if (this.heliusRpcUrl === undefined) {
+            throw new Error('heliusRpcUrl must be provided to use PriorityFeeMethod.HELIUS');
+        }
         const sample = await (0, heliusPriorityFeeMethod_1.fetchHeliusPriorityFee)(this.heliusRpcUrl, this.lookbackDistance, this.addresses);
         this.lastHeliusSample = (_b = (_a = sample === null || sample === void 0 ? void 0 : sample.result) === null || _a === void 0 ? void 0 : _a.priorityFeeLevels) !== null && _b !== void 0 ? _b : undefined;
-        if (this.lastHeliusSample) {
+        if (sample !== undefined && this.lastHeliusSample) {
             this.lastAvgStrategyResult =
                 this.lastHeliusSample[heliusPriorityFeeMethod_1.HeliusPriorityLevel.MEDIUM];
             this.lastMaxStrategyResult =
@@ -97,12 +106,27 @@ class PriorityFeeSubscriber {
         if (!this.velocityMarkets) {
             return;
         }
+        if (this.velocityPriorityFeeEndpoint === undefined) {
+            throw new Error('velocityPriorityFeeEndpoint must be provided to use PriorityFeeMethod.VELOCITY');
+        }
         const sample = await (0, velocityPriorityFeeMethod_1.fetchVelocityPriorityFee)(this.velocityPriorityFeeEndpoint, this.velocityMarkets.map((m) => m.marketType), this.velocityMarkets.map((m) => m.marketIndex));
         if (sample.length > 0) {
-            this.lastAvgStrategyResult = sample[heliusPriorityFeeMethod_1.HeliusPriorityLevel.MEDIUM];
-            this.lastMaxStrategyResult = sample[heliusPriorityFeeMethod_1.HeliusPriorityLevel.UNSAFE_MAX];
+            // The endpoint returns one fee-level set per requested market. Take the
+            // max level across markets so a transaction touching several markets is
+            // covered by the most expensive one. (Base indexed the array itself with
+            // a string enum key — `sample['medium']` — which yielded `undefined` and
+            // produced NaN strategy results; the missing per-element index is fixed
+            // here.)
+            this.lastAvgStrategyResult = Math.max(...sample.map((s) => s[heliusPriorityFeeMethod_1.HeliusPriorityLevel.MEDIUM]));
+            this.lastMaxStrategyResult = Math.max(...sample.map((s) => s[heliusPriorityFeeMethod_1.HeliusPriorityLevel.UNSAFE_MAX]));
             if (this.customStrategy) {
-                this.lastCustomStrategyResult = this.customStrategy.calculate(sample);
+                // Custom strategies expect `{ slot, prioritizationFee }[]`; map each
+                // market's medium level into that shape so they aggregate real values
+                // instead of summing the absent `prioritizationFee` field (NaN).
+                this.lastCustomStrategyResult = this.customStrategy.calculate(sample.map((s) => ({
+                    slot: 0,
+                    prioritizationFee: s[heliusPriorityFeeMethod_1.HeliusPriorityLevel.MEDIUM],
+                })));
             }
         }
     }

package/lib/browser/priorityFee/solanaPriorityFeeMethod.d.ts

@@ -3,4 +3,4 @@ export type SolanaPriorityFeeResponse = {
     slot: number;
     prioritizationFee: number;
 };
-export declare function fetchSolanaPriorityFee(connection: Connection, lookbackDistance: number, addresses: string[]): Promise<SolanaPriorityFeeResponse[]>;
+export declare function fetchSolanaPriorityFee(connection: Connection, lookbackDistance: number, addresses: string[]): Promise<SolanaPriorityFeeResponse[] | undefined>;

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

@@ -2222,5 +2222,4 @@ export type PythSolanaReceiver = {
     ];
 };
 export declare const IDL: PythSolanaReceiver;
-export declare const PYTH_SOLANA_RECEIVER_IDL: PythSolanaReceiver;
 export type PriceUpdateAccount = IdlAccounts<PythSolanaReceiver>['priceUpdateV2'];

package/lib/browser/slot/SlotSubscriber.d.ts

@@ -11,7 +11,7 @@ export interface SlotSubscriberEvents {
 export declare class SlotSubscriber {
     private connection;
     currentSlot: number;
-    subscriptionId: number;
+    subscriptionId?: number;
     eventEmitter: StrictEventEmitter<EventEmitter, SlotSubscriberEvents>;
     timeoutId?: ReturnType<typeof setTimeout>;
     resubTimeoutMs?: number;

package/lib/browser/slot/SlotSubscriber.js

@@ -5,11 +5,12 @@ const events_1 = require("events");
 class SlotSubscriber {
     constructor(connection, config) {
         this.connection = connection;
+        this.currentSlot = 0;
         this.isUnsubscribing = false;
         this.receivingData = false;
         this.eventEmitter = new events_1.EventEmitter();
         this.resubTimeoutMs = config === null || config === void 0 ? void 0 : config.resubTimeoutMs;
-        if (this.resubTimeoutMs < 1000) {
+        if (this.resubTimeoutMs !== undefined && this.resubTimeoutMs < 1000) {
             console.log('resubTimeoutMs should be at least 1000ms to avoid spamming resub');
         }
     }

package/lib/browser/slot/SlothashSubscriber.d.ts

@@ -9,8 +9,9 @@ export type Slothash = {
 };
 export declare class SlothashSubscriber {
     private connection;
-    currentSlothash: Slothash;
-    subscriptionId: number;
+    private _currentSlothash?;
+    private get currentSlothash();
+    subscriptionId?: number;
     commitment: Commitment;
     timeoutId?: ReturnType<typeof setTimeout>;
     resubTimeoutMs?: number;

package/lib/browser/slot/SlothashSubscriber.js

@@ -8,6 +8,12 @@ const web3_js_1 = require("@solana/web3.js");
 const bs58_1 = __importDefault(require("bs58"));
 const anchor_1 = require("../isomorphic/anchor");
 class SlothashSubscriber {
+    get currentSlothash() {
+        if (!this._currentSlothash) {
+            throw new Error('SlothashSubscriber: slothash accessed before subscribe()');
+        }
+        return this._currentSlothash;
+    }
     constructor(connection, config) {
         var _a;
         this.connection = connection;
@@ -15,7 +21,7 @@ class SlothashSubscriber {
         this.receivingData = false;
         this.resubTimeoutMs = config === null || config === void 0 ? void 0 : config.resubTimeoutMs;
         this.commitment = (_a = config === null || config === void 0 ? void 0 : config.commitment) !== null && _a !== void 0 ? _a : 'processed';
-        if (this.resubTimeoutMs < 1000) {
+        if (this.resubTimeoutMs != null && this.resubTimeoutMs < 1000) {
             console.log('resubTimeoutMs should be at least 1000ms to avoid spamming resub');
         }
     }
@@ -27,15 +33,16 @@ class SlothashSubscriber {
         if (currentAccountData == null) {
             throw new Error('Failed to retrieve current slot hash');
         }
-        this.currentSlothash = deserializeSlothash(currentAccountData.data);
+        this._currentSlothash = deserializeSlothash(currentAccountData.data);
         this.subscriptionId = this.connection.onAccountChange(web3_js_1.SYSVAR_SLOT_HASHES_PUBKEY, (slothashInfo, context) => {
-            if (!this.currentSlothash || this.currentSlothash.slot < context.slot) {
+            if (!this._currentSlothash ||
+                this._currentSlothash.slot < context.slot) {
                 if (this.resubTimeoutMs && !this.isUnsubscribing) {
                     this.receivingData = true;
                     clearTimeout(this.timeoutId);
                     this.setTimeout();
                 }
-                this.currentSlothash = deserializeSlothash(slothashInfo.data);
+                this._currentSlothash = deserializeSlothash(slothashInfo.data);
             }
         }, this.commitment);
         if (this.resubTimeoutMs) {

package/lib/browser/swift/grpcSignedMsgUserAccountSubscriber.d.ts

@@ -1,10 +1,7 @@
-import { grpcProgramAccountSubscriber } from '../accounts/grpcProgramAccountSubscriber';
 import { GrpcConfigs } from '../accounts/types';
-import { SignedMsgUserOrdersAccount } from '../types';
 import { SignedMsgUserOrdersAccountSubscriber, SignedMsgUserOrdersAccountSubscriberConfig } from './signedMsgUserAccountSubscriber';
 export declare class grpcSignedMsgUserOrdersAccountSubscriber extends SignedMsgUserOrdersAccountSubscriber {
     private grpcConfigs;
-    subscriber: grpcProgramAccountSubscriber<SignedMsgUserOrdersAccount>;
     constructor({ grpcConfigs, ...rest }: SignedMsgUserOrdersAccountSubscriberConfig & {
         grpcConfigs: GrpcConfigs;
     });

package/lib/browser/swift/grpcSignedMsgUserAccountSubscriber.js

@@ -10,8 +10,8 @@ class grpcSignedMsgUserOrdersAccountSubscriber extends signedMsgUserAccountSubsc
         this.grpcConfigs = grpcConfigs;
     }
     async subscribe() {
-        if (!this.subscriber) {
-            this.subscriber =
+        if (!this._subscriber) {
+            this._subscriber =
                 await grpcProgramAccountSubscriber_1.grpcProgramAccountSubscriber.create(this.grpcConfigs, 'SingedMsgUserOrdersAccountMap', 'signedMsgUserOrders', this.velocityClient.program, this.decodeFn, {
                     filters: [(0, memcmp_1.getSignedMsgUserOrdersFilter)()],
                 }, this.resubOpts);
@@ -38,10 +38,10 @@ class grpcSignedMsgUserOrdersAccountSubscriber extends signedMsgUserAccountSubsc
         }
     }
     async unsubscribe() {
-        if (!this.subscriber)
+        if (!this._subscriber)
             return;
-        await this.subscriber.unsubscribe();
-        this.subscriber = undefined;
+        await this._subscriber.unsubscribe();
+        this._subscriber = undefined;
         if (this.resyncTimeoutId !== undefined) {
             clearTimeout(this.resyncTimeoutId);
             this.resyncTimeoutId = undefined;

package/lib/browser/swift/signedMsgUserAccountSubscriber.d.ts

@@ -33,8 +33,9 @@ export declare class SignedMsgUserOrdersAccountSubscriber {
     }>;
     mostRecentSlot: number;
     fetchPromise?: Promise<void>;
-    fetchPromiseResolver: () => void;
-    protected subscriber: WebSocketProgramAccountSubscriber<SignedMsgUserOrdersAccount>;
+    private fetchPromiseResolver;
+    protected _subscriber?: WebSocketProgramAccountSubscriber<SignedMsgUserOrdersAccount>;
+    protected get subscriber(): WebSocketProgramAccountSubscriber<SignedMsgUserOrdersAccount>;
     eventEmitter: StrictEventEmitter<EventEmitter, SignedMsgUserOrdersAccountSubscriberEvents>;
     constructor({ velocityClient, commitment, resubOpts, decodeFn, resyncIntervalMs, }: SignedMsgUserOrdersAccountSubscriberConfig);
     subscribe(): Promise<void>;

package/lib/browser/swift/signedMsgUserAccountSubscriber.js

@@ -5,8 +5,16 @@ const memcmp_1 = require("../memcmp");
 const webSocketProgramAccountSubscriber_1 = require("../accounts/webSocketProgramAccountSubscriber");
 const events_1 = require("events");
 class SignedMsgUserOrdersAccountSubscriber {
+    get subscriber() {
+        if (!this._subscriber) {
+            throw new Error('SignedMsgUserOrdersAccountSubscriber: subscriber accessed before subscribe()');
+        }
+        return this._subscriber;
+    }
     constructor({ velocityClient, commitment, resubOpts, decodeFn, resyncIntervalMs, }) {
         this.signedMsgUserOrderAccounts = new Map();
+        this.mostRecentSlot = 0;
+        this.fetchPromiseResolver = () => { };
         this.commitment = commitment !== null && commitment !== void 0 ? commitment : 'confirmed';
         this.resubOpts = resubOpts;
         // Type-system guarantees at least one of the two is supplied.
@@ -19,9 +27,9 @@ class SignedMsgUserOrdersAccountSubscriber {
         this.resubOpts = resubOpts;
     }
     async subscribe() {
-        if (!this.subscriber) {
+        if (!this._subscriber) {
             const filters = [(0, memcmp_1.getSignedMsgUserOrdersFilter)()];
-            this.subscriber =
+            this._subscriber =
                 new webSocketProgramAccountSubscriber_1.WebSocketProgramAccountSubscriber('SingedMsgUserOrdersAccountMap', 'signedMsgUserOrders', this.velocityClient.program, this.decodeFn, {
                     filters,
                     commitment: this.commitment,
@@ -106,10 +114,10 @@ class SignedMsgUserOrdersAccountSubscriber {
         }
     }
     async unsubscribe() {
-        if (!this.subscriber)
+        if (!this._subscriber)
             return;
-        await this.subscriber.unsubscribe();
-        this.subscriber = undefined;
+        await this._subscriber.unsubscribe();
+        this._subscriber = undefined;
         if (this.resyncTimeoutId !== undefined) {
             clearTimeout(this.resyncTimeoutId);
             this.resyncTimeoutId = undefined;

package/lib/browser/swift/swiftOrderSubscriber.d.ts

@@ -52,7 +52,7 @@ export declare class SwiftOrderSubscriber {
     private ws;
     private velocityClient;
     userAccountGetter?: AccountGetter;
-    onOrder: (orderMessageRaw: SwiftOrderMessage, signedMessage: SignedMsgOrderParamsMessage | SignedMsgOrderParamsDelegateMessage, isDelegateSigner?: boolean) => Promise<void>;
+    onOrder?: (orderMessageRaw: SwiftOrderMessage, signedMessage: SignedMsgOrderParamsMessage | SignedMsgOrderParamsDelegateMessage, isDelegateSigner?: boolean) => Promise<void>;
     subscribed: boolean;
     constructor(config: SwiftOrderSubscriberConfig);
     unsubscribe(): void;