@drift-labs/sdk 0.2.0-master.24 → 0.2.0-master.26

package/lib/config.js

@@ -1,24 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMarketsBanksAndOraclesForSubscription = exports.initialize = exports.getConfig = exports.configs = void 0;
-const markets_1 = require("./constants/markets");
-const banks_1 = require("./constants/banks");
+exports.getMarketsAndOraclesForSubscription = exports.initialize = exports.getConfig = exports.configs = void 0;
+const perpMarkets_1 = require("./constants/perpMarkets");
+const spotMarkets_1 = require("./constants/spotMarkets");
 exports.configs = {
     devnet: {
         ENV: 'devnet',
         PYTH_ORACLE_MAPPING_ADDRESS: 'BmA9Z6FjioHJPpjT39QazZyhDRUdZy2ezwx4GiDdE2u2',
-        CLEARING_HOUSE_PROGRAM_ID: 'HbUKwqFPjz9r7ZtT416AU8aaecDQMKKiDCTS3AdXnS6c',
+        CLEARING_HOUSE_PROGRAM_ID: '3v1iEjbSSLSSYyt1pmx4UB5rqJGurmz71RibXF7X6UF3',
         USDC_MINT_ADDRESS: '8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2',
-        MARKETS: markets_1.DevnetMarkets,
-        BANKS: banks_1.DevnetBanks,
+        PERP_MARKETS: perpMarkets_1.DevnetPerpMarkets,
+        SPOT_MARKETS: spotMarkets_1.DevnetSpotMarkets,
     },
     'mainnet-beta': {
         ENV: 'mainnet-beta',
         PYTH_ORACLE_MAPPING_ADDRESS: 'AHtgzX45WTKfkPG53L6WYhGEXwQkN1BVknET3sVsLL8J',
         CLEARING_HOUSE_PROGRAM_ID: 'dammHkt7jmytvbS3nHTxQNEcP59aE57nxwV21YdqEDN',
         USDC_MINT_ADDRESS: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
-        MARKETS: markets_1.MainnetMarkets,
-        BANKS: banks_1.MainnetBanks,
+        PERP_MARKETS: perpMarkets_1.MainnetMarkets,
+        SPOT_MARKETS: spotMarkets_1.MainnetSpotMarkets,
     },
 };
 let currentConfig = exports.configs.devnet;
@@ -40,28 +40,28 @@ const initialize = (props) => {
     return currentConfig;
 };
 exports.initialize = initialize;
-function getMarketsBanksAndOraclesForSubscription(env) {
-    const marketIndexes = [];
-    const bankIndexes = [];
+function getMarketsAndOraclesForSubscription(env) {
+    const perpMarketIndexes = [];
+    const spotMarketIndexes = [];
     const oracleInfos = new Map();
-    for (const market of markets_1.Markets[env]) {
-        marketIndexes.push(market.marketIndex);
+    for (const market of perpMarkets_1.PerpMarkets[env]) {
+        perpMarketIndexes.push(market.marketIndex);
         oracleInfos.set(market.oracle.toString(), {
             publicKey: market.oracle,
             source: market.oracleSource,
         });
     }
-    for (const bank of banks_1.Banks[env]) {
-        bankIndexes.push(bank.bankIndex);
-        oracleInfos.set(bank.oracle.toString(), {
-            publicKey: bank.oracle,
-            source: bank.oracleSource,
+    for (const spotMarket of spotMarkets_1.SpotMarkets[env]) {
+        spotMarketIndexes.push(spotMarket.marketIndex);
+        oracleInfos.set(spotMarket.oracle.toString(), {
+            publicKey: spotMarket.oracle,
+            source: spotMarket.oracleSource,
         });
     }
     return {
-        marketIndexes,
-        bankIndexes,
+        perpMarketIndexes: perpMarketIndexes,
+        spotMarketIndexes: spotMarketIndexes,
         oracleInfos: Array.from(oracleInfos.values()),
     };
 }
-exports.getMarketsBanksAndOraclesForSubscription = getMarketsBanksAndOraclesForSubscription;
+exports.getMarketsAndOraclesForSubscription = getMarketsAndOraclesForSubscription;

package/lib/constants/numericConstants.d.ts

@@ -14,17 +14,17 @@ export declare const MARK_PRICE_PRECISION_EXP: BN;
 export declare const FUNDING_RATE_PRECISION_EXP: BN;
 export declare const PEG_PRECISION_EXP: BN;
 export declare const AMM_RESERVE_PRECISION_EXP: BN;
-export declare const BANK_INTEREST_PRECISION_EXP: BN;
-export declare const BANK_INTEREST_PRECISION: BN;
-export declare const BANK_CUMULATIVE_INTEREST_PRECISION_EXP: BN;
-export declare const BANK_CUMULATIVE_INTEREST_PRECISION: BN;
-export declare const BANK_UTILIZATION_PRECISION: BN;
-export declare const BANK_RATE_PRECISION: BN;
-export declare const BANK_WEIGHT_PRECISION: BN;
-export declare const BANK_BALANCE_PRECISION_EXP: BN;
-export declare const BANK_BALANCE_PRECISION: BN;
-export declare const BANK_IMF_PRECISION_EXP: BN;
-export declare const BANK_IMF_PRECISION: BN;
+export declare const SPOT_MARKET_INTEREST_PRECISION_EXP: BN;
+export declare const SPOT_MARKET_INTEREST_PRECISION: BN;
+export declare const SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION_EXP: BN;
+export declare const SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION: BN;
+export declare const SPOT_MARKET_UTILIZATION_PRECISION: BN;
+export declare const SPOT_MARKET_RATE_PRECISION: BN;
+export declare const SPOT_MARKET_WEIGHT_PRECISION: BN;
+export declare const SPOT_MARKET_BALANCE_PRECISION_EXP: BN;
+export declare const SPOT_MARKET_BALANCE_PRECISION: BN;
+export declare const SPOT_MARKET_IMF_PRECISION_EXP: BN;
+export declare const SPOT_MARKET_IMF_PRECISION: BN;
 export declare const LIQUIDATION_FEE_PRECISION: BN;
 export declare const QUOTE_PRECISION: BN;
 export declare const MARK_PRICE_PRECISION: BN;
@@ -40,6 +40,6 @@ export declare const AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO: BN;
 export declare const MARGIN_PRECISION: BN;
 export declare const BID_ASK_SPREAD_PRECISION: BN;
 export declare const ONE_YEAR: BN;
-export declare const QUOTE_ASSET_BANK_INDEX: BN;
+export declare const QUOTE_SPOT_MARKET_INDEX: BN;
 export declare const LAMPORTS_PRECISION: BN;
 export declare const LAMPORTS_EXP: BN;

package/lib/constants/numericConstants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LAMPORTS_EXP = exports.LAMPORTS_PRECISION = exports.QUOTE_ASSET_BANK_INDEX = exports.ONE_YEAR = exports.BID_ASK_SPREAD_PRECISION = exports.MARGIN_PRECISION = exports.AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO = exports.PRICE_TO_QUOTE_PRECISION = exports.PRICE_DIV_PEG = exports.AMM_TO_QUOTE_PRECISION_RATIO = exports.BASE_PRECISION_EXP = exports.BASE_PRECISION = exports.AMM_RESERVE_PRECISION = exports.PEG_PRECISION = exports.FUNDING_PAYMENT_PRECISION = exports.MARK_PRICE_PRECISION = exports.QUOTE_PRECISION = exports.LIQUIDATION_FEE_PRECISION = exports.BANK_IMF_PRECISION = exports.BANK_IMF_PRECISION_EXP = exports.BANK_BALANCE_PRECISION = exports.BANK_BALANCE_PRECISION_EXP = exports.BANK_WEIGHT_PRECISION = exports.BANK_RATE_PRECISION = exports.BANK_UTILIZATION_PRECISION = exports.BANK_CUMULATIVE_INTEREST_PRECISION = exports.BANK_CUMULATIVE_INTEREST_PRECISION_EXP = exports.BANK_INTEREST_PRECISION = exports.BANK_INTEREST_PRECISION_EXP = exports.AMM_RESERVE_PRECISION_EXP = exports.PEG_PRECISION_EXP = exports.FUNDING_RATE_PRECISION_EXP = exports.MARK_PRICE_PRECISION_EXP = exports.FUNDING_PAYMENT_PRECISION_EXP = exports.QUOTE_PRECISION_EXP = exports.MAX_LEVERAGE = exports.TEN_MILLION = exports.BN_MAX = exports.TEN_THOUSAND = exports.TEN = exports.TWO = exports.ONE = exports.ZERO = void 0;
+exports.LAMPORTS_EXP = exports.LAMPORTS_PRECISION = exports.QUOTE_SPOT_MARKET_INDEX = exports.ONE_YEAR = exports.BID_ASK_SPREAD_PRECISION = exports.MARGIN_PRECISION = exports.AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO = exports.PRICE_TO_QUOTE_PRECISION = exports.PRICE_DIV_PEG = exports.AMM_TO_QUOTE_PRECISION_RATIO = exports.BASE_PRECISION_EXP = exports.BASE_PRECISION = exports.AMM_RESERVE_PRECISION = exports.PEG_PRECISION = exports.FUNDING_PAYMENT_PRECISION = exports.MARK_PRICE_PRECISION = exports.QUOTE_PRECISION = exports.LIQUIDATION_FEE_PRECISION = exports.SPOT_MARKET_IMF_PRECISION = exports.SPOT_MARKET_IMF_PRECISION_EXP = exports.SPOT_MARKET_BALANCE_PRECISION = exports.SPOT_MARKET_BALANCE_PRECISION_EXP = exports.SPOT_MARKET_WEIGHT_PRECISION = exports.SPOT_MARKET_RATE_PRECISION = exports.SPOT_MARKET_UTILIZATION_PRECISION = exports.SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION = exports.SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION_EXP = exports.SPOT_MARKET_INTEREST_PRECISION = exports.SPOT_MARKET_INTEREST_PRECISION_EXP = exports.AMM_RESERVE_PRECISION_EXP = exports.PEG_PRECISION_EXP = exports.FUNDING_RATE_PRECISION_EXP = exports.MARK_PRICE_PRECISION_EXP = exports.FUNDING_PAYMENT_PRECISION_EXP = exports.QUOTE_PRECISION_EXP = exports.MAX_LEVERAGE = exports.TEN_MILLION = exports.BN_MAX = exports.TEN_THOUSAND = exports.TEN = exports.TWO = exports.ONE = exports.ZERO = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const __1 = require("../");
 exports.ZERO = new __1.BN(0);
@@ -17,17 +17,17 @@ exports.MARK_PRICE_PRECISION_EXP = new __1.BN(10);
 exports.FUNDING_RATE_PRECISION_EXP = exports.MARK_PRICE_PRECISION_EXP.mul(exports.FUNDING_PAYMENT_PRECISION_EXP);
 exports.PEG_PRECISION_EXP = new __1.BN(3);
 exports.AMM_RESERVE_PRECISION_EXP = new __1.BN(13);
-exports.BANK_INTEREST_PRECISION_EXP = new __1.BN(6);
-exports.BANK_INTEREST_PRECISION = new __1.BN(10).pow(exports.BANK_INTEREST_PRECISION_EXP);
-exports.BANK_CUMULATIVE_INTEREST_PRECISION_EXP = new __1.BN(10);
-exports.BANK_CUMULATIVE_INTEREST_PRECISION = new __1.BN(10).pow(exports.BANK_CUMULATIVE_INTEREST_PRECISION_EXP);
-exports.BANK_UTILIZATION_PRECISION = new __1.BN(1000000);
-exports.BANK_RATE_PRECISION = new __1.BN(1000000);
-exports.BANK_WEIGHT_PRECISION = new __1.BN(100);
-exports.BANK_BALANCE_PRECISION_EXP = new __1.BN(6);
-exports.BANK_BALANCE_PRECISION = new __1.BN(10).pow(exports.BANK_BALANCE_PRECISION_EXP);
-exports.BANK_IMF_PRECISION_EXP = new __1.BN(6);
-exports.BANK_IMF_PRECISION = new __1.BN(10).pow(exports.BANK_IMF_PRECISION_EXP);
+exports.SPOT_MARKET_INTEREST_PRECISION_EXP = new __1.BN(6);
+exports.SPOT_MARKET_INTEREST_PRECISION = new __1.BN(10).pow(exports.SPOT_MARKET_INTEREST_PRECISION_EXP);
+exports.SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION_EXP = new __1.BN(10);
+exports.SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION = new __1.BN(10).pow(exports.SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION_EXP);
+exports.SPOT_MARKET_UTILIZATION_PRECISION = new __1.BN(1000000);
+exports.SPOT_MARKET_RATE_PRECISION = new __1.BN(1000000);
+exports.SPOT_MARKET_WEIGHT_PRECISION = new __1.BN(10000);
+exports.SPOT_MARKET_BALANCE_PRECISION_EXP = new __1.BN(6);
+exports.SPOT_MARKET_BALANCE_PRECISION = new __1.BN(10).pow(exports.SPOT_MARKET_BALANCE_PRECISION_EXP);
+exports.SPOT_MARKET_IMF_PRECISION_EXP = new __1.BN(6);
+exports.SPOT_MARKET_IMF_PRECISION = new __1.BN(10).pow(exports.SPOT_MARKET_IMF_PRECISION_EXP);
 exports.LIQUIDATION_FEE_PRECISION = new __1.BN(1000000);
 exports.QUOTE_PRECISION = new __1.BN(10).pow(exports.QUOTE_PRECISION_EXP);
 exports.MARK_PRICE_PRECISION = new __1.BN(10).pow(exports.MARK_PRICE_PRECISION_EXP);
@@ -43,6 +43,6 @@ exports.AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO = exports.AMM_RESERVE_PRECISION.m
 exports.MARGIN_PRECISION = exports.TEN_THOUSAND;
 exports.BID_ASK_SPREAD_PRECISION = new __1.BN(1000000);
 exports.ONE_YEAR = new __1.BN(31536000);
-exports.QUOTE_ASSET_BANK_INDEX = new __1.BN(0);
+exports.QUOTE_SPOT_MARKET_INDEX = new __1.BN(0);
 exports.LAMPORTS_PRECISION = new __1.BN(web3_js_1.LAMPORTS_PER_SOL);
 exports.LAMPORTS_EXP = new __1.BN(Math.log10(web3_js_1.LAMPORTS_PER_SOL));

package/lib/constants/{markets.d.ts → perpMarkets.d.ts}

@@ -2,7 +2,7 @@
 import { BN, OracleSource } from '../';
 import { DriftEnv } from '../';
 import { PublicKey } from '@solana/web3.js';
-export declare type MarketConfig = {
+export declare type PerpMarketConfig = {
     fullName?: string;
     category?: string[];
     symbol: string;
@@ -12,8 +12,8 @@ export declare type MarketConfig = {
     oracle: PublicKey;
     oracleSource: OracleSource;
 };
-export declare const DevnetMarkets: MarketConfig[];
-export declare const MainnetMarkets: MarketConfig[];
-export declare const Markets: {
-    [key in DriftEnv]: MarketConfig[];
+export declare const DevnetPerpMarkets: PerpMarketConfig[];
+export declare const MainnetMarkets: PerpMarketConfig[];
+export declare const PerpMarkets: {
+    [key in DriftEnv]: PerpMarketConfig[];
 };

package/{src/constants/markets.js → lib/constants/perpMarkets.js}

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Markets = exports.MainnetMarkets = exports.DevnetMarkets = void 0;
+exports.PerpMarkets = exports.MainnetMarkets = exports.DevnetPerpMarkets = void 0;
 const __1 = require("../");
 const web3_js_1 = require("@solana/web3.js");
-exports.DevnetMarkets = [
+exports.DevnetPerpMarkets = [
     {
         fullName: 'Solana',
         category: ['L1', 'Infra'],
@@ -36,7 +36,7 @@ exports.DevnetMarkets = [
     },
 ];
 exports.MainnetMarkets = [];
-exports.Markets = {
-    devnet: exports.DevnetMarkets,
+exports.PerpMarkets = {
+    devnet: exports.DevnetPerpMarkets,
     'mainnet-beta': [],
 };

package/lib/constants/{banks.d.ts → spotMarkets.d.ts}

@@ -1,9 +1,9 @@
 /// <reference types="bn.js" />
 import { PublicKey } from '@solana/web3.js';
 import { BN, DriftEnv, OracleSource } from '../';
-export declare type BankConfig = {
+export declare type SpotMarketConfig = {
     symbol: string;
-    bankIndex: BN;
+    marketIndex: BN;
     oracle: PublicKey;
     mint: PublicKey;
     oracleSource: OracleSource;
@@ -11,8 +11,8 @@ export declare type BankConfig = {
     precisionExp: BN;
 };
 export declare const WRAPPED_SOL_MINT: PublicKey;
-export declare const DevnetBanks: BankConfig[];
-export declare const MainnetBanks: BankConfig[];
-export declare const Banks: {
-    [key in DriftEnv]: BankConfig[];
+export declare const DevnetSpotMarkets: SpotMarketConfig[];
+export declare const MainnetSpotMarkets: SpotMarketConfig[];
+export declare const SpotMarkets: {
+    [key in DriftEnv]: SpotMarketConfig[];
 };

package/lib/constants/{banks.js → spotMarkets.js}

@@ -1,23 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Banks = exports.MainnetBanks = exports.DevnetBanks = exports.WRAPPED_SOL_MINT = void 0;
+exports.SpotMarkets = exports.MainnetSpotMarkets = exports.DevnetSpotMarkets = exports.WRAPPED_SOL_MINT = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const __1 = require("../");
 const numericConstants_1 = require("./numericConstants");
 exports.WRAPPED_SOL_MINT = new web3_js_1.PublicKey('So11111111111111111111111111111111111111112');
-exports.DevnetBanks = [
+exports.DevnetSpotMarkets = [
     {
         symbol: 'USDC',
-        bankIndex: new __1.BN(0),
+        marketIndex: new __1.BN(0),
         oracle: web3_js_1.PublicKey.default,
         oracleSource: __1.OracleSource.QUOTE_ASSET,
         mint: new web3_js_1.PublicKey('8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2'),
-        precision: numericConstants_1.BANK_BALANCE_PRECISION,
-        precisionExp: numericConstants_1.BANK_BALANCE_PRECISION_EXP,
+        precision: numericConstants_1.SPOT_MARKET_BALANCE_PRECISION,
+        precisionExp: numericConstants_1.SPOT_MARKET_BALANCE_PRECISION_EXP,
     },
     {
         symbol: 'SOL',
-        bankIndex: new __1.BN(1),
+        marketIndex: new __1.BN(1),
         oracle: new web3_js_1.PublicKey('J83w4HKfqxwcq3BEMMkPFSppX3gqekLyLJBexebFVkix'),
         oracleSource: __1.OracleSource.PYTH,
         mint: new web3_js_1.PublicKey(exports.WRAPPED_SOL_MINT),
@@ -26,26 +26,26 @@ exports.DevnetBanks = [
     },
     {
         symbol: 'BTC',
-        bankIndex: new __1.BN(2),
+        marketIndex: new __1.BN(2),
         oracle: new web3_js_1.PublicKey('HovQMDrbAgAYPCmHVSrezcSmkMtXSSUsLDFANExrZh2J'),
         oracleSource: __1.OracleSource.PYTH,
         mint: new web3_js_1.PublicKey('3BZPwbcqB5kKScF3TEXxwNfx5ipV13kbRVDvfVp5c6fv'),
-        precision: numericConstants_1.BANK_BALANCE_PRECISION,
-        precisionExp: numericConstants_1.BANK_BALANCE_PRECISION_EXP,
+        precision: numericConstants_1.SPOT_MARKET_BALANCE_PRECISION,
+        precisionExp: numericConstants_1.SPOT_MARKET_BALANCE_PRECISION_EXP,
     },
 ];
-exports.MainnetBanks = [
+exports.MainnetSpotMarkets = [
     {
         symbol: 'USDC',
-        bankIndex: new __1.BN(0),
+        marketIndex: new __1.BN(0),
         oracle: web3_js_1.PublicKey.default,
         oracleSource: __1.OracleSource.QUOTE_ASSET,
         mint: new web3_js_1.PublicKey('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v'),
-        precision: numericConstants_1.BANK_BALANCE_PRECISION,
-        precisionExp: numericConstants_1.BANK_BALANCE_PRECISION_EXP,
+        precision: numericConstants_1.SPOT_MARKET_BALANCE_PRECISION,
+        precisionExp: numericConstants_1.SPOT_MARKET_BALANCE_PRECISION_EXP,
     },
 ];
-exports.Banks = {
-    devnet: exports.DevnetBanks,
-    'mainnet-beta': exports.MainnetBanks,
+exports.SpotMarkets = {
+    devnet: exports.DevnetSpotMarkets,
+    'mainnet-beta': exports.MainnetSpotMarkets,
 };

package/lib/events/eventSubscriber.d.ts

@@ -15,10 +15,12 @@ export declare class EventSubscriber {
     private awaitTxResolver;
     private logProvider;
     eventEmitter: StrictEventEmitter<EventEmitter, EventSubscriberEvents>;
+    private lastSeenSlot;
+    lastSeenTxSig: string;
     constructor(connection: Connection, program: Program, options?: EventSubscriptionOptions);
-    subscribe(): boolean;
+    subscribe(): Promise<boolean>;
     private handleTxLogs;
-    private fetchPreviousTx;
+    fetchPreviousTx(fetchMax?: boolean): Promise<void>;
     unsubscribe(): Promise<boolean>;
     private parseEventsFromLogs;
     awaitTx(txSig: TransactionSignature): Promise<void>;

package/lib/events/eventSubscriber.js

@@ -30,17 +30,21 @@ class EventSubscriber {
             this.logProvider = new pollingLogProvider_1.PollingLogProvider(this.connection, this.program.programId, options.commitment, this.options.logProviderConfig.frequency);
         }
     }
-    subscribe() {
-        if (this.logProvider.isSubscribed()) {
+    async subscribe() {
+        try {
+            if (this.logProvider.isSubscribed()) {
+                return true;
+            }
+            this.logProvider.subscribe((txSig, slot, logs) => {
+                this.handleTxLogs(txSig, slot, logs);
+            }, true);
             return true;
         }
-        this.fetchPreviousTx().catch((e) => {
+        catch (e) {
             console.error('Error fetching previous txs in event subscriber');
             console.error(e);
-        });
-        return this.logProvider.subscribe((txSig, slot, logs) => {
-            this.handleTxLogs(txSig, slot, logs);
-        });
+            return false;
+        }
     }
     handleTxLogs(txSig, slot, logs) {
         if (this.txEventCache.has(txSig)) {
@@ -56,10 +60,13 @@ class EventSubscriber {
             this.awaitTxResolver.get(txSig)();
             this.awaitTxResolver.delete(txSig);
         }
+        if (slot > this.lastSeenSlot) {
+            this.lastSeenTxSig = txSig;
+        }
         this.txEventCache.add(txSig, wrappedEvents);
     }
-    async fetchPreviousTx() {
-        if (!this.options.untilTx) {
+    async fetchPreviousTx(fetchMax) {
+        if (!this.options.untilTx && !fetchMax) {
             return;
         }
         let txFetched = 0;

package/lib/events/fetchLogs.d.ts

@@ -1,4 +1,6 @@
+import { Program } from '@project-serum/anchor';
 import { Connection, Finality, PublicKey, TransactionSignature } from '@solana/web3.js';
+import { WrappedEvents } from './types';
 declare type Log = {
     txSig: TransactionSignature;
     slot: number;
@@ -7,7 +9,14 @@ declare type Log = {
 declare type FetchLogsResponse = {
     earliestTx: string;
     mostRecentTx: string;
+    earliestSlot: number;
+    mostRecentSlot: number;
     transactionLogs: Log[];
 };
-export declare function fetchLogs(connection: Connection, programId: PublicKey, finality: Finality, beforeTx?: TransactionSignature, untilTx?: TransactionSignature): Promise<FetchLogsResponse | undefined>;
+export declare function fetchLogs(connection: Connection, programId: PublicKey, finality: Finality, beforeTx?: TransactionSignature, untilTx?: TransactionSignature, limit?: number): Promise<FetchLogsResponse>;
+export declare class LogParser {
+    private program;
+    constructor(program: Program);
+    parseEventsFromLogs(event: Log): WrappedEvents;
+}
 export {};

package/lib/events/fetchLogs.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchLogs = void 0;
-async function fetchLogs(connection, programId, finality, beforeTx, untilTx) {
+exports.LogParser = exports.fetchLogs = void 0;
+async function fetchLogs(connection, programId, finality, beforeTx, untilTx, limit) {
     const signatures = await connection.getSignaturesForAddress(programId, {
         before: beforeTx,
         until: untilTx,
+        limit,
     }, finality);
-    const sortedSignatures = signatures.sort((a, b) => a.slot < b.slot ? -1 : 1);
+    const sortedSignatures = signatures.sort((a, b) => a.slot === b.slot ? 0 : a.slot < b.slot ? -1 : 1);
     const filteredSignatures = sortedSignatures.filter((signature) => !signature.err);
     if (filteredSignatures.length === 0) {
         return undefined;
@@ -22,12 +23,14 @@ async function fetchLogs(connection, programId, finality, beforeTx, untilTx) {
             };
         });
     }))).flat();
-    const earliestTx = filteredSignatures[0].signature;
-    const mostRecentTx = filteredSignatures[filteredSignatures.length - 1].signature;
+    const earliest = filteredSignatures[0];
+    const mostRecent = filteredSignatures[filteredSignatures.length - 1];
     return {
         transactionLogs: transactionLogs,
-        earliestTx: earliestTx,
-        mostRecentTx: mostRecentTx,
+        earliestTx: earliest.signature,
+        mostRecentTx: mostRecent.signature,
+        earliestSlot: earliest.slot,
+        mostRecentSlot: mostRecent.slot,
     };
 }
 exports.fetchLogs = fetchLogs;
@@ -37,3 +40,20 @@ function chunk(array, size) {
         .map((_, index) => index * size)
         .map((begin) => array.slice(begin, begin + size));
 }
+class LogParser {
+    constructor(program) {
+        this.program = program;
+    }
+    parseEventsFromLogs(event) {
+        const records = [];
+        // @ts-ignore
+        this.program._events._eventParser.parseLogs(event.logs, (eventLog) => {
+            eventLog.data.txSig = event.txSig;
+            eventLog.data.slot = event.slot;
+            eventLog.data.eventType = eventLog.name;
+            records.push(eventLog.data);
+        });
+        return records;
+    }
+}
+exports.LogParser = LogParser;

package/lib/events/pollingLogProvider.d.ts

@@ -8,8 +8,9 @@ export declare class PollingLogProvider implements LogProvider {
     private intervalId;
     private mostRecentSeenTx?;
     private mutex;
+    private firstFetch;
     constructor(connection: Connection, programId: PublicKey, commitment: Commitment, frequency?: number);
-    subscribe(callback: logProviderCallback): boolean;
+    subscribe(callback: logProviderCallback, skipHistory?: boolean): boolean;
     isSubscribed(): boolean;
     unsubscribe(): Promise<boolean>;
 }

package/lib/events/pollingLogProvider.js

@@ -7,9 +7,10 @@ class PollingLogProvider {
         this.connection = connection;
         this.programId = programId;
         this.frequency = frequency;
+        this.firstFetch = true;
         this.finality = commitment === 'finalized' ? 'finalized' : 'confirmed';
     }
-    subscribe(callback) {
+    subscribe(callback, skipHistory) {
         if (this.intervalId) {
             return true;
         }
@@ -19,7 +20,10 @@ class PollingLogProvider {
             }
             this.mutex = 1;
             try {
-                const response = await (0, fetchLogs_1.fetchLogs)(this.connection, this.programId, this.finality, undefined, this.mostRecentSeenTx);
+                const response = await (0, fetchLogs_1.fetchLogs)(this.connection, this.programId, this.finality, undefined, this.mostRecentSeenTx, 
+                // If skipping history, only fetch one log back, not the maximum amount available
+                skipHistory && this.firstFetch ? 1 : undefined);
+                this.firstFetch = false;
                 if (response === undefined) {
                     return;
                 }

package/lib/events/types.d.ts

@@ -1,5 +1,5 @@
 import { Commitment, TransactionSignature } from '@solana/web3.js';
-import { DepositRecord, FundingPaymentRecord, FundingRateRecord, LiquidationRecord, NewUserRecord, OrderActionRecord, OrderRecord, SettlePnlRecord } from '../index';
+import { DepositRecord, FundingPaymentRecord, FundingRateRecord, LiquidationRecord, NewUserRecord, OrderActionRecord, OrderRecord, SettlePnlRecord, LPRecord, InsuranceFundRecord } from '../index';
 export declare type EventSubscriptionOptions = {
     eventTypes?: EventType[];
     maxEventsPerType?: number;
@@ -30,6 +30,8 @@ export declare type EventMap = {
     OrderActionRecord: Event<OrderActionRecord>;
     SettlePnlRecord: Event<SettlePnlRecord>;
     NewUserRecord: Event<NewUserRecord>;
+    LPRecord: Event<LPRecord>;
+    InsuranceFundRecord: Event<InsuranceFundRecord>;
 };
 export declare type EventType = keyof EventMap;
 export interface EventSubscriberEvents {
@@ -39,7 +41,7 @@ export declare type SortFn = (currentRecord: EventMap[EventType], newRecord: Eve
 export declare type logProviderCallback = (txSig: TransactionSignature, slot: number, logs: string[]) => void;
 export interface LogProvider {
     isSubscribed(): boolean;
-    subscribe(callback: logProviderCallback): boolean;
+    subscribe(callback: logProviderCallback, skipHistory?: boolean): boolean;
     unsubscribe(): Promise<boolean>;
 }
 export declare type WebSocketLogProviderConfig = {

package/lib/events/types.js

@@ -11,6 +11,8 @@ exports.DefaultEventSubscriptionOptions = {
         'FundingRateRecord',
         'NewUserRecord',
         'SettlePnlRecord',
+        'LPRecord',
+        'InsuranceFundRecord',
     ],
     maxEventsPerType: 4096,
     orderBy: 'blockchain',

package/lib/examples/makeTradeExample.js

@@ -6,14 +6,15 @@ const __1 = require("..");
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
 const __2 = require("..");
-const banks_1 = require("../constants/banks");
+const spotMarkets_1 = require("../constants/spotMarkets");
 const getTokenAddress = (mintAddress, userPubKey) => {
     return spl_token_1.Token.getAssociatedTokenAddress(new web3_js_1.PublicKey(`ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL`), spl_token_1.TOKEN_PROGRAM_ID, new web3_js_1.PublicKey(mintAddress), new web3_js_1.PublicKey(userPubKey));
 };
 exports.getTokenAddress = getTokenAddress;
+const cluster = 'devnet';
 const main = async () => {
     // Initialize Drift SDK
-    const sdkConfig = (0, __2.initialize)({ env: 'devnet' });
+    const sdkConfig = (0, __2.initialize)({ env: cluster });
     // Set up the Wallet and Provider
     const privateKey = process.env.BOT_PRIVATE_KEY; // stored as an array string
     const keypair = web3_js_1.Keypair.fromSecretKey(Uint8Array.from(JSON.parse(privateKey)));
@@ -30,32 +31,43 @@ const main = async () => {
     const usdcTokenAddress = await (0, exports.getTokenAddress)(sdkConfig.USDC_MINT_ADDRESS, wallet.publicKey.toString());
     // Set up the Drift Clearing House
     const clearingHousePublicKey = new web3_js_1.PublicKey(sdkConfig.CLEARING_HOUSE_PROGRAM_ID);
+    const bulkAccountLoader = new __2.BulkAccountLoader(connection, 'confirmed', 1000);
     const clearingHouse = new __2.ClearingHouse({
         connection,
         wallet: provider.wallet,
         programID: clearingHousePublicKey,
+        perpMarketIndexes: __2.PerpMarkets[cluster].map((market) => market.marketIndex),
+        spotMarketIndexes: spotMarkets_1.SpotMarkets[cluster].map((spotMarket) => spotMarket.marketIndex),
+        accountSubscription: {
+            type: 'polling',
+            accountLoader: bulkAccountLoader,
+        },
     });
     await clearingHouse.subscribe();
     // Set up Clearing House user client
     const user = new __2.ClearingHouseUser({
         clearingHouse,
         userAccountPublicKey: await clearingHouse.getUserAccountPublicKey(),
+        accountSubscription: {
+            type: 'polling',
+            accountLoader: bulkAccountLoader,
+        },
     });
     //// Check if clearing house account exists for the current wallet
     const userAccountExists = await user.exists();
     if (!userAccountExists) {
         //// Create a Clearing House account by Depositing some USDC ($10,000 in this case)
         const depositAmount = new anchor_1.BN(10000).mul(__2.QUOTE_PRECISION);
-        await clearingHouse.initializeUserAccountAndDepositCollateral(depositAmount, await (0, exports.getTokenAddress)(usdcTokenAddress.toString(), wallet.publicKey.toString()), banks_1.Banks['devnet'][0].bankIndex);
+        await clearingHouse.initializeUserAccountAndDepositCollateral(depositAmount, await (0, exports.getTokenAddress)(usdcTokenAddress.toString(), wallet.publicKey.toString()), spotMarkets_1.SpotMarkets['devnet'][0].marketIndex);
     }
     await user.subscribe();
     // Get current price
-    const solMarketInfo = sdkConfig.MARKETS.find((market) => market.baseAssetSymbol === 'SOL');
-    const currentMarketPrice = (0, __2.calculateMarkPrice)(clearingHouse.getMarketAccount(solMarketInfo.marketIndex), undefined);
+    const solMarketInfo = sdkConfig.PERP_MARKETS.find((market) => market.baseAssetSymbol === 'SOL');
+    const currentMarketPrice = (0, __2.calculateMarkPrice)(clearingHouse.getPerpMarketAccount(solMarketInfo.marketIndex), undefined);
     const formattedPrice = (0, __2.convertToNumber)(currentMarketPrice, __2.MARK_PRICE_PRECISION);
     console.log(`Current Market Price is $${formattedPrice}`);
     // Estimate the slippage for a $5000 LONG trade
-    const solMarketAccount = clearingHouse.getMarketAccount(solMarketInfo.marketIndex);
+    const solMarketAccount = clearingHouse.getPerpMarketAccount(solMarketInfo.marketIndex);
     const longAmount = new anchor_1.BN(5000).mul(__2.QUOTE_PRECISION);
     const slippage = (0, __2.convertToNumber)((0, __2.calculateTradeSlippage)(__2.PositionDirection.LONG, longAmount, solMarketAccount, 'quote', undefined)[0], __2.MARK_PRICE_PRECISION);
     console.log(`Slippage for a $5000 LONG on the SOL market would be $${slippage}`);