@drift-labs/sdk 2.32.1-beta.8 → 2.33.0

package/VERSION

@@ -1 +1 @@
-2.32.1-beta.8
+2.32.1-beta.13

package/lib/constants/perpMarkets.js

@@ -111,7 +111,7 @@ exports.DevnetPerpMarkets = [
         baseAssetSymbol: '1MPEPE',
         marketIndex: 10,
         oracle: new web3_js_1.PublicKey('Gz9RfgDeAFSsH7BHDGyNTgCik74rjNwsodJpsCizzmkj'),
-        launchTs: 1683125906000,
+        launchTs: 1683781239000,
         oracleSource: __1.OracleSource.PYTH_1M,
     },
     {
@@ -121,7 +121,7 @@ exports.DevnetPerpMarkets = [
         baseAssetSymbol: 'OP',
         marketIndex: 11,
         oracle: new web3_js_1.PublicKey('8ctSiDhA7eJoii4TkKV8Rx4KFdz3ycsA1FXy9wq56quG'),
-        launchTs: 1683125906000,
+        launchTs: 1686091480000,
         oracleSource: __1.OracleSource.PYTH,
     },
     {
@@ -131,7 +131,7 @@ exports.DevnetPerpMarkets = [
         baseAssetSymbol: 'RNDR',
         marketIndex: 12,
         oracle: new web3_js_1.PublicKey('C2QvUPBiU3fViSyqA4nZgGyYqLgYf9PRpd8B8oLoo48w'),
-        launchTs: 1683125906000,
+        launchTs: 1687201081000,
         oracleSource: __1.OracleSource.PYTH,
     },
 ];
@@ -243,7 +243,7 @@ exports.MainnetPerpMarkets = [
         baseAssetSymbol: '1MPEPE',
         marketIndex: 10,
         oracle: new web3_js_1.PublicKey('FSfxunDmjjbDV2QxpyxFCAPKmYJHSLnLuvQXDLkMzLBm'),
-        launchTs: 1683125906000,
+        launchTs: 1683781239000,
         oracleSource: __1.OracleSource.PYTH_1M,
     },
     {
@@ -253,7 +253,7 @@ exports.MainnetPerpMarkets = [
         baseAssetSymbol: 'OP',
         marketIndex: 11,
         oracle: new web3_js_1.PublicKey('4o4CUwzFwLqCvmA5x1G4VzoZkAhAcbiuiYyjWX1CVbY2'),
-        launchTs: 1683125906000,
+        launchTs: 1686091480000,
         oracleSource: __1.OracleSource.PYTH,
     },
     {
@@ -263,7 +263,7 @@ exports.MainnetPerpMarkets = [
         baseAssetSymbol: 'RNDR',
         marketIndex: 12,
         oracle: new web3_js_1.PublicKey('CYGfrBJB9HgLf9iZyN4aH5HvUAi2htQ4MjPxeXMf4Egn'),
-        launchTs: 1683125906000,
+        launchTs: 1687201081000,
         oracleSource: __1.OracleSource.PYTH,
     },
 ];

package/lib/driftClient.js

@@ -2053,7 +2053,7 @@ class DriftClient {
                 state: await this.getStatePublicKey(),
                 user: userAccountPublicKeyToUse,
                 userStats: this.getUserStatsAccountPublicKey(),
-                authority: this.authority,
+                authority: this.wallet.publicKey,
                 outSpotMarketVault: outSpotMarket.vault,
                 inSpotMarketVault: inSpotMarket.vault,
                 inTokenAccount,
@@ -2069,7 +2069,7 @@ class DriftClient {
                 state: await this.getStatePublicKey(),
                 user: userAccountPublicKeyToUse,
                 userStats: this.getUserStatsAccountPublicKey(),
-                authority: this.authority,
+                authority: this.wallet.publicKey,
                 outSpotMarketVault: outSpotMarket.vault,
                 inSpotMarketVault: inSpotMarket.vault,
                 inTokenAccount,

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.32.0",
+    "version": "2.33.0",
     "name": "drift",
     "instructions": [
         {

package/lib/math/superStake.d.ts

@@ -4,12 +4,13 @@ import { DriftClient } from '../driftClient';
 import { BN } from '@coral-xyz/anchor';
 import { User } from '../user';
 import { DepositRecord } from '../types';
-export declare function findBestSuperStakeIxs({ amount, jupiterClient, driftClient, userAccountPublicKey, marinadePrice, }: {
+export declare function findBestSuperStakeIxs({ amount, jupiterClient, driftClient, userAccountPublicKey, marinadePrice, forceMarinade, }: {
     amount: BN;
     jupiterClient: JupiterClient;
     driftClient: DriftClient;
     marinadePrice?: number;
     userAccountPublicKey?: PublicKey;
+    forceMarinade?: boolean;
 }): Promise<{
     ixs: TransactionInstruction[];
     lookupTables: AddressLookupTableAccount[];

package/lib/math/superStake.js

@@ -10,7 +10,7 @@ const anchor_1 = require("@coral-xyz/anchor");
 const types_1 = require("../types");
 const numericConstants_1 = require("../constants/numericConstants");
 const node_fetch_1 = __importDefault(require("node-fetch"));
-async function findBestSuperStakeIxs({ amount, jupiterClient, driftClient, userAccountPublicKey, marinadePrice, }) {
+async function findBestSuperStakeIxs({ amount, jupiterClient, driftClient, userAccountPublicKey, marinadePrice, forceMarinade, }) {
     if (!marinadePrice) {
         const marinadeProgram = (0, marinade_1.getMarinadeFinanceProgram)(driftClient.provider);
         marinadePrice = await (0, marinade_1.getMarinadeMSolPrice)(marinadeProgram);
@@ -31,8 +31,11 @@ async function findBestSuperStakeIxs({ amount, jupiterClient, driftClient, userA
     catch (e) {
         console.error('Error getting jupiter price', e);
     }
-    if (!jupiterPrice || marinadePrice <= jupiterPrice) {
-        const ixs = await driftClient.getStakeForMSOLIx({ amount });
+    if (!jupiterPrice || marinadePrice <= jupiterPrice || forceMarinade) {
+        const ixs = await driftClient.getStakeForMSOLIx({
+            amount,
+            userAccountPublicKey,
+        });
         return {
             method: 'marinade',
             ixs,

package/lib/types.d.ts

@@ -725,6 +725,8 @@ export type SpotMarketAccount = {
     nextDepositRecordId: BN;
     orderStepSize: BN;
     orderTickSize: BN;
+    minOrderSize: BN;
+    maxPositionSize: BN;
     nextFillRecordId: BN;
     spotFeePool: PoolBalance;
     totalSpotFee: BN;

package/lib/user.js

@@ -1172,7 +1172,8 @@ class User {
                     inSwap = minSwap.add(maxSwap).div(numericConstants_1.TWO);
                 }
                 if (i++ > iterationLimit) {
-                    throw new Error('getMaxSwapAmount iteration limit reached');
+                    console.log('getMaxSwapAmount iteration limit reached');
+                    break;
                 }
             }
         }

package/package.json

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

package/src/assert/assert.js

@@ -0,0 +1,9 @@
+"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/constants/perpMarkets.ts

@@ -121,7 +121,7 @@ export const DevnetPerpMarkets: PerpMarketConfig[] = [
 		baseAssetSymbol: '1MPEPE',
 		marketIndex: 10,
 		oracle: new PublicKey('Gz9RfgDeAFSsH7BHDGyNTgCik74rjNwsodJpsCizzmkj'),
-		launchTs: 1683125906000,
+		launchTs: 1683781239000,
 		oracleSource: OracleSource.PYTH_1M,
 	},
 	{
@@ -131,7 +131,7 @@ export const DevnetPerpMarkets: PerpMarketConfig[] = [
 		baseAssetSymbol: 'OP',
 		marketIndex: 11,
 		oracle: new PublicKey('8ctSiDhA7eJoii4TkKV8Rx4KFdz3ycsA1FXy9wq56quG'),
-		launchTs: 1683125906000,
+		launchTs: 1686091480000,
 		oracleSource: OracleSource.PYTH,
 	},
 	{
@@ -141,7 +141,7 @@ export const DevnetPerpMarkets: PerpMarketConfig[] = [
 		baseAssetSymbol: 'RNDR',
 		marketIndex: 12,
 		oracle: new PublicKey('C2QvUPBiU3fViSyqA4nZgGyYqLgYf9PRpd8B8oLoo48w'),
-		launchTs: 1683125906000,
+		launchTs: 1687201081000,
 		oracleSource: OracleSource.PYTH,
 	},
 ];
@@ -254,7 +254,7 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		baseAssetSymbol: '1MPEPE',
 		marketIndex: 10,
 		oracle: new PublicKey('FSfxunDmjjbDV2QxpyxFCAPKmYJHSLnLuvQXDLkMzLBm'),
-		launchTs: 1683125906000,
+		launchTs: 1683781239000,
 		oracleSource: OracleSource.PYTH_1M,
 	},
 	{
@@ -264,7 +264,7 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		baseAssetSymbol: 'OP',
 		marketIndex: 11,
 		oracle: new PublicKey('4o4CUwzFwLqCvmA5x1G4VzoZkAhAcbiuiYyjWX1CVbY2'),
-		launchTs: 1683125906000,
+		launchTs: 1686091480000,
 		oracleSource: OracleSource.PYTH,
 	},
 	{
@@ -274,7 +274,7 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		baseAssetSymbol: 'RNDR',
 		marketIndex: 12,
 		oracle: new PublicKey('CYGfrBJB9HgLf9iZyN4aH5HvUAi2htQ4MjPxeXMf4Egn'),
-		launchTs: 1683125906000,
+		launchTs: 1687201081000,
 		oracleSource: OracleSource.PYTH,
 	},
 ];

package/src/driftClient.ts

@@ -3594,7 +3594,7 @@ export class DriftClient {
 					state: await this.getStatePublicKey(),
 					user: userAccountPublicKeyToUse,
 					userStats: this.getUserStatsAccountPublicKey(),
-					authority: this.authority,
+					authority: this.wallet.publicKey,
 					outSpotMarketVault: outSpotMarket.vault,
 					inSpotMarketVault: inSpotMarket.vault,
 					inTokenAccount,
@@ -3617,7 +3617,7 @@ export class DriftClient {
 					state: await this.getStatePublicKey(),
 					user: userAccountPublicKeyToUse,
 					userStats: this.getUserStatsAccountPublicKey(),
-					authority: this.authority,
+					authority: this.wallet.publicKey,
 					outSpotMarketVault: outSpotMarket.vault,
 					inSpotMarketVault: inSpotMarket.vault,
 					inTokenAccount,

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.32.0",
+  "version": "2.33.0",
   "name": "drift",
   "instructions": [
     {

package/src/math/superStake.ts

@@ -19,12 +19,14 @@ export async function findBestSuperStakeIxs({
 	driftClient,
 	userAccountPublicKey,
 	marinadePrice,
+	forceMarinade,
 }: {
 	amount: BN;
 	jupiterClient: JupiterClient;
 	driftClient: DriftClient;
 	marinadePrice?: number;
 	userAccountPublicKey?: PublicKey;
+	forceMarinade?: boolean;
 }): Promise<{
 	ixs: TransactionInstruction[];
 	lookupTables: AddressLookupTableAccount[];
@@ -54,8 +56,11 @@ export async function findBestSuperStakeIxs({
 		console.error('Error getting jupiter price', e);
 	}
 
-	if (!jupiterPrice || marinadePrice <= jupiterPrice) {
-		const ixs = await driftClient.getStakeForMSOLIx({ amount });
+	if (!jupiterPrice || marinadePrice <= jupiterPrice || forceMarinade) {
+		const ixs = await driftClient.getStakeForMSOLIx({
+			amount,
+			userAccountPublicKey,
+		});
 		return {
 			method: 'marinade',
 			ixs,

package/src/token/index.js

@@ -0,0 +1,38 @@
+"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/types.ts

@@ -660,6 +660,8 @@ export type SpotMarketAccount = {
 
 	orderStepSize: BN;
 	orderTickSize: BN;
+	minOrderSize: BN;
+	maxPositionSize: BN;
 	nextFillRecordId: BN;
 	spotFeePool: PoolBalance;
 	totalSpotFee: BN;

package/src/user.ts

@@ -2106,7 +2106,8 @@ export class User {
 				}
 
 				if (i++ > iterationLimit) {
-					throw new Error('getMaxSwapAmount iteration limit reached');
+					console.log('getMaxSwapAmount iteration limit reached');
+					break;
 				}
 			}
 		}

package/src/util/computeUnits.js

@@ -0,0 +1,27 @@
+"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

@@ -0,0 +1,14 @@
+"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

@@ -0,0 +1,27 @@
+"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;

package/tests/dlob/helpers.ts

@@ -261,6 +261,8 @@ export const mockSpotMarkets: Array<SpotMarketAccount> = [
 		pubkey: PublicKey.default,
 		mint: DevnetSpotMarkets[0].mint,
 		vault: PublicKey.default,
+		minOrderSize: ZERO,
+		maxPositionSize: ZERO,
 		revenuePool: {
 			scaledBalance: new BN(0),
 			marketIndex: 0,
@@ -343,6 +345,8 @@ export const mockSpotMarkets: Array<SpotMarketAccount> = [
 			scaledBalance: new BN(0),
 			marketIndex: 0,
 		},
+		minOrderSize: ZERO,
+		maxPositionSize: ZERO,
 		insuranceFund: {
 			vault: PublicKey.default,
 			totalShares: new BN(0),
@@ -421,6 +425,8 @@ export const mockSpotMarkets: Array<SpotMarketAccount> = [
 			scaledBalance: new BN(0),
 			marketIndex: 0,
 		},
+		minOrderSize: ZERO,
+		maxPositionSize: ZERO,
 		insuranceFund: {
 			vault: PublicKey.default,
 			totalShares: new BN(0),