@velocity-exchange/sdk 0.0.5 → 0.2.0

package/lib/browser/auctionSubscriber/auctionSubscriber.d.ts

@@ -4,13 +4,11 @@ import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 export declare class AuctionSubscriber {
     private velocityClient;
-    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
-    private get driftClient();
     private opts;
     private resubOpts?;
     eventEmitter: StrictEventEmitter<EventEmitter, AuctionSubscriberEvents>;
-    private subscriber;
-    constructor({ velocityClient, driftClient, opts, resubTimeoutMs, logResubMessages, }: AuctionSubscriberConfig);
+    private subscriber?;
+    constructor({ velocityClient, opts, resubTimeoutMs, logResubMessages, }: AuctionSubscriberConfig);
     subscribe(): Promise<void>;
     unsubscribe(): Promise<void>;
 }

package/lib/browser/auctionSubscriber/auctionSubscriber.js

@@ -5,25 +5,23 @@ const memcmp_1 = require("../memcmp");
 const events_1 = require("events");
 const webSocketProgramAccountSubscriber_1 = require("../accounts/webSocketProgramAccountSubscriber");
 class AuctionSubscriber {
-    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
-    get driftClient() {
-        return this.velocityClient;
-    }
-    constructor({ velocityClient, driftClient, opts, resubTimeoutMs, logResubMessages, }) {
+    constructor({ velocityClient, opts, resubTimeoutMs, logResubMessages, }) {
         // Type-system guarantees at least one of the two is supplied.
-        this.velocityClient = (velocityClient !== null && velocityClient !== void 0 ? velocityClient : driftClient);
-        this.opts = opts || this.velocityClient.opts;
+        this.velocityClient = velocityClient;
+        this.opts = opts || this.velocityClient.opts || {};
         this.eventEmitter = new events_1.EventEmitter();
         this.resubOpts = { resubTimeoutMs, logResubMessages };
     }
     async subscribe() {
-        if (!this.subscriber) {
-            this.subscriber = new webSocketProgramAccountSubscriber_1.WebSocketProgramAccountSubscriber('AuctionSubscriber', 'user', this.velocityClient.program, this.velocityClient.program.account.user.coder.accounts.decode.bind(this.velocityClient.program.account.user.coder.accounts), {
+        let subscriber = this.subscriber;
+        if (!subscriber) {
+            subscriber = new webSocketProgramAccountSubscriber_1.WebSocketProgramAccountSubscriber('AuctionSubscriber', 'user', this.velocityClient.program, this.velocityClient.program.account.user.coder.accounts.decode.bind(this.velocityClient.program.account.user.coder.accounts), {
                 filters: [(0, memcmp_1.getUserFilter)(), (0, memcmp_1.getUserWithAuctionFilter)()],
                 commitment: this.opts.commitment,
             }, this.resubOpts);
+            this.subscriber = subscriber;
         }
-        await this.subscriber.subscribe((accountId, data, context) => {
+        await subscriber.subscribe((accountId, data, context) => {
             this.eventEmitter.emit('onAccountUpdate', data, accountId, context.slot);
         });
     }

package/lib/browser/auctionSubscriber/auctionSubscriberGrpc.d.ts

@@ -4,14 +4,12 @@ import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 export declare class AuctionSubscriberGrpc {
     private velocityClient;
-    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
-    private get driftClient();
     private opts;
     private resubOpts?;
     private grpcConfigs?;
     eventEmitter: StrictEventEmitter<EventEmitter, AuctionSubscriberEvents>;
-    private subscriber;
-    constructor({ velocityClient, driftClient, opts, grpcConfigs, resubTimeoutMs, logResubMessages, }: AuctionSubscriberConfig);
+    private subscriber?;
+    constructor({ velocityClient, opts, grpcConfigs, resubTimeoutMs, logResubMessages, }: AuctionSubscriberConfig);
     subscribe(): Promise<void>;
     unsubscribe(): Promise<void>;
 }

package/lib/browser/auctionSubscriber/auctionSubscriberGrpc.js

@@ -5,25 +5,26 @@ const memcmp_1 = require("../memcmp");
 const events_1 = require("events");
 const grpcProgramAccountSubscriber_1 = require("../accounts/grpcProgramAccountSubscriber");
 class AuctionSubscriberGrpc {
-    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
-    get driftClient() {
-        return this.velocityClient;
-    }
-    constructor({ velocityClient, driftClient, opts, grpcConfigs, resubTimeoutMs, logResubMessages, }) {
+    constructor({ velocityClient, opts, grpcConfigs, resubTimeoutMs, logResubMessages, }) {
         // Type-system guarantees at least one of the two is supplied.
-        this.velocityClient = (velocityClient !== null && velocityClient !== void 0 ? velocityClient : driftClient);
-        this.opts = opts || this.velocityClient.opts;
+        this.velocityClient = velocityClient;
+        this.opts = opts || this.velocityClient.opts || {};
         this.eventEmitter = new events_1.EventEmitter();
         this.resubOpts = { resubTimeoutMs, logResubMessages };
         this.grpcConfigs = grpcConfigs;
     }
     async subscribe() {
-        if (!this.subscriber) {
-            this.subscriber = await grpcProgramAccountSubscriber_1.grpcProgramAccountSubscriber.create(this.grpcConfigs, 'AuctionSubscriber', 'user', this.velocityClient.program, this.velocityClient.program.account.user.coder.accounts.decode.bind(this.velocityClient.program.account.user.coder.accounts), {
+        let subscriber = this.subscriber;
+        if (!subscriber) {
+            if (!this.grpcConfigs) {
+                throw new Error('grpcConfigs must be provided to use AuctionSubscriberGrpc');
+            }
+            subscriber = await grpcProgramAccountSubscriber_1.grpcProgramAccountSubscriber.create(this.grpcConfigs, 'AuctionSubscriber', 'user', this.velocityClient.program, this.velocityClient.program.account.user.coder.accounts.decode.bind(this.velocityClient.program.account.user.coder.accounts), {
                 filters: [(0, memcmp_1.getUserFilter)(), (0, memcmp_1.getUserWithAuctionFilter)()],
             }, this.resubOpts);
+            this.subscriber = subscriber;
         }
-        await this.subscriber.subscribe((accountId, data, context) => {
+        await subscriber.subscribe((accountId, data, context) => {
             this.eventEmitter.emit('onAccountUpdate', data, accountId, context.slot);
         });
     }

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

@@ -2,14 +2,15 @@ import { GrpcConfigs } from '../accounts/types';
 import { VelocityClient } from '../velocityClient';
 import { UserAccount } from '../types';
 import { ConfirmOptions, PublicKey } from '@solana/web3.js';
-import { AtLeastOne } from '../util/deprecatedAlias';
 type AuctionSubscriberConfigBase = {
     opts?: ConfirmOptions;
     resubTimeoutMs?: number;
     logResubMessages?: boolean;
     grpcConfigs?: GrpcConfigs;
 };
-export type AuctionSubscriberConfig = AuctionSubscriberConfigBase & AtLeastOne<'velocityClient', 'driftClient', VelocityClient>;
+export type AuctionSubscriberConfig = AuctionSubscriberConfigBase & {
+    velocityClient: VelocityClient;
+};
 export interface AuctionSubscriberEvents {
     onAccountUpdate: (account: UserAccount, pubkey: PublicKey, slot: number) => void;
 }

package/lib/browser/bankrun/bankrunConnection.d.ts

@@ -10,7 +10,7 @@ export type ClientSubscriptionId = number;
 export type Connection = SolanaConnection | BankrunConnection;
 type BankrunTransactionMetaNormalized = {
     logMessages: string[];
-    err: TransactionError;
+    err: TransactionError | null;
 };
 type BankrunTransactionRespose = {
     slot: number;
@@ -34,7 +34,8 @@ export declare class BankrunConnection {
     private readonly _banksClient;
     private readonly context;
     private transactionToMeta;
-    private clock;
+    private _clock?;
+    private get clock();
     private nextClientSubscriptionId;
     private onLogCallbacks;
     private onAccountChangeCallbacks;
@@ -43,14 +44,14 @@ export declare class BankrunConnection {
     getSlot(): Promise<bigint>;
     toConnection(): SolanaConnection;
     getTokenAccount(publicKey: PublicKey): Promise<Account>;
-    getMultipleAccountsInfo(publicKeys: PublicKey[], _commitmentOrConfig?: Commitment): Promise<AccountInfo<Buffer>[]>;
+    getMultipleAccountsInfo(publicKeys: PublicKey[], _commitmentOrConfig?: Commitment): Promise<(AccountInfo<Buffer> | null)[]>;
     getAccountInfo(publicKey: PublicKey): Promise<null | AccountInfo<Buffer>>;
     getAccountInfoAndContext(publicKey: PublicKey, _commitment?: Commitment): Promise<RpcResponseAndContext<null | AccountInfo<Buffer>>>;
     sendRawTransaction(rawTransaction: Buffer | Uint8Array | Array<number>, _options?: any): Promise<TransactionSignature>;
     sendTransaction(tx: Transaction | VersionedTransaction): Promise<TransactionSignature>;
     updateSlotAndClock(): Promise<void>;
     getTime(): number;
-    getParsedAccountInfo(publicKey: PublicKey): Promise<RpcResponseAndContext<AccountInfo<Buffer>>>;
+    getParsedAccountInfo(publicKey: PublicKey): Promise<RpcResponseAndContext<null | AccountInfo<Buffer>>>;
     getLatestBlockhash(commitment?: Commitment): Promise<Readonly<{
         blockhash: string;
         lastValidBlockHeight: number;
@@ -61,6 +62,7 @@ export declare class BankrunConnection {
      * There's really no direct equivalent to getTransaction exposed by SolanaProgramTest, so we do the best that we can here - it's a little hacky.
      */
     getTransaction(signature: string, _rawConfig?: GetTransactionConfig | GetVersionedTransactionConfig): Promise<BankrunTransactionRespose | null>;
+    private getTransactionMetaOrThrow;
     findComputeUnitConsumption(signature: string): bigint;
     printTxLogs(signature: string): void;
     simulateTransaction(transaction: Transaction | VersionedTransaction, _config?: SimulateTransactionConfig): Promise<RpcResponseAndContext<SimulatedTransactionResponse>>;

package/lib/browser/bankrun/bankrunConnection.js

@@ -78,6 +78,12 @@ class BankrunContextWrapper {
 }
 exports.BankrunContextWrapper = BankrunContextWrapper;
 class BankrunConnection {
+    get clock() {
+        if (!this._clock) {
+            throw new Error('BankrunConnection: clock accessed before updateSlotAndClock()');
+        }
+        return this._clock;
+    }
     constructor(banksClient, context, verifySignatures = true) {
         this.transactionToMeta = new Map();
         this.nextClientSubscriptionId = 0;
@@ -95,6 +101,9 @@ class BankrunConnection {
     }
     async getTokenAccount(publicKey) {
         const info = await this.getAccountInfo(publicKey);
+        if (info === null) {
+            throw new Error(`Account not found: ${publicKey.toBase58()}`);
+        }
         return (0, spl_token_1.unpackAccount)(publicKey, info, info.owner);
     }
     async getMultipleAccountsInfo(publicKeys, _commitmentOrConfig) {
@@ -132,9 +141,17 @@ class BankrunConnection {
             ? await internal.tryProcessVersionedTransaction(serialized)
             : await internal.tryProcessLegacyTransaction(serialized);
         const banksTransactionMeta = new solana_bankrun_1.BanksTransactionResultWithMeta(inner);
-        const signature = isVersioned
-            ? bs58_1.default.encode(tx.signatures[0])
-            : bs58_1.default.encode(tx.signatures[0].signature);
+        let signature;
+        if (isVersioned) {
+            signature = bs58_1.default.encode(tx.signatures[0]);
+        }
+        else {
+            const legacySignature = tx.signatures[0].signature;
+            if (legacySignature === null) {
+                throw new Error('BankrunConnection: transaction is missing its first signature');
+            }
+            signature = bs58_1.default.encode(legacySignature);
+        }
         if (banksTransactionMeta.result) {
             if (!banksTransactionMeta.result
                 .toString()
@@ -151,9 +168,12 @@ class BankrunConnection {
         }
         let finalizedCount = 0;
         while (finalizedCount < 10) {
-            const signatureStatus = (await this.getSignatureStatus(signature)).value
-                .confirmationStatus;
-            if (signatureStatus.toString() == '"finalized"') {
+            const statusValue = (await this.getSignatureStatus(signature)).value;
+            if (statusValue === null) {
+                throw new Error(`BankrunConnection: no signature status for ${signature}`);
+            }
+            const signatureStatus = statusValue.confirmationStatus;
+            if ((signatureStatus === null || signatureStatus === void 0 ? void 0 : signatureStatus.toString()) == '"finalized"') {
                 finalizedCount += 1;
             }
         }
@@ -167,18 +187,23 @@ class BankrunConnection {
         }
         if (this.onLogCallbacks.size > 0) {
             const transaction = await this.getTransaction(signature);
-            const context = { slot: transaction.slot };
-            const logs = {
-                logs: transaction.meta.logMessages,
-                err: transaction.meta.err,
-                signature,
-            };
-            for (const logCallback of this.onLogCallbacks.values()) {
-                logCallback(logs, context);
+            if (transaction !== null) {
+                const context = { slot: transaction.slot };
+                const logs = {
+                    logs: transaction.meta.logMessages,
+                    err: transaction.meta.err,
+                    signature,
+                };
+                for (const logCallback of this.onLogCallbacks.values()) {
+                    logCallback(logs, context);
+                }
             }
         }
         for (const [publicKey, callback,] of this.onAccountChangeCallbacks.values()) {
             const accountInfo = await this.getParsedAccountInfo(publicKey);
+            if (accountInfo.value === null) {
+                continue;
+            }
             callback(accountInfo.value, accountInfo.context);
         }
         return signature;
@@ -190,7 +215,7 @@ class BankrunConnection {
         const currentClock = await this._banksClient.getClock();
         const newClock = new solana_bankrun_1.Clock(nextSlot, currentClock.epochStartTimestamp, currentClock.epoch, currentClock.leaderScheduleEpoch, currentClock.unixTimestamp + BigInt(1));
         this.context.setClock(newClock);
-        this.clock = newClock;
+        this._clock = newClock;
     }
     getTime() {
         return Number(this.clock.unixTimestamp);
@@ -212,6 +237,9 @@ class BankrunConnection {
     }
     async getLatestBlockhash(commitment) {
         const blockhashAndBlockheight = await this._banksClient.getLatestBlockhash(commitment);
+        if (blockhashAndBlockheight === null) {
+            throw new Error('Failed to get latest blockhash');
+        }
         return {
             blockhash: blockhashAndBlockheight[0],
             lastValidBlockHeight: Number(blockhashAndBlockheight[1]),
@@ -258,6 +286,9 @@ class BankrunConnection {
             return null;
         }
         const transactionStatus = await this._banksClient.getTransactionStatus(signature);
+        if (transactionStatus === null) {
+            throw new Error(`tx has no status: ${signature}`);
+        }
         if (txMeta.meta === null) {
             throw new Error(`tx has no meta: ${JSON.stringify(txMeta)}`);
         }
@@ -270,36 +301,43 @@ class BankrunConnection {
             meta,
         };
     }
-    findComputeUnitConsumption(signature) {
+    getTransactionMetaOrThrow(signature) {
         const txMeta = this.transactionToMeta.get(signature);
         if (txMeta === undefined) {
             throw new Error('Transaction not found');
         }
-        return txMeta.meta.computeUnitsConsumed;
+        if (txMeta.meta === null) {
+            throw new Error(`tx has no meta: ${JSON.stringify(txMeta)}`);
+        }
+        return txMeta.meta;
+    }
+    findComputeUnitConsumption(signature) {
+        return this.getTransactionMetaOrThrow(signature).computeUnitsConsumed;
     }
     printTxLogs(signature) {
-        const txMeta = this.transactionToMeta.get(signature);
-        if (txMeta === undefined) {
-            throw new Error('Transaction not found');
-        }
-        console.log(txMeta.meta.logMessages);
+        console.log(this.getTransactionMetaOrThrow(signature).logMessages);
     }
     async simulateTransaction(transaction, _config) {
-        var _a, _b, _c, _d;
         const simulationResult = await this._banksClient.simulateTransaction(transaction);
-        const returnDataProgramId = (_b = (_a = simulationResult.meta) === null || _a === void 0 ? void 0 : _a.returnData) === null || _b === void 0 ? void 0 : _b.programId.toBase58();
-        const returnDataNormalized = Buffer.from((_d = (_c = simulationResult.meta) === null || _c === void 0 ? void 0 : _c.returnData) === null || _d === void 0 ? void 0 : _d.data).toString('base64');
-        const returnData = {
-            programId: returnDataProgramId,
-            data: [returnDataNormalized, 'base64'],
-        };
+        const meta = simulationResult.meta;
+        if (meta === null) {
+            throw new Error('BankrunConnection: simulation returned no meta');
+        }
+        let returnData;
+        if (meta.returnData !== null) {
+            const returnDataNormalized = Buffer.from(meta.returnData.data).toString('base64');
+            returnData = {
+                programId: meta.returnData.programId.toBase58(),
+                data: [returnDataNormalized, 'base64'],
+            };
+        }
         return {
             context: { slot: Number(await this._banksClient.getSlot()) },
             value: {
                 err: simulationResult.result,
-                logs: simulationResult.meta.logMessages,
+                logs: meta.logMessages,
                 accounts: undefined,
-                unitsConsumed: Number(simulationResult.meta.computeUnitsConsumed),
+                unitsConsumed: Number(meta.computeUnitsConsumed),
                 returnData,
             },
         };

package/lib/browser/blockhashSubscriber/BlockhashSubscriber.d.ts

@@ -11,7 +11,7 @@ export declare class BlockhashSubscriber {
     private updateIntervalMs;
     constructor(config: BlockhashSubscriberConfig);
     getBlockhashCacheSize(): number;
-    getLatestBlockHeight(): number;
+    getLatestBlockHeight(): number | undefined;
     getLatestBlockHeightContext(): Context | undefined;
     /**
      * Returns the latest cached blockhash, based on an offset from the latest obtained

package/lib/browser/blockhashSubscriber/BlockhashSubscriber.js

@@ -40,8 +40,9 @@ class BlockhashSubscriber {
         return this.blockhashes[this.blockhashes.length - 1 - clampedOffset];
     }
     pruneBlockhashes() {
-        if (this.latestBlockHeight) {
-            this.blockhashes = this.blockhashes.filter((blockhash) => blockhash.lastValidBlockHeight > this.latestBlockHeight);
+        if (this.latestBlockHeight !== undefined) {
+            const latestBlockHeight = this.latestBlockHeight;
+            this.blockhashes = this.blockhashes.filter((blockhash) => blockhash.lastValidBlockHeight > latestBlockHeight);
         }
     }
     async updateBlockhash() {

package/lib/browser/clock/clockSubscriber.d.ts

@@ -11,13 +11,13 @@ export interface ClockSubscriberEvent {
 }
 export declare class ClockSubscriber {
     private connection;
-    private _latestSlot;
-    private _currentTs;
-    private subscriptionId;
+    private _latestSlot?;
+    private _currentTs?;
+    private subscriptionId?;
     commitment: Commitment;
     eventEmitter: StrictEventEmitter<EventEmitter, ClockSubscriberEvent>;
-    get latestSlot(): number;
-    get currentTs(): number;
+    get latestSlot(): number | undefined;
+    get currentTs(): number | undefined;
     private timeoutId?;
     private resubTimeoutMs?;
     private isUnsubscribing;
@@ -25,7 +25,7 @@ export declare class ClockSubscriber {
     constructor(connection: Connection, config?: ClockSubscriberConfig);
     subscribe(): Promise<void>;
     private setTimeout;
-    getUnixTs(): number;
+    getUnixTs(): number | undefined;
     unsubscribe(onResub?: boolean): Promise<void>;
 }
 export {};

package/lib/browser/clock/clockSubscriber.js

@@ -18,7 +18,7 @@ class ClockSubscriber {
         this.eventEmitter = new events_1.EventEmitter();
         this.resubTimeoutMs = config === null || config === void 0 ? void 0 : config.resubTimeoutMs;
         this.commitment = (config === null || config === void 0 ? void 0 : config.commitment) || 'confirmed';
-        if (this.resubTimeoutMs < 1000) {
+        if (this.resubTimeoutMs !== undefined && this.resubTimeoutMs < 1000) {
             console.log('resubTimeoutMs should be at least 1000ms to avoid spamming resub');
         }
     }
@@ -34,8 +34,9 @@ class ClockSubscriber {
                     this.setTimeout();
                 }
                 this._latestSlot = context.slot;
-                this._currentTs = new anchor_1.BN(acctInfo.data.subarray(32, 39), undefined, 'le').toNumber();
-                this.eventEmitter.emit('clockUpdate', this.currentTs);
+                const currentTs = new anchor_1.BN(acctInfo.data.subarray(32, 39), undefined, 'le').toNumber();
+                this._currentTs = currentTs;
+                this.eventEmitter.emit('clockUpdate', currentTs);
             }
         }, this.commitment);
         if (this.resubTimeoutMs) {

package/lib/browser/config.d.ts

@@ -4,25 +4,17 @@ import { PerpMarketConfig } from './constants/perpMarkets';
 import { SpotMarketConfig } from './constants/spotMarkets';
 import { OracleInfo } from './oracles/types';
 import { Program } from './isomorphic/anchor';
-import { Drift } from './idl/drift';
-export type VelocityProgram = Program<Drift>;
-/** @deprecated Use `VelocityProgram` instead. `DriftProgram` will be removed in a future major. */
-export type DriftProgram = VelocityProgram;
+import { Velocity } from './idl/velocity';
+export type VelocityProgram = Program<Velocity>;
 export type VelocityEnv = 'devnet' | 'mainnet-beta';
-/** @deprecated Use `VelocityEnv` instead. `DriftEnv` will be removed in a future major. */
-export type DriftEnv = VelocityEnv;
 /** Widened env type accepted by `initialize()`; `'master'` is a legacy alias for `'devnet'`. */
 export type LegacyVelocityEnv = VelocityEnv | 'master';
 export interface VelocityConfig {
     ENV: VelocityEnv;
     PYTH_ORACLE_MAPPING_ADDRESS: string;
     VELOCITY_PROGRAM_ID: string;
-    /** @deprecated Use `VELOCITY_PROGRAM_ID` instead. Kept on the config shape so existing callers reading this field continue to work; will be removed in a future major. */
-    DRIFT_PROGRAM_ID: string;
     JIT_PROXY_PROGRAM_ID?: string;
     VELOCITY_ORACLE_RECEIVER_ID: string;
-    /** @deprecated Use `VELOCITY_ORACLE_RECEIVER_ID` instead. Kept on the config shape so existing callers reading this field continue to work; will be removed in a future major. */
-    DRIFT_ORACLE_RECEIVER_ID: string;
     QUOTE_MINT_ADDRESS: string;
     V2_ALPHA_TICKET_MINT_ADDRESS: string;
     PERP_MARKETS: PerpMarketConfig[];
@@ -32,18 +24,10 @@ export interface VelocityConfig {
     MARKET_LOOKUP_TABLES: string[];
     SB_ON_DEMAND_PID: PublicKey;
 }
-/** @deprecated Use `VelocityConfig` instead. `DriftConfig` will be removed in a future major. */
-export type DriftConfig = VelocityConfig;
-export declare const VELOCITY_PROGRAM_ID = "dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH";
-/** @deprecated Use `VELOCITY_PROGRAM_ID` instead. `DRIFT_PROGRAM_ID` will be removed in a future major. */
-export declare const DRIFT_PROGRAM_ID = "dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH";
+export declare const VELOCITY_PROGRAM_ID = "vELoC1audYbSYVRXn1vPaV8Axoa9oU6BYmNGZZBDZ1P";
 export declare const VELOCITY_DEVNET_PROGRAM_ID = "vELoC1audYbSYVRXn1vPaV8Axoa9oU6BYmNGZZBDZ1P";
-/** @deprecated Use `VELOCITY_DEVNET_PROGRAM_ID` instead. `DRIFT_DEVNET_PROGRAM_ID` will be removed in a future major. */
-export declare const DRIFT_DEVNET_PROGRAM_ID = "vELoC1audYbSYVRXn1vPaV8Axoa9oU6BYmNGZZBDZ1P";
 export declare const VELOCITY_ORACLE_RECEIVER_ID = "G6EoTTTgpkNBtVXo96EQp2m6uwwVh2Kt6YidjkmQqoha";
-/** @deprecated Use `VELOCITY_ORACLE_RECEIVER_ID` instead. `DRIFT_ORACLE_RECEIVER_ID` will be removed in a future major. */
-export declare const DRIFT_ORACLE_RECEIVER_ID = "G6EoTTTgpkNBtVXo96EQp2m6uwwVh2Kt6YidjkmQqoha";
-export declare const PTYH_LAZER_PROGRAM_ID = "pytd2yyk641x7ak7mkaasSJVXh6YYZnC7wTmtgAyxPt";
+export declare const PYTH_LAZER_PROGRAM_ID = "pytd2yyk641x7ak7mkaasSJVXh6YYZnC7wTmtgAyxPt";
 export declare const SB_ON_DEMAND_DEVNET_PID: PublicKey;
 export declare const SB_ON_DEMAND_MAINNET_PID: PublicKey;
 export declare const PYTH_LAZER_STORAGE_ACCOUNT_KEY: PublicKey;
@@ -52,6 +36,13 @@ export declare const configs: {
     [key in VelocityEnv]: VelocityConfig;
 };
 export declare const getConfig: () => VelocityConfig;
+/**
+ * Allows customization of the SDK's environment and endpoints. You can pass individual settings to override the settings with your own presets.
+ *
+ * Defaults to master environment if you don't use this function.
+ * @param props
+ * @returns
+ */
 export declare const initialize: (props: {
     env: LegacyVelocityEnv;
     overrideEnv?: Partial<VelocityConfig>;

package/lib/browser/config.js

@@ -1,20 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findAllMarketAndOracles = exports.getMarketsAndOraclesForSubscription = exports.initialize = exports.getConfig = exports.configs = exports.DEFAULT_CONFIRMATION_OPTS = exports.PYTH_LAZER_STORAGE_ACCOUNT_KEY = exports.SB_ON_DEMAND_MAINNET_PID = exports.SB_ON_DEMAND_DEVNET_PID = exports.PTYH_LAZER_PROGRAM_ID = exports.DRIFT_ORACLE_RECEIVER_ID = exports.VELOCITY_ORACLE_RECEIVER_ID = exports.DRIFT_DEVNET_PROGRAM_ID = exports.VELOCITY_DEVNET_PROGRAM_ID = exports.DRIFT_PROGRAM_ID = exports.VELOCITY_PROGRAM_ID = void 0;
+exports.findAllMarketAndOracles = exports.getMarketsAndOraclesForSubscription = exports.initialize = exports.getConfig = exports.configs = exports.DEFAULT_CONFIRMATION_OPTS = exports.PYTH_LAZER_STORAGE_ACCOUNT_KEY = exports.SB_ON_DEMAND_MAINNET_PID = exports.SB_ON_DEMAND_DEVNET_PID = exports.PYTH_LAZER_PROGRAM_ID = exports.VELOCITY_ORACLE_RECEIVER_ID = exports.VELOCITY_DEVNET_PROGRAM_ID = exports.VELOCITY_PROGRAM_ID = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const perpMarkets_1 = require("./constants/perpMarkets");
 const spotMarkets_1 = require("./constants/spotMarkets");
 const oracleId_1 = require("./oracles/oracleId");
-exports.VELOCITY_PROGRAM_ID = 'dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH';
-/** @deprecated Use `VELOCITY_PROGRAM_ID` instead. `DRIFT_PROGRAM_ID` will be removed in a future major. */
-exports.DRIFT_PROGRAM_ID = exports.VELOCITY_PROGRAM_ID;
+exports.VELOCITY_PROGRAM_ID = 'vELoC1audYbSYVRXn1vPaV8Axoa9oU6BYmNGZZBDZ1P';
 exports.VELOCITY_DEVNET_PROGRAM_ID = 'vELoC1audYbSYVRXn1vPaV8Axoa9oU6BYmNGZZBDZ1P';
-/** @deprecated Use `VELOCITY_DEVNET_PROGRAM_ID` instead. `DRIFT_DEVNET_PROGRAM_ID` will be removed in a future major. */
-exports.DRIFT_DEVNET_PROGRAM_ID = exports.VELOCITY_DEVNET_PROGRAM_ID;
 exports.VELOCITY_ORACLE_RECEIVER_ID = 'G6EoTTTgpkNBtVXo96EQp2m6uwwVh2Kt6YidjkmQqoha';
-/** @deprecated Use `VELOCITY_ORACLE_RECEIVER_ID` instead. `DRIFT_ORACLE_RECEIVER_ID` will be removed in a future major. */
-exports.DRIFT_ORACLE_RECEIVER_ID = exports.VELOCITY_ORACLE_RECEIVER_ID;
-exports.PTYH_LAZER_PROGRAM_ID = 'pytd2yyk641x7ak7mkaasSJVXh6YYZnC7wTmtgAyxPt';
+exports.PYTH_LAZER_PROGRAM_ID = 'pytd2yyk641x7ak7mkaasSJVXh6YYZnC7wTmtgAyxPt';
 exports.SB_ON_DEMAND_DEVNET_PID = new web3_js_1.PublicKey('Aio4gaXjXzJNVLtzwtNVmSqGKpANtXhybbkhtAC94ji2');
 exports.SB_ON_DEMAND_MAINNET_PID = new web3_js_1.PublicKey('SBondMDrcV3K4kxZR1HNVT7osZxAHVHgYXL5Ze1oMUv');
 exports.PYTH_LAZER_STORAGE_ACCOUNT_KEY = new web3_js_1.PublicKey('3rdJbqfnagQ4yx9HXJViD4zc4xpiSqmFsKpPuSCQVyQL');
@@ -27,8 +21,6 @@ exports.configs = {
         ENV: 'devnet',
         PYTH_ORACLE_MAPPING_ADDRESS: 'BmA9Z6FjioHJPpjT39QazZyhDRUdZy2ezwx4GiDdE2u2',
         VELOCITY_PROGRAM_ID: exports.VELOCITY_DEVNET_PROGRAM_ID,
-        /** @deprecated Read `VELOCITY_PROGRAM_ID` instead. */
-        DRIFT_PROGRAM_ID: exports.VELOCITY_DEVNET_PROGRAM_ID,
         JIT_PROXY_PROGRAM_ID: 'J1TnP8zvVxbtF5KFp5xRmWuvG9McnhzmBd9XGfCyuxFP',
         QUOTE_MINT_ADDRESS: '8FfvSRKMZRDHrCBy142XMUXrKEkXnxDQ4YmJv7xbAw8Q',
         V2_ALPHA_TICKET_MINT_ADDRESS: 'DeEiGWfCMP9psnLGkxGrBBMEAW5Jv8bBGMN8DCtFRCyB',
@@ -38,16 +30,12 @@ exports.configs = {
         MARKET_LOOKUP_TABLE: 'FaMS3U4uBojvGn5FSDEPimddcXsCfwkKsFgMVVnDdxGb',
         MARKET_LOOKUP_TABLES: ['FaMS3U4uBojvGn5FSDEPimddcXsCfwkKsFgMVVnDdxGb'],
         VELOCITY_ORACLE_RECEIVER_ID: exports.VELOCITY_ORACLE_RECEIVER_ID,
-        /** @deprecated Read `VELOCITY_ORACLE_RECEIVER_ID` instead. */
-        DRIFT_ORACLE_RECEIVER_ID: exports.VELOCITY_ORACLE_RECEIVER_ID,
         SB_ON_DEMAND_PID: exports.SB_ON_DEMAND_DEVNET_PID,
     },
     'mainnet-beta': {
         ENV: 'mainnet-beta',
         PYTH_ORACLE_MAPPING_ADDRESS: 'AHtgzX45WTKfkPG53L6WYhGEXwQkN1BVknET3sVsLL8J',
         VELOCITY_PROGRAM_ID: exports.VELOCITY_PROGRAM_ID,
-        /** @deprecated Read `VELOCITY_PROGRAM_ID` instead. */
-        DRIFT_PROGRAM_ID: exports.VELOCITY_PROGRAM_ID,
         JIT_PROXY_PROGRAM_ID: 'J1TnP8zvVxbtF5KFp5xRmWuvG9McnhzmBd9XGfCyuxFP',
         QUOTE_MINT_ADDRESS: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
         V2_ALPHA_TICKET_MINT_ADDRESS: 'Cmvhycb6LQvvzaShGw4iDHRLzeSSryioAsU98DSSkMNa',
@@ -60,8 +48,6 @@ exports.configs = {
             'EiWSskK5HXnBTptiS5DH6gpAJRVNQ3cAhTKBGaiaysAb',
         ],
         VELOCITY_ORACLE_RECEIVER_ID: exports.VELOCITY_ORACLE_RECEIVER_ID,
-        /** @deprecated Read `VELOCITY_ORACLE_RECEIVER_ID` instead. */
-        DRIFT_ORACLE_RECEIVER_ID: exports.VELOCITY_ORACLE_RECEIVER_ID,
         SB_ON_DEMAND_PID: exports.SB_ON_DEMAND_MAINNET_PID,
     },
 };
@@ -75,30 +61,21 @@ exports.getConfig = getConfig;
  * @param props
  * @returns
  */
-/**
- * Mirror a canonical/deprecated alias pair so the resolved config carries the
- * same value under both keys regardless of which one the caller overrode.
- */
-const mirrorAlias = (merged, override, canon, deprecated) => {
-    var _a, _b;
-    const value = (_b = (_a = override[canon]) !== null && _a !== void 0 ? _a : override[deprecated]) !== null && _b !== void 0 ? _b : merged[canon];
-    merged[canon] = value;
-    merged[deprecated] = value;
-};
 const initialize = (props) => {
     var _a;
     const override = (_a = props.overrideEnv) !== null && _a !== void 0 ? _a : {};
     const normalizedEnv = props.env === 'master' ? 'devnet' : props.env;
-    const merged = { ...exports.configs[normalizedEnv], ...override };
-    mirrorAlias(merged, override, 'VELOCITY_PROGRAM_ID', 'DRIFT_PROGRAM_ID');
-    mirrorAlias(merged, override, 'VELOCITY_ORACLE_RECEIVER_ID', 'DRIFT_ORACLE_RECEIVER_ID');
-    currentConfig = merged;
+    currentConfig = { ...exports.configs[normalizedEnv], ...override };
     return currentConfig;
 };
 exports.initialize = initialize;
 function getMarketsAndOraclesForSubscription(env, perpMarkets, spotMarkets) {
-    const perpMarketsToUse = (perpMarkets === null || perpMarkets === void 0 ? void 0 : perpMarkets.length) > 0 ? perpMarkets : perpMarkets_1.PerpMarkets[env];
-    const spotMarketsToUse = (spotMarkets === null || spotMarkets === void 0 ? void 0 : spotMarkets.length) > 0 ? spotMarkets : spotMarkets_1.SpotMarkets[env];
+    const perpMarketsToUse = perpMarkets !== undefined && perpMarkets.length > 0
+        ? perpMarkets
+        : perpMarkets_1.PerpMarkets[env];
+    const spotMarketsToUse = spotMarkets !== undefined && spotMarkets.length > 0
+        ? spotMarkets
+        : spotMarkets_1.SpotMarkets[env];
     const perpMarketIndexes = [];
     const spotMarketIndexes = [];
     const oracleInfos = new Map();
@@ -132,9 +109,9 @@ async function findAllMarketAndOracles(program) {
     for (const perpMarketProgramAccount of perpMarketProgramAccounts) {
         const perpMarket = perpMarketProgramAccount.account;
         perpMarketIndexes.push(perpMarket.marketIndex);
-        oracleInfos.set((0, oracleId_1.getOracleId)(perpMarket.amm.oracle, perpMarket.amm.oracleSource), {
-            publicKey: perpMarket.amm.oracle,
-            source: perpMarket.amm.oracleSource,
+        oracleInfos.set((0, oracleId_1.getOracleId)(perpMarket.oracle, perpMarket.oracleSource), {
+            publicKey: perpMarket.oracle,
+            source: perpMarket.oracleSource,
         });
     }
     for (const spotMarketProgramAccount of spotMarketProgramAccounts) {

package/lib/browser/constants/index.d.ts

@@ -1,9 +1,8 @@
 /**
  * Protocol constants: numeric precision bases, market indices, transaction size limits,
- * insurance fund parameters, and perp/spot market config arrays.
+ * and perp/spot market config arrays.
  * Import specific submodules to avoid pulling in unused market lists.
  */
-export * from './insuranceFund';
 export * from './numericConstants';
 export * from './perpMarkets';
 export * from './spotMarkets';

package/lib/browser/constants/index.js

@@ -16,10 +16,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * Protocol constants: numeric precision bases, market indices, transaction size limits,
- * insurance fund parameters, and perp/spot market config arrays.
+ * and perp/spot market config arrays.
  * Import specific submodules to avoid pulling in unused market lists.
  */
-__exportStar(require("./insuranceFund"), exports);
 __exportStar(require("./numericConstants"), exports);
 __exportStar(require("./perpMarkets"), exports);
 __exportStar(require("./spotMarkets"), exports);