@drift-labs/sdk 2.84.0-beta.2 → 2.84.0-beta.4

package/VERSION

@@ -1 +1 @@
-2.84.0-beta.2
+2.84.0-beta.4

package/lib/adminClient.js

@@ -1601,7 +1601,7 @@ class AdminClient extends driftClient_1.DriftClient {
             maxPrice: maxPrice || null,
         };
         const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex);
-        return await this.program.instruction.getDeletePrelaunchOracleIx(params, {
+        return await this.program.instruction.deletePrelaunchOracle(params, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin

package/lib/constants/perpMarkets.js

@@ -582,9 +582,9 @@ exports.MainnetPerpMarkets = [
         symbol: 'IO-PERP',
         baseAssetSymbol: 'IO',
         marketIndex: 32,
-        oracle: new web3_js_1.PublicKey('5sAqMGidMtztNFdUukyguz6jMFS8DvTmSUr4p5u5zsSg'),
+        oracle: new web3_js_1.PublicKey('Gcm39uDrFyRCZko4hdrKMTBQsboPJHEd4RwnWhWFKr9a'),
         launchTs: 1718021389000,
-        oracleSource: __1.OracleSource.Prelaunch,
+        oracleSource: __1.OracleSource.SWITCHBOARD,
     },
 ];
 exports.PerpMarkets = {

package/lib/idl/drift.json

@@ -8849,7 +8849,7 @@
                 "kind": "enum",
                 "variants": [
                     {
-                        "name": "Invalid"
+                        "name": "NonPositive"
                     },
                     {
                         "name": "TooVolatile"
@@ -11962,6 +11962,36 @@
             "code": 6260,
             "name": "PnlPoolCantSettleUser",
             "msg": "PnlPoolCantSettleUser"
+        },
+        {
+            "code": 6261,
+            "name": "OracleNonPositive",
+            "msg": "OracleInvalid"
+        },
+        {
+            "code": 6262,
+            "name": "OracleTooVolatile",
+            "msg": "OracleTooVolatile"
+        },
+        {
+            "code": 6263,
+            "name": "OracleTooUncertain",
+            "msg": "OracleTooUncertain"
+        },
+        {
+            "code": 6264,
+            "name": "OracleStaleForMargin",
+            "msg": "OracleStaleForMargin"
+        },
+        {
+            "code": 6265,
+            "name": "OracleInsufficientDataPoints",
+            "msg": "OracleInsufficientDataPoints"
+        },
+        {
+            "code": 6266,
+            "name": "OracleStaleForAMM",
+            "msg": "OracleStaleForAMM"
         }
     ]
 }

package/lib/math/market.d.ts

@@ -32,7 +32,7 @@ export declare function calculateUnrealizedAssetWeight(market: PerpMarketAccount
 export declare function calculateMarketAvailablePNL(perpMarket: PerpMarketAccount, spotMarket: SpotMarketAccount): BN;
 export declare function calculateMarketMaxAvailableInsurance(perpMarket: PerpMarketAccount, spotMarket: SpotMarketAccount): BN;
 export declare function calculateNetUserPnl(perpMarket: PerpMarketAccount, oraclePriceData: OraclePriceData): BN;
-export declare function calculateNetUserPnlImbalance(perpMarket: PerpMarketAccount, spotMarket: SpotMarketAccount, oraclePriceData: OraclePriceData): BN;
+export declare function calculateNetUserPnlImbalance(perpMarket: PerpMarketAccount, spotMarket: SpotMarketAccount, oraclePriceData: OraclePriceData, applyFeePoolDiscount?: boolean): BN;
 export declare function calculateAvailablePerpLiquidity(market: PerpMarketAccount, oraclePriceData: OraclePriceData, dlob: DLOB, slot: number): {
     bids: BN;
     asks: BN;

package/lib/math/market.js

@@ -123,10 +123,13 @@ function calculateNetUserPnl(perpMarket, oraclePriceData) {
     return netUserPnl;
 }
 exports.calculateNetUserPnl = calculateNetUserPnl;
-function calculateNetUserPnlImbalance(perpMarket, spotMarket, oraclePriceData) {
+function calculateNetUserPnlImbalance(perpMarket, spotMarket, oraclePriceData, applyFeePoolDiscount = true) {
     const netUserPnl = calculateNetUserPnl(perpMarket, oraclePriceData);
     const pnlPool = (0, spotBalance_1.getTokenAmount)(perpMarket.pnlPool.scaledBalance, spotMarket, types_1.SpotBalanceType.DEPOSIT);
-    const feePool = (0, spotBalance_1.getTokenAmount)(perpMarket.amm.feePool.scaledBalance, spotMarket, types_1.SpotBalanceType.DEPOSIT).div(new anchor_1.BN(5));
+    let feePool = (0, spotBalance_1.getTokenAmount)(perpMarket.amm.feePool.scaledBalance, spotMarket, types_1.SpotBalanceType.DEPOSIT);
+    if (applyFeePoolDiscount) {
+        feePool = feePool.div(new anchor_1.BN(5));
+    }
     const imbalance = netUserPnl.sub(pnlPool.add(feePool));
     return imbalance;
 }

package/lib/testClient.js

@@ -8,6 +8,8 @@ class TestClient extends adminClient_1.AdminClient {
             throw new Error('Test client must be polling');
         }
         super(config);
+        // @ts-ignore
+        this.txHandler.blockhashCommitment = 'recent';
     }
     async sendTransaction(tx, additionalSigners, opts, preSigned) {
         const { txSig, slot } = await super.sendTransaction(tx, additionalSigners, opts, preSigned);

package/lib/tx/baseTxSender.js

@@ -238,7 +238,12 @@ class BaseTxSender {
         const logs = transactionResult.meta.logMessages;
         const lastLog = logs[logs.length - 1];
         const friendlyMessage = (_b = lastLog === null || lastLog === void 0 ? void 0 : lastLog.match(/(failed:) (.+)/)) === null || _b === void 0 ? void 0 : _b[2];
-        throw new web3_js_1.SendTransactionError(`Transaction Failed${friendlyMessage ? `: ${friendlyMessage}` : ''}`, transactionResult.meta.logMessages);
+        throw new web3_js_1.SendTransactionError({
+            action: 'send',
+            signature: txSig,
+            transactionMessage: `Transaction Failed${friendlyMessage ? `: ${friendlyMessage}` : ''}`,
+            logs,
+        });
     }
 }
 exports.BaseTxSender = BaseTxSender;

package/lib/tx/txHandler.d.ts

@@ -24,6 +24,7 @@ export declare class TxHandler {
     private confirmationOptions;
     private preSignedCb?;
     private onSignedCb?;
+    private blockhashCommitment;
     constructor(props: {
         connection: Connection;
         wallet: IWallet;

package/lib/tx/txHandler.js

@@ -13,7 +13,7 @@ const computeUnits_1 = require("../util/computeUnits");
  *
  * When the whileValidTxSender waits for confirmation of a given transaction, it needs the last available blockheight and blockhash used in the signature to do so. For pre-signed transactions, these values aren't attached to the transaction object by default. For a "scrappy" workaround which doesn't break backwards compatibility, the SIGNATURE_BLOCK_AND_EXPIRY property is simply attached to the transaction objects as they are created or signed in this handler despite a mismatch in the typescript types. If the values are attached to the transaction when they reach the whileValidTxSender, it can opt-in to use these values.
  */
-const DEV_TRY_FORCE_TX_TIMEOUTS = false;
+const DEV_TRY_FORCE_TX_TIMEOUTS = process.env.DEV_TRY_FORCE_TX_TIMEOUTS === 'true' || false;
 exports.COMPUTE_UNITS_DEFAULT = 200000;
 /**
  * This class is responsible for creating and signing transactions.
@@ -23,6 +23,7 @@ class TxHandler {
         var _a, _b, _c, _d;
         this.blockHashToLastValidBlockHeightLookup = {};
         this.returnBlockHeightsWithSignedTxCallbackData = false;
+        this.blockhashCommitment = 'finalized';
         this.getProps = (wallet, confirmationOpts) => [wallet !== null && wallet !== void 0 ? wallet : this.wallet, confirmationOpts !== null && confirmationOpts !== void 0 ? confirmationOpts : this.confirmationOptions];
         this.connection = props.connection;
         this.wallet = props.wallet;
@@ -50,7 +51,7 @@ class TxHandler {
      * @returns
      */
     getLatestBlockhashForTransaction() {
-        return this.connection.getLatestBlockhash('finalized');
+        return this.connection.getLatestBlockhash(this.blockhashCommitment);
     }
     /**
      * Applies recent blockhash and signs a given transaction
@@ -283,7 +284,7 @@ class TxHandler {
             }));
         }
         const computeUnitsPrice = baseTxParams === null || baseTxParams === void 0 ? void 0 : baseTxParams.computeUnitsPrice;
-        if (process.env.DEV_TRY_FORCE_TX_TIMEOUTS || DEV_TRY_FORCE_TX_TIMEOUTS) {
+        if (DEV_TRY_FORCE_TX_TIMEOUTS) {
             allIx.push(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
                 microLamports: 0,
             }));
@@ -319,7 +320,7 @@ class TxHandler {
                 units: computeUnits,
             }));
         }
-        if (process.env.DEV_TRY_FORCE_TX_TIMEOUTS || DEV_TRY_FORCE_TX_TIMEOUTS) {
+        if (DEV_TRY_FORCE_TX_TIMEOUTS) {
             tx.add(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
                 microLamports: 0,
             }));

package/lib/tx/whileValidTxSender.js

@@ -32,7 +32,7 @@ class WhileValidTxSender extends baseTxSender_1.BaseTxSender {
     }
     async prepareTx(tx, additionalSigners, opts, preSigned) {
         var _a;
-        const latestBlockhash = await this.txHandler.getLatestBlockhashForTransaction();
+        let latestBlockhash = await this.txHandler.getLatestBlockhashForTransaction();
         // handle tx
         let signedTx = tx;
         if (!preSigned) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.84.0-beta.2",
+	"version": "2.84.0-beta.4",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",
@@ -39,7 +39,7 @@
 		"@project-serum/serum": "^0.13.38",
 		"@pythnetwork/client": "2.5.3",
 		"@solana/spl-token": "^0.3.7",
-		"@solana/web3.js": "1.91.7",
+		"@solana/web3.js": "1.92.3",
 		"strict-event-emitter-types": "^2.0.0",
 		"uuid": "^8.3.2",
 		"zstddec": "^0.1.0"

package/src/adminClient.ts

@@ -3472,7 +3472,7 @@ export class AdminClient extends DriftClient {
 			perpMarketIndex
 		);
 
-		return await this.program.instruction.getDeletePrelaunchOracleIx(params, {
+		return await this.program.instruction.deletePrelaunchOracle(params, {
 			accounts: {
 				admin: this.isSubscribed
 					? this.getStateAccount().admin

package/src/constants/perpMarkets.ts

@@ -593,9 +593,9 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		symbol: 'IO-PERP',
 		baseAssetSymbol: 'IO',
 		marketIndex: 32,
-		oracle: new PublicKey('5sAqMGidMtztNFdUukyguz6jMFS8DvTmSUr4p5u5zsSg'),
+		oracle: new PublicKey('Gcm39uDrFyRCZko4hdrKMTBQsboPJHEd4RwnWhWFKr9a'),
 		launchTs: 1718021389000,
-		oracleSource: OracleSource.Prelaunch,
+		oracleSource: OracleSource.SWITCHBOARD,
 	},
 ];
 

package/src/idl/drift.json

@@ -8849,7 +8849,7 @@
         "kind": "enum",
         "variants": [
           {
-            "name": "Invalid"
+            "name": "NonPositive"
           },
           {
             "name": "TooVolatile"
@@ -11962,6 +11962,36 @@
       "code": 6260,
       "name": "PnlPoolCantSettleUser",
       "msg": "PnlPoolCantSettleUser"
+    },
+    {
+      "code": 6261,
+      "name": "OracleNonPositive",
+      "msg": "OracleInvalid"
+    },
+    {
+      "code": 6262,
+      "name": "OracleTooVolatile",
+      "msg": "OracleTooVolatile"
+    },
+    {
+      "code": 6263,
+      "name": "OracleTooUncertain",
+      "msg": "OracleTooUncertain"
+    },
+    {
+      "code": 6264,
+      "name": "OracleStaleForMargin",
+      "msg": "OracleStaleForMargin"
+    },
+    {
+      "code": 6265,
+      "name": "OracleInsufficientDataPoints",
+      "msg": "OracleInsufficientDataPoints"
+    },
+    {
+      "code": 6266,
+      "name": "OracleStaleForAMM",
+      "msg": "OracleStaleForAMM"
     }
   ]
 }

package/src/math/market.ts

@@ -252,7 +252,8 @@ export function calculateNetUserPnl(
 export function calculateNetUserPnlImbalance(
 	perpMarket: PerpMarketAccount,
 	spotMarket: SpotMarketAccount,
-	oraclePriceData: OraclePriceData
+	oraclePriceData: OraclePriceData,
+	applyFeePoolDiscount = true
 ): BN {
 	const netUserPnl = calculateNetUserPnl(perpMarket, oraclePriceData);
 
@@ -261,11 +262,14 @@ export function calculateNetUserPnlImbalance(
 		spotMarket,
 		SpotBalanceType.DEPOSIT
 	);
-	const feePool = getTokenAmount(
+	let feePool = getTokenAmount(
 		perpMarket.amm.feePool.scaledBalance,
 		spotMarket,
 		SpotBalanceType.DEPOSIT
-	).div(new BN(5));
+	);
+	if (applyFeePoolDiscount) {
+		feePool = feePool.div(new BN(5));
+	}
 
 	const imbalance = netUserPnl.sub(pnlPool.add(feePool));
 

package/src/testClient.ts

@@ -10,6 +10,8 @@ export class TestClient extends AdminClient {
 			throw new Error('Test client must be polling');
 		}
 		super(config);
+		// @ts-ignore
+		this.txHandler.blockhashCommitment = 'recent';
 	}
 
 	async sendTransaction(

package/src/tx/baseTxSender.ts

@@ -394,9 +394,13 @@ export abstract class BaseTxSender implements TxSender {
 
 		const friendlyMessage = lastLog?.match(/(failed:) (.+)/)?.[2];
 
-		throw new SendTransactionError(
-			`Transaction Failed${friendlyMessage ? `: ${friendlyMessage}` : ''}`,
-			transactionResult.meta.logMessages
-		);
+		throw new SendTransactionError({
+			action: 'send',
+			signature: txSig,
+			transactionMessage: `Transaction Failed${
+				friendlyMessage ? `: ${friendlyMessage}` : ''
+			}`,
+			logs,
+		});
 	}
 }

package/src/tx/txHandler.ts

@@ -31,7 +31,8 @@ import { containsComputeUnitIxs } from '../util/computeUnits';
  * When the whileValidTxSender waits for confirmation of a given transaction, it needs the last available blockheight and blockhash used in the signature to do so. For pre-signed transactions, these values aren't attached to the transaction object by default. For a "scrappy" workaround which doesn't break backwards compatibility, the SIGNATURE_BLOCK_AND_EXPIRY property is simply attached to the transaction objects as they are created or signed in this handler despite a mismatch in the typescript types. If the values are attached to the transaction when they reach the whileValidTxSender, it can opt-in to use these values.
  */
 
-const DEV_TRY_FORCE_TX_TIMEOUTS = false;
+const DEV_TRY_FORCE_TX_TIMEOUTS =
+	process.env.DEV_TRY_FORCE_TX_TIMEOUTS === 'true' || false;
 
 export const COMPUTE_UNITS_DEFAULT = 200_000;
 
@@ -62,6 +63,8 @@ export class TxHandler {
 	private preSignedCb?: () => void;
 	private onSignedCb?: (txSigs: DriftClientMetricsEvents['txSigned']) => void;
 
+	private blockhashCommitment: Commitment = 'finalized';
+
 	constructor(props: {
 		connection: Connection;
 		wallet: IWallet;
@@ -110,7 +113,7 @@ export class TxHandler {
 	 * @returns
 	 */
 	public getLatestBlockhashForTransaction() {
-		return this.connection.getLatestBlockhash('finalized');
+		return this.connection.getLatestBlockhash(this.blockhashCommitment);
 	}
 
 	/**
@@ -457,7 +460,7 @@ export class TxHandler {
 
 		const computeUnitsPrice = baseTxParams?.computeUnitsPrice;
 
-		if (process.env.DEV_TRY_FORCE_TX_TIMEOUTS || DEV_TRY_FORCE_TX_TIMEOUTS) {
+		if (DEV_TRY_FORCE_TX_TIMEOUTS) {
 			allIx.push(
 				ComputeBudgetProgram.setComputeUnitPrice({
 					microLamports: 0,
@@ -512,7 +515,7 @@ export class TxHandler {
 			);
 		}
 
-		if (process.env.DEV_TRY_FORCE_TX_TIMEOUTS || DEV_TRY_FORCE_TX_TIMEOUTS) {
+		if (DEV_TRY_FORCE_TX_TIMEOUTS) {
 			tx.add(
 				ComputeBudgetProgram.setComputeUnitPrice({
 					microLamports: 0,

package/src/tx/whileValidTxSender.ts

@@ -79,7 +79,7 @@ export class WhileValidTxSender extends BaseTxSender {
 		opts: ConfirmOptions,
 		preSigned?: boolean
 	): Promise<Transaction> {
-		const latestBlockhash =
+		let latestBlockhash =
 			await this.txHandler.getLatestBlockhashForTransaction();
 
 		// handle tx