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

package/src/events/pollingLogProvider.js

@@ -0,0 +1,113 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+exports.__esModule = true;
+exports.PollingLogProvider = void 0;
+var fetchLogs_1 = require("./fetchLogs");
+var PollingLogProvider = /** @class */ (function () {
+    function PollingLogProvider(connection, programId, commitment, frequency) {
+        if (frequency === void 0) { frequency = 15 * 1000; }
+        this.connection = connection;
+        this.programId = programId;
+        this.frequency = frequency;
+        this.firstFetch = true;
+        this.finality = commitment === 'finalized' ? 'finalized' : 'confirmed';
+    }
+    PollingLogProvider.prototype.subscribe = function (callback, skipHistory) {
+        var _this = this;
+        if (this.intervalId) {
+            return true;
+        }
+        this.intervalId = setInterval(function () { return __awaiter(_this, void 0, void 0, function () {
+            var response, mostRecentTx, transactionLogs, _i, transactionLogs_1, _a, txSig, slot, logs, e_1;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        if (this.mutex === 1) {
+                            return [2 /*return*/];
+                        }
+                        this.mutex = 1;
+                        _b.label = 1;
+                    case 1:
+                        _b.trys.push([1, 3, 4, 5]);
+                        return [4 /*yield*/, (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)];
+                    case 2:
+                        response = _b.sent();
+                        this.firstFetch = false;
+                        if (response === undefined) {
+                            return [2 /*return*/];
+                        }
+                        mostRecentTx = response.mostRecentTx, transactionLogs = response.transactionLogs;
+                        for (_i = 0, transactionLogs_1 = transactionLogs; _i < transactionLogs_1.length; _i++) {
+                            _a = transactionLogs_1[_i], txSig = _a.txSig, slot = _a.slot, logs = _a.logs;
+                            callback(txSig, slot, logs);
+                        }
+                        this.mostRecentSeenTx = mostRecentTx;
+                        return [3 /*break*/, 5];
+                    case 3:
+                        e_1 = _b.sent();
+                        console.error('PollingLogProvider threw an Error');
+                        console.error(e_1);
+                        return [3 /*break*/, 5];
+                    case 4:
+                        this.mutex = 0;
+                        return [7 /*endfinally*/];
+                    case 5: return [2 /*return*/];
+                }
+            });
+        }); }, this.frequency);
+        return true;
+    };
+    PollingLogProvider.prototype.isSubscribed = function () {
+        return this.intervalId !== undefined;
+    };
+    PollingLogProvider.prototype.unsubscribe = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                if (this.intervalId !== undefined) {
+                    clearInterval(this.intervalId);
+                    this.intervalId = undefined;
+                }
+                return [2 /*return*/, true];
+            });
+        });
+    };
+    return PollingLogProvider;
+}());
+exports.PollingLogProvider = PollingLogProvider;

package/src/events/pollingLogProvider.ts

@@ -13,6 +13,7 @@ export class PollingLogProvider implements LogProvider {
 	private intervalId: NodeJS.Timer;
 	private mostRecentSeenTx?: TransactionSignature;
 	private mutex: number;
+	private firstFetch = true;
 
 	public constructor(
 		private connection: Connection,
@@ -23,7 +24,10 @@ export class PollingLogProvider implements LogProvider {
 		this.finality = commitment === 'finalized' ? 'finalized' : 'confirmed';
 	}
 
-	public subscribe(callback: logProviderCallback): boolean {
+	public subscribe(
+		callback: logProviderCallback,
+		skipHistory?: boolean
+	): boolean {
 		if (this.intervalId) {
 			return true;
 		}
@@ -40,9 +44,13 @@ export class PollingLogProvider implements LogProvider {
 					this.programId,
 					this.finality,
 					undefined,
-					this.mostRecentSeenTx
+					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/src/events/sort.js

@@ -0,0 +1,41 @@
+"use strict";
+exports.__esModule = true;
+exports.getSortFn = void 0;
+var index_1 = require("../index");
+function clientSortAscFn() {
+    return 'less than';
+}
+function clientSortDescFn() {
+    return 'greater than';
+}
+function defaultBlockchainSortFn(currentEvent, newEvent) {
+    return currentEvent.slot <= newEvent.slot ? 'less than' : 'greater than';
+}
+function orderActionRecordSortFn(currentEvent, newEvent) {
+    var _a, _b;
+    var currentEventMarketIndex = currentEvent.marketIndex;
+    var newEventMarketIndex = newEvent.marketIndex;
+    if (!currentEventMarketIndex.eq(newEventMarketIndex)) {
+        return currentEvent.ts.lte(newEvent.ts) ? 'less than' : 'greater than';
+    }
+    if (((_a = currentEvent.fillRecordId) === null || _a === void 0 ? void 0 : _a.gt(index_1.ZERO)) && ((_b = newEvent.fillRecordId) === null || _b === void 0 ? void 0 : _b.gt(index_1.ZERO))) {
+        return currentEvent.fillRecordId.lte(newEvent.fillRecordId)
+            ? 'less than'
+            : 'greater than';
+    }
+    else {
+        return currentEvent.ts.lte(newEvent.ts) ? 'less than' : 'greater than';
+    }
+}
+function getSortFn(orderBy, orderDir, eventType) {
+    if (orderBy === 'client') {
+        return orderDir === 'asc' ? clientSortAscFn : clientSortDescFn;
+    }
+    switch (eventType) {
+        case 'OrderActionRecord':
+            return orderActionRecordSortFn;
+        default:
+            return defaultBlockchainSortFn;
+    }
+}
+exports.getSortFn = getSortFn;

package/src/events/txEventCache.js

@@ -1,23 +1,25 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+exports.__esModule = true;
 exports.TxEventCache = void 0;
-class Node {
-    constructor(key, value, next, prev) {
+var Node = /** @class */ (function () {
+    function Node(key, value, next, prev) {
         this.key = key;
         this.value = value;
         this.next = next;
         this.prev = prev;
     }
-}
+    return Node;
+}());
 // lru cache
-class TxEventCache {
-    constructor(maxTx = 1024) {
+var TxEventCache = /** @class */ (function () {
+    function TxEventCache(maxTx) {
+        if (maxTx === void 0) { maxTx = 1024; }
         this.maxTx = maxTx;
         this.size = 0;
         this.cacheMap = {};
     }
-    add(key, events) {
-        const existingNode = this.cacheMap[key];
+    TxEventCache.prototype.add = function (key, events) {
+        var existingNode = this.cacheMap[key];
         if (existingNode) {
             this.detach(existingNode);
             this.size--;
@@ -32,22 +34,22 @@ class TxEventCache {
             this.head = this.tail = new Node(key, events);
         }
         else {
-            const node = new Node(key, events, this.head);
+            var node = new Node(key, events, this.head);
             this.head.prev = node;
             this.head = node;
         }
         // update cacheMap with LinkedList key and Node reference
         this.cacheMap[key] = this.head;
         this.size++;
-    }
-    has(key) {
+    };
+    TxEventCache.prototype.has = function (key) {
         return this.cacheMap.hasOwnProperty(key);
-    }
-    get(key) {
+    };
+    TxEventCache.prototype.get = function (key) {
         var _a;
         return (_a = this.cacheMap[key]) === null || _a === void 0 ? void 0 : _a.value;
-    }
-    detach(node) {
+    };
+    TxEventCache.prototype.detach = function (node) {
         if (node.prev !== undefined) {
             node.prev.next = node.next;
         }
@@ -60,12 +62,13 @@ class TxEventCache {
         else {
             this.tail = node.prev;
         }
-    }
-    clear() {
+    };
+    TxEventCache.prototype.clear = function () {
         this.head = undefined;
         this.tail = undefined;
         this.size = 0;
         this.cacheMap = {};
-    }
-}
+    };
+    return TxEventCache;
+}());
 exports.TxEventCache = TxEventCache;

package/src/events/types.js

@@ -0,0 +1,25 @@
+"use strict";
+exports.__esModule = true;
+exports.DefaultEventSubscriptionOptions = void 0;
+exports.DefaultEventSubscriptionOptions = {
+    eventTypes: [
+        'DepositRecord',
+        'FundingPaymentRecord',
+        'LiquidationRecord',
+        'OrderRecord',
+        'OrderActionRecord',
+        'FundingRateRecord',
+        'NewUserRecord',
+        'SettlePnlRecord',
+        'LPRecord',
+        'InsuranceFundRecord',
+    ],
+    maxEventsPerType: 4096,
+    orderBy: 'blockchain',
+    orderDir: 'asc',
+    commitment: 'confirmed',
+    maxTx: 4096,
+    logProviderConfig: {
+        type: 'websocket'
+    }
+};

package/src/events/types.ts

@@ -8,6 +8,8 @@ import {
 	OrderActionRecord,
 	OrderRecord,
 	SettlePnlRecord,
+	LPRecord,
+	InsuranceFundRecord,
 } from '../index';
 
 export type EventSubscriptionOptions = {
@@ -33,6 +35,8 @@ export const DefaultEventSubscriptionOptions: EventSubscriptionOptions = {
 		'FundingRateRecord',
 		'NewUserRecord',
 		'SettlePnlRecord',
+		'LPRecord',
+		'InsuranceFundRecord',
 	],
 	maxEventsPerType: 4096,
 	orderBy: 'blockchain',
@@ -68,6 +72,8 @@ export type EventMap = {
 	OrderActionRecord: Event<OrderActionRecord>;
 	SettlePnlRecord: Event<SettlePnlRecord>;
 	NewUserRecord: Event<NewUserRecord>;
+	LPRecord: Event<LPRecord>;
+	InsuranceFundRecord: Event<InsuranceFundRecord>;
 };
 
 export type EventType = keyof EventMap;
@@ -89,7 +95,7 @@ export type logProviderCallback = (
 
 export interface LogProvider {
 	isSubscribed(): boolean;
-	subscribe(callback: logProviderCallback): boolean;
+	subscribe(callback: logProviderCallback, skipHistory?: boolean): boolean;
 	unsubscribe(): Promise<boolean>;
 }
 

package/src/events/webSocketLogProvider.js

@@ -0,0 +1,76 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+exports.__esModule = true;
+exports.WebSocketLogProvider = void 0;
+var WebSocketLogProvider = /** @class */ (function () {
+    function WebSocketLogProvider(connection, programId, commitment) {
+        this.connection = connection;
+        this.programId = programId;
+        this.commitment = commitment;
+    }
+    WebSocketLogProvider.prototype.subscribe = function (callback) {
+        if (this.subscriptionId) {
+            return true;
+        }
+        this.subscriptionId = this.connection.onLogs(this.programId, function (logs, ctx) {
+            callback(logs.signature, ctx.slot, logs.logs);
+        }, this.commitment);
+        return true;
+    };
+    WebSocketLogProvider.prototype.isSubscribed = function () {
+        return this.subscriptionId !== undefined;
+    };
+    WebSocketLogProvider.prototype.unsubscribe = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!(this.subscriptionId !== undefined)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this.connection.removeOnLogsListener(this.subscriptionId)];
+                    case 1:
+                        _a.sent();
+                        this.subscriptionId = undefined;
+                        _a.label = 2;
+                    case 2: return [2 /*return*/, true];
+                }
+            });
+        });
+    };
+    return WebSocketLogProvider;
+}());
+exports.WebSocketLogProvider = WebSocketLogProvider;

package/src/examples/makeTradeExample.ts

@@ -10,10 +10,12 @@ import {
 	PositionDirection,
 	convertToNumber,
 	calculateTradeSlippage,
+	BulkAccountLoader,
+	PerpMarkets,
 	MARK_PRICE_PRECISION,
 	QUOTE_PRECISION,
 } from '..';
-import { Banks } from '../constants/banks';
+import { SpotMarkets } from '../constants/spotMarkets';
 
 export const getTokenAddress = (
 	mintAddress: string,
@@ -27,9 +29,11 @@ export const getTokenAddress = (
 	);
 };
 
+const cluster = 'devnet';
+
 const main = async () => {
 	// Initialize Drift SDK
-	const sdkConfig = initialize({ env: 'devnet' });
+	const sdkConfig = initialize({ env: cluster });
 
 	// Set up the Wallet and Provider
 	const privateKey = process.env.BOT_PRIVATE_KEY; // stored as an array string
@@ -63,10 +67,23 @@ const main = async () => {
 	const clearingHousePublicKey = new PublicKey(
 		sdkConfig.CLEARING_HOUSE_PROGRAM_ID
 	);
+	const bulkAccountLoader = new BulkAccountLoader(
+		connection,
+		'confirmed',
+		1000
+	);
 	const clearingHouse = new ClearingHouse({
 		connection,
 		wallet: provider.wallet,
 		programID: clearingHousePublicKey,
+		perpMarketIndexes: PerpMarkets[cluster].map((market) => market.marketIndex),
+		spotMarketIndexes: SpotMarkets[cluster].map(
+			(spotMarket) => spotMarket.marketIndex
+		),
+		accountSubscription: {
+			type: 'polling',
+			accountLoader: bulkAccountLoader,
+		},
 	});
 	await clearingHouse.subscribe();
 
@@ -74,6 +91,10 @@ const main = async () => {
 	const user = new ClearingHouseUser({
 		clearingHouse,
 		userAccountPublicKey: await clearingHouse.getUserAccountPublicKey(),
+		accountSubscription: {
+			type: 'polling',
+			accountLoader: bulkAccountLoader,
+		},
 	});
 
 	//// Check if clearing house account exists for the current wallet
@@ -88,19 +109,19 @@ const main = async () => {
 				usdcTokenAddress.toString(),
 				wallet.publicKey.toString()
 			),
-			Banks['devnet'][0].bankIndex
+			SpotMarkets['devnet'][0].marketIndex
 		);
 	}
 
 	await user.subscribe();
 
 	// Get current price
-	const solMarketInfo = sdkConfig.MARKETS.find(
+	const solMarketInfo = sdkConfig.PERP_MARKETS.find(
 		(market) => market.baseAssetSymbol === 'SOL'
 	);
 
 	const currentMarketPrice = calculateMarkPrice(
-		clearingHouse.getMarketAccount(solMarketInfo.marketIndex),
+		clearingHouse.getPerpMarketAccount(solMarketInfo.marketIndex),
 		undefined
 	);
 
@@ -112,7 +133,7 @@ const main = async () => {
 	console.log(`Current Market Price is $${formattedPrice}`);
 
 	// Estimate the slippage for a $5000 LONG trade
-	const solMarketAccount = clearingHouse.getMarketAccount(
+	const solMarketAccount = clearingHouse.getPerpMarketAccount(
 		solMarketInfo.marketIndex
 	);