@velocity-exchange/sdk 0.1.0 → 0.2.1

package/lib/browser/constituentMap/webSocketConstituentAccountSubscriber.js

@@ -6,6 +6,12 @@ const events_1 = require("events");
 const webSocketProgramAccountSubscriber_1 = require("../accounts/webSocketProgramAccountSubscriber");
 const memcmp_1 = require("../memcmp");
 class WebSocketConstituentAccountSubscriber {
+    get constituentDataAccountSubscriber() {
+        if (!this._constituentDataAccountSubscriber) {
+            throw new Error('WebSocketConstituentAccountSubscriber: constituentDataAccountSubscriber accessed before subscribe()');
+        }
+        return this._constituentDataAccountSubscriber;
+    }
     constructor(constituentMap, program, resubTimeoutMs, commitment, additionalFilters) {
         this.constituentMap = constituentMap;
         this.isSubscribed = false;
@@ -19,7 +25,7 @@ class WebSocketConstituentAccountSubscriber {
         if (this.isSubscribed) {
             return true;
         }
-        this.constituentDataAccountSubscriber =
+        this._constituentDataAccountSubscriber =
             new webSocketProgramAccountSubscriber_1.WebSocketProgramAccountSubscriber('LpPoolConstituent', 'constituent', this.program, this.program.account.constituent.coder.accounts.decode.bind(this.program.account.constituent.coder.accounts), {
                 filters: [(0, memcmp_1.getConstituentFilter)(), ...(this.additionalFilters || [])],
                 commitment: this.commitment,
@@ -38,8 +44,9 @@ class WebSocketConstituentAccountSubscriber {
             this.eventEmitter.emit('update');
         }
         catch (error) {
-            console.log(`WebSocketConstituentAccountSubscriber.sync() error: ${error.message}`);
-            this.eventEmitter.emit('error', error);
+            const err = error instanceof Error ? error : new Error(String(error));
+            console.log(`WebSocketConstituentAccountSubscriber.sync() error: ${err.message}`);
+            this.eventEmitter.emit('error', err);
         }
     }
     async unsubscribe() {

package/lib/browser/core/VelocityCore.d.ts

@@ -1,6 +1,5 @@
 /// <reference types="node" />
 /// <reference types="node" />
-/// <reference types="bn.js" />
 import type { AccountMeta, Connection, PublicKey, TransactionInstruction } from '@solana/web3.js';
 import * as pdas from '../addresses/pda';
 import * as constants from '../constants';

package/lib/browser/core/instructions/deposit.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import type { AccountMeta, PublicKey, TransactionInstruction } from '@solana/web3.js';
 import type { BN } from '../../isomorphic/anchor';
 import type { VelocityProgram } from '../../config';

package/lib/browser/core/instructions/perpOrders.d.ts

@@ -31,6 +31,20 @@ export declare function buildPlaceAndMakePerpOrderInstruction(args: {
     authority: PublicKey;
     remainingAccounts: AccountMeta[];
 }): Promise<TransactionInstruction>;
+/**
+ * Build a raw `cancelOrder` instruction.
+ *
+ * Pass `orderId: null` to cancel the user's most recently placed order. The program
+ * resolves a `null` ID on-chain via `get_last_order_id`, which makes this safe to use
+ * in a multi-instruction transaction where a place instruction precedes the cancel and
+ * the program-assigned order ID is not yet known at build time — e.g.:
+ *
+ *   [placePerpOrder] → [cancelOrder(orderId: null)]
+ *
+ * The on-chain `order_id` counter is a monotonically incrementing u32 on the user
+ * account, so `get_last_order_id` reliably points to the order placed in the preceding
+ * instruction of the same transaction.
+ */
 export declare function buildCancelOrderInstruction(args: {
     program: VelocityProgram;
     orderId: number | null;

package/lib/browser/core/instructions/perpOrders.js

@@ -39,6 +39,20 @@ async function buildPlaceAndMakePerpOrderInstruction(args) {
     });
 }
 exports.buildPlaceAndMakePerpOrderInstruction = buildPlaceAndMakePerpOrderInstruction;
+/**
+ * Build a raw `cancelOrder` instruction.
+ *
+ * Pass `orderId: null` to cancel the user's most recently placed order. The program
+ * resolves a `null` ID on-chain via `get_last_order_id`, which makes this safe to use
+ * in a multi-instruction transaction where a place instruction precedes the cancel and
+ * the program-assigned order ID is not yet known at build time — e.g.:
+ *
+ *   [placePerpOrder] → [cancelOrder(orderId: null)]
+ *
+ * The on-chain `order_id` counter is a monotonically incrementing u32 on the user
+ * account, so `get_last_order_id` reliably points to the order placed in the preceding
+ * instruction of the same transaction.
+ */
 async function buildCancelOrderInstruction(args) {
     return await args.program.instruction.cancelOrder(args.orderId, {
         accounts: {

package/lib/browser/core/instructions/withdraw.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import type { AccountMeta, PublicKey, TransactionInstruction } from '@solana/web3.js';
 import type { BN } from '../../isomorphic/anchor';
 import type { VelocityProgram } from '../../config';

package/lib/browser/core/remainingAccounts.d.ts

@@ -13,10 +13,10 @@ export type RemainingAccountsContext = {
     getPerpMarketAccount: (marketIndex: number) => PerpMarketAccount;
     getSpotMarketAccount: (marketIndex: number) => SpotMarketAccount;
     /** Used to resolve user's last slot for cache invalidation. */
-    getUserAccountAndSlot: (subAccountId: number, authority: PublicKey) => {
+    getUserAccountAndSlot: (subAccountId: number | undefined, authority: PublicKey) => {
         slot: number;
     } | undefined;
-    activeSubAccountId: number;
+    activeSubAccountId: number | undefined;
     authority: PublicKey;
     /** Mutable caches + forced-market sets (owned by caller). */
     perpMarketLastSlotCache: Map<number, number>;

package/lib/browser/core/remainingAccounts.js

@@ -16,7 +16,7 @@ function getRemainingAccounts(ctx, params) {
             ? params.userAccounts[0].authority
             : ctx.authority)) === null || _a === void 0 ? void 0 : _a.slot;
         for (const [marketIndex, slot] of ctx.perpMarketLastSlotCache.entries()) {
-            if (slot > lastUserSlot) {
+            if (lastUserSlot !== undefined && slot > lastUserSlot) {
                 addPerpMarketToRemainingAccountMaps(ctx, marketIndex, false, oracleAccountMap, spotMarketAccountMap, perpMarketAccountMap);
             }
             else {
@@ -24,7 +24,7 @@ function getRemainingAccounts(ctx, params) {
             }
         }
         for (const [marketIndex, slot] of ctx.spotMarketLastSlotCache.entries()) {
-            if (slot > lastUserSlot) {
+            if (lastUserSlot !== undefined && slot > lastUserSlot) {
                 addSpotMarketToRemainingAccountMaps(ctx, marketIndex, false, oracleAccountMap, spotMarketAccountMap);
             }
             else {

package/lib/browser/decode/user.js

@@ -156,6 +156,9 @@ function decodeUser(buffer) {
         else if (orderStatusNum === 1) {
             status = types_1.OrderStatus.OPEN;
         }
+        else {
+            throw new Error(`decodeUser: unknown order status ${orderStatusNum}`);
+        }
         offset += 1;
         const orderTypeNum = buffer.readUInt8(offset);
         let orderType;
@@ -174,6 +177,9 @@ function decodeUser(buffer) {
         else if (orderTypeNum === 4) {
             orderType = types_1.OrderType.ORACLE;
         }
+        else {
+            throw new Error(`decodeUser: unknown order type ${orderTypeNum}`);
+        }
         offset += 1;
         const marketTypeNum = buffer.readUInt8(offset);
         let marketType;
@@ -224,6 +230,9 @@ function decodeUser(buffer) {
         else if (triggerConditionNum === 3) {
             triggerCondition = types_1.OrderTriggerCondition.TRIGGERED_BELOW;
         }
+        else {
+            throw new Error(`decodeUser: unknown trigger condition ${triggerConditionNum}`);
+        }
         offset += 1;
         const auctionDuration = buffer.readUInt8(offset);
         offset += 1;
@@ -236,7 +245,6 @@ function decodeUser(buffer) {
             slot,
             price,
             baseAssetAmount,
-            quoteAssetAmount: undefined,
             baseAssetAmountFilled,
             quoteAssetAmountFilled,
             triggerPrice,

package/lib/browser/dlob/DLOB.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 /**
  * DLOB — Decentralized Limit Order Book.
  *
@@ -74,6 +73,10 @@ export declare class DLOB {
     initialized: boolean;
     constructor();
     private init;
+    private getOpenOrdersForMarketType;
+    private getOrderListsForMarketType;
+    private tryGetMarketNodeLists;
+    private getMarketNodeLists;
     clear(): void;
     /**
      * initializes a new DLOB instance
@@ -86,6 +89,7 @@ export declare class DLOB {
     addOrderList(marketType: MarketTypeStr, marketIndex: number): void;
     delete(order: Order, userAccount: PublicKey, slot: number, onDelete?: OrderBookCallback): void;
     getListForOnChainOrder(order: Order, slot: number): NodeList<any> | undefined;
+    private getListForOnChainOrderOrThrow;
     updateRestingLimitOrders(slot: number): void;
     updateRestingLimitOrdersForMarketType(slot: number, marketTypeStr: MarketTypeStr): void;
     getOrder(orderId: number, userAccount: PublicKey): Order | undefined;
@@ -111,7 +115,7 @@ export declare class DLOB {
     } ? SpotMarketAccount : PerpMarketAccount, fallbackAsk: BN | undefined, fallbackBid?: BN | undefined): NodeToFill[];
     findTakingNodesCrossingMakerNodes<T extends MarketType>(marketIndex: number, slot: number, marketType: T, oraclePriceData: T extends {
         spot: unknown;
-    } ? OraclePriceData : MMOraclePriceData, takerNodeGenerator: Generator<DLOBNode>, makerNodeGeneratorFn: (marketIndex: number, slot: number, marketType: MarketType, oraclePriceData: T extends {
+    } ? OraclePriceData : MMOraclePriceData, takerNodeGenerator: Generator<DLOBNode>, makerNodeGeneratorFn: (marketIndex: number, slot: number, marketType: T, oraclePriceData: T extends {
         spot: unknown;
     } ? OraclePriceData : MMOraclePriceData) => Generator<DLOBNode>, doesCross: (takerPrice: BN | undefined, makerPrice: BN) => boolean): NodeToFill[];
     findNodesCrossingFallbackLiquidity<T extends MarketType>(marketType: T, slot: number, oraclePriceData: T extends {