@drift-labs/sdk 2.24.0 → 2.25.0-beta.0

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.24.0",
+  "version": "2.25.0-beta.0",
   "name": "drift",
   "instructions": [
     {
@@ -428,6 +428,72 @@
         }
       ]
     },
+    {
+      "name": "modifyOrder",
+      "accounts": [
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "user",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "authority",
+          "isMut": false,
+          "isSigner": true
+        }
+      ],
+      "args": [
+        {
+          "name": "orderId",
+          "type": {
+            "option": "u32"
+          }
+        },
+        {
+          "name": "modifyOrderParams",
+          "type": {
+            "defined": "ModifyOrderParams"
+          }
+        }
+      ]
+    },
+    {
+      "name": "modifyOrderByUserId",
+      "accounts": [
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "user",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "authority",
+          "isMut": false,
+          "isSigner": true
+        }
+      ],
+      "args": [
+        {
+          "name": "userOrderId",
+          "type": "u8"
+        },
+        {
+          "name": "modifyOrderParams",
+          "type": {
+            "defined": "ModifyOrderParams"
+          }
+        }
+      ]
+    },
     {
       "name": "placeAndTakePerpOrder",
       "accounts": [
@@ -4882,6 +4948,98 @@
         ]
       }
     },
+    {
+      "name": "ModifyOrderParams",
+      "type": {
+        "kind": "struct",
+        "fields": [
+          {
+            "name": "direction",
+            "type": {
+              "option": {
+                "defined": "PositionDirection"
+              }
+            }
+          },
+          {
+            "name": "baseAssetAmount",
+            "type": {
+              "option": "u64"
+            }
+          },
+          {
+            "name": "price",
+            "type": {
+              "option": "u64"
+            }
+          },
+          {
+            "name": "reduceOnly",
+            "type": {
+              "option": "bool"
+            }
+          },
+          {
+            "name": "postOnly",
+            "type": {
+              "option": {
+                "defined": "PostOnlyParam"
+              }
+            }
+          },
+          {
+            "name": "immediateOrCancel",
+            "type": {
+              "option": "bool"
+            }
+          },
+          {
+            "name": "maxTs",
+            "type": {
+              "option": "i64"
+            }
+          },
+          {
+            "name": "triggerPrice",
+            "type": {
+              "option": "u64"
+            }
+          },
+          {
+            "name": "triggerCondition",
+            "type": {
+              "option": {
+                "defined": "OrderTriggerCondition"
+              }
+            }
+          },
+          {
+            "name": "oraclePriceOffset",
+            "type": {
+              "option": "i32"
+            }
+          },
+          {
+            "name": "auctionDuration",
+            "type": {
+              "option": "u8"
+            }
+          },
+          {
+            "name": "auctionStartPrice",
+            "type": {
+              "option": "i64"
+            }
+          },
+          {
+            "name": "auctionEndPrice",
+            "type": {
+              "option": "i64"
+            }
+          }
+        ]
+      }
+    },
     {
       "name": "LiquidatePerpRecord",
       "type": {
@@ -5157,7 +5315,7 @@
         "fields": [
           {
             "name": "revenueWithdrawSinceLastSettle",
-            "type": "u64"
+            "type": "i64"
           },
           {
             "name": "maxRevenueWithdrawPerPeriod",
@@ -6011,31 +6169,35 @@
       }
     },
     {
-      "name": "PositionDirection",
+      "name": "ModifyOrderId",
       "type": {
         "kind": "enum",
         "variants": [
           {
-            "name": "Long"
+            "name": "UserOrderId",
+            "fields": [
+              "u8"
+            ]
           },
           {
-            "name": "Short"
+            "name": "OrderId",
+            "fields": [
+              "u32"
+            ]
           }
         ]
       }
     },
     {
-      "name": "FulfillmentParams",
+      "name": "PositionDirection",
       "type": {
         "kind": "enum",
         "variants": [
           {
-            "name": "SerumFulfillmentParams",
-            "fields": [
-              {
-                "defined": "SerumFulfillmentParams<'a,'b>"
-              }
-            ]
+            "name": "Long"
+          },
+          {
+            "name": "Short"
           }
         ]
       }
@@ -6049,7 +6211,7 @@
             "name": "SerumV3"
           },
           {
-            "name": "None"
+            "name": "Match"
           }
         ]
       }
@@ -6410,7 +6572,7 @@
         "kind": "enum",
         "variants": [
           {
-            "name": "SerumV3"
+            "name": "ExternalMarket"
           },
           {
             "name": "Match"
@@ -8861,6 +9023,11 @@
       "code": 6240,
       "name": "InvalidMarketAccountforDeletion",
       "msg": "Invalid MarketAccount for Deletion"
+    },
+    {
+      "code": 6241,
+      "name": "InvalidSpotFulfillmentParams",
+      "msg": "Invalid Spot Fulfillment Params"
     }
   ]
 }

package/src/index.ts

@@ -1,4 +1,4 @@
-import { BN } from '@project-serum/anchor';
+import { BN } from '@coral-xyz/anchor';
 import { PublicKey } from '@solana/web3.js';
 import pyth from '@pythnetwork/client';
 

package/src/math/amm.ts

@@ -1,4 +1,4 @@
-import { BN } from '@project-serum/anchor';
+import { BN } from '@coral-xyz/anchor';
 import {
 	AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO,
 	PRICE_PRECISION,

package/src/math/funding.ts

@@ -1,4 +1,4 @@
-import { BN } from '@project-serum/anchor';
+import { BN } from '@coral-xyz/anchor';
 import {
 	AMM_RESERVE_PRECISION,
 	PRICE_PRECISION,

package/src/math/insurance.ts

@@ -33,3 +33,32 @@ export function unstakeSharesToAmount(
 
 	return amount;
 }
+
+export function unstakeSharesToAmountWithOpenRequest(
+	nShares: BN,
+	withdrawRequestShares: BN,
+	withdrawRequestAmount: BN,
+	totalIfShares: BN,
+	insuranceFundVaultBalance: BN
+): BN {
+	let stakedAmount: BN;
+	if (totalIfShares.gt(ZERO)) {
+		stakedAmount = BN.max(
+			ZERO,
+			nShares
+				.sub(withdrawRequestShares)
+				.mul(insuranceFundVaultBalance)
+				.div(totalIfShares)
+		);
+	} else {
+		stakedAmount = ZERO;
+	}
+
+	const withdrawAmount = BN.min(
+		withdrawRequestAmount,
+		withdrawRequestShares.mul(insuranceFundVaultBalance).div(totalIfShares)
+	);
+	const amount = withdrawAmount.add(stakedAmount);
+
+	return amount;
+}

package/src/math/margin.ts

@@ -6,7 +6,7 @@ import {
 	BID_ASK_SPREAD_PRECISION,
 	AMM_RESERVE_PRECISION,
 } from '../constants/numericConstants';
-import { BN } from '@project-serum/anchor';
+import { BN } from '@coral-xyz/anchor';
 import { OraclePriceData } from '../oracles/types';
 import { PerpMarketAccount, PerpPosition } from '..';
 import { isVariant } from '../types';

package/src/math/market.ts

@@ -1,4 +1,4 @@
-import { BN } from '@project-serum/anchor';
+import { BN } from '@coral-xyz/anchor';
 import {
 	PerpMarketAccount,
 	PositionDirection,

package/src/math/oracles.ts

@@ -41,11 +41,10 @@ export function isOracleValid(
 			.div(BN.max(ONE, oraclePriceData.price))
 			.gt(oracleGuardRails.validity.tooVolatileRatio);
 
-	const isConfidenceTooLarge = new BN(amm.baseSpread)
-		.add(BN.max(ONE, oraclePriceData.confidence))
+	const isConfidenceTooLarge = BN.max(ONE, oraclePriceData.confidence)
 		.mul(BID_ASK_SPREAD_PRECISION)
 		.div(oraclePriceData.price)
-		.gt(new BN(amm.maxSpread));
+		.gt(oracleGuardRails.validity.confidenceIntervalMaxSize);
 
 	const oracleIsStale = oraclePriceData.slot
 		.sub(new BN(slot))

package/src/math/orders.ts

@@ -8,7 +8,7 @@ import {
 	PositionDirection,
 } from '../types';
 import { ZERO, TWO } from '../constants/numericConstants';
-import { BN } from '@project-serum/anchor';
+import { BN } from '@coral-xyz/anchor';
 import { OraclePriceData } from '../oracles/types';
 import { getAuctionPrice, isAuctionComplete } from './auction';
 import {

package/src/math/repeg.ts

@@ -1,4 +1,4 @@
-import { BN } from '@project-serum/anchor';
+import { BN } from '@coral-xyz/anchor';
 import { assert } from '../assert/assert';
 import {
 	PRICE_PRECISION,

package/src/math/spotBalance.ts

@@ -4,7 +4,7 @@ import {
 	isVariant,
 	MarginCategory,
 } from '../types';
-import { BN } from '@project-serum/anchor';
+import { BN } from '@coral-xyz/anchor';
 import {
 	SPOT_MARKET_UTILIZATION_PRECISION,
 	ONE,

package/src/math/spotMarket.ts

@@ -1,4 +1,4 @@
-import { BN } from '@project-serum/anchor';
+import { BN } from '@coral-xyz/anchor';
 import {
 	isVariant,
 	MarginCategory,

package/src/math/spotPosition.ts

@@ -1,6 +1,6 @@
 import { SpotMarketAccount, SpotPosition } from '../types';
 import { ZERO } from '../constants/numericConstants';
-import { BN } from '@project-serum/anchor';
+import { BN } from '@coral-xyz/anchor';
 import {
 	getSignedTokenAmount,
 	getTokenAmount,

package/src/math/trade.ts

@@ -4,7 +4,7 @@ import {
 	PositionDirection,
 	SpotMarketAccount,
 } from '../types';
-import { BN } from '@project-serum/anchor';
+import { BN } from '@coral-xyz/anchor';
 import { assert } from '../assert/assert';
 import {
 	PRICE_PRECISION,

package/src/oracles/pythClient.ts

@@ -1,7 +1,7 @@
 import { parsePriceData } from '@pythnetwork/client';
 import { Connection, PublicKey } from '@solana/web3.js';
 import { OracleClient, OraclePriceData } from './types';
-import { BN } from '@project-serum/anchor';
+import { BN } from '@coral-xyz/anchor';
 import {
 	ONE,
 	PRICE_PRECISION,

package/src/oracles/quoteAssetOracleClient.ts

@@ -1,6 +1,6 @@
 import { PublicKey } from '@solana/web3.js';
 import { OracleClient, OraclePriceData } from './types';
-import { BN } from '@project-serum/anchor';
+import { BN } from '@coral-xyz/anchor';
 import { PRICE_PRECISION } from '../constants/numericConstants';
 
 export const QUOTE_ORACLE_PRICE_DATA: OraclePriceData = {

package/src/oracles/types.ts

@@ -1,4 +1,4 @@
-import { BN } from '@project-serum/anchor';
+import { BN } from '@coral-xyz/anchor';
 import { PublicKey } from '@solana/web3.js';
 import { OracleSource } from '../types';
 

package/src/orderParams.ts

@@ -1,5 +1,5 @@
 import { OptionalOrderParams, OrderTriggerCondition, OrderType } from './types';
-import { BN } from '@project-serum/anchor';
+import { BN } from '@coral-xyz/anchor';
 
 export function getLimitOrderParams(
 	params: Omit<OptionalOrderParams, 'orderType' | 'marketType'> & { price: BN }

package/src/serum/serumSubscriber.ts

@@ -2,7 +2,7 @@ import { Connection, PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from '../accounts/bulkAccountLoader';
 import { Market, Orderbook } from '@project-serum/serum';
 import { SerumMarketSubscriberConfig } from './types';
-import { BN } from '@project-serum/anchor';
+import { BN } from '@coral-xyz/anchor';
 import { PRICE_PRECISION } from '../constants/numericConstants';
 
 export class SerumSubscriber {

package/src/tokenFaucet.ts

@@ -1,5 +1,5 @@
-import * as anchor from '@project-serum/anchor';
-import { AnchorProvider, Idl, Program } from '@project-serum/anchor';
+import * as anchor from '@coral-xyz/anchor';
+import { AnchorProvider, Idl, Program } from '@coral-xyz/anchor';
 import {
 	AccountInfo,
 	ASSOCIATED_TOKEN_PROGRAM_ID,

package/src/tx/retryTxSender.ts

@@ -14,7 +14,7 @@ import {
 	TransactionInstruction,
 	AddressLookupTableAccount,
 } from '@solana/web3.js';
-import { AnchorProvider } from '@project-serum/anchor';
+import { AnchorProvider } from '@coral-xyz/anchor';
 import assert from 'assert';
 import bs58 from 'bs58';
 

package/src/tx/types.ts

@@ -1,4 +1,4 @@
-import { Provider } from '@project-serum/anchor';
+import { Provider } from '@coral-xyz/anchor';
 import {
 	AddressLookupTableAccount,
 	ConfirmOptions,

package/src/types.ts

@@ -161,7 +161,8 @@ export class OrderTriggerCondition {
 }
 
 export class SpotFulfillmentType {
-	static readonly SERUM_v3 = { serumV3: {} };
+	static readonly EXTERNAL = { external: {} };
+	static readonly MATCH = { match: {} };
 }
 
 export class SpotFulfillmentStatus {
@@ -880,6 +881,10 @@ export type OptionalOrderParams = {
 	[Property in keyof OrderParams]?: OrderParams[Property];
 } & NecessaryOrderParams;
 
+export type ModifyOrderParams = {
+	[Property in keyof OrderParams]?: OrderParams[Property] | null;
+};
+
 export const DefaultOrderParams: OrderParams = {
 	orderType: OrderType.MARKET,
 	marketType: MarketType.PERP,

package/src/userMap/userStatsMap.ts

@@ -16,7 +16,7 @@ import {
 	LPRecord,
 	InsuranceFundStakeRecord,
 } from '..';
-import { ProgramAccount } from '@project-serum/anchor';
+import { ProgramAccount } from '@coral-xyz/anchor';
 import { AccountInfo, PublicKey } from '@solana/web3.js';
 
 import { UserMap } from './userMap';