@drift-labs/sdk 2.31.0-beta.4 → 2.31.0-beta.5

package/get_events.ts

@@ -0,0 +1,47 @@
+import { Connection, Keypair, PublicKey } from '@solana/web3.js';
+import {
+  configs,
+  DriftClient,
+  Wallet,
+} from "@drift-labs/sdk";
+
+
+async function main() {
+
+  const driftConfig = configs['mainnet-beta'];
+  const connection = new Connection('https://api.mainnet-beta.solana.com');
+
+  const driftClient = new DriftClient({
+    connection: connection,
+    wallet: new Wallet(new Keypair()),
+    programID: new PublicKey(driftConfig.DRIFT_PROGRAM_ID),
+    userStats: true,
+    env: 'mainnet-beta',
+  });
+  console.log(`driftClientSubscribed: ${await driftClient.subscribe()}`);
+
+  const txHash = "3gvGQufckXGHrFDv4dNWEXuXKRMy3NZkKHMyFrAhLoYScaXXTGCp9vq58kWkfyJ8oDYZrz4bTyGayjUy9PKigeLS";
+
+  const tx = await driftClient.connection.getParsedTransaction(txHash, {
+    commitment: "confirmed",
+    maxSupportedTransactionVersion: 0,
+  });
+
+  let logIdx = 0;
+  // @ts-ignore
+  for (const event of driftClient.program._events._eventParser.parseLogs(tx!.meta!.logMessages)) {
+    console.log("----------------------------------------");
+    console.log(`Log ${logIdx++}`);
+    console.log("----------------------------------------");
+    console.log(`${JSON.stringify(event, null, 2)}`);
+  }
+
+  console.log("========================================");
+  console.log("Raw transaction logs");
+  console.log("========================================");
+  console.log(JSON.stringify(tx!.meta!.logMessages, null, 2));
+
+  process.exit(0);
+}
+
+main().catch(console.error);

package/lib/config.js

@@ -78,8 +78,8 @@ async function findAllMarketAndOracles(program) {
     const perpMarketIndexes = [];
     const spotMarketIndexes = [];
     const oracleInfos = new Map();
-    const perpMarketProgramAccounts = await program.account.perpMarket.all();
-    const spotMarketProgramAccounts = await program.account.spotMarket.all();
+    const perpMarketProgramAccounts = (await program.account.perpMarket.all());
+    const spotMarketProgramAccounts = (await program.account.spotMarket.all());
     for (const perpMarketProgramAccount of perpMarketProgramAccounts) {
         const perpMarket = perpMarketProgramAccount.account;
         perpMarketIndexes.push(perpMarket.marketIndex);

package/lib/dlob/orderBookLevels.d.ts

@@ -41,5 +41,5 @@ export declare function getVammL2Generator({ marketAccount, oraclePriceData, num
     numOrders: number;
     now?: BN;
 }): L2OrderBookGenerator;
-export declare function groupL2(l2: L2OrderBook, grouping: BN): L2OrderBook;
+export declare function groupL2(l2: L2OrderBook, grouping: BN, depth: number): L2OrderBook;
 export {};

package/lib/dlob/orderBookLevels.js

@@ -135,14 +135,14 @@ function getVammL2Generator({ marketAccount, oraclePriceData, numOrders, now, })
     };
 }
 exports.getVammL2Generator = getVammL2Generator;
-function groupL2(l2, grouping) {
+function groupL2(l2, grouping, depth) {
     return {
-        bids: groupL2Levels(l2.bids, grouping, __1.PositionDirection.LONG),
-        asks: groupL2Levels(l2.asks, grouping, __1.PositionDirection.SHORT),
+        bids: groupL2Levels(l2.bids, grouping, __1.PositionDirection.LONG, depth),
+        asks: groupL2Levels(l2.asks, grouping, __1.PositionDirection.SHORT, depth),
     };
 }
 exports.groupL2 = groupL2;
-function groupL2Levels(levels, grouping, direction) {
+function groupL2Levels(levels, grouping, direction, depth) {
     const groupedLevels = [];
     for (const level of levels) {
         const price = (0, __1.standardizePrice)(level.price, grouping, direction);
@@ -168,6 +168,9 @@ function groupL2Levels(levels, grouping, direction) {
             };
             groupedLevels.push(groupedLevel);
         }
+        if (groupedLevels.length === depth) {
+            break;
+        }
     }
     return groupedLevels;
 }

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.31.0-beta.4",
+    "version": "2.31.0-beta.5",
     "name": "drift",
     "instructions": [
         {

package/lib/memcmp.d.ts

@@ -3,3 +3,4 @@ export declare function getUserFilter(): MemcmpFilter;
 export declare function getNonIdleUserFilter(): MemcmpFilter;
 export declare function getUserWithOrderFilter(): MemcmpFilter;
 export declare function getUserWithAuctionFilter(): MemcmpFilter;
+export declare function getUserThatHasBeenLP(): MemcmpFilter;

package/lib/memcmp.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUserWithAuctionFilter = exports.getUserWithOrderFilter = exports.getNonIdleUserFilter = exports.getUserFilter = void 0;
+exports.getUserThatHasBeenLP = exports.getUserWithAuctionFilter = exports.getUserWithOrderFilter = exports.getNonIdleUserFilter = exports.getUserFilter = void 0;
 const bs58_1 = __importDefault(require("bs58"));
 const anchor_1 = require("@coral-xyz/anchor");
 function getUserFilter() {
@@ -42,3 +42,12 @@ function getUserWithAuctionFilter() {
     };
 }
 exports.getUserWithAuctionFilter = getUserWithAuctionFilter;
+function getUserThatHasBeenLP() {
+    return {
+        memcmp: {
+            offset: 4267,
+            bytes: bs58_1.default.encode(Uint8Array.from([99])),
+        },
+    };
+}
+exports.getUserThatHasBeenLP = getUserThatHasBeenLP;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.31.0-beta.4",
+	"version": "2.31.0-beta.5",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/config.ts

@@ -1,3 +1,4 @@
+import { PerpMarketAccount, SpotMarketAccount } from '.';
 import {
 	DevnetPerpMarkets,
 	MainnetPerpMarkets,
@@ -11,7 +12,7 @@ import {
 	MainnetSpotMarkets,
 } from './constants/spotMarkets';
 import { OracleInfo } from './oracles/types';
-import { Program } from '@coral-xyz/anchor';
+import { Program, ProgramAccount } from '@coral-xyz/anchor';
 
 type DriftConfig = {
 	ENV: DriftEnv;
@@ -124,8 +125,10 @@ export async function findAllMarketAndOracles(program: Program): Promise<{
 	const spotMarketIndexes = [];
 	const oracleInfos = new Map<string, OracleInfo>();
 
-	const perpMarketProgramAccounts = await program.account.perpMarket.all();
-	const spotMarketProgramAccounts = await program.account.spotMarket.all();
+	const perpMarketProgramAccounts =
+		(await program.account.perpMarket.all()) as ProgramAccount<PerpMarketAccount>[];
+	const spotMarketProgramAccounts =
+		(await program.account.spotMarket.all()) as ProgramAccount<SpotMarketAccount>[];
 
 	for (const perpMarketProgramAccount of perpMarketProgramAccounts) {
 		const perpMarket = perpMarketProgramAccount.account;

package/src/dlob/orderBookLevels.ts

@@ -244,17 +244,22 @@ export function getVammL2Generator({
 	};
 }
 
-export function groupL2(l2: L2OrderBook, grouping: BN): L2OrderBook {
+export function groupL2(
+	l2: L2OrderBook,
+	grouping: BN,
+	depth: number
+): L2OrderBook {
 	return {
-		bids: groupL2Levels(l2.bids, grouping, PositionDirection.LONG),
-		asks: groupL2Levels(l2.asks, grouping, PositionDirection.SHORT),
+		bids: groupL2Levels(l2.bids, grouping, PositionDirection.LONG, depth),
+		asks: groupL2Levels(l2.asks, grouping, PositionDirection.SHORT, depth),
 	};
 }
 
 function groupL2Levels(
 	levels: L2Level[],
 	grouping: BN,
-	direction: PositionDirection
+	direction: PositionDirection,
+	depth: number
 ): L2Level[] {
 	const groupedLevels = [];
 	for (const level of levels) {
@@ -281,6 +286,10 @@ function groupL2Levels(
 			};
 			groupedLevels.push(groupedLevel);
 		}
+
+		if (groupedLevels.length === depth) {
+			break;
+		}
 	}
 	return groupedLevels;
 }

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.31.0-beta.4",
+  "version": "2.31.0-beta.5",
   "name": "drift",
   "instructions": [
     {

package/src/memcmp.ts

@@ -37,3 +37,12 @@ export function getUserWithAuctionFilter(): MemcmpFilter {
 		},
 	};
 }
+
+export function getUserThatHasBeenLP(): MemcmpFilter {
+	return {
+		memcmp: {
+			offset: 4267,
+			bytes: bs58.encode(Uint8Array.from([99])),
+		},
+	};
+}

package/src/assert/assert.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.assert = void 0;
-function assert(condition, error) {
-    if (!condition) {
-        throw new Error(error || 'Unspecified AssertionError');
-    }
-}
-exports.assert = assert;

package/src/token/index.js

@@ -1,38 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseTokenAccount = void 0;
-const spl_token_1 = require("@solana/spl-token");
-const web3_js_1 = require("@solana/web3.js");
-function parseTokenAccount(data) {
-    const accountInfo = spl_token_1.AccountLayout.decode(data);
-    accountInfo.mint = new web3_js_1.PublicKey(accountInfo.mint);
-    accountInfo.owner = new web3_js_1.PublicKey(accountInfo.owner);
-    accountInfo.amount = spl_token_1.u64.fromBuffer(accountInfo.amount);
-    if (accountInfo.delegateOption === 0) {
-        accountInfo.delegate = null;
-        // eslint-disable-next-line new-cap
-        accountInfo.delegatedAmount = new spl_token_1.u64(0);
-    }
-    else {
-        accountInfo.delegate = new web3_js_1.PublicKey(accountInfo.delegate);
-        accountInfo.delegatedAmount = spl_token_1.u64.fromBuffer(accountInfo.delegatedAmount);
-    }
-    accountInfo.isInitialized = accountInfo.state !== 0;
-    accountInfo.isFrozen = accountInfo.state === 2;
-    if (accountInfo.isNativeOption === 1) {
-        accountInfo.rentExemptReserve = spl_token_1.u64.fromBuffer(accountInfo.isNative);
-        accountInfo.isNative = true;
-    }
-    else {
-        accountInfo.rentExemptReserve = null;
-        accountInfo.isNative = false;
-    }
-    if (accountInfo.closeAuthorityOption === 0) {
-        accountInfo.closeAuthority = null;
-    }
-    else {
-        accountInfo.closeAuthority = new web3_js_1.PublicKey(accountInfo.closeAuthority);
-    }
-    return accountInfo;
-}
-exports.parseTokenAccount = parseTokenAccount;

package/src/util/computeUnits.js

@@ -1,27 +0,0 @@
-"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());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.findComputeUnitConsumption = void 0;
-function findComputeUnitConsumption(programId, connection, txSignature, commitment = 'confirmed') {
-    return __awaiter(this, void 0, void 0, function* () {
-        const tx = yield connection.getTransaction(txSignature, { commitment });
-        const computeUnits = [];
-        const regex = new RegExp(`Program ${programId.toString()} consumed ([0-9]{0,6}) of ([0-9]{0,7}) compute units`);
-        tx.meta.logMessages.forEach((logMessage) => {
-            const match = logMessage.match(regex);
-            if (match && match[1]) {
-                computeUnits.push(match[1]);
-            }
-        });
-        return computeUnits;
-    });
-}
-exports.findComputeUnitConsumption = findComputeUnitConsumption;

package/src/util/promiseTimeout.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.promiseTimeout = void 0;
-function promiseTimeout(promise, timeoutMs) {
-    let timeoutId;
-    const timeoutPromise = new Promise((resolve) => {
-        timeoutId = setTimeout(() => resolve(null), timeoutMs);
-    });
-    return Promise.race([promise, timeoutPromise]).then((result) => {
-        clearTimeout(timeoutId);
-        return result;
-    });
-}
-exports.promiseTimeout = promiseTimeout;

package/src/util/tps.js

@@ -1,27 +0,0 @@
-"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());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.estimateTps = void 0;
-function estimateTps(programId, connection, failed) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let signatures = yield connection.getSignaturesForAddress(programId, undefined, 'finalized');
-        if (failed) {
-            signatures = signatures.filter((signature) => signature.err);
-        }
-        const numberOfSignatures = signatures.length;
-        if (numberOfSignatures === 0) {
-            return 0;
-        }
-        return (numberOfSignatures /
-            (signatures[0].blockTime - signatures[numberOfSignatures - 1].blockTime));
-    });
-}
-exports.estimateTps = estimateTps;