@drift-labs/sdk 2.31.0 → 2.31.1-beta.1

package/README.md

@@ -5,7 +5,7 @@
 
   <p>
     <a href="https://www.npmjs.com/package/@drift-labs/sdk"><img alt="SDK npm package" src="https://img.shields.io/npm/v/@drift-labs/sdk" /></a>
-    <a href="https://drift-labs.github.io/protocol-v1/sdk/"><img alt="Docs" src="https://img.shields.io/badge/docs-tutorials-blueviolet" /></a>
+    <a href="https://drift-labs.github.io/protocol-v2/sdk/"><img alt="Docs" src="https://img.shields.io/badge/docs-tutorials-blueviolet" /></a>
     <a href="https://discord.com/channels/849494028176588802/878700556904980500"><img alt="Discord Chat" src="https://img.shields.io/discord/889577356681945098?color=blueviolet" /></a>
     <a href="https://opensource.org/licenses/Apache-2.0"><img alt="License" src="https://img.shields.io/github/license/project-serum/anchor?color=blueviolet" /></a>
   </p>
@@ -53,6 +53,7 @@ The Drift SDK uses some common precisions, which are available as constants to i
 | PEG_PRECISION         | 10^6  |
 | PRICE_PRECISION       | 10^6  |
 | AMM_RESERVE_PRECISION | 10^9  |
+| BASE_PRECISION        | 10^9  |
 
 **Important Note for BigNum division**
 
@@ -238,7 +239,7 @@ main();
 
 ## License
 
-Drift Protocol v1 is licensed under [Apache 2.0](./LICENSE).
+Drift Protocol v2 is licensed under [Apache 2.0](./LICENSE).
 
 Unless you explicitly state otherwise, any contribution intentionally submitted
 for inclusion in Drift SDK by you, as defined in the Apache-2.0 license, shall be

package/VERSION

@@ -0,0 +1 @@
+2.31.1-beta.1

package/lib/auctionSubscriber/auctionSubscriber.js

@@ -2,10 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuctionSubscriber = void 0;
 const memcmp_1 = require("../memcmp");
+const events_1 = require("events");
 class AuctionSubscriber {
     constructor({ driftClient, opts }) {
         this.driftClient = driftClient;
         this.opts = opts || this.driftClient.opts;
+        this.eventEmitter = new events_1.EventEmitter();
     }
     async subscribe() {
         this.websocketId = this.driftClient.connection.onProgramAccountChange(this.driftClient.program.programId, (keyAccountInfo, context) => {

package/lib/driftClient.d.ts

@@ -472,6 +472,10 @@ export declare class DriftClient {
         settleeUserAccountPublicKey: PublicKey;
         settleeUserAccount: UserAccount;
     }[], marketIndexes: number[]): Promise<TransactionSignature>;
+    getSettlePNLsIxs(users: {
+        settleeUserAccountPublicKey: PublicKey;
+        settleeUserAccount: UserAccount;
+    }[], marketIndexes: number[]): Promise<Array<TransactionInstruction>>;
     settlePNL(settleeUserAccountPublicKey: PublicKey, settleeUserAccount: UserAccount, marketIndex: number, txParams?: TxParams): Promise<TransactionSignature>;
     settlePNLIx(settleeUserAccountPublicKey: PublicKey, settleeUserAccount: UserAccount, marketIndex: number): Promise<TransactionInstruction>;
     liquidatePerp(userAccountPublicKey: PublicKey, userAccount: UserAccount, marketIndex: number, maxBaseAssetAmount: BN, limitPrice?: BN, txParams?: TxParams): Promise<TransactionSignature>;

package/lib/driftClient.js

@@ -2527,12 +2527,7 @@ class DriftClient {
         });
     }
     async settlePNLs(users, marketIndexes) {
-        const ixs = [];
-        for (const { settleeUserAccountPublicKey, settleeUserAccount } of users) {
-            for (const marketIndex of marketIndexes) {
-                ixs.push(await this.settlePNLIx(settleeUserAccountPublicKey, settleeUserAccount, marketIndex));
-            }
-        }
+        const ixs = await this.getSettlePNLsIxs(users, marketIndexes);
         const tx = new web3_js_1.Transaction()
             .add(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
             units: 1000000,
@@ -2541,6 +2536,15 @@ class DriftClient {
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
+    async getSettlePNLsIxs(users, marketIndexes) {
+        const ixs = [];
+        for (const { settleeUserAccountPublicKey, settleeUserAccount } of users) {
+            for (const marketIndex of marketIndexes) {
+                ixs.push(await this.settlePNLIx(settleeUserAccountPublicKey, settleeUserAccount, marketIndex));
+            }
+        }
+        return ixs;
+    }
     async settlePNL(settleeUserAccountPublicKey, settleeUserAccount, marketIndex, txParams) {
         const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.settlePNLIx(settleeUserAccountPublicKey, settleeUserAccount, marketIndex), txParams), [], this.opts);
         return txSig;

package/lib/idl/drift.json

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

package/lib/index.d.ts

@@ -57,6 +57,7 @@ export * from './serum/serumFulfillmentConfigMap';
 export * from './phoenix/phoenixSubscriber';
 export * from './phoenix/phoenixFulfillmentConfigMap';
 export * from './tx/retryTxSender';
+export * from './tx/types';
 export * from './util/computeUnits';
 export * from './util/tps';
 export * from './util/promiseTimeout';
@@ -75,4 +76,7 @@ export * from './userMap/userMap';
 export * from './userMap/userStatsMap';
 export * from './math/bankruptcy';
 export * from './orderSubscriber';
+export * from './orderSubscriber/types';
+export * from './auctionSubscriber';
+export * from './auctionSubscriber/types';
 export { BN, PublicKey, pyth };

package/lib/index.js

@@ -27,7 +27,6 @@ exports.pyth = client_1.default;
 __exportStar(require("./tokenFaucet"), exports);
 __exportStar(require("./oracles/types"), exports);
 __exportStar(require("./oracles/pythClient"), exports);
-// export * from './oracles/switchboardClient';
 __exportStar(require("./types"), exports);
 __exportStar(require("./constants/perpMarkets"), exports);
 __exportStar(require("./accounts/fetch"), exports);
@@ -81,6 +80,7 @@ __exportStar(require("./serum/serumFulfillmentConfigMap"), exports);
 __exportStar(require("./phoenix/phoenixSubscriber"), exports);
 __exportStar(require("./phoenix/phoenixFulfillmentConfigMap"), exports);
 __exportStar(require("./tx/retryTxSender"), exports);
+__exportStar(require("./tx/types"), exports);
 __exportStar(require("./util/computeUnits"), exports);
 __exportStar(require("./util/tps"), exports);
 __exportStar(require("./util/promiseTimeout"), exports);
@@ -99,3 +99,6 @@ __exportStar(require("./userMap/userMap"), exports);
 __exportStar(require("./userMap/userStatsMap"), exports);
 __exportStar(require("./math/bankruptcy"), exports);
 __exportStar(require("./orderSubscriber"), exports);
+__exportStar(require("./orderSubscriber/types"), exports);
+__exportStar(require("./auctionSubscriber"), exports);
+__exportStar(require("./auctionSubscriber/types"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.31.0",
+	"version": "2.31.1-beta.1",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",
@@ -18,7 +18,8 @@
 		"test:bignum": "mocha -r ts-node/register tests/bn/**/*.ts",
 		"patch-and-pub": "npm version patch --force && npm publish",
 		"prettify": "prettier --check './src/***/*.ts'",
-		"prettify:fix": "prettier --write './{src,tests}/***/*.ts'"
+		"prettify:fix": "prettier --write './{src,tests}/***/*.ts'",
+		"version": "node ./scripts/updateVersion.js"
 	},
 	"keywords": [
 		"drift-labs",

package/scripts/updateVersion.js

@@ -0,0 +1,28 @@
+const fs = require('fs');
+const path = require('path');
+const packageJson = require('../package.json');
+
+const versionFilePath = path.join(__dirname, '..', 'VERSION');
+
+let version = fs.readFileSync(versionFilePath, 'utf8');
+version = version.replace(/\n/g, '');
+
+const filesToReplace = [
+    // sdk/src/idl/drift.json
+    path.join(__dirname, '..', 'src', 'idl', 'drift.json'),
+    // programs/drift/Cargo.toml
+    path.join(__dirname, '..', '..', 'programs', 'drift', 'Cargo.toml'),
+    // Cargo.lock
+    path.join(__dirname, '..', '..', 'Cargo.lock'),
+]
+
+console.log(`Updating versions from ${version} to ${packageJson.version} in:`);
+for (const file of filesToReplace) {
+    console.log(`* ${file}`);
+    const fileContents = fs.readFileSync(file, 'utf8');
+    const newFileContents = fileContents.replace(version, packageJson.version);
+    fs.writeFileSync(file, newFileContents);
+}
+
+fs.writeFileSync(versionFilePath, packageJson.version);
+console.log("");

package/src/auctionSubscriber/auctionSubscriber.ts

@@ -17,6 +17,7 @@ export class AuctionSubscriber {
 	constructor({ driftClient, opts }: AuctionSubscriberConfig) {
 		this.driftClient = driftClient;
 		this.opts = opts || this.driftClient.opts;
+		this.eventEmitter = new EventEmitter();
 	}
 
 	public async subscribe() {

package/src/driftClient.ts

@@ -4309,6 +4309,26 @@ export class DriftClient {
 		}[],
 		marketIndexes: number[]
 	): Promise<TransactionSignature> {
+		const ixs = await this.getSettlePNLsIxs(users, marketIndexes);
+		const tx = new Transaction()
+			.add(
+				ComputeBudgetProgram.setComputeUnitLimit({
+					units: 1_000_000,
+				})
+			)
+			.add(...ixs);
+
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+		return txSig;
+	}
+
+	public async getSettlePNLsIxs(
+		users: {
+			settleeUserAccountPublicKey: PublicKey;
+			settleeUserAccount: UserAccount;
+		}[],
+		marketIndexes: number[]
+	): Promise<Array<TransactionInstruction>> {
 		const ixs = [];
 		for (const { settleeUserAccountPublicKey, settleeUserAccount } of users) {
 			for (const marketIndex of marketIndexes) {
@@ -4322,16 +4342,7 @@ export class DriftClient {
 			}
 		}
 
-		const tx = new Transaction()
-			.add(
-				ComputeBudgetProgram.setComputeUnitLimit({
-					units: 1_000_000,
-				})
-			)
-			.add(...ixs);
-
-		const { txSig } = await this.sendTransaction(tx, [], this.opts);
-		return txSig;
+		return ixs;
 	}
 
 	public async settlePNL(

package/src/idl/drift.json

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

package/src/index.ts

@@ -5,7 +5,6 @@ import pyth from '@pythnetwork/client';
 export * from './tokenFaucet';
 export * from './oracles/types';
 export * from './oracles/pythClient';
-// export * from './oracles/switchboardClient';
 export * from './types';
 export * from './constants/perpMarkets';
 export * from './accounts/fetch';
@@ -59,6 +58,7 @@ export * from './serum/serumFulfillmentConfigMap';
 export * from './phoenix/phoenixSubscriber';
 export * from './phoenix/phoenixFulfillmentConfigMap';
 export * from './tx/retryTxSender';
+export * from './tx/types';
 export * from './util/computeUnits';
 export * from './util/tps';
 export * from './util/promiseTimeout';
@@ -77,5 +77,8 @@ export * from './userMap/userMap';
 export * from './userMap/userStatsMap';
 export * from './math/bankruptcy';
 export * from './orderSubscriber';
+export * from './orderSubscriber/types';
+export * from './auctionSubscriber';
+export * from './auctionSubscriber/types';
 
 export { BN, PublicKey, pyth };

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;