@drift-labs/sdk 2.104.0-beta.3 → 2.104.0-beta.30

package/VERSION

@@ -1 +1 @@
-2.104.0-beta.3
+2.104.0-beta.30

package/lib/browser/accounts/pollingDriftClientAccountSubscriber.js

@@ -244,6 +244,7 @@ class PollingDriftClientAccountSubscriber {
         this.accountsToPoll.clear();
         this.oraclesToPoll.clear();
         this.isSubscribed = false;
+        this.accountLoader.accountsToLoad = new Map();
     }
     async addSpotMarket(marketIndex) {
         const marketPublicKey = await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, marketIndex);

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

@@ -27,5 +27,7 @@ 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;
+export declare function getProtectedMakerModeConfigPublicKey(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.getProtectedMakerModeConfigPublicKey = 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;
@@ -198,3 +209,9 @@ function getHighLeverageModeConfigPublicKey(programId) {
     return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from(anchor.utils.bytes.utf8.encode('high_leverage_mode_config'))], programId)[0];
 }
 exports.getHighLeverageModeConfigPublicKey = getHighLeverageModeConfigPublicKey;
+function getProtectedMakerModeConfigPublicKey(programId) {
+    return web3_js_1.PublicKey.findProgramAddressSync([
+        Buffer.from(anchor.utils.bytes.utf8.encode('protected_maker_mode_config')),
+    ], programId)[0];
+}
+exports.getProtectedMakerModeConfigPublicKey = getProtectedMakerModeConfigPublicKey;

package/lib/browser/adminClient.d.ts

@@ -197,8 +197,14 @@ 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>;
     getUpdateHighLeverageModeConfigIx(maxUsers: number, reduceOnly: boolean): Promise<TransactionInstruction>;
+    initializeProtectedMakerModeConfig(maxUsers: number): Promise<TransactionSignature>;
+    getInitializeProtectedMakerModeConfigIx(maxUsers: number): Promise<TransactionInstruction>;
+    updateProtectedMakerModeConfig(maxUsers: number, reduceOnly: boolean): Promise<TransactionSignature>;
+    getUpdateProtectedMakerModeConfigIx(maxUsers: number, reduceOnly: boolean): Promise<TransactionInstruction>;
 }

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);
@@ -1837,5 +1854,41 @@ class AdminClient extends driftClient_1.DriftClient {
             },
         });
     }
+    async initializeProtectedMakerModeConfig(maxUsers) {
+        const initializeProtectedMakerModeConfigIx = await this.getInitializeProtectedMakerModeConfigIx(maxUsers);
+        const tx = await this.buildTransaction(initializeProtectedMakerModeConfigIx);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
+    }
+    async getInitializeProtectedMakerModeConfigIx(maxUsers) {
+        return await this.program.instruction.initializeProtectedMakerModeConfig(maxUsers, {
+            accounts: {
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+                rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+                systemProgram: anchor.web3.SystemProgram.programId,
+                protectedMakerModeConfig: (0, pda_1.getProtectedMakerModeConfigPublicKey)(this.program.programId),
+            },
+        });
+    }
+    async updateProtectedMakerModeConfig(maxUsers, reduceOnly) {
+        const updateProtectedMakerModeConfigIx = await this.getUpdateProtectedMakerModeConfigIx(maxUsers, reduceOnly);
+        const tx = await this.buildTransaction(updateProtectedMakerModeConfigIx);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
+    }
+    async getUpdateProtectedMakerModeConfigIx(maxUsers, reduceOnly) {
+        return await this.program.instruction.updateProtectedMakerModeConfig(maxUsers, reduceOnly, {
+            accounts: {
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+                protectedMakerModeConfig: (0, pda_1.getProtectedMakerModeConfigPublicKey)(this.program.programId),
+            },
+        });
+    }
 }
 exports.AdminClient = AdminClient;

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

@@ -25,8 +25,8 @@ type DriftConfig = {
 export type DriftEnv = 'devnet' | 'mainnet-beta';
 export declare const DRIFT_PROGRAM_ID = "dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH";
 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,14 +1,15 @@
 "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.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");
 const oracleId_1 = require("./oracles/oracleId");
 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

@@ -62,8 +62,8 @@ exports.DevnetPerpMarkets = [
     {
         fullName: 'Polygon',
         category: ['L2', 'Infra'],
-        symbol: 'MATIC-PERP',
-        baseAssetSymbol: 'MATIC',
+        symbol: 'POL-PERP',
+        baseAssetSymbol: 'POL',
         marketIndex: 5,
         oracle: new web3_js_1.PublicKey('BrzyDgwELy4jjjsqLQpBeUxzrsueYyMhuWpYBaUYcXvi'),
         launchTs: 1677690149000,
@@ -380,8 +380,8 @@ exports.MainnetPerpMarkets = [
     {
         fullName: 'Polygon',
         category: ['L2', 'Infra'],
-        symbol: 'MATIC-PERP',
-        baseAssetSymbol: 'MATIC',
+        symbol: 'POL-PERP',
+        baseAssetSymbol: 'POL',
         marketIndex: 5,
         oracle: new web3_js_1.PublicKey('BrzyDgwELy4jjjsqLQpBeUxzrsueYyMhuWpYBaUYcXvi'),
         launchTs: 1677690149000,
@@ -979,6 +979,28 @@ 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',
+    },
+    {
+        fullName: 'PENGU',
+        category: ['Meme'],
+        symbol: 'PENGU-PERP',
+        baseAssetSymbol: 'PENGU',
+        marketIndex: 62,
+        oracle: new web3_js_1.PublicKey('7vGHChuBJyFMYBqMLXRzBmRxWdSuwEmg8RvRm3RWQsxi'),
+        launchTs: 1734444000000,
+        oracleSource: __1.OracleSource.PYTH_PULL,
+        pythFeedId: '0xbed3097008b9b5e3c93bec20be79cb43986b85a996475589351a21e67bae9b61',
+    },
 ];
 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,38 @@ 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',
+    },
+    {
+        symbol: 'PENGU',
+        marketIndex: 31,
+        poolId: 0,
+        oracle: new web3_js_1.PublicKey('7vGHChuBJyFMYBqMLXRzBmRxWdSuwEmg8RvRm3RWQsxi'),
+        oracleSource: __1.OracleSource.PYTH_PULL,
+        mint: new web3_js_1.PublicKey('2zMMhcVQEXDtdE6vsFS7S7D5oUodfJHE8vd1gnBouauv'),
+        precision: new __1.BN(10).pow(numericConstants_1.SIX),
+        precisionExp: numericConstants_1.SIX,
+        pythFeedId: '0xbed3097008b9b5e3c93bec20be79cb43986b85a996475589351a21e67bae9b61',
+    },
 ];
 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;