@drift-labs/sdk 2.28.0-beta.3 → 2.28.0-beta.5

package/lib/math/spotMarket.d.ts

@@ -1,4 +1,4 @@
 import { BN } from '@coral-xyz/anchor';
 import { MarginCategory, SpotBalanceType, SpotMarketAccount } from '../types';
-export declare function castNumberToSpotPrecision(value: number, spotMarket: SpotMarketAccount): BN;
+export declare function castNumberToSpotPrecision(value: number | BN, spotMarket: SpotMarketAccount): BN;
 export declare function calculateSpotMarketMarginRatio(market: SpotMarketAccount, marginCategory: MarginCategory, size: BN, balanceType: SpotBalanceType): number;

package/lib/math/spotMarket.js

@@ -6,7 +6,12 @@ const types_1 = require("../types");
 const spotBalance_1 = require("./spotBalance");
 const numericConstants_1 = require("../constants/numericConstants");
 function castNumberToSpotPrecision(value, spotMarket) {
-    return new anchor_1.BN(value * Math.pow(10, spotMarket.decimals));
+    if (typeof value === 'number') {
+        return new anchor_1.BN(value * Math.pow(10, spotMarket.decimals));
+    }
+    else {
+        return value.mul(new anchor_1.BN(Math.pow(10, spotMarket.decimals)));
+    }
 }
 exports.castNumberToSpotPrecision = castNumberToSpotPrecision;
 function calculateSpotMarketMarginRatio(market, marginCategory, size, balanceType) {

package/lib/math/utils.d.ts

@@ -2,3 +2,12 @@ import { BN } from '../';
 export declare function clampBN(x: BN, min: BN, max: BN): BN;
 export declare const squareRootBN: (n: BN) => BN;
 export declare const divCeil: (a: BN, b: BN) => BN;
+/**
+ * calculates the time remaining until the next update based on a rounded, "on-the-hour" update schedule
+ * this schedule is used for Perpetual Funding Rate and Revenue -> Insurance Updates
+ * @param now: current blockchain unix timestamp
+ * @param lastUpdateTs: the unix timestamp of the last update
+ * @param updatePeriod: desired interval between updates (in seconds)
+ * @returns: timeRemainingUntilUpdate (in seconds)
+ */
+export declare function timeRemainingUntilUpdate(now: BN, lastUpdateTs: BN, updatePeriod: BN): BN;

package/lib/math/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.divCeil = exports.squareRootBN = exports.clampBN = void 0;
+exports.timeRemainingUntilUpdate = exports.divCeil = exports.squareRootBN = exports.clampBN = void 0;
 const __1 = require("../");
 function clampBN(x, min, max) {
     return __1.BN.max(min, __1.BN.min(x, max));
@@ -34,3 +34,41 @@ const divCeil = (a, b) => {
     }
 };
 exports.divCeil = divCeil;
+/**
+ * calculates the time remaining until the next update based on a rounded, "on-the-hour" update schedule
+ * this schedule is used for Perpetual Funding Rate and Revenue -> Insurance Updates
+ * @param now: current blockchain unix timestamp
+ * @param lastUpdateTs: the unix timestamp of the last update
+ * @param updatePeriod: desired interval between updates (in seconds)
+ * @returns: timeRemainingUntilUpdate (in seconds)
+ */
+function timeRemainingUntilUpdate(now, lastUpdateTs, updatePeriod) {
+    const timeSinceLastUpdate = now.sub(lastUpdateTs);
+    // round next update time to be available on the hour
+    let nextUpdateWait = updatePeriod;
+    if (updatePeriod.gt(new __1.BN(1))) {
+        const lastUpdateDelay = lastUpdateTs.umod(updatePeriod);
+        if (!lastUpdateDelay.isZero()) {
+            const maxDelayForNextPeriod = updatePeriod.div(new __1.BN(3));
+            const twoFundingPeriods = updatePeriod.mul(new __1.BN(2));
+            if (lastUpdateDelay.gt(maxDelayForNextPeriod)) {
+                // too late for on the hour next period, delay to following period
+                nextUpdateWait = twoFundingPeriods.sub(lastUpdateDelay);
+            }
+            else {
+                // allow update on the hour
+                nextUpdateWait = updatePeriod.sub(lastUpdateDelay);
+            }
+            if (nextUpdateWait.gt(twoFundingPeriods)) {
+                nextUpdateWait = nextUpdateWait.sub(updatePeriod);
+            }
+        }
+    }
+    const timeRemainingUntilUpdate = nextUpdateWait
+        .sub(timeSinceLastUpdate)
+        .isNeg()
+        ? __1.ZERO
+        : nextUpdateWait.sub(timeSinceLastUpdate);
+    return timeRemainingUntilUpdate;
+}
+exports.timeRemainingUntilUpdate = timeRemainingUntilUpdate;

package/lib/phoenix/phoenixSubscriber.js

@@ -99,8 +99,7 @@ class PhoenixSubscriber {
         return this.getL2Levels('asks');
     }
     *getL2Levels(side) {
-        // @ts-ignore
-        const basePrecision = Math.pow(10, this.market.header.baseParams.decimals);
+        const basePrecision = Math.pow(10, this.market.data.header.baseParams.decimals);
         const pricePrecision = numericConstants_1.PRICE_PRECISION.toNumber();
         const ladder = (0, phoenix_sdk_1.getMarketUiLadder)(this.market, this.lastSlot, this.lastUnixTimestamp, 20);
         for (let i = 0; i < ladder[side].length; i++) {

package/lib/tx/retryTxSender.d.ts

@@ -14,7 +14,7 @@ export declare class RetryTxSender implements TxSender {
     send(tx: Transaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): Promise<TxSigAndSlot>;
     prepareTx(tx: Transaction, additionalSigners: Array<Signer>, opts: ConfirmOptions): Promise<Transaction>;
     getVersionedTransaction(ixs: TransactionInstruction[], lookupTableAccounts: AddressLookupTableAccount[], additionalSigners?: Array<Signer>, opts?: ConfirmOptions): Promise<VersionedTransaction>;
-    sendVersionedTransaction(ixs: TransactionInstruction[], lookupTableAccounts: AddressLookupTableAccount[], additionalSigners?: Array<Signer>, opts?: ConfirmOptions): Promise<TxSigAndSlot>;
+    sendVersionedTransaction(tx: VersionedTransaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions): Promise<TxSigAndSlot>;
     sendRawTransaction(rawTransaction: Buffer | Uint8Array, opts: ConfirmOptions): Promise<TxSigAndSlot>;
     confirmTransaction(signature: TransactionSignature, commitment?: Commitment): Promise<RpcResponseAndContext<SignatureResult>>;
     getTimestamp(): number;

package/lib/tx/retryTxSender.js

@@ -54,8 +54,7 @@ class RetryTxSender {
         const tx = new web3_js_1.VersionedTransaction(message);
         return tx;
     }
-    async sendVersionedTransaction(ixs, lookupTableAccounts, additionalSigners, opts) {
-        const tx = await this.getVersionedTransaction(ixs, lookupTableAccounts, additionalSigners, opts);
+    async sendVersionedTransaction(tx, additionalSigners, opts) {
         // @ts-ignore
         tx.sign(additionalSigners.concat(this.provider.wallet.payer));
         return this.sendRawTransaction(tx.serialize(), opts);

package/lib/tx/types.d.ts

@@ -8,7 +8,7 @@ export type TxSigAndSlot = {
 export interface TxSender {
     provider: Provider;
     send(tx: Transaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): Promise<TxSigAndSlot>;
-    sendVersionedTransaction(ixs: TransactionInstruction[], lookupTableAccounts: AddressLookupTableAccount[], additionalSigners?: Array<Signer>, opts?: ConfirmOptions): Promise<TxSigAndSlot>;
+    sendVersionedTransaction(tx: VersionedTransaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions): Promise<TxSigAndSlot>;
     getVersionedTransaction(ixs: TransactionInstruction[], lookupTableAccounts: AddressLookupTableAccount[], additionalSigners?: Array<Signer>, opts?: ConfirmOptions): Promise<VersionedTransaction>;
     sendRawTransaction(rawTransaction: Buffer | Uint8Array, opts: ConfirmOptions): Promise<TxSigAndSlot>;
 }

package/lib/types.d.ts

@@ -904,7 +904,6 @@ export type OrderParams = {
     immediateOrCancel: boolean;
     triggerPrice: BN | null;
     triggerCondition: OrderTriggerCondition;
-    positionLimit: BN;
     oraclePriceOffset: number | null;
     auctionDuration: number | null;
     maxTs: BN | null;

package/lib/types.js

@@ -255,7 +255,6 @@ exports.DefaultOrderParams = {
     immediateOrCancel: false,
     triggerPrice: null,
     triggerCondition: OrderTriggerCondition.ABOVE,
-    positionLimit: _1.ZERO,
     oraclePriceOffset: null,
     auctionDuration: null,
     maxTs: null,

package/lib/user.d.ts

@@ -42,6 +42,13 @@ export declare class User {
      * @returns userSpotPosition
      */
     getSpotPosition(marketIndex: number): SpotPosition | undefined;
+    /**
+     * Returns the token amount for a given market. The spot market precision is based on the token mint decimals.
+     * Positive if it is a deposit, negative if it is a borrow.
+     *
+     * @param marketIndex
+     */
+    getTokenAmount(marketIndex: number): BN;
     getEmptyPosition(marketIndex: number): PerpPosition;
     getClonedPosition(position: PerpPosition): PerpPosition;
     /**
@@ -54,6 +61,7 @@ export declare class User {
      * @returns Order
      */
     getOrderByUserOrderId(userOrderId: number): Order | undefined;
+    getOpenOrders(): Order[];
     getUserAccountPublicKey(): PublicKey;
     exists(): Promise<boolean>;
     /**

package/lib/user.js

@@ -76,6 +76,20 @@ class User {
     getSpotPosition(marketIndex) {
         return this.getUserAccount().spotPositions.find((position) => position.marketIndex === marketIndex);
     }
+    /**
+     * Returns the token amount for a given market. The spot market precision is based on the token mint decimals.
+     * Positive if it is a deposit, negative if it is a borrow.
+     *
+     * @param marketIndex
+     */
+    getTokenAmount(marketIndex) {
+        const spotPosition = this.getSpotPosition(marketIndex);
+        if (spotPosition === undefined) {
+            return numericConstants_1.ZERO;
+        }
+        const spotMarket = this.driftClient.getSpotMarketAccount(marketIndex);
+        return (0, _1.getSignedTokenAmount)((0, spotBalance_1.getTokenAmount)(spotPosition.scaledBalance, spotMarket, spotPosition.balanceType), spotPosition.balanceType);
+    }
     getEmptyPosition(marketIndex) {
         return {
             baseAssetAmount: numericConstants_1.ZERO,
@@ -112,6 +126,10 @@ class User {
     getOrderByUserOrderId(userOrderId) {
         return this.getUserAccount().orders.find((order) => order.userOrderId === userOrderId);
     }
+    getOpenOrders() {
+        var _a;
+        return (_a = this.getUserAccount()) === null || _a === void 0 ? void 0 : _a.orders.filter((order) => (0, types_1.isVariant)(order.status, 'open'));
+    }
     getUserAccountPublicKey() {
         return this.userAccountPublicKey;
     }

package/package.json

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

package/src/config.ts

@@ -27,11 +27,13 @@ type DriftConfig = {
 
 export type DriftEnv = 'devnet' | 'mainnet-beta';
 
+export const DRIFT_PROGRAM_ID = 'dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH';
+
 export const configs: { [key in DriftEnv]: DriftConfig } = {
 	devnet: {
 		ENV: 'devnet',
 		PYTH_ORACLE_MAPPING_ADDRESS: 'BmA9Z6FjioHJPpjT39QazZyhDRUdZy2ezwx4GiDdE2u2',
-		DRIFT_PROGRAM_ID: 'dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH',
+		DRIFT_PROGRAM_ID,
 		USDC_MINT_ADDRESS: '8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2',
 		SERUM_V3: 'DESVgJVGajEgKGXhb6XmqDHGz3VjdgP7rEVESBgxmroY',
 		PHOENIX: 'PhoeNiXZ8ByJGLkxNfZRnkUfjvmuYqLR89jjFHGqdXY',
@@ -44,7 +46,7 @@ export const configs: { [key in DriftEnv]: DriftConfig } = {
 	'mainnet-beta': {
 		ENV: 'mainnet-beta',
 		PYTH_ORACLE_MAPPING_ADDRESS: 'AHtgzX45WTKfkPG53L6WYhGEXwQkN1BVknET3sVsLL8J',
-		DRIFT_PROGRAM_ID: 'dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH',
+		DRIFT_PROGRAM_ID,
 		USDC_MINT_ADDRESS: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
 		SERUM_V3: 'srmqPvymJeFKQ4zGQed1GFppgkRHL9kaELCbyksJtPX',
 		PHOENIX: 'PhoeNiXZ8ByJGLkxNfZRnkUfjvmuYqLR89jjFHGqdXY',

package/src/constants/perpMarkets.ts

@@ -114,6 +114,16 @@ export const DevnetPerpMarkets: PerpMarketConfig[] = [
 		launchTs: 1683125906000,
 		oracleSource: OracleSource.PYTH,
 	},
+	{
+		fullName: 'Pepe',
+		category: ['Meme'],
+		symbol: '1MPEPE-PERP',
+		baseAssetSymbol: '1MPEPE',
+		marketIndex: 10,
+		oracle: new PublicKey('Gz9RfgDeAFSsH7BHDGyNTgCik74rjNwsodJpsCizzmkj'),
+		launchTs: 1683125906000,
+		oracleSource: OracleSource.PYTH_1M,
+	},
 ];
 
 export const MainnetPerpMarkets: PerpMarketConfig[] = [
@@ -217,6 +227,16 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		launchTs: 1683125906000,
 		oracleSource: OracleSource.PYTH,
 	},
+	{
+		fullName: 'Pepe',
+		category: ['Meme'],
+		symbol: '1MPEPE-PERP',
+		baseAssetSymbol: '1MPEPE',
+		marketIndex: 10,
+		oracle: new PublicKey('FSfxunDmjjbDV2QxpyxFCAPKmYJHSLnLuvQXDLkMzLBm'),
+		launchTs: 1683125906000,
+		oracleSource: OracleSource.PYTH_1M,
+	},
 ];
 
 export const PerpMarkets: { [key in DriftEnv]: PerpMarketConfig[] } = {

package/src/dlob/DLOBSubscriber.ts

@@ -107,8 +107,8 @@ export class DLOBSubscriber {
 		if (isPerp) {
 			const perpMarketAccount =
 				this.driftClient.getPerpMarketAccount(marketIndex);
-			oraclePriceData = this.driftClient.getOraclePriceDataAndSlot(
-				perpMarketAccount.amm.oracle
+			oraclePriceData = this.driftClient.getOracleDataForPerpMarket(
+				perpMarketAccount.marketIndex
 			);
 			fallbackBid = calculateBidPrice(perpMarketAccount, oraclePriceData);
 			fallbackAsk = calculateAskPrice(perpMarketAccount, oraclePriceData);