@drift-labs/sdk 2.22.0 → 2.23.0-beta.1

package/lib/user.js

@@ -268,7 +268,7 @@ class User {
      * @returns The margin requirement of a certain type (Initial or Maintenance) in USDC. : QUOTE_PRECISION
      */
     getMarginRequirement(marginCategory, liquidationBuffer, strict = false) {
-        return this.getTotalPerpPositionValue(marginCategory, liquidationBuffer, true).add(this.getSpotMarketLiabilityValue(undefined, marginCategory, liquidationBuffer, true, strict));
+        return this.getTotalPerpPositionValue(marginCategory, liquidationBuffer, true, strict).add(this.getSpotMarketLiabilityValue(undefined, marginCategory, liquidationBuffer, true, strict));
     }
     /**
      * @returns The initial margin requirement in USDC. : QUOTE_PRECISION
@@ -292,17 +292,31 @@ class User {
      * calculates unrealized position price pnl
      * @returns : Precision QUOTE_PRECISION
      */
-    getUnrealizedPNL(withFunding, marketIndex, withWeightMarginCategory) {
-        const quoteSpotMarket = this.driftClient.getQuoteSpotMarketAccount();
+    getUnrealizedPNL(withFunding, marketIndex, withWeightMarginCategory, strict = false) {
         return this.getActivePerpPositions()
             .filter((pos) => (marketIndex ? pos.marketIndex === marketIndex : true))
             .reduce((unrealizedPnl, perpPosition) => {
             const market = this.driftClient.getPerpMarketAccount(perpPosition.marketIndex);
             const oraclePriceData = this.getOracleDataForPerpMarket(market.marketIndex);
+            const quoteSpotMarket = this.driftClient.getSpotMarketAccount(market.quoteSpotMarketIndex);
+            const quoteOraclePriceData = this.getOracleDataForSpotMarket(market.quoteSpotMarketIndex);
             if (perpPosition.lpShares.gt(numericConstants_1.ZERO)) {
                 perpPosition = this.getSettledLPPosition(perpPosition.marketIndex)[0];
             }
             let positionUnrealizedPnl = (0, _1.calculatePositionPNL)(market, perpPosition, withFunding, oraclePriceData);
+            let quotePrice;
+            if (strict && positionUnrealizedPnl.gt(numericConstants_1.ZERO)) {
+                quotePrice = _1.BN.min(quoteOraclePriceData.price, quoteSpotMarket.historicalOracleData.lastOraclePriceTwap5Min);
+            }
+            else if (strict && positionUnrealizedPnl.lt(numericConstants_1.ZERO)) {
+                quotePrice = _1.BN.max(quoteOraclePriceData.price, quoteSpotMarket.historicalOracleData.lastOraclePriceTwap5Min);
+            }
+            else {
+                quotePrice = quoteOraclePriceData.price;
+            }
+            positionUnrealizedPnl = positionUnrealizedPnl
+                .mul(quotePrice)
+                .div(new _1.BN(numericConstants_1.PRICE_PRECISION));
             if (withWeightMarginCategory !== undefined) {
                 if (positionUnrealizedPnl.gt(numericConstants_1.ZERO)) {
                     positionUnrealizedPnl = positionUnrealizedPnl
@@ -340,31 +354,24 @@ class User {
                 continue;
             }
             const spotMarketAccount = this.driftClient.getSpotMarketAccount(spotPosition.marketIndex);
+            const oraclePriceData = this.getOracleDataForSpotMarket(spotPosition.marketIndex);
             if (spotPosition.marketIndex === numericConstants_1.QUOTE_SPOT_MARKET_INDEX &&
                 countForQuote) {
+                const tokenAmount = (0, _1.getSignedTokenAmount)((0, spotBalance_1.getTokenAmount)(spotPosition.scaledBalance, spotMarketAccount, spotPosition.balanceType), spotPosition.balanceType);
                 if ((0, types_1.isVariant)(spotPosition.balanceType, 'borrow')) {
-                    const tokenAmount = (0, spotBalance_1.getTokenAmount)(spotPosition.scaledBalance, spotMarketAccount, spotPosition.balanceType);
-                    let weight = numericConstants_1.SPOT_MARKET_WEIGHT_PRECISION;
-                    if (marginCategory === 'Initial') {
-                        weight = _1.BN.max(weight, new _1.BN(this.getUserAccount().maxMarginRatio));
-                    }
-                    const weightedTokenValue = tokenAmount
-                        .mul(weight)
-                        .div(numericConstants_1.SPOT_MARKET_WEIGHT_PRECISION);
+                    const weightedTokenValue = this.getSpotLiabilityValue(tokenAmount, oraclePriceData, spotMarketAccount, marginCategory, liquidationBuffer, strict, now).abs();
                     netQuoteValue = netQuoteValue.sub(weightedTokenValue);
-                    continue;
                 }
                 else {
-                    const tokenAmount = (0, spotBalance_1.getTokenAmount)(spotPosition.scaledBalance, spotMarketAccount, spotPosition.balanceType);
-                    netQuoteValue = netQuoteValue.add(tokenAmount);
-                    continue;
+                    const weightedTokenValue = this.getSpotAssetValue(tokenAmount, oraclePriceData, spotMarketAccount, marginCategory, strict, now);
+                    netQuoteValue = netQuoteValue.add(weightedTokenValue);
                 }
+                continue;
             }
-            const oraclePriceData = this.getOracleDataForSpotMarket(spotPosition.marketIndex);
             if (!includeOpenOrders && countForBase) {
                 if ((0, types_1.isVariant)(spotPosition.balanceType, 'borrow')) {
-                    const tokenAmount = (0, spotBalance_1.getTokenAmount)(spotPosition.scaledBalance, spotMarketAccount, spotPosition.balanceType);
-                    const liabilityValue = this.getSpotLiabilityValue(tokenAmount, oraclePriceData, spotMarketAccount, marginCategory, liquidationBuffer, strict, now);
+                    const tokenAmount = (0, _1.getSignedTokenAmount)((0, spotBalance_1.getTokenAmount)(spotPosition.scaledBalance, spotMarketAccount, spotPosition.balanceType), _1.SpotBalanceType.BORROW);
+                    const liabilityValue = this.getSpotLiabilityValue(tokenAmount, oraclePriceData, spotMarketAccount, marginCategory, liquidationBuffer, strict, now).abs();
                     totalLiabilityValue = totalLiabilityValue.add(liabilityValue);
                     continue;
                 }
@@ -381,7 +388,7 @@ class User {
                 totalAssetValue = totalAssetValue.add(baseAssetValue);
             }
             if (worstCaseTokenAmount.lt(numericConstants_1.ZERO) && countForBase) {
-                const baseLiabilityValue = this.getSpotLiabilityValue(worstCaseTokenAmount.abs(), oraclePriceData, spotMarketAccount, marginCategory, liquidationBuffer, strict, now);
+                const baseLiabilityValue = this.getSpotLiabilityValue(worstCaseTokenAmount, oraclePriceData, spotMarketAccount, marginCategory, liquidationBuffer, strict, now).abs();
                 totalLiabilityValue = totalLiabilityValue.add(baseLiabilityValue);
             }
             if (worstCaseQuoteTokenAmount.gt(numericConstants_1.ZERO) && countForQuote) {
@@ -416,7 +423,7 @@ class User {
     }
     getSpotLiabilityValue(tokenAmount, oraclePriceData, spotMarketAccount, marginCategory, liquidationBuffer, strict = false, now) {
         let liabilityValue = null;
-        if (strict && spotMarketAccount.marketIndex != numericConstants_1.QUOTE_SPOT_MARKET_INDEX) {
+        if (strict) {
             const estOracleTwap = (0, oracles_1.calculateLiveOracleTwap)(spotMarketAccount.historicalOracleData, oraclePriceData, now, numericConstants_1.FIVE_MINUTE // 5MIN
             );
             liabilityValue = (0, _1.getStrictTokenValue)(tokenAmount, spotMarketAccount.decimals, oraclePriceData, estOracleTwap);
@@ -444,7 +451,7 @@ class User {
     }
     getSpotAssetValue(tokenAmount, oraclePriceData, spotMarketAccount, marginCategory, strict = false, now) {
         let assetValue = null;
-        if (strict && spotMarketAccount.marketIndex != numericConstants_1.QUOTE_SPOT_MARKET_INDEX) {
+        if (strict) {
             const estOracleTwap = (0, oracles_1.calculateLiveOracleTwap)(spotMarketAccount.historicalOracleData, oraclePriceData, now, numericConstants_1.FIVE_MINUTE // 5MIN
             );
             assetValue = (0, _1.getStrictTokenValue)(tokenAmount, spotMarketAccount.decimals, oraclePriceData, estOracleTwap);
@@ -474,8 +481,8 @@ class User {
      * calculates TotalCollateral: collateral + unrealized pnl
      * @returns : Precision QUOTE_PRECISION
      */
-    getTotalCollateral(marginCategory = 'Initial') {
-        return this.getSpotMarketAssetValue(undefined, marginCategory, true).add(this.getUnrealizedPNL(true, undefined, marginCategory));
+    getTotalCollateral(marginCategory = 'Initial', strict = false) {
+        return this.getSpotMarketAssetValue(undefined, marginCategory, true, strict).add(this.getUnrealizedPNL(true, undefined, marginCategory, strict));
     }
     /**
      * calculates User Health by comparing total collateral and maint. margin requirement
@@ -513,7 +520,7 @@ class User {
      * calculates sum of position value across all positions in margin system
      * @returns : Precision QUOTE_PRECISION
      */
-    getTotalPerpPositionValue(marginCategory, liquidationBuffer, includeOpenOrders) {
+    getTotalPerpPositionValue(marginCategory, liquidationBuffer, includeOpenOrders, strict = false) {
         return this.getActivePerpPositions().reduce((totalPerpValue, perpPosition) => {
             const market = this.driftClient.getPerpMarketAccount(perpPosition.marketIndex);
             if (perpPosition.lpShares.gt(numericConstants_1.ZERO)) {
@@ -551,7 +558,18 @@ class User {
                 if ((0, types_1.isVariant)(market.status, 'settlement')) {
                     marginRatio = numericConstants_1.ZERO;
                 }
+                const quoteSpotMarket = this.driftClient.getSpotMarketAccount(market.quoteSpotMarketIndex);
+                const quoteOraclePriceData = this.driftClient.getOraclePriceDataAndSlot(quoteSpotMarket.oracle).data;
+                let quotePrice;
+                if (strict) {
+                    quotePrice = _1.BN.max(quoteOraclePriceData.price, quoteSpotMarket.historicalOracleData.lastOraclePriceTwap5Min);
+                }
+                else {
+                    quotePrice = quoteOraclePriceData.price;
+                }
                 baseAssetValue = baseAssetValue
+                    .mul(quotePrice)
+                    .div(numericConstants_1.PRICE_PRECISION)
                     .mul(marginRatio)
                     .div(numericConstants_1.MARGIN_PRECISION);
                 if (includeOpenOrders) {
@@ -1218,7 +1236,8 @@ class User {
             return false;
         }
         const userLastActiveSlot = userAccount.lastActiveSlot;
-        if (userLastActiveSlot.lt(slotsBeforeIdle)) {
+        const slotsSinceLastActive = slot.sub(userLastActiveSlot);
+        if (slotsSinceLastActive.lt(slotsBeforeIdle)) {
             return false;
         }
         if (this.isBeingLiquidated()) {

package/package.json

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

package/src/constants/spotMarkets.ts

@@ -27,8 +27,8 @@ export const DevnetSpotMarkets: SpotMarketConfig[] = [
 	{
 		symbol: 'USDC',
 		marketIndex: 0,
-		oracle: PublicKey.default,
-		oracleSource: OracleSource.QUOTE_ASSET,
+		oracle: new PublicKey('5SSkXsEKQepHHAewytPVwdej4epN1nxgLVM84L4KXgy7'),
+		oracleSource: OracleSource.PYTH_STABLE_COIN,
 		mint: new PublicKey('8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2'),
 		precision: new BN(10).pow(SIX),
 		precisionExp: SIX,
@@ -59,8 +59,8 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 	{
 		symbol: 'USDC',
 		marketIndex: 0,
-		oracle: PublicKey.default,
-		oracleSource: OracleSource.QUOTE_ASSET,
+		oracle: new PublicKey('Gnt27xtC473ZT2Mw5u8wZ68Z3gULkSTb5DuxJy7eJotD'),
+		oracleSource: OracleSource.PYTH_STABLE_COIN,
 		mint: new PublicKey('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v'),
 		precision: QUOTE_PRECISION,
 		precisionExp: QUOTE_PRECISION_EXP,

package/src/driftClient.ts

@@ -37,6 +37,7 @@ import {
 	PostOnlyParams,
 	SpotBalanceType,
 	PerpMarketExtendedInfo,
+	UserStatsAccount,
 } from './types';
 import * as anchor from '@project-serum/anchor';
 import driftIDL from './idl/drift.json';
@@ -417,6 +418,7 @@ export class DriftClient {
 			throw Error('Market lookup table address not set');
 		}
 
+		// @ts-ignore
 		return (await this.connection.getAddressLookupTable(this.marketLookupTable))
 			.value;
 	}
@@ -776,6 +778,24 @@ export class DriftClient {
 		);
 	}
 
+	public async getReferredUserStatsAccountsByReferrer(
+		referrer: PublicKey
+	): Promise<UserStatsAccount[]> {
+		const programAccounts = await this.program.account.userStats.all([
+			{
+				memcmp: {
+					offset: 40,
+					/** data to match, as base-58 encoded string and limited to less than 129 bytes */
+					bytes: bs58.encode(referrer.toBuffer()),
+				},
+			},
+		]);
+
+		return programAccounts.map(
+			(programAccount) => programAccount.account as UserStatsAccount
+		);
+	}
+
 	public async getReferrerNameAccountsForAuthority(
 		authority: PublicKey
 	): Promise<ReferrerNameAccount[]> {
@@ -934,17 +954,32 @@ export class DriftClient {
 				// if cache has more recent slot than user positions account slot, add market to remaining accounts
 				// otherwise remove from slot
 				if (slot > lastUserSlot) {
-					const marketAccount = this.getPerpMarketAccount(marketIndex);
+					const perpMarketAccount = this.getPerpMarketAccount(marketIndex);
 					perpMarketAccountMap.set(marketIndex, {
-						pubkey: marketAccount.pubkey,
+						pubkey: perpMarketAccount.pubkey,
+						isSigner: false,
+						isWritable: false,
+					});
+					oracleAccountMap.set(perpMarketAccount.amm.oracle.toString(), {
+						pubkey: perpMarketAccount.amm.oracle,
 						isSigner: false,
 						isWritable: false,
 					});
-					oracleAccountMap.set(marketAccount.amm.oracle.toString(), {
-						pubkey: marketAccount.amm.oracle,
+					const spotMarketAccount = this.getSpotMarketAccount(
+						perpMarketAccount.quoteSpotMarketIndex
+					);
+					spotMarketAccountMap.set(perpMarketAccount.quoteSpotMarketIndex, {
+						pubkey: spotMarketAccount.pubkey,
 						isSigner: false,
 						isWritable: false,
 					});
+					if (!spotMarketAccount.oracle.equals(PublicKey.default)) {
+						oracleAccountMap.set(spotMarketAccount.oracle.toString(), {
+							pubkey: spotMarketAccount.oracle,
+							isSigner: false,
+							isWritable: false,
+						});
+					}
 				} else {
 					this.perpMarketLastSlotCache.delete(marketIndex);
 				}
@@ -957,15 +992,15 @@ export class DriftClient {
 				// if cache has more recent slot than user positions account slot, add market to remaining accounts
 				// otherwise remove from slot
 				if (slot > lastUserSlot) {
-					const marketAccount = this.getSpotMarketAccount(marketIndex);
+					const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
 					spotMarketAccountMap.set(marketIndex, {
-						pubkey: marketAccount.pubkey,
+						pubkey: spotMarketAccount.pubkey,
 						isSigner: false,
 						isWritable: false,
 					});
-					if (!marketAccount.oracle.equals(PublicKey.default)) {
-						oracleAccountMap.set(marketAccount.oracle.toString(), {
-							pubkey: marketAccount.oracle,
+					if (!spotMarketAccount.oracle.equals(PublicKey.default)) {
+						oracleAccountMap.set(spotMarketAccount.oracle.toString(), {
+							pubkey: spotMarketAccount.oracle,
 							isSigner: false,
 							isWritable: false,
 						});
@@ -977,50 +1012,80 @@ export class DriftClient {
 		}
 
 		if (params.readablePerpMarketIndex !== undefined) {
-			const marketAccount = this.getPerpMarketAccount(
+			const perpMarketAccount = this.getPerpMarketAccount(
 				params.readablePerpMarketIndex
 			);
 			perpMarketAccountMap.set(params.readablePerpMarketIndex, {
-				pubkey: marketAccount.pubkey,
+				pubkey: perpMarketAccount.pubkey,
+				isSigner: false,
+				isWritable: false,
+			});
+			oracleAccountMap.set(perpMarketAccount.amm.oracle.toString(), {
+				pubkey: perpMarketAccount.amm.oracle,
 				isSigner: false,
 				isWritable: false,
 			});
-			oracleAccountMap.set(marketAccount.amm.oracle.toString(), {
-				pubkey: marketAccount.amm.oracle,
+			const spotMarketAccount = this.getSpotMarketAccount(
+				perpMarketAccount.quoteSpotMarketIndex
+			);
+			spotMarketAccountMap.set(perpMarketAccount.quoteSpotMarketIndex, {
+				pubkey: spotMarketAccount.pubkey,
 				isSigner: false,
 				isWritable: false,
 			});
+			if (!spotMarketAccount.oracle.equals(PublicKey.default)) {
+				oracleAccountMap.set(spotMarketAccount.oracle.toString(), {
+					pubkey: spotMarketAccount.oracle,
+					isSigner: false,
+					isWritable: false,
+				});
+			}
+		}
+
+		if (params.readableSpotMarketIndexes !== undefined) {
+			for (const readableSpotMarketIndex of params.readableSpotMarketIndexes) {
+				const spotMarketAccount = this.getSpotMarketAccount(
+					readableSpotMarketIndex
+				);
+				spotMarketAccountMap.set(readableSpotMarketIndex, {
+					pubkey: spotMarketAccount.pubkey,
+					isSigner: false,
+					isWritable: false,
+				});
+				if (!spotMarketAccount.oracle.equals(PublicKey.default)) {
+					oracleAccountMap.set(spotMarketAccount.oracle.toString(), {
+						pubkey: spotMarketAccount.oracle,
+						isSigner: false,
+						isWritable: false,
+					});
+				}
+			}
 		}
 
 		if (params.writablePerpMarketIndexes !== undefined) {
 			for (const writablePerpMarketIndex of params.writablePerpMarketIndexes) {
-				const marketAccount = this.getPerpMarketAccount(
+				const perpMarketAccount = this.getPerpMarketAccount(
 					writablePerpMarketIndex
 				);
 				perpMarketAccountMap.set(writablePerpMarketIndex, {
-					pubkey: marketAccount.pubkey,
+					pubkey: perpMarketAccount.pubkey,
 					isSigner: false,
 					isWritable: true,
 				});
-				oracleAccountMap.set(marketAccount.amm.oracle.toString(), {
-					pubkey: marketAccount.amm.oracle,
+				oracleAccountMap.set(perpMarketAccount.amm.oracle.toString(), {
+					pubkey: perpMarketAccount.amm.oracle,
 					isSigner: false,
 					isWritable: false,
 				});
-			}
-		}
-
-		if (params.readableSpotMarketIndexes !== undefined) {
-			for (const readableSpotMarketIndex of params.readableSpotMarketIndexes) {
 				const spotMarketAccount = this.getSpotMarketAccount(
-					readableSpotMarketIndex
+					perpMarketAccount.quoteSpotMarketIndex
 				);
-				spotMarketAccountMap.set(readableSpotMarketIndex, {
+				spotMarketAccountMap.set(perpMarketAccount.quoteSpotMarketIndex, {
 					pubkey: spotMarketAccount.pubkey,
 					isSigner: false,
 					isWritable: false,
 				});
-				if (spotMarketAccount.marketIndex !== 0) {
+				if (!spotMarketAccount.oracle.equals(PublicKey.default)) {
 					oracleAccountMap.set(spotMarketAccount.oracle.toString(), {
 						pubkey: spotMarketAccount.oracle,
 						isSigner: false,
@@ -1090,27 +1155,52 @@ export class DriftClient {
 						!spotPosition.openAsks.eq(ZERO) ||
 						!spotPosition.openBids.eq(ZERO)
 					) {
+						const quoteSpotMarket = this.getQuoteSpotMarketAccount();
 						spotMarketAccountMap.set(QUOTE_SPOT_MARKET_INDEX, {
-							pubkey: this.getQuoteSpotMarketAccount().pubkey,
+							pubkey: quoteSpotMarket.pubkey,
 							isSigner: false,
 							isWritable: false,
 						});
+						if (!quoteSpotMarket.oracle.equals(PublicKey.default)) {
+							oracleAccountMap.set(quoteSpotMarket.oracle.toString(), {
+								pubkey: quoteSpotMarket.oracle,
+								isSigner: false,
+								isWritable: false,
+							});
+						}
 					}
 				}
 			}
 			for (const position of userAccount.perpPositions) {
 				if (!positionIsAvailable(position)) {
-					const market = this.getPerpMarketAccount(position.marketIndex);
+					const perpMarketAccount = this.getPerpMarketAccount(
+						position.marketIndex
+					);
 					perpMarketAccountMap.set(position.marketIndex, {
-						pubkey: market.pubkey,
+						pubkey: perpMarketAccount.pubkey,
 						isWritable: false,
 						isSigner: false,
 					});
-					oracleAccountMap.set(market.amm.oracle.toString(), {
-						pubkey: market.amm.oracle,
+					oracleAccountMap.set(perpMarketAccount.amm.oracle.toString(), {
+						pubkey: perpMarketAccount.amm.oracle,
 						isWritable: false,
 						isSigner: false,
 					});
+					const spotMarketAccount = this.getSpotMarketAccount(
+						perpMarketAccount.quoteSpotMarketIndex
+					);
+					spotMarketAccountMap.set(perpMarketAccount.quoteSpotMarketIndex, {
+						pubkey: spotMarketAccount.pubkey,
+						isSigner: false,
+						isWritable: false,
+					});
+					if (!spotMarketAccount.oracle.equals(PublicKey.default)) {
+						oracleAccountMap.set(spotMarketAccount.oracle.toString(), {
+							pubkey: spotMarketAccount.oracle,
+							isSigner: false,
+							isWritable: false,
+						});
+					}
 				}
 			}
 		}
@@ -1143,6 +1233,7 @@ export class DriftClient {
 	): Promise<TransactionSignature> {
 		const tx = new Transaction();
 		tx.add(
+			// @ts-ignore
 			ComputeBudgetProgram.setComputeUnitLimit({
 				units: 600_000,
 			})
@@ -1368,6 +1459,7 @@ export class DriftClient {
 		const tx = new Transaction();
 
 		tx.add(
+			// @ts-ignore
 			ComputeBudgetProgram.setComputeUnitLimit({
 				units: txParams?.computeUnits ?? 600_000,
 			})
@@ -1375,6 +1467,7 @@ export class DriftClient {
 
 		if (txParams?.computeUnitsPrice) {
 			tx.add(
+				// @ts-ignore
 				ComputeBudgetProgram.setComputeUnitPrice({
 					microLamports: txParams.computeUnitsPrice,
 				})
@@ -1505,6 +1598,7 @@ export class DriftClient {
 	): Promise<TransactionSignature> {
 		const tx = new Transaction();
 		tx.add(
+			// @ts-ignore
 			ComputeBudgetProgram.setComputeUnitLimit({
 				units: 600_000,
 			})
@@ -3364,6 +3458,7 @@ export class DriftClient {
 
 		const tx = new Transaction();
 		tx.add(
+			// @ts-ignore
 			ComputeBudgetProgram.setComputeUnitLimit({
 				units: 1_000_000,
 			})
@@ -3475,6 +3570,7 @@ export class DriftClient {
 
 		const tx = new Transaction();
 		tx.add(
+			// @ts-ignore
 			ComputeBudgetProgram.setComputeUnitLimit({
 				units: 1_000_000,
 			})
@@ -3515,6 +3611,7 @@ export class DriftClient {
 
 		const tx = new Transaction()
 			.add(
+				// @ts-ignore
 				ComputeBudgetProgram.setComputeUnitLimit({
 					units: 1_000_000,
 				})

package/src/factory/oracleClient.ts

@@ -22,6 +22,10 @@ export function getOracleClient(
 		return new PythClient(connection, new BN(1000000));
 	}
 
+	if (isVariant(oracleSource, 'pythStableCoin')) {
+		return new PythClient(connection, undefined, true);
+	}
+
 	// if (isVariant(oracleSource, 'switchboard')) {
 	// 	return new SwitchboardClient(connection);
 	// }

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.22.0",
+  "version": "2.23.0-beta.1",
   "name": "drift",
   "instructions": [
     {
@@ -4081,12 +4081,20 @@
               "defined": "ContractTier"
             }
           },
+          {
+            "name": "padding1",
+            "type": "bool"
+          },
+          {
+            "name": "quoteSpotMarketIndex",
+            "type": "u16"
+          },
           {
             "name": "padding",
             "type": {
               "array": [
                 "u8",
-                51
+                48
               ]
             }
           }
@@ -6383,6 +6391,9 @@
           },
           {
             "name": "Pyth1M"
+          },
+          {
+            "name": "PythStableCoin"
           }
         ]
       }

package/src/oracles/pythClient.ts

@@ -2,15 +2,26 @@ import { parsePriceData } from '@pythnetwork/client';
 import { Connection, PublicKey } from '@solana/web3.js';
 import { OracleClient, OraclePriceData } from './types';
 import { BN } from '@project-serum/anchor';
-import { ONE, PRICE_PRECISION, TEN } from '../constants/numericConstants';
+import {
+	ONE,
+	PRICE_PRECISION,
+	QUOTE_PRECISION,
+	TEN,
+} from '../constants/numericConstants';
 
 export class PythClient implements OracleClient {
 	private connection: Connection;
 	private multiple: BN;
+	private stableCoin: boolean;
 
-	public constructor(connection: Connection, multiple = ONE) {
+	public constructor(
+		connection: Connection,
+		multiple = ONE,
+		stableCoin = false
+	) {
 		this.connection = connection;
 		this.multiple = multiple;
+		this.stableCoin = stableCoin;
 	}
 
 	public async getOraclePriceData(
@@ -22,18 +33,24 @@ export class PythClient implements OracleClient {
 
 	public getOraclePriceDataFromBuffer(buffer: Buffer): OraclePriceData {
 		const priceData = parsePriceData(buffer);
+		const confidence = convertPythPrice(
+			priceData.confidence,
+			priceData.exponent,
+			this.multiple
+		);
+		let price = convertPythPrice(
+			priceData.aggregate.price,
+			priceData.exponent,
+			this.multiple
+		);
+		if (this.stableCoin) {
+			price = getStableCoinPrice(price, confidence);
+		}
+
 		return {
-			price: convertPythPrice(
-				priceData.aggregate.price,
-				priceData.exponent,
-				this.multiple
-			),
+			price,
 			slot: new BN(priceData.lastSlot.toString()),
-			confidence: convertPythPrice(
-				priceData.confidence,
-				priceData.exponent,
-				this.multiple
-			),
+			confidence,
 			twap: convertPythPrice(
 				priceData.twap.value,
 				priceData.exponent,
@@ -60,3 +77,12 @@ export function convertPythPrice(
 		.mul(PRICE_PRECISION)
 		.div(pythPrecision);
 }
+
+const fiveBPS = new BN(500);
+function getStableCoinPrice(price: BN, confidence: BN): BN {
+	if (price.sub(QUOTE_PRECISION).abs().lt(BN.min(confidence, fiveBPS))) {
+		return QUOTE_PRECISION;
+	} else {
+		return price;
+	}
+}

package/src/tx/utils.ts

@@ -14,6 +14,7 @@ export function wrapInTx(
 	const tx = new Transaction();
 	if (computeUnits != COMPUTE_UNITS_DEFAULT) {
 		tx.add(
+			// @ts-ignore
 			ComputeBudgetProgram.setComputeUnitLimit({
 				units: computeUnits,
 			})
@@ -22,6 +23,7 @@ export function wrapInTx(
 
 	if (computeUnitsPrice != 0) {
 		tx.add(
+			// @ts-ignore
 			ComputeBudgetProgram.setComputeUnitPrice({
 				microLamports: computeUnitsPrice,
 			})

package/src/types.ts

@@ -80,6 +80,7 @@ export class OracleSource {
 	static readonly PYTH_1M = { pyth1M: {} };
 	// static readonly SWITCHBOARD = { switchboard: {} };
 	static readonly QUOTE_ASSET = { quoteAsset: {} };
+	static readonly PYTH_STABLE_COIN = { pythStableCoin: {} };
 }
 
 export class OrderType {
@@ -560,6 +561,7 @@ export type PerpMarketAccount = {
 		quoteSettledInsurance: BN;
 		quoteMaxInsurance: BN;
 	};
+	quoteSpotMarketIndex: number;
 };
 
 export type HistoricalOracleData = {