@drift-labs/sdk-browser 2.106.0-beta.5 → 2.106.0-beta.7

package/VERSION

@@ -1 +1 @@
-2.106.0-beta.5
+2.106.0-beta.7

package/lib/browser/idl/drift.json

@@ -6111,7 +6111,7 @@
                 {
                     "name": "fuelBoostDeposits",
                     "type": {
-                        "option": "u32"
+                        "option": "i32"
                     }
                 },
                 {

package/lib/browser/math/oracles.d.ts

@@ -3,7 +3,7 @@
 /// <reference types="node" />
 import { AMM, OracleGuardRails } from '../types';
 import { OraclePriceData } from '../oracles/types';
-import { BN, HistoricalOracleData, PerpMarketAccount } from '../index';
+import { BN, HistoricalOracleData, OracleSource, PerpMarketAccount } from '../index';
 export declare function oraclePriceBands(market: PerpMarketAccount, oraclePriceData: OraclePriceData): [BN, BN];
 export declare function getMaxConfidenceIntervalMultiplier(market: PerpMarketAccount): BN;
 export declare function isOracleValid(market: PerpMarketAccount, oraclePriceData: OraclePriceData, oracleGuardRails: OracleGuardRails, slot: number): boolean;
@@ -12,3 +12,7 @@ export declare function calculateLiveOracleTwap(histOracleData: HistoricalOracle
 export declare function calculateLiveOracleStd(amm: AMM, oraclePriceData: OraclePriceData, now: BN): BN;
 export declare function getNewOracleConfPct(amm: AMM, oraclePriceData: OraclePriceData, reservePrice: BN, now: BN): BN;
 export declare function trimVaaSignatures(vaa: Buffer, n?: number): Buffer;
+export declare function getMultipleBetweenOracleSources(firstOracleSource: OracleSource, secondOracleSource: OracleSource): {
+    numerator: BN;
+    denominator: BN;
+};

package/lib/browser/math/oracles.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.trimVaaSignatures = exports.getNewOracleConfPct = exports.calculateLiveOracleStd = exports.calculateLiveOracleTwap = exports.isOracleTooDivergent = exports.isOracleValid = exports.getMaxConfidenceIntervalMultiplier = exports.oraclePriceBands = void 0;
+exports.getMultipleBetweenOracleSources = exports.trimVaaSignatures = exports.getNewOracleConfPct = exports.calculateLiveOracleStd = exports.calculateLiveOracleTwap = exports.isOracleTooDivergent = exports.isOracleValid = exports.getMaxConfidenceIntervalMultiplier = exports.oraclePriceBands = void 0;
 const types_1 = require("../types");
 const numericConstants_1 = require("../constants/numericConstants");
 const index_1 = require("../index");
@@ -132,3 +132,23 @@ function trimVaaSignatures(vaa, n = 3) {
     return trimmedVaa;
 }
 exports.trimVaaSignatures = trimVaaSignatures;
+function getMultipleBetweenOracleSources(firstOracleSource, secondOracleSource) {
+    if ((0, types_1.isVariant)(firstOracleSource, 'pythPull') &&
+        (0, types_1.isVariant)(secondOracleSource, 'pyth1MPull')) {
+        return { numerator: new index_1.BN(1000000), denominator: new index_1.BN(1) };
+    }
+    if ((0, types_1.isVariant)(firstOracleSource, 'pythPull') &&
+        (0, types_1.isVariant)(secondOracleSource, 'pyth1KPull')) {
+        return { numerator: new index_1.BN(1000), denominator: new index_1.BN(1) };
+    }
+    if ((0, types_1.isVariant)(firstOracleSource, 'pyth1MPull') &&
+        (0, types_1.isVariant)(secondOracleSource, 'pythPull')) {
+        return { numerator: new index_1.BN(1), denominator: new index_1.BN(1000000) };
+    }
+    if ((0, types_1.isVariant)(firstOracleSource, 'pyth1KPull') &&
+        (0, types_1.isVariant)(secondOracleSource, 'pythPull')) {
+        return { numerator: new index_1.BN(1), denominator: new index_1.BN(1000) };
+    }
+    return { numerator: new index_1.BN(1), denominator: new index_1.BN(1) };
+}
+exports.getMultipleBetweenOracleSources = getMultipleBetweenOracleSources;

package/lib/browser/user.js

@@ -1174,7 +1174,13 @@ class User {
         if (perpMarketWithSameOracle) {
             const perpPosition = this.getPerpPositionWithLPSettle(perpMarketWithSameOracle.marketIndex, undefined, true)[0];
             if (perpPosition) {
-                const freeCollateralDeltaForPerp = this.calculateFreeCollateralDeltaForPerp(perpMarketWithSameOracle, perpPosition, numericConstants_1.ZERO, oraclePrice);
+                let freeCollateralDeltaForPerp = this.calculateFreeCollateralDeltaForPerp(perpMarketWithSameOracle, perpPosition, numericConstants_1.ZERO, oraclePrice);
+                if (freeCollateralDeltaForPerp) {
+                    const { numerator, denominator } = (0, oracles_1.getMultipleBetweenOracleSources)(market.oracleSource, perpMarketWithSameOracle.amm.oracleSource);
+                    freeCollateralDeltaForPerp = freeCollateralDeltaForPerp
+                        .mul(numerator)
+                        .div(denominator);
+                }
                 freeCollateralDelta = freeCollateralDelta.add(freeCollateralDeltaForPerp || numericConstants_1.ZERO);
             }
         }
@@ -1223,7 +1229,13 @@ class User {
             const spotPosition = this.getSpotPosition(spotMarketWithSameOracle.marketIndex);
             if (spotPosition) {
                 const signedTokenAmount = (0, _1.getSignedTokenAmount)((0, spotBalance_1.getTokenAmount)(spotPosition.scaledBalance, spotMarketWithSameOracle, spotPosition.balanceType), spotPosition.balanceType);
-                const spotFreeCollateralDelta = this.calculateFreeCollateralDeltaForSpot(spotMarketWithSameOracle, signedTokenAmount, marginCategory);
+                let spotFreeCollateralDelta = this.calculateFreeCollateralDeltaForSpot(spotMarketWithSameOracle, signedTokenAmount, marginCategory);
+                if (spotFreeCollateralDelta) {
+                    const { numerator, denominator } = (0, oracles_1.getMultipleBetweenOracleSources)(market.amm.oracleSource, spotMarketWithSameOracle.oracleSource);
+                    spotFreeCollateralDelta = spotFreeCollateralDelta
+                        .mul(numerator)
+                        .div(denominator);
+                }
                 freeCollateralDelta = freeCollateralDelta.add(spotFreeCollateralDelta || numericConstants_1.ZERO);
             }
         }

package/lib/node/idl/drift.json

@@ -6111,7 +6111,7 @@
                 {
                     "name": "fuelBoostDeposits",
                     "type": {
-                        "option": "u32"
+                        "option": "i32"
                     }
                 },
                 {

package/lib/node/math/oracles.d.ts

@@ -3,7 +3,7 @@
 /// <reference types="node" />
 import { AMM, OracleGuardRails } from '../types';
 import { OraclePriceData } from '../oracles/types';
-import { BN, HistoricalOracleData, PerpMarketAccount } from '../index';
+import { BN, HistoricalOracleData, OracleSource, PerpMarketAccount } from '../index';
 export declare function oraclePriceBands(market: PerpMarketAccount, oraclePriceData: OraclePriceData): [BN, BN];
 export declare function getMaxConfidenceIntervalMultiplier(market: PerpMarketAccount): BN;
 export declare function isOracleValid(market: PerpMarketAccount, oraclePriceData: OraclePriceData, oracleGuardRails: OracleGuardRails, slot: number): boolean;
@@ -12,3 +12,7 @@ export declare function calculateLiveOracleTwap(histOracleData: HistoricalOracle
 export declare function calculateLiveOracleStd(amm: AMM, oraclePriceData: OraclePriceData, now: BN): BN;
 export declare function getNewOracleConfPct(amm: AMM, oraclePriceData: OraclePriceData, reservePrice: BN, now: BN): BN;
 export declare function trimVaaSignatures(vaa: Buffer, n?: number): Buffer;
+export declare function getMultipleBetweenOracleSources(firstOracleSource: OracleSource, secondOracleSource: OracleSource): {
+    numerator: BN;
+    denominator: BN;
+};

package/lib/node/math/oracles.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.trimVaaSignatures = exports.getNewOracleConfPct = exports.calculateLiveOracleStd = exports.calculateLiveOracleTwap = exports.isOracleTooDivergent = exports.isOracleValid = exports.getMaxConfidenceIntervalMultiplier = exports.oraclePriceBands = void 0;
+exports.getMultipleBetweenOracleSources = exports.trimVaaSignatures = exports.getNewOracleConfPct = exports.calculateLiveOracleStd = exports.calculateLiveOracleTwap = exports.isOracleTooDivergent = exports.isOracleValid = exports.getMaxConfidenceIntervalMultiplier = exports.oraclePriceBands = void 0;
 const types_1 = require("../types");
 const numericConstants_1 = require("../constants/numericConstants");
 const index_1 = require("../index");
@@ -132,3 +132,23 @@ function trimVaaSignatures(vaa, n = 3) {
     return trimmedVaa;
 }
 exports.trimVaaSignatures = trimVaaSignatures;
+function getMultipleBetweenOracleSources(firstOracleSource, secondOracleSource) {
+    if ((0, types_1.isVariant)(firstOracleSource, 'pythPull') &&
+        (0, types_1.isVariant)(secondOracleSource, 'pyth1MPull')) {
+        return { numerator: new index_1.BN(1000000), denominator: new index_1.BN(1) };
+    }
+    if ((0, types_1.isVariant)(firstOracleSource, 'pythPull') &&
+        (0, types_1.isVariant)(secondOracleSource, 'pyth1KPull')) {
+        return { numerator: new index_1.BN(1000), denominator: new index_1.BN(1) };
+    }
+    if ((0, types_1.isVariant)(firstOracleSource, 'pyth1MPull') &&
+        (0, types_1.isVariant)(secondOracleSource, 'pythPull')) {
+        return { numerator: new index_1.BN(1), denominator: new index_1.BN(1000000) };
+    }
+    if ((0, types_1.isVariant)(firstOracleSource, 'pyth1KPull') &&
+        (0, types_1.isVariant)(secondOracleSource, 'pythPull')) {
+        return { numerator: new index_1.BN(1), denominator: new index_1.BN(1000) };
+    }
+    return { numerator: new index_1.BN(1), denominator: new index_1.BN(1) };
+}
+exports.getMultipleBetweenOracleSources = getMultipleBetweenOracleSources;

package/lib/node/user.js

@@ -1174,7 +1174,13 @@ class User {
         if (perpMarketWithSameOracle) {
             const perpPosition = this.getPerpPositionWithLPSettle(perpMarketWithSameOracle.marketIndex, undefined, true)[0];
             if (perpPosition) {
-                const freeCollateralDeltaForPerp = this.calculateFreeCollateralDeltaForPerp(perpMarketWithSameOracle, perpPosition, numericConstants_1.ZERO, oraclePrice);
+                let freeCollateralDeltaForPerp = this.calculateFreeCollateralDeltaForPerp(perpMarketWithSameOracle, perpPosition, numericConstants_1.ZERO, oraclePrice);
+                if (freeCollateralDeltaForPerp) {
+                    const { numerator, denominator } = (0, oracles_1.getMultipleBetweenOracleSources)(market.oracleSource, perpMarketWithSameOracle.amm.oracleSource);
+                    freeCollateralDeltaForPerp = freeCollateralDeltaForPerp
+                        .mul(numerator)
+                        .div(denominator);
+                }
                 freeCollateralDelta = freeCollateralDelta.add(freeCollateralDeltaForPerp || numericConstants_1.ZERO);
             }
         }
@@ -1223,7 +1229,13 @@ class User {
             const spotPosition = this.getSpotPosition(spotMarketWithSameOracle.marketIndex);
             if (spotPosition) {
                 const signedTokenAmount = (0, _1.getSignedTokenAmount)((0, spotBalance_1.getTokenAmount)(spotPosition.scaledBalance, spotMarketWithSameOracle, spotPosition.balanceType), spotPosition.balanceType);
-                const spotFreeCollateralDelta = this.calculateFreeCollateralDeltaForSpot(spotMarketWithSameOracle, signedTokenAmount, marginCategory);
+                let spotFreeCollateralDelta = this.calculateFreeCollateralDeltaForSpot(spotMarketWithSameOracle, signedTokenAmount, marginCategory);
+                if (spotFreeCollateralDelta) {
+                    const { numerator, denominator } = (0, oracles_1.getMultipleBetweenOracleSources)(market.amm.oracleSource, spotMarketWithSameOracle.oracleSource);
+                    spotFreeCollateralDelta = spotFreeCollateralDelta
+                        .mul(numerator)
+                        .div(denominator);
+                }
                 freeCollateralDelta = freeCollateralDelta.add(spotFreeCollateralDelta || numericConstants_1.ZERO);
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drift-labs/sdk-browser",
-  "version": "2.106.0-beta.5",
+  "version": "2.106.0-beta.7",
   "main": "lib/node/index.js",
   "types": "lib/node/index.d.ts",
   "browser": "./lib/browser/index.js",

package/src/idl/drift.json

@@ -6111,7 +6111,7 @@
         {
           "name": "fuelBoostDeposits",
           "type": {
-            "option": "u32"
+            "option": "i32"
           }
         },
         {

package/src/math/oracles.ts

@@ -9,7 +9,12 @@ import {
 	FIVE_MINUTE,
 	PERCENTAGE_PRECISION,
 } from '../constants/numericConstants';
-import { BN, HistoricalOracleData, PerpMarketAccount } from '../index';
+import {
+	BN,
+	HistoricalOracleData,
+	OracleSource,
+	PerpMarketAccount,
+} from '../index';
 import { assert } from '../assert/assert';
 
 export function oraclePriceBands(
@@ -226,3 +231,38 @@ export function trimVaaSignatures(vaa: Buffer, n = 3): Buffer {
 	trimmedVaa[5] = n;
 	return trimmedVaa;
 }
+
+export function getMultipleBetweenOracleSources(
+	firstOracleSource: OracleSource,
+	secondOracleSource: OracleSource
+): { numerator: BN; denominator: BN } {
+	if (
+		isVariant(firstOracleSource, 'pythPull') &&
+		isVariant(secondOracleSource, 'pyth1MPull')
+	) {
+		return { numerator: new BN(1000000), denominator: new BN(1) };
+	}
+
+	if (
+		isVariant(firstOracleSource, 'pythPull') &&
+		isVariant(secondOracleSource, 'pyth1KPull')
+	) {
+		return { numerator: new BN(1000), denominator: new BN(1) };
+	}
+
+	if (
+		isVariant(firstOracleSource, 'pyth1MPull') &&
+		isVariant(secondOracleSource, 'pythPull')
+	) {
+		return { numerator: new BN(1), denominator: new BN(1000000) };
+	}
+
+	if (
+		isVariant(firstOracleSource, 'pyth1KPull') &&
+		isVariant(secondOracleSource, 'pythPull')
+	) {
+		return { numerator: new BN(1), denominator: new BN(1000) };
+	}
+
+	return { numerator: new BN(1), denominator: new BN(1) };
+}

package/src/user.ts

@@ -92,7 +92,10 @@ import {
 	getWorstCaseTokenAmounts,
 	isSpotPositionAvailable,
 } from './math/spotPosition';
-import { calculateLiveOracleTwap } from './math/oracles';
+import {
+	calculateLiveOracleTwap,
+	getMultipleBetweenOracleSources,
+} from './math/oracles';
 import { getPerpMarketTierNumber, getSpotMarketTierNumber } from './math/tiers';
 import { StrictOraclePrice } from './oracles/strictOraclePrice';
 
@@ -2219,7 +2222,7 @@ export class User {
 				true
 			)[0];
 			if (perpPosition) {
-				const freeCollateralDeltaForPerp =
+				let freeCollateralDeltaForPerp =
 					this.calculateFreeCollateralDeltaForPerp(
 						perpMarketWithSameOracle,
 						perpPosition,
@@ -2227,6 +2230,16 @@ export class User {
 						oraclePrice
 					);
 
+				if (freeCollateralDeltaForPerp) {
+					const { numerator, denominator } = getMultipleBetweenOracleSources(
+						market.oracleSource,
+						perpMarketWithSameOracle.amm.oracleSource
+					);
+					freeCollateralDeltaForPerp = freeCollateralDeltaForPerp
+						.mul(numerator)
+						.div(denominator);
+				}
+
 				freeCollateralDelta = freeCollateralDelta.add(
 					freeCollateralDeltaForPerp || ZERO
 				);
@@ -2342,12 +2355,22 @@ export class User {
 					spotPosition.balanceType
 				);
 
-				const spotFreeCollateralDelta =
-					this.calculateFreeCollateralDeltaForSpot(
-						spotMarketWithSameOracle,
-						signedTokenAmount,
-						marginCategory
+				let spotFreeCollateralDelta = this.calculateFreeCollateralDeltaForSpot(
+					spotMarketWithSameOracle,
+					signedTokenAmount,
+					marginCategory
+				);
+
+				if (spotFreeCollateralDelta) {
+					const { numerator, denominator } = getMultipleBetweenOracleSources(
+						market.amm.oracleSource,
+						spotMarketWithSameOracle.oracleSource
 					);
+					spotFreeCollateralDelta = spotFreeCollateralDelta
+						.mul(numerator)
+						.div(denominator);
+				}
+
 				freeCollateralDelta = freeCollateralDelta.add(
 					spotFreeCollateralDelta || ZERO
 				);