@velocity-exchange/sdk 0.0.3 → 0.1.0

package/lib/browser/adminClient.js

@@ -50,16 +50,16 @@ class AdminClient extends velocityClient_1.VelocityClient {
         if (stateAccountRPCResponse.value !== null) {
             throw new Error('Clearing house already initialized');
         }
-        const [driftStatePublicKey] = await (0, pda_1.getVelocityStateAccountPublicKeyAndNonce)(this.program.programId);
+        const [velocityStatePublicKey] = await (0, pda_1.getVelocityStateAccountPublicKeyAndNonce)(this.program.programId);
         const initializeIx = await this.program.instruction.initialize({
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().coldAdmin
                     : this.wallet.publicKey,
-                state: driftStatePublicKey,
+                state: velocityStatePublicKey,
                 quoteAssetMint: usdcMint,
                 rent: web3_js_1.SYSVAR_RENT_PUBKEY,
-                driftSigner: this.getSignerPublicKey(),
+                velocitySigner: this.getSignerPublicKey(),
                 systemProgram: anchor.web3.SystemProgram.programId,
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             },
@@ -99,7 +99,7 @@ class AdminClient extends velocityClient_1.VelocityClient {
                 spotMarket,
                 spotMarketVault,
                 insuranceFundVault,
-                driftSigner: this.getSignerPublicKey(),
+                velocitySigner: this.getSignerPublicKey(),
                 spotMarketMint: mint,
                 oracle,
                 rent: web3_js_1.SYSVAR_RENT_PUBKEY,
@@ -128,7 +128,7 @@ class AdminClient extends velocityClient_1.VelocityClient {
                 spotMarket: spotMarketPublicKey,
                 spotMarketVault: spotMarketVaultPublicKey,
                 insuranceFundVault: insuranceFundVaultPublicKey,
-                driftSigner: this.getSignerPublicKey(),
+                velocitySigner: this.getSignerPublicKey(),
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             },
         });
@@ -344,7 +344,7 @@ class AdminClient extends velocityClient_1.VelocityClient {
                     ? this.getStateAccount().coldAdmin
                     : this.wallet.publicKey,
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
-                oracle: this.getPerpMarketAccount(perpMarketIndex).amm.oracle,
+                oracle: this.getPerpMarketAccount(perpMarketIndex).oracle,
             },
         });
     }
@@ -381,7 +381,7 @@ class AdminClient extends velocityClient_1.VelocityClient {
                 state: await this.getStatePublicKey(),
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
                 spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, numericConstants_1.QUOTE_SPOT_MARKET_INDEX),
-                oracle: this.getPerpMarketAccount(perpMarketIndex).amm.oracle,
+                oracle: this.getPerpMarketAccount(perpMarketIndex).oracle,
             },
         });
     }
@@ -467,14 +467,14 @@ class AdminClient extends velocityClient_1.VelocityClient {
     }
     async getRepegAmmCurveIx(newPeg, perpMarketIndex) {
         const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex);
-        const ammData = this.getPerpMarketAccount(perpMarketIndex).amm;
+        const perpMarketAccount = this.getPerpMarketAccount(perpMarketIndex);
         return await this.program.instruction.repegAmmCurve(newPeg, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 admin: this.isSubscribed
                     ? this.getStateAccount().coldAdmin
                     : this.wallet.publicKey,
-                oracle: ammData.oracle,
+                oracle: perpMarketAccount.oracle,
                 perpMarket: perpMarketPublicKey,
             },
         });
@@ -486,7 +486,7 @@ class AdminClient extends velocityClient_1.VelocityClient {
         return txSig;
     }
     async getUpdatePerpMarketAmmOracleTwapIx(perpMarketIndex) {
-        const ammData = this.getPerpMarketAccount(perpMarketIndex).amm;
+        const perpMarketAccount = this.getPerpMarketAccount(perpMarketIndex);
         const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex);
         return await this.program.instruction.updatePerpMarketAmmOracleTwap({
             accounts: {
@@ -494,7 +494,7 @@ class AdminClient extends velocityClient_1.VelocityClient {
                 admin: this.isSubscribed
                     ? this.getStateAccount().coldAdmin
                     : this.wallet.publicKey,
-                oracle: ammData.oracle,
+                oracle: perpMarketAccount.oracle,
                 perpMarket: perpMarketPublicKey,
             },
         });
@@ -506,7 +506,7 @@ class AdminClient extends velocityClient_1.VelocityClient {
         return txSig;
     }
     async getResetPerpMarketAmmOracleTwapIx(perpMarketIndex) {
-        const ammData = this.getPerpMarketAccount(perpMarketIndex).amm;
+        const perpMarketAccount = this.getPerpMarketAccount(perpMarketIndex);
         const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex);
         return await this.program.instruction.resetPerpMarketAmmOracleTwap({
             accounts: {
@@ -514,7 +514,7 @@ class AdminClient extends velocityClient_1.VelocityClient {
                 admin: this.isSubscribed
                     ? this.getStateAccount().coldAdmin
                     : this.wallet.publicKey,
-                oracle: ammData.oracle,
+                oracle: perpMarketAccount.oracle,
                 perpMarket: perpMarketPublicKey,
             },
         });
@@ -542,7 +542,7 @@ class AdminClient extends velocityClient_1.VelocityClient {
                 state: await this.getStatePublicKey(),
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
                 sourceVault,
-                driftSigner: this.getSignerPublicKey(),
+                velocitySigner: this.getSignerPublicKey(),
                 quoteSpotMarket: spotMarket.pubkey,
                 spotMarketVault: spotMarket.vault,
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
@@ -672,7 +672,7 @@ class AdminClient extends velocityClient_1.VelocityClient {
                 state: await this.getStatePublicKey(),
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
                 spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, numericConstants_1.QUOTE_SPOT_MARKET_INDEX),
-                oracle: this.getPerpMarketAccount(perpMarketIndex).amm.oracle,
+                oracle: this.getPerpMarketAccount(perpMarketIndex).oracle,
             },
         });
     }
@@ -1104,7 +1104,7 @@ class AdminClient extends velocityClient_1.VelocityClient {
                 state: await this.getStatePublicKey(),
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
                 oracle: oracle,
-                oldOracle: this.getPerpMarketAccount(perpMarketIndex).amm.oracle,
+                oldOracle: this.getPerpMarketAccount(perpMarketIndex).oracle,
                 ammCache: (0, pda_1.getAmmCachePublicKey)(this.program.programId),
             },
         });
@@ -1714,7 +1714,7 @@ class AdminClient extends velocityClient_1.VelocityClient {
                 spotMarketVault: await (0, pda_1.getSpotMarketVaultPublicKey)(this.program.programId, outMarketIndex),
                 ifRebalanceConfig: await (0, pda_1.getIfRebalanceConfigPublicKey)(this.program.programId, inMarketIndex, outMarketIndex),
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                driftSigner: this.getStateAccount().signer,
+                velocitySigner: this.getStateAccount().signer,
             },
             remainingAccounts,
         });
@@ -1743,7 +1743,7 @@ class AdminClient extends velocityClient_1.VelocityClient {
                 insuranceFundVault: spotMarket.insuranceFund.vault,
                 recipientTokenAccount,
                 tokenProgram: tokenProgramId,
-                driftSigner: this.getSignerPublicKey(),
+                velocitySigner: this.getSignerPublicKey(),
             },
             remainingAccounts,
         });
@@ -2063,7 +2063,7 @@ class AdminClient extends velocityClient_1.VelocityClient {
                 insuranceFundVault: spotMarket.insuranceFund.vault,
                 userTokenAccount: userTokenAccountPublicKey,
                 tokenProgram: this.getTokenProgramForSpotMarket(spotMarket),
-                driftSigner: this.getSignerPublicKey(),
+                velocitySigner: this.getSignerPublicKey(),
             },
         });
     }
@@ -2399,7 +2399,7 @@ class AdminClient extends velocityClient_1.VelocityClient {
         ];
     }
     /**
-     * Get the drift begin_swap and end_swap instructions
+     * Get the velocity begin_swap and end_swap instructions
      *
      * @param outMarketIndex the market index of the token you're buying
      * @param inMarketIndex the market index of the token you're selling
@@ -2605,7 +2605,7 @@ class AdminClient extends velocityClient_1.VelocityClient {
                 spotMarketVault: withdrawSpotMarket.vault,
                 tokenProgram: withdrawTokenProgram,
                 mint: withdrawSpotMarket.mint,
-                driftSigner: (0, pda_1.getVelocitySignerPublicKey)(this.program.programId),
+                velocitySigner: (0, pda_1.getVelocitySignerPublicKey)(this.program.programId),
                 oracle: withdrawSpotMarket.oracle,
             },
         });

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);
+    constructor({ velocityClient, opts, resubTimeoutMs, logResubMessages, }: AuctionSubscriberConfig);
     subscribe(): Promise<void>;
     unsubscribe(): Promise<void>;
 }

package/lib/browser/auctionSubscriber/auctionSubscriber.js

@@ -5,13 +5,9 @@ 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.velocityClient = velocityClient;
         this.opts = opts || this.velocityClient.opts;
         this.eventEmitter = new events_1.EventEmitter();
         this.resubOpts = { resubTimeoutMs, logResubMessages };

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);
+    constructor({ velocityClient, opts, grpcConfigs, resubTimeoutMs, logResubMessages, }: AuctionSubscriberConfig);
     subscribe(): Promise<void>;
     unsubscribe(): Promise<void>;
 }

package/lib/browser/auctionSubscriber/auctionSubscriberGrpc.js

@@ -5,13 +5,9 @@ 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.velocityClient = velocityClient;
         this.opts = opts || this.velocityClient.opts;
         this.eventEmitter = new events_1.EventEmitter();
         this.resubOpts = { resubTimeoutMs, logResubMessages };

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/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,17 +24,9 @@ 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 SB_ON_DEMAND_DEVNET_PID: PublicKey;
 export declare const SB_ON_DEMAND_MAINNET_PID: 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,19 +1,13 @@
 "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.PTYH_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.SB_ON_DEMAND_DEVNET_PID = new web3_js_1.PublicKey('Aio4gaXjXzJNVLtzwtNVmSqGKpANtXhybbkhtAC94ji2');
 exports.SB_ON_DEMAND_MAINNET_PID = new web3_js_1.PublicKey('SBondMDrcV3K4kxZR1HNVT7osZxAHVHgYXL5Ze1oMUv');
@@ -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,24 +61,11 @@ 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;
@@ -132,9 +105,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/insuranceFund.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="bn.js" />
 /**
- * Max APR for DRIFT IF vault.
+ * Max APR for VELOCITY IF vault.
  */
 export declare const MAX_APR_PER_REVENUE_SETTLE_TO_INSURANCE_FUND_VAULT_GOV: import("bn.js");

package/lib/browser/constants/insuranceFund.js

@@ -4,6 +4,6 @@ exports.MAX_APR_PER_REVENUE_SETTLE_TO_INSURANCE_FUND_VAULT_GOV = void 0;
 const numericConstants_1 = require("./numericConstants");
 // follows program constant MAX_APR_PER_REVENUE_SETTLE_TO_INSURANCE_FUND_VAULT_GOV in math/constants.rs
 /**
- * Max APR for DRIFT IF vault.
+ * Max APR for VELOCITY IF vault.
  */
 exports.MAX_APR_PER_REVENUE_SETTLE_TO_INSURANCE_FUND_VAULT_GOV = numericConstants_1.PERCENTAGE_PRECISION.divn(22);

package/lib/browser/constituentMap/constituentMap.d.ts

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

package/lib/browser/constituentMap/constituentMap.js

@@ -9,20 +9,20 @@ const pda_1 = require("../addresses/pda");
 const MAX_CONSTITUENT_SIZE_BYTES = 480; // TODO: update this when account is finalized
 class ConstituentMap {
     constructor(config) {
-        var _a, _b, _c;
+        var _a, _b;
         this.constituentMap = new Map();
         this.constituentIndexToKeyMap = new Map();
         this.spotMarketIndexToKeyMap = new Map();
-        const velocityClient = (_a = config.velocityClient) !== null && _a !== void 0 ? _a : config.driftClient;
+        const velocityClient = config.velocityClient;
         if (!velocityClient) {
-            throw new Error('ConstituentMap: velocityClient (or deprecated driftClient) must be provided');
+            throw new Error('ConstituentMap: velocityClient must be provided');
         }
         this.velocityClient = velocityClient;
         this.additionalFilters = config.additionalFilters;
         this.commitment = config.subscriptionConfig.commitment;
         this.connection = config.connection || this.velocityClient.connection;
-        this.lpPoolId = (_b = config.lpPoolId) !== null && _b !== void 0 ? _b : 0;
-        this.decoder = (_c = config.decoder) !== null && _c !== void 0 ? _c : 'base64+zstd';
+        this.lpPoolId = (_a = config.lpPoolId) !== null && _a !== void 0 ? _a : 0;
+        this.decoder = (_b = config.decoder) !== null && _b !== void 0 ? _b : 'base64+zstd';
         if (config.subscriptionConfig.type === 'polling') {
             this.constituentAccountSubscriber =
                 new pollingConstituentAccountSubscriber_1.PollingConstituentAccountSubscriber(this, this.velocityClient.program, config.subscriptionConfig.frequency, config.subscriptionConfig.commitment, this.getFilters());

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

@@ -5,20 +5,18 @@ import type { AccountMeta, Connection, PublicKey, TransactionInstruction } from
 import * as pdas from '../addresses/pda';
 import * as constants from '../constants';
 import { CustomBorshCoder } from '../decode/customCoder';
-import type { Drift } from '../idl/drift';
+import type { Velocity } from '../idl/velocity';
 import type { UserAccount } from '../types';
 import type { VelocityProgram } from '../config';
 import type { BN } from '@coral-xyz/anchor';
 import * as remainingAccounts from './remainingAccounts';
 import * as signedMsg from './signedMsg';
 export type VelocityCoreContext = {
-    /** Drift program id. */
+    /** Velocity program id. */
     programId: PublicKey;
-    /** Anchor IDL json for Drift (defaults to bundled `idl/drift.json`). */
-    idl?: Drift;
+    /** Anchor IDL json for Velocity (defaults to bundled `idl/velocity.json`). */
+    idl?: Velocity;
 };
-/** @deprecated Use `VelocityCoreContext` instead. `DriftCoreContext` will be removed in a future major. */
-export type DriftCoreContext = VelocityCoreContext;
 /**
  * VelocityCore is the minimal, core SDK surface:
  * - No subscriptions / polling / websockets.
@@ -34,11 +32,11 @@ export declare class VelocityCore {
     /** Re-export remaining-accounts logic (pure). */
     static readonly remainingAccounts: typeof remainingAccounts;
     static readonly signedMsg: typeof signedMsg;
-    static defaultIdl(): Drift;
-    static coder(idl?: Drift): CustomBorshCoder;
-    /** Decode a Drift `User` account buffer without creating a Program. */
+    static defaultIdl(): Velocity;
+    static coder(idl?: Velocity): CustomBorshCoder;
+    /** Decode a Velocity `User` account buffer without creating a Program. */
     static decodeUserAccount(buffer: Buffer): UserAccount;
-    /** Fetch and decode a Drift `User` account. */
+    /** Fetch and decode a Velocity `User` account. */
     static fetchUserAccount(connection: Connection, userAccountPublicKey: PublicKey): Promise<UserAccount | null>;
     static buildDepositInstruction(args: {
         program: VelocityProgram;
@@ -63,7 +61,7 @@ export declare class VelocityCore {
         state: PublicKey;
         spotMarket: PublicKey;
         spotMarketVault: PublicKey;
-        driftSigner: PublicKey;
+        velocitySigner: PublicKey;
         user: PublicKey;
         userStats: PublicKey;
         userTokenAccount: PublicKey;
@@ -224,7 +222,3 @@ export declare class VelocityCore {
      */
     static buildInstructions(_ctx: VelocityCoreContext): TransactionInstruction[];
 }
-/** @deprecated Use `VelocityCore` instead. `DriftCore` will be removed in a future major. */
-export declare const DriftCore: typeof VelocityCore;
-/** @deprecated Use `VelocityCore` instead. `DriftCore` will be removed in a future major. */
-export type DriftCore = VelocityCore;

package/lib/browser/core/VelocityCore.js

@@ -26,12 +26,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DriftCore = exports.VelocityCore = void 0;
+exports.VelocityCore = void 0;
 const pdas = __importStar(require("../addresses/pda"));
 const constants = __importStar(require("../constants"));
 const user_1 = require("../decode/user");
 const customCoder_1 = require("../decode/customCoder");
-const drift_json_1 = __importDefault(require("../idl/drift.json"));
+const velocity_json_1 = __importDefault(require("../idl/velocity.json"));
 const fetch_1 = require("../accounts/fetch");
 const deposit_1 = require("./instructions/deposit");
 const withdraw_1 = require("./instructions/withdraw");
@@ -53,16 +53,16 @@ const signedMsg = __importStar(require("./signedMsg"));
  */
 class VelocityCore {
     static defaultIdl() {
-        return drift_json_1.default;
+        return velocity_json_1.default;
     }
     static coder(idl = VelocityCore.defaultIdl()) {
         return new customCoder_1.CustomBorshCoder(idl);
     }
-    /** Decode a Drift `User` account buffer without creating a Program. */
+    /** Decode a Velocity `User` account buffer without creating a Program. */
     static decodeUserAccount(buffer) {
         return (0, user_1.decodeUser)(buffer);
     }
-    /** Fetch and decode a Drift `User` account. */
+    /** Fetch and decode a Velocity `User` account. */
     static async fetchUserAccount(connection, userAccountPublicKey) {
         const data = await (0, fetch_1.fetchAccount)(connection, userAccountPublicKey);
         return data ? VelocityCore.decodeUserAccount(data) : null;
@@ -136,5 +136,3 @@ VelocityCore.constants = constants;
 /** Re-export remaining-accounts logic (pure). */
 VelocityCore.remainingAccounts = remainingAccounts;
 VelocityCore.signedMsg = signedMsg;
-/** @deprecated Use `VelocityCore` instead. `DriftCore` will be removed in a future major. */
-exports.DriftCore = VelocityCore;

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

@@ -10,7 +10,7 @@ export declare function buildWithdrawInstruction(args: {
     state: PublicKey;
     spotMarket: PublicKey;
     spotMarketVault: PublicKey;
-    driftSigner: PublicKey;
+    velocitySigner: PublicKey;
     user: PublicKey;
     userStats: PublicKey;
     userTokenAccount: PublicKey;

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

@@ -7,7 +7,7 @@ async function buildWithdrawInstruction(args) {
             state: args.state,
             spotMarket: args.spotMarket,
             spotMarketVault: args.spotMarketVault,
-            driftSigner: args.driftSigner,
+            velocitySigner: args.velocitySigner,
             user: args.user,
             userStats: args.userStats,
             userTokenAccount: args.userTokenAccount,

package/lib/browser/core/remainingAccounts.js

@@ -75,9 +75,9 @@ function addPerpMarketToRemainingAccountMaps(ctx, marketIndex, writable, oracleA
         isSigner: false,
         isWritable: writable,
     });
-    const oracleWritable = writable && (0, types_1.isVariant)(perpMarketAccount.amm.oracleSource, 'prelaunch');
-    oracleAccountMap.set(perpMarketAccount.amm.oracle.toString(), {
-        pubkey: perpMarketAccount.amm.oracle,
+    const oracleWritable = writable && (0, types_1.isVariant)(perpMarketAccount.oracleSource, 'prelaunch');
+    oracleAccountMap.set(perpMarketAccount.oracle.toString(), {
+        pubkey: perpMarketAccount.oracle,
         isSigner: false,
         isWritable: oracleWritable,
     });

package/lib/browser/decode/user.js

@@ -120,8 +120,8 @@ function decodeUser(buffer) {
     const orders = [];
     for (let i = 0; i < 32; i++) {
         // skip order if it's not open
-        if (buffer.readUint8(offset + 82) !== 1) {
-            offset += 96;
+        if (buffer.readUint8(offset + 86) !== 1) {
+            offset += 104;
             continue;
         }
         const slot = readUnsignedBigInt64LE(buffer, offset);
@@ -142,8 +142,8 @@ function decodeUser(buffer) {
         offset += 8;
         const maxTs = readSignedBigInt64LE(buffer, offset);
         offset += 8;
-        const oraclePriceOffset = buffer.readInt32LE(offset);
-        offset += 4;
+        const oraclePriceOffset = readSignedBigInt64LE(buffer, offset);
+        offset += 8;
         const orderId = buffer.readUInt32LE(offset);
         offset += 4;
         const marketIndex = buffer.readUInt16LE(offset);
@@ -231,7 +231,7 @@ function decodeUser(buffer) {
         offset += 1;
         const bitFlags = buffer.readUint8(offset);
         offset += 1;
-        offset += 1; // padding
+        offset += 5; // padding
         orders.push({
             slot,
             price,