@drift-labs/sdk 2.104.0-beta.2 → 2.104.0-beta.20

package/VERSION

@@ -1 +1 @@
-2.104.0-beta.2
+2.104.0-beta.20

package/lib/browser/addresses/pda.d.ts

@@ -27,5 +27,6 @@ export declare function getReferrerNamePublicKeySync(programId: PublicKey, nameB
 export declare function getProtocolIfSharesTransferConfigPublicKey(programId: PublicKey): PublicKey;
 export declare function getPrelaunchOraclePublicKey(programId: PublicKey, marketIndex: number): PublicKey;
 export declare function getPythPullOraclePublicKey(progarmId: PublicKey, feedId: Uint8Array): PublicKey;
+export declare function getPythLazerOraclePublicKey(progarmId: PublicKey, feedId: number): PublicKey;
 export declare function getTokenProgramForSpotMarket(spotMarketAccount: SpotMarketAccount): PublicKey;
 export declare function getHighLeverageModeConfigPublicKey(programId: PublicKey): PublicKey;

package/lib/browser/addresses/pda.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getHighLeverageModeConfigPublicKey = exports.getTokenProgramForSpotMarket = exports.getPythPullOraclePublicKey = exports.getPrelaunchOraclePublicKey = exports.getProtocolIfSharesTransferConfigPublicKey = exports.getReferrerNamePublicKeySync = exports.getOpenbookV2FulfillmentConfigPublicKey = exports.getPhoenixFulfillmentConfigPublicKey = exports.getSerumFulfillmentConfigPublicKey = exports.getSerumSignerPublicKey = exports.getSerumOpenOrdersPublicKey = exports.getDriftSignerPublicKey = exports.getInsuranceFundStakeAccountPublicKey = exports.getInsuranceFundVaultPublicKey = exports.getSpotMarketVaultPublicKey = exports.getSpotMarketPublicKeySync = exports.getSpotMarketPublicKey = exports.getPerpMarketPublicKeySync = exports.getPerpMarketPublicKey = exports.getSwiftUserAccountPublicKey = exports.getRFQUserAccountPublicKey = exports.getUserStatsAccountPublicKey = exports.getUserAccountPublicKeySync = exports.getUserAccountPublicKey = exports.getUserAccountPublicKeyAndNonce = exports.getDriftStateAccountPublicKey = exports.getDriftStateAccountPublicKeyAndNonce = void 0;
+exports.getHighLeverageModeConfigPublicKey = exports.getTokenProgramForSpotMarket = exports.getPythLazerOraclePublicKey = exports.getPythPullOraclePublicKey = exports.getPrelaunchOraclePublicKey = exports.getProtocolIfSharesTransferConfigPublicKey = exports.getReferrerNamePublicKeySync = exports.getOpenbookV2FulfillmentConfigPublicKey = exports.getPhoenixFulfillmentConfigPublicKey = exports.getSerumFulfillmentConfigPublicKey = exports.getSerumSignerPublicKey = exports.getSerumOpenOrdersPublicKey = exports.getDriftSignerPublicKey = exports.getInsuranceFundStakeAccountPublicKey = exports.getInsuranceFundVaultPublicKey = exports.getSpotMarketVaultPublicKey = exports.getSpotMarketPublicKeySync = exports.getSpotMarketPublicKey = exports.getPerpMarketPublicKeySync = exports.getPerpMarketPublicKey = exports.getSwiftUserAccountPublicKey = exports.getRFQUserAccountPublicKey = exports.getUserStatsAccountPublicKey = exports.getUserAccountPublicKeySync = exports.getUserAccountPublicKey = exports.getUserAccountPublicKeyAndNonce = exports.getDriftStateAccountPublicKey = exports.getDriftStateAccountPublicKeyAndNonce = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const anchor = __importStar(require("@coral-xyz/anchor"));
 const spl_token_1 = require("@solana/spl-token");
@@ -187,6 +187,17 @@ function getPythPullOraclePublicKey(progarmId, feedId) {
     ], progarmId)[0];
 }
 exports.getPythPullOraclePublicKey = getPythPullOraclePublicKey;
+function getPythLazerOraclePublicKey(progarmId, feedId) {
+    const buffer = new ArrayBuffer(4);
+    const view = new DataView(buffer);
+    view.setUint32(0, feedId, true);
+    const feedIdBytes = new Uint8Array(buffer);
+    return web3_js_1.PublicKey.findProgramAddressSync([
+        Buffer.from(anchor.utils.bytes.utf8.encode('pyth_lazer')),
+        Buffer.from(feedIdBytes),
+    ], progarmId)[0];
+}
+exports.getPythLazerOraclePublicKey = getPythLazerOraclePublicKey;
 function getTokenProgramForSpotMarket(spotMarketAccount) {
     if (spotMarketAccount.tokenProgram === 1) {
         return spl_token_1.TOKEN_2022_PROGRAM_ID;

package/lib/browser/adminClient.d.ts

@@ -197,6 +197,8 @@ export declare class AdminClient extends DriftClient {
     getInitUserFuelIx(user: PublicKey, authority: PublicKey, fuelBonusDeposits?: number, fuelBonusBorrows?: number, fuelBonusTaker?: number, fuelBonusMaker?: number, fuelBonusInsurance?: number): Promise<TransactionInstruction>;
     initializePythPullOracle(feedId: string, isAdmin?: boolean): Promise<TransactionSignature>;
     getInitializePythPullOracleIx(feedId: string, isAdmin?: boolean): Promise<TransactionInstruction>;
+    initializePythLazerOracle(feedId: number, isAdmin?: boolean): Promise<TransactionSignature>;
+    getInitializePythLazerOracleIx(feedId: number, isAdmin?: boolean): Promise<TransactionInstruction>;
     initializeHighLeverageModeConfig(maxUsers: number): Promise<TransactionSignature>;
     getInitializeHighLeverageModeConfigIx(maxUsers: number): Promise<TransactionInstruction>;
     updateUpdateHighLeverageModeConfig(maxUsers: number, reduceOnly: boolean): Promise<TransactionSignature>;

package/lib/browser/adminClient.js

@@ -38,7 +38,7 @@ const trade_1 = require("./math/trade");
 const amm_1 = require("./math/amm");
 const phoenix_sdk_1 = require("@ellipsis-labs/phoenix-sdk");
 const config_1 = require("./config");
-const pythPullOracleUtils_1 = require("./util/pythPullOracleUtils");
+const pythOracleUtils_1 = require("./util/pythOracleUtils");
 const OPENBOOK_PROGRAM_ID = new web3_js_1.PublicKey('opnb2LAfJYbRMAHHvqjCwQxanZn7ReEHp1k81EohpZb');
 class AdminClient extends driftClient_1.DriftClient {
     async initialize(usdcMint, _adminControlsPrices) {
@@ -1790,7 +1790,7 @@ class AdminClient extends driftClient_1.DriftClient {
         return txSig;
     }
     async getInitializePythPullOracleIx(feedId, isAdmin = false) {
-        const feedIdBuffer = (0, pythPullOracleUtils_1.getFeedIdUint8Array)(feedId);
+        const feedIdBuffer = (0, pythOracleUtils_1.getFeedIdUint8Array)(feedId);
         return await this.program.instruction.initializePythPullOracle(feedIdBuffer, {
             accounts: {
                 admin: isAdmin ? this.getStateAccount().admin : this.wallet.publicKey,
@@ -1801,6 +1801,23 @@ class AdminClient extends driftClient_1.DriftClient {
             },
         });
     }
+    async initializePythLazerOracle(feedId, isAdmin = false) {
+        const initializePythPullOracleIx = await this.getInitializePythLazerOracleIx(feedId, isAdmin);
+        const tx = await this.buildTransaction(initializePythPullOracleIx);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
+    }
+    async getInitializePythLazerOracleIx(feedId, isAdmin = false) {
+        return await this.program.instruction.initializePythLazerOracle(feedId, {
+            accounts: {
+                admin: isAdmin ? this.getStateAccount().admin : this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+                systemProgram: web3_js_1.SystemProgram.programId,
+                lazerOracle: (0, pda_1.getPythLazerOraclePublicKey)(this.program.programId, feedId),
+                rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+            },
+        });
+    }
     async initializeHighLeverageModeConfig(maxUsers) {
         const initializeHighLeverageModeConfigIx = await this.getInitializeHighLeverageModeConfigIx(maxUsers);
         const tx = await this.buildTransaction(initializeHighLeverageModeConfigIx);

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

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="bn.js" />
-import { AccountInfo, Keypair, PublicKey, Transaction, RpcResponseAndContext, Commitment, TransactionSignature, SignatureStatusConfig, SignatureStatus, GetVersionedTransactionConfig, GetTransactionConfig, VersionedTransaction, SimulateTransactionConfig, SimulatedTransactionResponse, TransactionError, SignatureResultCallback, ClientSubscriptionId, Connection as SolanaConnection, Blockhash, LogsFilter, LogsCallback, AccountChangeCallback } from '@solana/web3.js';
+import { AccountInfo, Keypair, PublicKey, Transaction, RpcResponseAndContext, Commitment, TransactionSignature, SignatureStatusConfig, SignatureStatus, GetVersionedTransactionConfig, GetTransactionConfig, VersionedTransaction, SimulateTransactionConfig, SimulatedTransactionResponse, TransactionError, SignatureResultCallback, ClientSubscriptionId, Connection as SolanaConnection, Blockhash, LogsFilter, LogsCallback, AccountChangeCallback, AddressLookupTableAccount } from '@solana/web3.js';
 import { ProgramTestContext, BanksClient } from 'solana-bankrun';
 import { BankrunProvider } from 'anchor-bankrun';
 import { BN, Wallet } from '@coral-xyz/anchor';
@@ -54,6 +54,7 @@ export declare class BankrunConnection {
         blockhash: string;
         lastValidBlockHeight: number;
     }>>;
+    getAddressLookupTable(accountKey: PublicKey): Promise<RpcResponseAndContext<null | AddressLookupTableAccount>>;
     getSignatureStatus(signature: string, _config?: SignatureStatusConfig): Promise<RpcResponseAndContext<null | SignatureStatus>>;
     /**
      * 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.

package/lib/browser/bankrun/bankrunConnection.js

@@ -204,6 +204,20 @@ class BankrunConnection {
             lastValidBlockHeight: Number(blockhashAndBlockheight[1]),
         };
     }
+    async getAddressLookupTable(accountKey) {
+        const { context, value: accountInfo } = await this.getParsedAccountInfo(accountKey);
+        let value = null;
+        if (accountInfo !== null) {
+            value = new web3_js_1.AddressLookupTableAccount({
+                key: accountKey,
+                state: web3_js_1.AddressLookupTableAccount.deserialize(accountInfo.data),
+            });
+        }
+        return {
+            context,
+            value,
+        };
+    }
     async getSignatureStatus(signature, _config) {
         const transactionStatus = await this._banksClient.getTransactionStatus(signature);
         if (transactionStatus === null) {

package/lib/browser/config.d.ts

@@ -27,6 +27,8 @@ export declare const DRIFT_PROGRAM_ID = "dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn
 export declare const DRIFT_ORACLE_RECEIVER_ID = "G6EoTTTgpkNBtVXo96EQp2m6uwwVh2Kt6YidjkmQqoha";
 export declare const SWIFT_ID = "SW1fThqrxLzVprnCMpiybiqYQfoNCdduC5uWsSUKChS";
 export declare const ANCHOR_TEST_SWIFT_ID = "DpaEdAPW3ZX67fnczT14AoX12Lx9VMkxvtT81nCHy3Nv";
+export declare const PTYH_LAZER_PROGRAM_ID = "pytd2yyk641x7ak7mkaasSJVXh6YYZnC7wTmtgAyxPt";
+export declare const PYTH_LAZER_STORAGE_ACCOUNT_KEY: PublicKey;
 export declare const DEFAULT_CONFIRMATION_OPTS: ConfirmOptions;
 export declare const configs: {
     [key in DriftEnv]: DriftConfig;

package/lib/browser/config.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findAllMarketAndOracles = exports.getMarketsAndOraclesForSubscription = exports.initialize = exports.getConfig = exports.configs = exports.DEFAULT_CONFIRMATION_OPTS = exports.ANCHOR_TEST_SWIFT_ID = exports.SWIFT_ID = exports.DRIFT_ORACLE_RECEIVER_ID = exports.DRIFT_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.PTYH_LAZER_PROGRAM_ID = exports.ANCHOR_TEST_SWIFT_ID = exports.SWIFT_ID = exports.DRIFT_ORACLE_RECEIVER_ID = exports.DRIFT_PROGRAM_ID = void 0;
+const _1 = require(".");
 const perpMarkets_1 = require("./constants/perpMarkets");
 const spotMarkets_1 = require("./constants/spotMarkets");
 const on_demand_1 = require("@switchboard-xyz/on-demand");
@@ -9,6 +10,8 @@ exports.DRIFT_PROGRAM_ID = 'dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH';
 exports.DRIFT_ORACLE_RECEIVER_ID = 'G6EoTTTgpkNBtVXo96EQp2m6uwwVh2Kt6YidjkmQqoha';
 exports.SWIFT_ID = 'SW1fThqrxLzVprnCMpiybiqYQfoNCdduC5uWsSUKChS';
 exports.ANCHOR_TEST_SWIFT_ID = 'DpaEdAPW3ZX67fnczT14AoX12Lx9VMkxvtT81nCHy3Nv';
+exports.PTYH_LAZER_PROGRAM_ID = 'pytd2yyk641x7ak7mkaasSJVXh6YYZnC7wTmtgAyxPt';
+exports.PYTH_LAZER_STORAGE_ACCOUNT_KEY = new _1.PublicKey('3rdJbqfnagQ4yx9HXJViD4zc4xpiSqmFsKpPuSCQVyQL');
 exports.DEFAULT_CONFIRMATION_OPTS = {
     preflightCommitment: 'confirmed',
     commitment: 'confirmed',

package/lib/browser/constants/perpMarkets.js

@@ -979,6 +979,17 @@ exports.MainnetPerpMarkets = [
         oracleSource: __1.OracleSource.PYTH_PULL,
         pythFeedId: '0x6e3f3fa8253588df9326580180233eb791e03b443a3ba7a1d892e73874e19a54',
     },
+    {
+        fullName: 'Magic Eden',
+        category: ['DEX'],
+        symbol: 'ME-PERP',
+        baseAssetSymbol: 'ME',
+        marketIndex: 61,
+        oracle: new web3_js_1.PublicKey('FLQjrmEPGwbCKRYZ1eYM5FPccHBrCv2cN4GBu3mWfmPH'),
+        launchTs: 1733839936000,
+        oracleSource: __1.OracleSource.PYTH_PULL,
+        pythFeedId: '0x91519e3e48571e1232a85a938e714da19fe5ce05107f3eebb8a870b2e8020169',
+    },
 ];
 exports.PerpMarkets = {
     devnet: exports.DevnetPerpMarkets,

package/lib/browser/constants/spotMarkets.js

@@ -80,7 +80,7 @@ exports.DevnetSpotMarkets = [
         marketIndex: 6,
         poolId: 1,
         oracle: new web3_js_1.PublicKey('En8hkHLkRe9d9DraYmBTrus518BvmVH448YcvmrFM6Ce'),
-        oracleSource: __1.OracleSource.PYTH_STABLE_COIN_PULL,
+        oracleSource: __1.OracleSource.PYTH_PULL,
         mint: new web3_js_1.PublicKey('8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2'),
         precision: new __1.BN(10).pow(numericConstants_1.SIX),
         precisionExp: numericConstants_1.SIX,
@@ -442,6 +442,27 @@ exports.MainnetSpotMarkets = [
         precisionExp: numericConstants_1.SIX,
         pythFeedId: '0x77f0971af11cc8bac224917275c1bf55f2319ed5c654a1ca955c82fa2d297ea1',
     },
+    {
+        symbol: 'META',
+        marketIndex: 29,
+        poolId: 0,
+        oracle: new web3_js_1.PublicKey('DwYF1yveo8XTF1oqfsqykj332rjSxAd7bR6Gu6i4iUET'),
+        oracleSource: __1.OracleSource.SWITCHBOARD_ON_DEMAND,
+        mint: new web3_js_1.PublicKey('METADDFL6wWMWEoKTFJwcThTbUmtarRJZjRpzUvkxhr'),
+        precision: new __1.BN(10).pow(numericConstants_1.NINE),
+        precisionExp: numericConstants_1.NINE,
+    },
+    {
+        symbol: 'ME',
+        marketIndex: 30,
+        poolId: 0,
+        oracle: new web3_js_1.PublicKey('FLQjrmEPGwbCKRYZ1eYM5FPccHBrCv2cN4GBu3mWfmPH'),
+        oracleSource: __1.OracleSource.PYTH_PULL,
+        mint: new web3_js_1.PublicKey('MEFNBXixkEbait3xn9bkm8WsJzXtVsaJEn4c8Sam21u'),
+        precision: new __1.BN(10).pow(numericConstants_1.SIX),
+        precisionExp: numericConstants_1.SIX,
+        pythFeedId: '0x91519e3e48571e1232a85a938e714da19fe5ce05107f3eebb8a870b2e8020169',
+    },
 ];
 exports.SpotMarkets = {
     devnet: exports.DevnetSpotMarkets,

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

@@ -1,9 +1,13 @@
 /// <reference types="bn.js" />
 import { NodeList } from './NodeList';
-import { BN, DLOBNode, DLOBNodeType, DriftClient, MarketType, MarketTypeStr, OraclePriceData, Order, OrderActionRecord, OrderRecord, PerpMarketAccount, PositionDirection, SlotSubscriber, SpotMarketAccount, StateAccount, TriggerOrderNode, UserMap } from '..';
+import { BN, DLOBNode, DLOBNodeType, DriftClient, MarketType, MarketTypeStr, OraclePriceData, Order, PerpMarketAccount, PositionDirection, SlotSubscriber, SpotMarketAccount, StateAccount, TriggerOrderNode, UserMap } from '..';
 import { PublicKey } from '@solana/web3.js';
-import { DLOBOrders } from './DLOBOrders';
 import { L2OrderBook, L2OrderBookGenerator, L3OrderBook } from './orderBookLevels';
+export type DLOBOrder = {
+    user: PublicKey;
+    order: Order;
+};
+export type DLOBOrders = DLOBOrder[];
 export type MarketNodeLists = {
     restingLimit: {
         ask: NodeList<'restingLimit'>;
@@ -25,6 +29,10 @@ export type MarketNodeLists = {
         above: NodeList<'trigger'>;
         below: NodeList<'trigger'>;
     };
+    swift: {
+        ask: NodeList<'swift'>;
+        bid: NodeList<'swift'>;
+    };
 };
 type OrderBookCallback = () => void;
 /**
@@ -55,15 +63,10 @@ export declare class DLOB {
      * @returns a promise that resolves when the DLOB is initialized
      */
     initFromUserMap(userMap: UserMap, slot: number): Promise<boolean>;
-    initFromOrders(dlobOrders: DLOBOrders, slot: number): boolean;
-    handleOrderRecord(record: OrderRecord, slot: number): void;
-    handleOrderActionRecord(record: OrderActionRecord, slot: number): void;
     insertOrder(order: Order, userAccount: string, slot: number, isUserProtectedMaker: boolean, onInsert?: OrderBookCallback): void;
+    insertSwiftOrder(order: Order, userAccount: string, isUserProtectedMaker: boolean, onInsert?: OrderBookCallback): void;
     addOrderList(marketType: MarketTypeStr, marketIndex: number): void;
-    updateOrder(order: Order, userAccount: PublicKey, slot: number, cumulativeBaseAssetAmountFilled: BN, onUpdate?: OrderBookCallback): void;
-    trigger(order: Order, userAccount: PublicKey, slot: number, isUserProtectedMaker: boolean, onTrigger?: OrderBookCallback): void;
-    delete(order: Order, userAccount: PublicKey, slot: number, onDelete?: OrderBookCallback): void;
-    getListForOrder(order: Order, slot: number): NodeList<any> | undefined;
+    getListForOnChainOrder(order: Order, slot: number): NodeList<any> | undefined;
     updateRestingLimitOrders(slot: number): void;
     updateRestingLimitOrdersForMarketType(slot: number, marketTypeStr: MarketTypeStr): void;
     getOrder(orderId: number, userAccount: PublicKey): Order | undefined;
@@ -77,8 +80,7 @@ export declare class DLOB {
     findTakingNodesToFill(marketIndex: number, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData, isAmmPaused: boolean, minAuctionDuration: number, fallbackAsk: BN | undefined, fallbackBid?: BN | undefined): NodeToFill[];
     findTakingNodesCrossingMakerNodes(marketIndex: number, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData, takerNodeGenerator: Generator<DLOBNode>, makerNodeGeneratorFn: (marketIndex: number, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData) => Generator<DLOBNode>, doesCross: (takerPrice: BN | undefined, makerPrice: BN) => boolean): NodeToFill[];
     findNodesCrossingFallbackLiquidity(marketType: MarketType, slot: number, oraclePriceData: OraclePriceData, nodeGenerator: Generator<DLOBNode>, doesCross: (nodePrice: BN | undefined) => boolean, minAuctionDuration: number): NodeToFill[];
-    findExpiredNodesToFill(marketIndex: number, ts: number, marketType: MarketType): NodeToFill[];
-    findJitAuctionNodesToFill(marketIndex: number, slot: number, oraclePriceData: OraclePriceData, marketType: MarketType): NodeToFill[];
+    findExpiredNodesToFill(marketIndex: number, ts: number, marketType: MarketType, slot?: BN): NodeToFill[];
     getTakingBids(marketIndex: number, marketType: MarketType, slot: number, oraclePriceData: OraclePriceData, filterFcn?: DLOBFilterFcn): Generator<DLOBNode>;
     getTakingAsks(marketIndex: number, marketType: MarketType, slot: number, oraclePriceData: OraclePriceData, filterFcn?: DLOBFilterFcn): Generator<DLOBNode>;
     protected getBestNode(generatorList: Array<Generator<DLOBNode>>, oraclePriceData: OraclePriceData, slot: number, compareFcn: (bestDLOBNode: DLOBNode, currentDLOBNode: DLOBNode, slot: number, oraclePriceData: OraclePriceData) => boolean, filterFcn?: DLOBFilterFcn): Generator<DLOBNode>;
@@ -93,7 +95,7 @@ export declare class DLOB {
      * @param oraclePriceData
      * @param filterFcn
      */
-    getAsks(marketIndex: number, fallbackAsk: BN | undefined, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData, filterFcn?: DLOBFilterFcn): Generator<DLOBNode>;
+    getAsks(marketIndex: number, _fallbackAsk: BN | undefined, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData, filterFcn?: DLOBFilterFcn): Generator<DLOBNode>;
     /**
      * This will look at both the taking and resting limit bids
      * @param marketIndex
@@ -103,7 +105,7 @@ export declare class DLOB {
      * @param oraclePriceData
      * @param filterFcn
      */
-    getBids(marketIndex: number, fallbackBid: BN | undefined, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData, filterFcn?: DLOBFilterFcn): Generator<DLOBNode>;
+    getBids(marketIndex: number, _fallbackBid: BN | undefined, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData, filterFcn?: DLOBFilterFcn): Generator<DLOBNode>;
     findCrossingRestingLimitOrders(marketIndex: number, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData): NodeToFill[];
     determineMakerAndTaker(askNode: DLOBNode, bidNode: DLOBNode): {
         takerNode: DLOBNode;

package/lib/browser/dlob/DLOB.js

@@ -6,7 +6,6 @@ const __1 = require("..");
 const web3_js_1 = require("@solana/web3.js");
 const exchangeStatus_1 = require("../math/exchangeStatus");
 const orderBookLevels_1 = require("./orderBookLevels");
-const userStatus_1 = require("../math/userStatus");
 const SUPPORTED_ORDER_TYPES = [
     'market',
     'limit',
@@ -63,7 +62,7 @@ class DLOB {
             const userAccount = user.getUserAccount();
             const userAccountPubkey = user.getUserAccountPublicKey();
             const userAccountPubkeyString = userAccountPubkey.toString();
-            const protectedMaker = (0, userStatus_1.isUserProtectedMaker)(userAccount);
+            const protectedMaker = (0, __1.isUserProtectedMaker)(userAccount);
             for (const order of userAccount.orders) {
                 this.insertOrder(order, userAccountPubkeyString, slot, protectedMaker);
             }
@@ -71,66 +70,6 @@ class DLOB {
         this.initialized = true;
         return true;
     }
-    initFromOrders(dlobOrders, slot) {
-        if (this.initialized) {
-            return false;
-        }
-        for (const { user, order } of dlobOrders) {
-            this.insertOrder(order, user.toString(), slot, false);
-        }
-        this.initialized = true;
-        return true;
-    }
-    handleOrderRecord(record, slot) {
-        this.insertOrder(record.order, record.user.toString(), slot, false);
-    }
-    handleOrderActionRecord(record, slot) {
-        if ((0, __1.isOneOfVariant)(record.action, ['place', 'expire'])) {
-            return;
-        }
-        if ((0, __1.isVariant)(record.action, 'trigger')) {
-            if (record.taker !== null) {
-                const takerOrder = this.getOrder(record.takerOrderId, record.taker);
-                if (takerOrder) {
-                    this.trigger(takerOrder, record.taker, slot, false);
-                }
-            }
-            if (record.maker !== null) {
-                const makerOrder = this.getOrder(record.makerOrderId, record.maker);
-                if (makerOrder) {
-                    this.trigger(makerOrder, record.maker, slot, false);
-                }
-            }
-        }
-        else if ((0, __1.isVariant)(record.action, 'fill')) {
-            if (record.taker !== null) {
-                const takerOrder = this.getOrder(record.takerOrderId, record.taker);
-                if (takerOrder) {
-                    this.updateOrder(takerOrder, record.taker, slot, record.takerOrderCumulativeBaseAssetAmountFilled);
-                }
-            }
-            if (record.maker !== null) {
-                const makerOrder = this.getOrder(record.makerOrderId, record.maker);
-                if (makerOrder) {
-                    this.updateOrder(makerOrder, record.maker, slot, record.makerOrderCumulativeBaseAssetAmountFilled);
-                }
-            }
-        }
-        else if ((0, __1.isVariant)(record.action, 'cancel')) {
-            if (record.taker !== null) {
-                const takerOrder = this.getOrder(record.takerOrderId, record.taker);
-                if (takerOrder) {
-                    this.delete(takerOrder, record.taker, slot);
-                }
-            }
-            if (record.maker !== null) {
-                const makerOrder = this.getOrder(record.makerOrderId, record.maker);
-                if (makerOrder) {
-                    this.delete(makerOrder, record.maker, slot);
-                }
-            }
-        }
-    }
     insertOrder(order, userAccount, slot, isUserProtectedMaker, onInsert) {
         var _a;
         if ((0, __1.isVariant)(order.status, 'init')) {
@@ -148,7 +87,25 @@ class DLOB {
                 .get(marketType)
                 .add((0, NodeList_1.getOrderSignature)(order.orderId, userAccount));
         }
-        (_a = this.getListForOrder(order, slot)) === null || _a === void 0 ? void 0 : _a.insert(order, marketType, userAccount, isUserProtectedMaker);
+        (_a = this.getListForOnChainOrder(order, slot)) === null || _a === void 0 ? void 0 : _a.insert(order, marketType, userAccount, isUserProtectedMaker);
+        if (onInsert) {
+            onInsert();
+        }
+    }
+    insertSwiftOrder(order, userAccount, isUserProtectedMaker, onInsert) {
+        const marketType = (0, __1.getVariant)(order.marketType);
+        const marketIndex = order.marketIndex;
+        const bidOrAsk = (0, __1.isVariant)(order.direction, 'long') ? 'bid' : 'ask';
+        if (!this.orderLists.get(marketType).has(order.marketIndex)) {
+            this.addOrderList(marketType, order.marketIndex);
+        }
+        this.openOrders
+            .get(marketType)
+            .add((0, NodeList_1.getOrderSignature)(order.orderId, userAccount));
+        this.orderLists
+            .get(marketType)
+            .get(marketIndex)
+            .swift[bidOrAsk].insert(order, marketType, userAccount, isUserProtectedMaker);
         if (onInsert) {
             onInsert();
         }
@@ -175,57 +132,13 @@ class DLOB {
                 above: new NodeList_1.NodeList('trigger', 'asc'),
                 below: new NodeList_1.NodeList('trigger', 'desc'),
             },
+            swift: {
+                ask: new NodeList_1.NodeList('swift', 'asc'),
+                bid: new NodeList_1.NodeList('swift', 'asc'),
+            },
         });
     }
-    updateOrder(order, userAccount, slot, cumulativeBaseAssetAmountFilled, onUpdate) {
-        var _a;
-        this.updateRestingLimitOrders(slot);
-        if (order.baseAssetAmount.eq(cumulativeBaseAssetAmountFilled)) {
-            this.delete(order, userAccount, slot);
-            return;
-        }
-        if (order.baseAssetAmountFilled.eq(cumulativeBaseAssetAmountFilled)) {
-            return;
-        }
-        const newOrder = {
-            ...order,
-        };
-        newOrder.baseAssetAmountFilled = cumulativeBaseAssetAmountFilled;
-        (_a = this.getListForOrder(order, slot)) === null || _a === void 0 ? void 0 : _a.update(newOrder, userAccount.toString());
-        if (onUpdate) {
-            onUpdate();
-        }
-    }
-    trigger(order, userAccount, slot, isUserProtectedMaker, onTrigger) {
-        var _a;
-        if ((0, __1.isVariant)(order.status, 'init')) {
-            return;
-        }
-        this.updateRestingLimitOrders(slot);
-        if ((0, __1.isTriggered)(order)) {
-            return;
-        }
-        const marketType = (0, __1.getVariant)(order.marketType);
-        const triggerList = this.orderLists.get(marketType).get(order.marketIndex)
-            .trigger[(0, __1.isVariant)(order.triggerCondition, 'above') ? 'above' : 'below'];
-        triggerList.remove(order, userAccount.toString());
-        (_a = this.getListForOrder(order, slot)) === null || _a === void 0 ? void 0 : _a.insert(order, marketType, userAccount.toString(), isUserProtectedMaker);
-        if (onTrigger) {
-            onTrigger();
-        }
-    }
-    delete(order, userAccount, slot, onDelete) {
-        var _a;
-        if ((0, __1.isVariant)(order.status, 'init')) {
-            return;
-        }
-        this.updateRestingLimitOrders(slot);
-        (_a = this.getListForOrder(order, slot)) === null || _a === void 0 ? void 0 : _a.remove(order, userAccount.toString());
-        if (onDelete) {
-            onDelete();
-        }
-    }
-    getListForOrder(order, slot) {
+    getListForOnChainOrder(order, slot) {
         const isInactiveTriggerOrder = (0, __1.mustBeTriggered)(order) && !(0, __1.isTriggered)(order);
         let type;
         if (isInactiveTriggerOrder) {
@@ -309,10 +222,10 @@ class DLOB {
             ? stateAccount.minPerpAuctionDuration
             : 0;
         const { makerRebateNumerator, makerRebateDenominator } = this.getMakerRebate(marketType, stateAccount, marketAccount);
-        const restingLimitOrderNodesToFill = this.findRestingLimitOrderNodesToFill(marketIndex, slot, marketType, oraclePriceData, isAmmPaused, minAuctionDuration, makerRebateNumerator, makerRebateDenominator, fallbackAsk, fallbackBid);
         const takingOrderNodesToFill = this.findTakingNodesToFill(marketIndex, slot, marketType, oraclePriceData, isAmmPaused, minAuctionDuration, fallbackAsk, fallbackBid);
+        const restingLimitOrderNodesToFill = this.findRestingLimitOrderNodesToFill(marketIndex, slot, marketType, oraclePriceData, isAmmPaused, minAuctionDuration, makerRebateNumerator, makerRebateDenominator, fallbackAsk, fallbackBid);
         // get expired market nodes
-        const expiredNodesToFill = this.findExpiredNodesToFill(marketIndex, ts, marketType);
+        const expiredNodesToFill = this.findExpiredNodesToFill(marketIndex, ts, marketType, new __1.BN(slot));
         return this.mergeNodesToFill(restingLimitOrderNodesToFill, takingOrderNodesToFill).concat(expiredNodesToFill);
     }
     getMakerRebate(marketType, stateAccount, marketAccount) {
@@ -469,11 +382,11 @@ class DLOB {
                 const newMakerOrder = { ...makerOrder };
                 newMakerOrder.baseAssetAmountFilled =
                     makerOrder.baseAssetAmountFilled.add(baseFilled);
-                this.getListForOrder(newMakerOrder, slot).update(newMakerOrder, makerNode.userAccount);
+                this.getListForOnChainOrder(newMakerOrder, slot).update(newMakerOrder, makerNode.userAccount);
                 const newTakerOrder = { ...takerOrder };
                 newTakerOrder.baseAssetAmountFilled =
                     takerOrder.baseAssetAmountFilled.add(baseFilled);
-                this.getListForOrder(newTakerOrder, slot).update(newTakerOrder, takerNode.userAccount);
+                this.getListForOnChainOrder(newTakerOrder, slot).update(newTakerOrder, takerNode.userAccount);
                 if (newTakerOrder.baseAssetAmountFilled.eq(takerOrder.baseAssetAmount)) {
                     break;
                 }
@@ -507,7 +420,7 @@ class DLOB {
         }
         return nodesToFill;
     }
-    findExpiredNodesToFill(marketIndex, ts, marketType) {
+    findExpiredNodesToFill(marketIndex, ts, marketType, slot) {
         const nodesToFill = new Array();
         const marketTypeStr = (0, __1.getVariant)(marketType);
         const nodeLists = this.orderLists.get(marketTypeStr).get(marketIndex);
@@ -521,16 +434,25 @@ class DLOB {
             nodeLists.restingLimit.bid.getGenerator(),
             nodeLists.floatingLimit.bid.getGenerator(),
             nodeLists.market.bid.getGenerator(),
+            nodeLists.swift.bid.getGenerator(),
         ];
         const askGenerators = [
             nodeLists.takingLimit.ask.getGenerator(),
             nodeLists.restingLimit.ask.getGenerator(),
             nodeLists.floatingLimit.ask.getGenerator(),
             nodeLists.market.ask.getGenerator(),
+            nodeLists.swift.ask.getGenerator(),
         ];
         for (const bidGenerator of bidGenerators) {
             for (const bid of bidGenerator) {
-                if ((0, __1.isOrderExpired)(bid.order, ts, true, 25)) {
+                if (bid.isSwift &&
+                    slot.gt(bid.order.slot.addn(bid.order.auctionDuration))) {
+                    this.orderLists
+                        .get(marketTypeStr)
+                        .get(marketIndex)
+                        .swift.bid.remove(bid.order, bid.userAccount);
+                }
+                else if ((0, __1.isOrderExpired)(bid.order, ts, true, 25)) {
                     nodesToFill.push({
                         node: bid,
                         makerNodes: [],
@@ -550,23 +472,6 @@ class DLOB {
         }
         return nodesToFill;
     }
-    findJitAuctionNodesToFill(marketIndex, slot, oraclePriceData, marketType) {
-        const nodesToFill = new Array();
-        // Then see if there are orders still in JIT auction
-        for (const marketBid of this.getTakingBids(marketIndex, marketType, slot, oraclePriceData)) {
-            nodesToFill.push({
-                node: marketBid,
-                makerNodes: [],
-            });
-        }
-        for (const marketAsk of this.getTakingAsks(marketIndex, marketType, slot, oraclePriceData)) {
-            nodesToFill.push({
-                node: marketAsk,
-                makerNodes: [],
-            });
-        }
-        return nodesToFill;
-    }
     *getTakingBids(marketIndex, marketType, slot, oraclePriceData, filterFcn) {
         const marketTypeStr = (0, __1.getVariant)(marketType);
         const orderLists = this.orderLists.get(marketTypeStr).get(marketIndex);
@@ -577,6 +482,7 @@ class DLOB {
         const generatorList = [
             orderLists.market.bid.getGenerator(),
             orderLists.takingLimit.bid.getGenerator(),
+            orderLists.swift.bid.getGenerator(),
         ];
         yield* this.getBestNode(generatorList, oraclePriceData, slot, (bestNode, currentNode) => {
             return bestNode.order.slot.lt(currentNode.order.slot);
@@ -592,6 +498,7 @@ class DLOB {
         const generatorList = [
             orderLists.market.ask.getGenerator(),
             orderLists.takingLimit.ask.getGenerator(),
+            orderLists.swift.ask.getGenerator(),
         ];
         yield* this.getBestNode(generatorList, oraclePriceData, slot, (bestNode, currentNode) => {
             return bestNode.order.slot.lt(currentNode.order.slot);
@@ -686,7 +593,7 @@ class DLOB {
      * @param oraclePriceData
      * @param filterFcn
      */
-    *getAsks(marketIndex, fallbackAsk, slot, marketType, oraclePriceData, filterFcn) {
+    *getAsks(marketIndex, _fallbackAsk, slot, marketType, oraclePriceData, filterFcn) {
         if ((0, __1.isVariant)(marketType, 'spot') && !oraclePriceData) {
             throw new Error('Must provide OraclePriceData to get spot asks');
         }
@@ -694,10 +601,6 @@ class DLOB {
             this.getTakingAsks(marketIndex, marketType, slot, oraclePriceData),
             this.getRestingLimitAsks(marketIndex, slot, marketType, oraclePriceData),
         ];
-        const marketTypeStr = (0, __1.getVariant)(marketType);
-        if (marketTypeStr === 'perp' && fallbackAsk) {
-            generatorList.push((0, NodeList_1.getVammNodeGenerator)(fallbackAsk));
-        }
         yield* this.getBestNode(generatorList, oraclePriceData, slot, (bestNode, currentNode, slot, oraclePriceData) => {
             var _a, _b;
             const bestNodePrice = (_a = bestNode.getPrice(oraclePriceData, slot)) !== null && _a !== void 0 ? _a : __1.ZERO;
@@ -717,7 +620,7 @@ class DLOB {
      * @param oraclePriceData
      * @param filterFcn
      */
-    *getBids(marketIndex, fallbackBid, slot, marketType, oraclePriceData, filterFcn) {
+    *getBids(marketIndex, _fallbackBid, slot, marketType, oraclePriceData, filterFcn) {
         if ((0, __1.isVariant)(marketType, 'spot') && !oraclePriceData) {
             throw new Error('Must provide OraclePriceData to get spot bids');
         }
@@ -725,10 +628,6 @@ class DLOB {
             this.getTakingBids(marketIndex, marketType, slot, oraclePriceData),
             this.getRestingLimitBids(marketIndex, slot, marketType, oraclePriceData),
         ];
-        const marketTypeStr = (0, __1.getVariant)(marketType);
-        if (marketTypeStr === 'perp' && fallbackBid) {
-            generatorList.push((0, NodeList_1.getVammNodeGenerator)(fallbackBid));
-        }
         yield* this.getBestNode(generatorList, oraclePriceData, slot, (bestNode, currentNode, slot, oraclePriceData) => {
             var _a, _b;
             const bestNodePrice = (_a = bestNode.getPrice(oraclePriceData, slot)) !== null && _a !== void 0 ? _a : __1.BN_MAX;
@@ -769,12 +668,12 @@ class DLOB {
                 const newBidOrder = { ...bidOrder };
                 newBidOrder.baseAssetAmountFilled =
                     bidOrder.baseAssetAmountFilled.add(baseFilled);
-                this.getListForOrder(newBidOrder, slot).update(newBidOrder, bidNode.userAccount);
+                this.getListForOnChainOrder(newBidOrder, slot).update(newBidOrder, bidNode.userAccount);
                 // ask completely filled
                 const newAskOrder = { ...askOrder };
                 newAskOrder.baseAssetAmountFilled =
                     askOrder.baseAssetAmountFilled.add(baseFilled);
-                this.getListForOrder(newAskOrder, slot).update(newAskOrder, askNode.userAccount);
+                this.getListForOnChainOrder(newAskOrder, slot).update(newAskOrder, askNode.userAccount);
                 nodesToFill.push({
                     node: takerNode,
                     makerNodes: [makerNode],