@drift-labs/sdk-browser 2.137.0-beta.0 → 2.137.0-beta.2

package/VERSION

@@ -1 +1 @@
-2.137.0-beta.0
+2.137.0-beta.2

package/lib/browser/accounts/webSocketAccountSubscriberV2.d.ts

@@ -2,7 +2,7 @@
 /// <reference types="node" />
 import { DataAndSlot, AccountSubscriber, ResubOpts, BufferAndSlot } from './types';
 import { Program } from '@coral-xyz/anchor';
-import { AccountInfoBase, AccountInfoWithBase64EncodedData, AccountInfoWithBase58EncodedData, Rpc, RpcSubscriptions, SolanaRpcSubscriptionsApi, type Commitment } from 'gill';
+import { AccountInfoBase, AccountInfoWithBase64EncodedData, AccountInfoWithBase58EncodedData, Rpc, RpcSubscriptions, SolanaRpcSubscriptionsApi, Commitment } from 'gill';
 import { PublicKey } from '@solana/web3.js';
 /**
  * WebSocketAccountSubscriberV2

package/lib/browser/accounts/webSocketProgramAccountsSubscriberV2.d.ts

@@ -3,7 +3,7 @@
 import { BufferAndSlot, ProgramAccountSubscriber, ResubOpts } from './types';
 import { Program } from '@coral-xyz/anchor';
 import { Commitment, Context, MemcmpFilter, PublicKey } from '@solana/web3.js';
-import { AccountInfoBase, AccountInfoWithBase58EncodedData, AccountInfoWithBase64EncodedData, type Address } from 'gill';
+import { AccountInfoBase, AccountInfoWithBase58EncodedData, AccountInfoWithBase64EncodedData, Address } from 'gill';
 /**
  * WebSocketProgramAccountsSubscriberV2
  *

package/lib/browser/decode/user.js

@@ -94,7 +94,7 @@ function decodeUser(buffer) {
         offset += 8;
         const lastQuoteAssetAmountPerLp = readSignedBigInt64LE(buffer, offset);
         offset += 8;
-        const remainderBaseAssetAmount = buffer.readInt32LE(offset);
+        const maxMarginRatio = buffer.readUInt16LE(offset);
         offset += 4;
         const marketIndex = buffer.readUInt16LE(offset);
         offset += 3;
@@ -110,12 +110,13 @@ function decodeUser(buffer) {
             openAsks,
             settledPnl,
             lpShares,
+            remainderBaseAssetAmount: 0,
             lastBaseAssetAmountPerLp,
             lastQuoteAssetAmountPerLp,
-            remainderBaseAssetAmount,
             marketIndex,
             openOrders,
             perLpBase,
+            maxMarginRatio,
         });
     }
     const orders = [];

package/lib/browser/driftClient.d.ts

@@ -188,6 +188,8 @@ export declare class DriftClient {
         subAccountId: number;
     }[], txParams?: TxParams): Promise<TransactionSignature>;
     getUpdateUserCustomMarginRatioIx(marginRatio: number, subAccountId?: number): Promise<TransactionInstruction>;
+    getUpdateUserPerpPositionCustomMarginRatioIx(perpMarketIndex: number, marginRatio: number, subAccountId?: number): Promise<TransactionInstruction>;
+    updateUserPerpPositionCustomMarginRatio(perpMarketIndex: number, marginRatio: number, subAccountId?: number, txParams?: TxParams): Promise<TransactionSignature>;
     getUpdateUserMarginTradingEnabledIx(marginTradingEnabled: boolean, subAccountId?: number, userAccountPublicKey?: PublicKey): Promise<TransactionInstruction>;
     updateUserMarginTradingEnabled(updates: {
         marginTradingEnabled: boolean;

package/lib/browser/driftClient.js

@@ -868,6 +868,23 @@ class DriftClient {
         });
         return ix;
     }
+    async getUpdateUserPerpPositionCustomMarginRatioIx(perpMarketIndex, marginRatio, subAccountId = 0) {
+        const userAccountPublicKey = (0, pda_1.getUserAccountPublicKeySync)(this.program.programId, this.wallet.publicKey, subAccountId);
+        await this.addUser(subAccountId, this.wallet.publicKey);
+        const ix = this.program.instruction.updateUserPerpPositionCustomMarginRatio(subAccountId, perpMarketIndex, marginRatio, {
+            accounts: {
+                user: userAccountPublicKey,
+                authority: this.wallet.publicKey,
+            },
+        });
+        return ix;
+    }
+    async updateUserPerpPositionCustomMarginRatio(perpMarketIndex, marginRatio, subAccountId = 0, txParams) {
+        const ix = await this.getUpdateUserPerpPositionCustomMarginRatioIx(perpMarketIndex, marginRatio, subAccountId);
+        const tx = await this.buildTransaction(ix, txParams !== null && txParams !== void 0 ? txParams : this.txParams);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
+    }
     async getUpdateUserMarginTradingEnabledIx(marginTradingEnabled, subAccountId = 0, userAccountPublicKey) {
         const userAccountPublicKeyToUse = userAccountPublicKey ||
             (0, pda_1.getUserAccountPublicKeySync)(this.program.programId, this.wallet.publicKey, subAccountId);

package/lib/browser/idl/drift.json

@@ -1390,13 +1390,8 @@
             ]
         },
         {
-            "name": "addPerpLpShares",
+            "name": "updateUserName",
             "accounts": [
-                {
-                    "name": "state",
-                    "isMut": false,
-                    "isSigner": false
-                },
                 {
                     "name": "user",
                     "isMut": true,
@@ -1410,23 +1405,23 @@
             ],
             "args": [
                 {
-                    "name": "nShares",
-                    "type": "u64"
+                    "name": "subAccountId",
+                    "type": "u16"
                 },
                 {
-                    "name": "marketIndex",
-                    "type": "u16"
+                    "name": "name",
+                    "type": {
+                        "array": [
+                            "u8",
+                            32
+                        ]
+                    }
                 }
             ]
         },
         {
-            "name": "removePerpLpShares",
+            "name": "updateUserCustomMarginRatio",
             "accounts": [
-                {
-                    "name": "state",
-                    "isMut": false,
-                    "isSigner": false
-                },
                 {
                     "name": "user",
                     "isMut": true,
@@ -1440,47 +1435,17 @@
             ],
             "args": [
                 {
-                    "name": "sharesToBurn",
-                    "type": "u64"
-                },
-                {
-                    "name": "marketIndex",
+                    "name": "subAccountId",
                     "type": "u16"
-                }
-            ]
-        },
-        {
-            "name": "removePerpLpSharesInExpiringMarket",
-            "accounts": [
-                {
-                    "name": "state",
-                    "isMut": false,
-                    "isSigner": false
-                },
-                {
-                    "name": "user",
-                    "isMut": true,
-                    "isSigner": false
-                },
-                {
-                    "name": "signer",
-                    "isMut": false,
-                    "isSigner": true
-                }
-            ],
-            "args": [
-                {
-                    "name": "sharesToBurn",
-                    "type": "u64"
                 },
                 {
-                    "name": "marketIndex",
-                    "type": "u16"
+                    "name": "marginRatio",
+                    "type": "u32"
                 }
             ]
         },
         {
-            "name": "updateUserName",
+            "name": "updateUserPerpPositionCustomMarginRatio",
             "accounts": [
                 {
                     "name": "user",
@@ -1499,38 +1464,12 @@
                     "type": "u16"
                 },
                 {
-                    "name": "name",
-                    "type": {
-                        "array": [
-                            "u8",
-                            32
-                        ]
-                    }
-                }
-            ]
-        },
-        {
-            "name": "updateUserCustomMarginRatio",
-            "accounts": [
-                {
-                    "name": "user",
-                    "isMut": true,
-                    "isSigner": false
-                },
-                {
-                    "name": "authority",
-                    "isMut": false,
-                    "isSigner": true
-                }
-            ],
-            "args": [
-                {
-                    "name": "subAccountId",
+                    "name": "perpMarketIndex",
                     "type": "u16"
                 },
                 {
                     "name": "marginRatio",
-                    "type": "u32"
+                    "type": "u16"
                 }
             ]
         },
@@ -2291,27 +2230,6 @@
             ],
             "args": []
         },
-        {
-            "name": "settleLp",
-            "accounts": [
-                {
-                    "name": "state",
-                    "isMut": false,
-                    "isSigner": false
-                },
-                {
-                    "name": "user",
-                    "isMut": true,
-                    "isSigner": false
-                }
-            ],
-            "args": [
-                {
-                    "name": "marketIndex",
-                    "type": "u16"
-                }
-            ]
-        },
         {
             "name": "settleExpiredMarket",
             "accounts": [
@@ -6003,58 +5921,6 @@
                 }
             ]
         },
-        {
-            "name": "updatePerpMarketTargetBaseAssetAmountPerLp",
-            "accounts": [
-                {
-                    "name": "admin",
-                    "isMut": false,
-                    "isSigner": true
-                },
-                {
-                    "name": "state",
-                    "isMut": false,
-                    "isSigner": false
-                },
-                {
-                    "name": "perpMarket",
-                    "isMut": true,
-                    "isSigner": false
-                }
-            ],
-            "args": [
-                {
-                    "name": "targetBaseAssetAmountPerLp",
-                    "type": "i32"
-                }
-            ]
-        },
-        {
-            "name": "updatePerpMarketPerLpBase",
-            "accounts": [
-                {
-                    "name": "admin",
-                    "isMut": false,
-                    "isSigner": true
-                },
-                {
-                    "name": "state",
-                    "isMut": false,
-                    "isSigner": false
-                },
-                {
-                    "name": "perpMarket",
-                    "isMut": true,
-                    "isSigner": false
-                }
-            ],
-            "args": [
-                {
-                    "name": "perLpBase",
-                    "type": "i8"
-                }
-            ]
-        },
         {
             "name": "updateLpCooldownTime",
             "accounts": [
@@ -11647,13 +11513,17 @@
                         "type": "i64"
                     },
                     {
-                        "name": "remainderBaseAssetAmount",
-                        "docs": [
-                            "Settling LP position can lead to a small amount of base asset being left over smaller than step size",
-                            "This records that remainder so it can be settled later on",
-                            "precision: BASE_PRECISION"
-                        ],
-                        "type": "i32"
+                        "name": "padding",
+                        "type": {
+                            "array": [
+                                "u8",
+                                2
+                            ]
+                        }
+                    },
+                    {
+                        "name": "maxMarginRatio",
+                        "type": "u16"
                     },
                     {
                         "name": "marketIndex",
@@ -12713,23 +12583,6 @@
                 ]
             }
         },
-        {
-            "name": "AMMLiquiditySplit",
-            "type": {
-                "kind": "enum",
-                "variants": [
-                    {
-                        "name": "ProtocolOwned"
-                    },
-                    {
-                        "name": "LPOwned"
-                    },
-                    {
-                        "name": "Shared"
-                    }
-                ]
-            }
-        },
         {
             "name": "AMMAvailability",
             "type": {

package/lib/browser/math/bankruptcy.js

@@ -20,8 +20,7 @@ function isUserBankrupt(user) {
     for (const position of userAccount.perpPositions) {
         if (!position.baseAssetAmount.eq(numericConstants_1.ZERO) ||
             position.quoteAssetAmount.gt(numericConstants_1.ZERO) ||
-            (0, position_1.hasOpenOrders)(position) ||
-            position.lpShares.gt(numericConstants_1.ZERO)) {
+            (0, position_1.hasOpenOrders)(position)) {
             return false;
         }
         if (position.quoteAssetAmount.lt(numericConstants_1.ZERO)) {

package/lib/browser/types.d.ts

@@ -1102,7 +1102,9 @@ export type PerpPosition = {
     openAsks: BN;
     settledPnl: BN;
     lpShares: BN;
+    /**	 TODO: remove this field - it doesn't exist on chain */
     remainderBaseAssetAmount: number;
+    maxMarginRatio: number;
     lastBaseAssetAmountPerLp: BN;
     lastQuoteAssetAmountPerLp: BN;
     perLpBase: number;

package/lib/browser/user.d.ts

@@ -41,6 +41,7 @@ export declare class User {
      * @returns userPerpPosition
      */
     getPerpPosition(marketIndex: number): PerpPosition | undefined;
+    getPerpPositionOrEmpty(marketIndex: number): PerpPosition;
     getPerpPositionAndSlot(marketIndex: number): DataAndSlot<PerpPosition | undefined>;
     getSpotPositionForUserAccount(userAccount: UserAccount, marketIndex: number): SpotPosition | undefined;
     /**
@@ -85,26 +86,12 @@ export declare class User {
      * @returns : open asks
      */
     getPerpBidAsks(marketIndex: number): [BN, BN];
-    /**
-     * calculates the open bids and asks for an lp
-     * optionally pass in lpShares to see what bid/asks a user *would* take on
-     * @returns : lp open bids
-     * @returns : lp open asks
-     */
-    getLPBidAsks(marketIndex: number, lpShares?: BN): [BN, BN];
-    /**
-     * calculates the market position if the lp position was settled
-     * @returns : the settled userPosition
-     * @returns : the dust base asset amount (ie, < stepsize)
-     * @returns : pnl from settle
-     */
-    getPerpPositionWithLPSettle(marketIndex: number, originalPosition?: PerpPosition, burnLpShares?: boolean, includeRemainderInBaseAmount?: boolean): [PerpPosition, BN, BN];
     /**
      * calculates Buying Power = free collateral / initial margin ratio
      * @returns : Precision QUOTE_PRECISION
      */
     getPerpBuyingPower(marketIndex: number, collateralBuffer?: BN, enterHighLeverageMode?: any): BN;
-    getPerpBuyingPowerFromFreeCollateralAndBaseAssetAmount(marketIndex: number, freeCollateral: BN, baseAssetAmount: BN, enterHighLeverageMode?: any): BN;
+    getPerpBuyingPowerFromFreeCollateralAndBaseAssetAmount(marketIndex: number, freeCollateral: BN, baseAssetAmount: BN, enterHighLeverageMode?: any, perpPosition?: PerpPosition): BN;
     /**
      * calculates Free Collateral = Total collateral - margin requirement
      * @returns : Precision QUOTE_PRECISION