@drift-labs/sdk 2.97.0-beta.9 → 2.98.0-beta.1

package/lib/{idl → browser/idl}/switchboard_on_demand_30.json

@@ -443,10 +443,14 @@
                     }
                 },
                 {
-                    "name": "queue"
+                    "name": "queue",
+                    "relations": [
+                        "oracle"
+                    ]
                 },
                 {
-                    "name": "authority"
+                    "name": "authority",
+                    "signer": true
                 },
                 {
                     "name": "program_state",
@@ -503,6 +507,9 @@
                 },
                 {
                     "name": "stake_pool"
+                },
+                {
+                    "name": "delegation_group"
                 }
             ],
             "args": [
@@ -955,10 +962,7 @@
                 },
                 {
                     "name": "authority",
-                    "signer": true,
-                    "relations": [
-                        "queue"
-                    ]
+                    "signer": true
                 },
                 {
                     "name": "program_authority"
@@ -1038,6 +1042,13 @@
                 {
                     "name": "oracle",
                     "writable": true
+                },
+                {
+                    "name": "authority",
+                    "signer": true
+                },
+                {
+                    "name": "state"
                 }
             ],
             "args": [
@@ -1294,10 +1305,7 @@
                 },
                 {
                     "name": "authority",
-                    "signer": true,
-                    "relations": [
-                        "queue"
-                    ]
+                    "signer": true
                 },
                 {
                     "name": "program_authority"
@@ -1336,10 +1344,7 @@
                 },
                 {
                     "name": "authority",
-                    "signer": true,
-                    "relations": [
-                        "queue"
-                    ]
+                    "signer": true
                 },
                 {
                     "name": "state"
@@ -1387,6 +1392,13 @@
                 {
                     "name": "recent_slothashes",
                     "address": "SysvarS1otHashes111111111111111111111111111"
+                },
+                {
+                    "name": "authority",
+                    "signer": true,
+                    "relations": [
+                        "randomness"
+                    ]
                 }
             ],
             "args": [
@@ -1860,6 +1872,19 @@
         }
     ],
     "events": [
+        {
+            "name": "CostWhitelistEvent",
+            "discriminator": [
+                56,
+                107,
+                191,
+                127,
+                116,
+                6,
+                138,
+                149
+            ]
+        },
         {
             "name": "GarbageCollectionEvent",
             "discriminator": [
@@ -2235,9 +2260,84 @@
         {
             "code": 6047,
             "name": "InvalidInstruction"
+        },
+        {
+            "code": 6048,
+            "name": "OracleAlreadyVerified"
+        },
+        {
+            "code": 6049,
+            "name": "GuardianNotVerified"
+        },
+        {
+            "code": 6050,
+            "name": "InvalidConstraint"
+        },
+        {
+            "code": 6051,
+            "name": "InvalidDelegationGroup"
+        },
+        {
+            "code": 6052,
+            "name": "OracleKeyNotFound"
+        },
+        {
+            "code": 6053,
+            "name": "GuardianReregisterAttempt"
         }
     ],
     "types": [
+        {
+            "name": "CompactResult",
+            "serialization": "bytemuck",
+            "repr": {
+                "kind": "c"
+            },
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "std_dev",
+                        "docs": [
+                            "The standard deviation of the submissions needed for quorom size"
+                        ],
+                        "type": "f32"
+                    },
+                    {
+                        "name": "mean",
+                        "docs": [
+                            "The mean of the submissions needed for quorom size"
+                        ],
+                        "type": "f32"
+                    },
+                    {
+                        "name": "slot",
+                        "docs": [
+                            "The slot at which this value was signed."
+                        ],
+                        "type": "u64"
+                    }
+                ]
+            }
+        },
+        {
+            "name": "CostWhitelistEvent",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "feeds",
+                        "type": {
+                            "vec": "pubkey"
+                        }
+                    },
+                    {
+                        "name": "reward",
+                        "type": "u32"
+                    }
+                ]
+            }
+        },
         {
             "name": "CurrentResult",
             "serialization": "bytemuck",
@@ -2384,7 +2484,7 @@
                         }
                     },
                     {
-                        "name": "idx",
+                        "name": "_reserved1",
                         "type": "u32"
                     },
                     {
@@ -2437,12 +2537,7 @@
             "name": "GuardianUnregisterParams",
             "type": {
                 "kind": "struct",
-                "fields": [
-                    {
-                        "name": "idx",
-                        "type": "u32"
-                    }
-                ]
+                "fields": []
             }
         },
         {
@@ -2948,7 +3043,7 @@
                 "kind": "struct",
                 "fields": [
                     {
-                        "name": "recent_slot",
+                        "name": "_reserved1",
                         "type": "u64"
                     }
                 ]
@@ -3068,14 +3163,18 @@
                         }
                     },
                     {
-                        "name": "_padding1",
+                        "name": "padding1",
                         "type": {
                             "array": [
                                 "u8",
-                                3
+                                2
                             ]
                         }
                     },
+                    {
+                        "name": "historical_result_idx",
+                        "type": "u8"
+                    },
                     {
                         "name": "min_sample_size",
                         "type": "u8"
@@ -3089,7 +3188,7 @@
                         "type": "u64"
                     },
                     {
-                        "name": "ipfs_hash",
+                        "name": "_reserved1",
                         "type": {
                             "array": [
                                 "u8",
@@ -3110,38 +3209,51 @@
                         "type": "u32"
                     },
                     {
-                        "name": "_ebuf4",
+                        "name": "padding2",
                         "type": {
                             "array": [
                                 "u8",
-                                20
+                                12
                             ]
                         }
                     },
                     {
-                        "name": "_ebuf3",
+                        "name": "historical_results",
+                        "type": {
+                            "array": [
+                                {
+                                    "defined": {
+                                        "name": "CompactResult"
+                                    }
+                                },
+                                32
+                            ]
+                        }
+                    },
+                    {
+                        "name": "_ebuf4",
                         "type": {
                             "array": [
                                 "u8",
-                                24
+                                8
                             ]
                         }
                     },
                     {
-                        "name": "_ebuf2",
+                        "name": "_ebuf3",
                         "type": {
                             "array": [
                                 "u8",
-                                256
+                                24
                             ]
                         }
                     },
                     {
-                        "name": "_ebuf1",
+                        "name": "_ebuf2",
                         "type": {
                             "array": [
                                 "u8",
-                                512
+                                256
                             ]
                         }
                     }
@@ -4237,12 +4349,43 @@
                         "name": "lut_slot",
                         "type": "u64"
                     },
+                    {
+                        "name": "base_reward",
+                        "type": "u32"
+                    },
+                    {
+                        "name": "_ebuf6",
+                        "type": {
+                            "array": [
+                                "u8",
+                                28
+                            ]
+                        }
+                    },
+                    {
+                        "name": "_ebuf5",
+                        "type": {
+                            "array": [
+                                "u8",
+                                32
+                            ]
+                        }
+                    },
+                    {
+                        "name": "_ebuf4",
+                        "type": {
+                            "array": [
+                                "u8",
+                                64
+                            ]
+                        }
+                    },
                     {
                         "name": "_ebuf3",
                         "type": {
                             "array": [
                                 "u8",
-                                256
+                                128
                             ]
                         }
                     },
@@ -4256,11 +4399,14 @@
                         }
                     },
                     {
-                        "name": "_ebuf1",
+                        "name": "cost_whitelist",
+                        "docs": [
+                            "Cost whitelist by authority"
+                        ],
                         "type": {
                             "array": [
-                                "u8",
-                                1024
+                                "pubkey",
+                                32
                             ]
                         }
                     }
@@ -4346,6 +4492,18 @@
                     {
                         "name": "subsidy_amount",
                         "type": "u32"
+                    },
+                    {
+                        "name": "base_reward",
+                        "type": "u32"
+                    },
+                    {
+                        "name": "add_cost_wl",
+                        "type": "pubkey"
+                    },
+                    {
+                        "name": "rm_cost_wl",
+                        "type": "pubkey"
                     }
                 ]
             }

package/lib/{index.d.ts → browser/index.d.ts}

@@ -24,12 +24,14 @@ export * from './accounts/oneShotUserAccountSubscriber';
 export * from './accounts/types';
 export * from './addresses/pda';
 export * from './adminClient';
+export * from './assert/assert';
 export * from './testClient';
 export * from './user';
 export * from './userConfig';
 export * from './userStats';
 export * from './userName';
 export * from './userStatsConfig';
+export * from './decode/user';
 export * from './driftClient';
 export * from './factory/oracleClient';
 export * from './factory/bigNum';
@@ -58,6 +60,7 @@ export * from './math/insurance';
 export * from './math/superStake';
 export * from './math/spotPosition';
 export * from './math/state';
+export * from './math/tiers';
 export * from './marinade';
 export * from './orderParams';
 export * from './slot/SlotSubscriber';
@@ -75,6 +78,9 @@ export * from './priorityFee';
 export * from './phoenix/phoenixFulfillmentConfigMap';
 export * from './openbook/openbookV2Subscriber';
 export * from './openbook/openbookV2FulfillmentConfigMap';
+export * from './oracles/pythClient';
+export * from './oracles/pythPullClient';
+export * from './oracles/switchboardOnDemandClient';
 export * from './tx/fastSingleTxSender';
 export * from './tx/retryTxSender';
 export * from './tx/whileValidTxSender';
@@ -85,6 +91,7 @@ export * from './tx/txHandler';
 export * from './util/computeUnits';
 export * from './util/tps';
 export * from './util/promiseTimeout';
+export * from './util/pythPullOracleUtils';
 export * from './math/spotBalance';
 export * from './constants/spotMarkets';
 export * from './driftClientConfig';
@@ -98,6 +105,7 @@ export * from './dlob/types';
 export * from './dlob/orderBookLevels';
 export * from './userMap/userMap';
 export * from './userMap/userStatsMap';
+export * from './userMap/userMapConfig';
 export * from './math/bankruptcy';
 export * from './orderSubscriber';
 export * from './orderSubscriber/types';

package/lib/{index.js → browser/index.js}

@@ -47,12 +47,14 @@ __exportStar(require("./accounts/oneShotUserAccountSubscriber"), exports);
 __exportStar(require("./accounts/types"), exports);
 __exportStar(require("./addresses/pda"), exports);
 __exportStar(require("./adminClient"), exports);
+__exportStar(require("./assert/assert"), exports);
 __exportStar(require("./testClient"), exports);
 __exportStar(require("./user"), exports);
 __exportStar(require("./userConfig"), exports);
 __exportStar(require("./userStats"), exports);
 __exportStar(require("./userName"), exports);
 __exportStar(require("./userStatsConfig"), exports);
+__exportStar(require("./decode/user"), exports);
 __exportStar(require("./driftClient"), exports);
 __exportStar(require("./factory/oracleClient"), exports);
 __exportStar(require("./factory/bigNum"), exports);
@@ -81,6 +83,7 @@ __exportStar(require("./math/insurance"), exports);
 __exportStar(require("./math/superStake"), exports);
 __exportStar(require("./math/spotPosition"), exports);
 __exportStar(require("./math/state"), exports);
+__exportStar(require("./math/tiers"), exports);
 __exportStar(require("./marinade"), exports);
 __exportStar(require("./orderParams"), exports);
 __exportStar(require("./slot/SlotSubscriber"), exports);
@@ -98,6 +101,9 @@ __exportStar(require("./priorityFee"), exports);
 __exportStar(require("./phoenix/phoenixFulfillmentConfigMap"), exports);
 __exportStar(require("./openbook/openbookV2Subscriber"), exports);
 __exportStar(require("./openbook/openbookV2FulfillmentConfigMap"), exports);
+__exportStar(require("./oracles/pythClient"), exports);
+__exportStar(require("./oracles/pythPullClient"), exports);
+__exportStar(require("./oracles/switchboardOnDemandClient"), exports);
 __exportStar(require("./tx/fastSingleTxSender"), exports);
 __exportStar(require("./tx/retryTxSender"), exports);
 __exportStar(require("./tx/whileValidTxSender"), exports);
@@ -108,6 +114,7 @@ __exportStar(require("./tx/txHandler"), exports);
 __exportStar(require("./util/computeUnits"), exports);
 __exportStar(require("./util/tps"), exports);
 __exportStar(require("./util/promiseTimeout"), exports);
+__exportStar(require("./util/pythPullOracleUtils"), exports);
 __exportStar(require("./math/spotBalance"), exports);
 __exportStar(require("./constants/spotMarkets"), exports);
 __exportStar(require("./driftClientConfig"), exports);
@@ -121,6 +128,7 @@ __exportStar(require("./dlob/types"), exports);
 __exportStar(require("./dlob/orderBookLevels"), exports);
 __exportStar(require("./userMap/userMap"), exports);
 __exportStar(require("./userMap/userStatsMap"), exports);
+__exportStar(require("./userMap/userMapConfig"), exports);
 __exportStar(require("./math/bankruptcy"), exports);
 __exportStar(require("./orderSubscriber"), exports);
 __exportStar(require("./orderSubscriber/types"), exports);

package/lib/browser/isomorphic/grpc.browser.d.ts

@@ -0,0 +1 @@
+export declare function createClient(..._args: any): void;

package/lib/browser/isomorphic/grpc.browser.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createClient = void 0;
+// Export a function to create a new Client instance
+function createClient(..._args) {
+    throw new Error('Only available in node context');
+}
+exports.createClient = createClient;

package/lib/browser/isomorphic/grpc.d.ts

@@ -0,0 +1 @@
+export * from './grpc.node';

package/lib/browser/isomorphic/grpc.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createClient = void 0;
+// Export a function to create a new Client instance
+function createClient(..._args) {
+    throw new Error('Only available in node context');
+}
+exports.createClient = createClient;

package/lib/browser/isomorphic/grpc.node.d.ts

@@ -0,0 +1,5 @@
+import Client from '@triton-one/yellowstone-grpc';
+import { SubscribeRequest, SubscribeUpdate, CommitmentLevel } from '@triton-one/yellowstone-grpc';
+import { ClientDuplexStream, ChannelOptions } from '@grpc/grpc-js';
+export { ClientDuplexStream, ChannelOptions, SubscribeRequest, SubscribeUpdate, CommitmentLevel, Client, };
+export declare function createClient(...args: ConstructorParameters<typeof Client>): Client;

package/lib/{math → browser/math}/auction.js

@@ -18,14 +18,17 @@ function isFallbackAvailableLiquiditySource(order, minAuctionDuration, slot) {
 }
 exports.isFallbackAvailableLiquiditySource = isFallbackAvailableLiquiditySource;
 function getAuctionPrice(order, slot, oraclePrice) {
-    if ((0, types_1.isOneOfVariant)(order.orderType, [
-        'market',
-        'triggerMarket',
-        'limit',
-        'triggerLimit',
-    ])) {
+    if ((0, types_1.isOneOfVariant)(order.orderType, ['market', 'triggerMarket', 'triggerLimit'])) {
         return getAuctionPriceForFixedAuction(order, slot);
     }
+    else if ((0, types_1.isVariant)(order.orderType, 'limit')) {
+        if (order.oraclePriceOffset !== 0) {
+            return getAuctionPriceForOracleOffsetAuction(order, slot, oraclePrice);
+        }
+        else {
+            return getAuctionPriceForFixedAuction(order, slot);
+        }
+    }
     else if ((0, types_1.isVariant)(order.orderType, 'oracle')) {
         return getAuctionPriceForOracleOffsetAuction(order, slot, oraclePrice);
     }

package/lib/{math → browser/math}/margin.d.ts

@@ -21,19 +21,19 @@ export declare function calculateWorstCasePerpLiabilityValue(perpPosition: PerpP
     worstCaseBaseAssetAmount: BN;
     worstCaseLiabilityValue: BN;
 };
-export declare function calculatePerpLiabilityValue(baseAssetAmount: BN, oraclePrice: BN, isPredictionMarket: boolean): BN;
+export declare function calculatePerpLiabilityValue(baseAssetAmount: BN, price: BN, isPredictionMarket: boolean): BN;
 /**
  * Calculates the margin required to open a trade, in quote amount. Only accounts for the trade size as a scalar value, does not account for the trade direction or current open positions and whether the trade would _actually_ be risk-increasing and use any extra collateral.
  * @param targetMarketIndex
  * @param baseSize
  * @returns
  */
-export declare function calculateMarginUSDCRequiredForTrade(driftClient: DriftClient, targetMarketIndex: number, baseSize: BN, userMaxMarginRatio?: number, userHighLeverageMode?: boolean): BN;
+export declare function calculateMarginUSDCRequiredForTrade(driftClient: DriftClient, targetMarketIndex: number, baseSize: BN, userMaxMarginRatio?: number, userHighLeverageMode?: boolean, entryPrice?: BN): BN;
 /**
  * Similar to calculatetMarginUSDCRequiredForTrade, but calculates how much of a given collateral is required to cover the margin requirements for a given trade. Basically does the same thing as getMarginUSDCRequiredForTrade but also accounts for asset weight of the selected collateral.
  *
  * Returns collateral required in the precision of the target collateral market.
  */
-export declare function calculateCollateralDepositRequiredForTrade(driftClient: DriftClient, targetMarketIndex: number, baseSize: BN, collateralIndex: number, userMaxMarginRatio?: number, userHighLeverageMode?: boolean): BN;
+export declare function calculateCollateralDepositRequiredForTrade(driftClient: DriftClient, targetMarketIndex: number, baseSize: BN, collateralIndex: number, userMaxMarginRatio?: number, userHighLeverageMode?: boolean, estEntryPrice?: BN): BN;
 export declare function calculateCollateralValueOfDeposit(driftClient: DriftClient, collateralIndex: number, baseSize: BN): BN;
 export declare function calculateLiquidationPrice(freeCollateral: BN, freeCollateralDelta: BN, oraclePrice: BN): BN;

package/lib/{math → browser/math}/margin.js

@@ -100,20 +100,20 @@ function calculateWorstCasePerpLiabilityValue(perpPosition, perpMarket, oraclePr
     }
 }
 exports.calculateWorstCasePerpLiabilityValue = calculateWorstCasePerpLiabilityValue;
-function calculatePerpLiabilityValue(baseAssetAmount, oraclePrice, isPredictionMarket) {
+function calculatePerpLiabilityValue(baseAssetAmount, price, isPredictionMarket) {
     if (isPredictionMarket) {
         if (baseAssetAmount.gt(numericConstants_1.ZERO)) {
-            return baseAssetAmount.mul(oraclePrice).div(numericConstants_1.BASE_PRECISION);
+            return baseAssetAmount.mul(price).div(numericConstants_1.BASE_PRECISION);
         }
         else {
             return baseAssetAmount
                 .abs()
-                .mul(numericConstants_1.MAX_PREDICTION_PRICE.sub(oraclePrice))
+                .mul(numericConstants_1.MAX_PREDICTION_PRICE.sub(price))
                 .div(numericConstants_1.BASE_PRECISION);
         }
     }
     else {
-        return baseAssetAmount.abs().mul(oraclePrice).div(numericConstants_1.BASE_PRECISION);
+        return baseAssetAmount.abs().mul(price).div(numericConstants_1.BASE_PRECISION);
     }
 }
 exports.calculatePerpLiabilityValue = calculatePerpLiabilityValue;
@@ -123,10 +123,10 @@ exports.calculatePerpLiabilityValue = calculatePerpLiabilityValue;
  * @param baseSize
  * @returns
  */
-function calculateMarginUSDCRequiredForTrade(driftClient, targetMarketIndex, baseSize, userMaxMarginRatio, userHighLeverageMode) {
+function calculateMarginUSDCRequiredForTrade(driftClient, targetMarketIndex, baseSize, userMaxMarginRatio, userHighLeverageMode, entryPrice) {
     const targetMarket = driftClient.getPerpMarketAccount(targetMarketIndex);
-    const oracleData = driftClient.getOracleDataForPerpMarket(targetMarket.marketIndex);
-    const perpLiabilityValue = calculatePerpLiabilityValue(baseSize, oracleData.price, (0, types_1.isVariant)(targetMarket.contractType, 'prediction'));
+    const price = entryPrice !== null && entryPrice !== void 0 ? entryPrice : driftClient.getOracleDataForPerpMarket(targetMarket.marketIndex).price;
+    const perpLiabilityValue = calculatePerpLiabilityValue(baseSize, price, (0, types_1.isVariant)(targetMarket.contractType, 'prediction'));
     const marginRequired = new anchor_1.BN((0, __1.calculateMarketMarginRatio)(targetMarket, baseSize.abs(), 'Initial', userMaxMarginRatio, userHighLeverageMode))
         .mul(perpLiabilityValue)
         .div(numericConstants_1.MARGIN_PRECISION);
@@ -138,8 +138,8 @@ exports.calculateMarginUSDCRequiredForTrade = calculateMarginUSDCRequiredForTrad
  *
  * Returns collateral required in the precision of the target collateral market.
  */
-function calculateCollateralDepositRequiredForTrade(driftClient, targetMarketIndex, baseSize, collateralIndex, userMaxMarginRatio, userHighLeverageMode) {
-    const marginRequiredUsdc = calculateMarginUSDCRequiredForTrade(driftClient, targetMarketIndex, baseSize, userMaxMarginRatio, userHighLeverageMode);
+function calculateCollateralDepositRequiredForTrade(driftClient, targetMarketIndex, baseSize, collateralIndex, userMaxMarginRatio, userHighLeverageMode, estEntryPrice) {
+    const marginRequiredUsdc = calculateMarginUSDCRequiredForTrade(driftClient, targetMarketIndex, baseSize, userMaxMarginRatio, userHighLeverageMode, estEntryPrice);
     const collateralMarket = driftClient.getSpotMarketAccount(collateralIndex);
     const collateralOracleData = driftClient.getOracleDataForSpotMarket(collateralIndex);
     const scaledAssetWeight = (0, __1.calculateScaledInitialAssetWeight)(collateralMarket, collateralOracleData.price);

package/lib/{math → browser/math}/oracles.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="bn.js" />
 /// <reference types="node" />
+/// <reference types="node" />
 import { AMM, OracleGuardRails } from '../types';
 import { OraclePriceData } from '../oracles/types';
 import { BN, HistoricalOracleData, PerpMarketAccount } from '../index';

package/lib/{math → browser/math}/position.d.ts

@@ -23,11 +23,27 @@ export declare function calculateBaseAssetValue(market: PerpMarketAccount, userP
 export declare function calculatePositionPNL(market: PerpMarketAccount, perpPosition: PerpPosition, withFunding: boolean, oraclePriceData: OraclePriceData): BN;
 export declare function calculateClaimablePnl(market: PerpMarketAccount, spotMarket: SpotMarketAccount, perpPosition: PerpPosition, oraclePriceData: OraclePriceData): BN;
 /**
+ * Returns total fees and funding pnl for a position
+ *
+ * @param market
+ * @param PerpPosition
+ * @param includeUnsettled include unsettled funding in return value (default: true)
+ * @returns — // QUOTE_PRECISION
+ */
+export declare function calculateFeesAndFundingPnl(market: PerpMarketAccount, perpPosition: PerpPosition, includeUnsettled?: boolean): BN;
+/**
+ * Returns unsettled funding pnl for the position
+ *
+ * To calculate all fees and funding pnl including settled, use calculateFeesAndFundingPnl
  *
  * @param market
  * @param PerpPosition
  * @returns // QUOTE_PRECISION
  */
+export declare function calculateUnsettledFundingPnl(market: PerpMarketAccount, perpPosition: PerpPosition): BN;
+/**
+ * @deprecated use calculateUnsettledFundingPnl or calculateFeesAndFundingPnl instead
+ */
 export declare function calculatePositionFundingPNL(market: PerpMarketAccount, perpPosition: PerpPosition): BN;
 export declare function positionIsAvailable(position: PerpPosition): boolean;
 /**