@drift-labs/sdk 2.87.0-beta.7 → 2.87.0-beta.8

package/VERSION

@@ -1 +1 @@
-2.87.0-beta.7
+2.87.0-beta.8

package/lib/driftClient.d.ts

@@ -640,6 +640,8 @@ export declare class DriftClient {
     settleMultiplePNLsIx(settleeUserAccountPublicKey: PublicKey, settleeUserAccount: UserAccount, marketIndexes: number[], mode: SettlePnlMode): Promise<TransactionInstruction>;
     liquidatePerp(userAccountPublicKey: PublicKey, userAccount: UserAccount, marketIndex: number, maxBaseAssetAmount: BN, limitPrice?: BN, txParams?: TxParams, liquidatorSubAccountId?: number): Promise<TransactionSignature>;
     getLiquidatePerpIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, marketIndex: number, maxBaseAssetAmount: BN, limitPrice?: BN, liquidatorSubAccountId?: number): Promise<TransactionInstruction>;
+    liquidatePerpWithFill(userAccountPublicKey: PublicKey, userAccount: UserAccount, marketIndex: number, makerInfos: MakerInfo[], txParams?: TxParams, liquidatorSubAccountId?: number): Promise<TransactionSignature>;
+    getLiquidatePerpWithFillIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, marketIndex: number, makerInfos: MakerInfo[], liquidatorSubAccountId?: number): Promise<TransactionInstruction>;
     liquidateSpot(userAccountPublicKey: PublicKey, userAccount: UserAccount, assetMarketIndex: number, liabilityMarketIndex: number, maxLiabilityTransfer: BN, limitPrice?: BN, txParams?: TxParams, liquidatorSubAccountId?: number): Promise<TransactionSignature>;
     getLiquidateSpotIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, assetMarketIndex: number, liabilityMarketIndex: number, maxLiabilityTransfer: BN, limitPrice?: BN, liquidatorSubAccountId?: number): Promise<TransactionInstruction>;
     liquidateBorrowForPerpPnl(userAccountPublicKey: PublicKey, userAccount: UserAccount, perpMarketIndex: number, liabilityMarketIndex: number, maxLiabilityTransfer: BN, limitPrice?: BN, txParams?: TxParams, liquidatorSubAccountId?: number): Promise<TransactionSignature>;

package/lib/driftClient.js

@@ -3228,6 +3228,44 @@ class DriftClient {
             remainingAccounts: remainingAccounts,
         });
     }
+    async liquidatePerpWithFill(userAccountPublicKey, userAccount, marketIndex, makerInfos, txParams, liquidatorSubAccountId) {
+        const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(await this.getLiquidatePerpWithFillIx(userAccountPublicKey, userAccount, marketIndex, makerInfos, liquidatorSubAccountId), txParams), [], this.opts);
+        this.perpMarketLastSlotCache.set(marketIndex, slot);
+        return txSig;
+    }
+    async getLiquidatePerpWithFillIx(userAccountPublicKey, userAccount, marketIndex, makerInfos, liquidatorSubAccountId) {
+        const userStatsPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, userAccount.authority);
+        const liquidator = await this.getUserAccountPublicKey(liquidatorSubAccountId);
+        const liquidatorStatsPublicKey = this.getUserStatsAccountPublicKey();
+        const remainingAccounts = this.getRemainingAccounts({
+            userAccounts: [this.getUserAccount(liquidatorSubAccountId), userAccount],
+            useMarketLastSlotCache: true,
+            writablePerpMarketIndexes: [marketIndex],
+        });
+        for (const makerInfo of makerInfos) {
+            remainingAccounts.push({
+                pubkey: makerInfo.maker,
+                isSigner: false,
+                isWritable: true,
+            });
+            remainingAccounts.push({
+                pubkey: makerInfo.makerStats,
+                isSigner: false,
+                isWritable: true,
+            });
+        }
+        return await this.program.instruction.liquidatePerpWithFill(marketIndex, {
+            accounts: {
+                state: await this.getStatePublicKey(),
+                authority: this.wallet.publicKey,
+                user: userAccountPublicKey,
+                userStats: userStatsPublicKey,
+                liquidator,
+                liquidatorStats: liquidatorStatsPublicKey,
+            },
+            remainingAccounts: remainingAccounts,
+        });
+    }
     async liquidateSpot(userAccountPublicKey, userAccount, assetMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, limitPrice, txParams, liquidatorSubAccountId) {
         const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(await this.getLiquidateSpotIx(userAccountPublicKey, userAccount, assetMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, limitPrice, liquidatorSubAccountId), txParams), [], this.opts);
         this.spotMarketLastSlotCache.set(assetMarketIndex, slot);

package/lib/idl/drift.json

@@ -1675,6 +1675,47 @@
                 }
             ]
         },
+        {
+            "name": "liquidatePerpWithFill",
+            "accounts": [
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "authority",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "liquidator",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "liquidatorStats",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "user",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "userStats",
+                    "isMut": true,
+                    "isSigner": false
+                }
+            ],
+            "args": [
+                {
+                    "name": "marketIndex",
+                    "type": "u16"
+                }
+            ]
+        },
         {
             "name": "liquidateSpot",
             "accounts": [
@@ -3362,27 +3403,6 @@
                 }
             ]
         },
-        {
-            "name": "initializePredictionMarket",
-            "accounts": [
-                {
-                    "name": "admin",
-                    "isMut": false,
-                    "isSigner": true
-                },
-                {
-                    "name": "state",
-                    "isMut": false,
-                    "isSigner": false
-                },
-                {
-                    "name": "perpMarket",
-                    "isMut": true,
-                    "isSigner": false
-                }
-            ],
-            "args": []
-        },
         {
             "name": "deleteInitializedPerpMarket",
             "accounts": [
@@ -9858,6 +9878,9 @@
                     },
                     {
                         "name": "PlaceAndTake"
+                    },
+                    {
+                        "name": "Liquidation"
                     }
                 ]
             }
@@ -10125,9 +10148,6 @@
                     },
                     {
                         "name": "Future"
-                    },
-                    {
-                        "name": "Prediction"
                     }
                 ]
             }
@@ -12797,6 +12817,11 @@
             "code": 6282,
             "name": "NonZeroTransferFee",
             "msg": "Non zero transfer fee"
+        },
+        {
+            "code": 6283,
+            "name": "LiquidationOrderFailedToFill",
+            "msg": "Liquidation order failed to fill"
         }
     ],
     "metadata": {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.87.0-beta.7",
+	"version": "2.87.0-beta.8",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/driftClient.ts

@@ -5990,6 +5990,81 @@ export class DriftClient {
 		);
 	}
 
+	public async liquidatePerpWithFill(
+		userAccountPublicKey: PublicKey,
+		userAccount: UserAccount,
+		marketIndex: number,
+		makerInfos: MakerInfo[],
+		txParams?: TxParams,
+		liquidatorSubAccountId?: number
+	): Promise<TransactionSignature> {
+		const { txSig, slot } = await this.sendTransaction(
+			await this.buildTransaction(
+				await this.getLiquidatePerpWithFillIx(
+					userAccountPublicKey,
+					userAccount,
+					marketIndex,
+					makerInfos,
+					liquidatorSubAccountId
+				),
+				txParams
+			),
+			[],
+			this.opts
+		);
+		this.perpMarketLastSlotCache.set(marketIndex, slot);
+		return txSig;
+	}
+
+	public async getLiquidatePerpWithFillIx(
+		userAccountPublicKey: PublicKey,
+		userAccount: UserAccount,
+		marketIndex: number,
+		makerInfos: MakerInfo[],
+		liquidatorSubAccountId?: number
+	): Promise<TransactionInstruction> {
+		const userStatsPublicKey = getUserStatsAccountPublicKey(
+			this.program.programId,
+			userAccount.authority
+		);
+
+		const liquidator = await this.getUserAccountPublicKey(
+			liquidatorSubAccountId
+		);
+		const liquidatorStatsPublicKey = this.getUserStatsAccountPublicKey();
+
+		const remainingAccounts = this.getRemainingAccounts({
+			userAccounts: [this.getUserAccount(liquidatorSubAccountId), userAccount],
+			useMarketLastSlotCache: true,
+			writablePerpMarketIndexes: [marketIndex],
+		});
+
+		for (const makerInfo of makerInfos) {
+			remainingAccounts.push({
+				pubkey: makerInfo.maker,
+				isSigner: false,
+				isWritable: true,
+			});
+			remainingAccounts.push({
+				pubkey: makerInfo.makerStats,
+				isSigner: false,
+				isWritable: true,
+			});
+		}
+
+		return await this.program.instruction.liquidatePerpWithFill(marketIndex, {
+			accounts: {
+				state: await this.getStatePublicKey(),
+				authority: this.wallet.publicKey,
+				user: userAccountPublicKey,
+				userStats: userStatsPublicKey,
+				liquidator,
+				liquidatorStats: liquidatorStatsPublicKey,
+			},
+			remainingAccounts: remainingAccounts,
+		});
+	}
+
 	public async liquidateSpot(
 		userAccountPublicKey: PublicKey,
 		userAccount: UserAccount,

package/src/idl/drift.json

@@ -1675,6 +1675,47 @@
         }
       ]
     },
+    {
+      "name": "liquidatePerpWithFill",
+      "accounts": [
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "authority",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "liquidator",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "liquidatorStats",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "user",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "userStats",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "marketIndex",
+          "type": "u16"
+        }
+      ]
+    },
     {
       "name": "liquidateSpot",
       "accounts": [
@@ -3362,27 +3403,6 @@
         }
       ]
     },
-    {
-      "name": "initializePredictionMarket",
-      "accounts": [
-        {
-          "name": "admin",
-          "isMut": false,
-          "isSigner": true
-        },
-        {
-          "name": "state",
-          "isMut": false,
-          "isSigner": false
-        },
-        {
-          "name": "perpMarket",
-          "isMut": true,
-          "isSigner": false
-        }
-      ],
-      "args": []
-    },
     {
       "name": "deleteInitializedPerpMarket",
       "accounts": [
@@ -9858,6 +9878,9 @@
           },
           {
             "name": "PlaceAndTake"
+          },
+          {
+            "name": "Liquidation"
           }
         ]
       }
@@ -10125,9 +10148,6 @@
           },
           {
             "name": "Future"
-          },
-          {
-            "name": "Prediction"
           }
         ]
       }
@@ -12797,9 +12817,14 @@
       "code": 6282,
       "name": "NonZeroTransferFee",
       "msg": "Non zero transfer fee"
+    },
+    {
+      "code": 6283,
+      "name": "LiquidationOrderFailedToFill",
+      "msg": "Liquidation order failed to fill"
     }
   ],
   "metadata": {
     "address": "dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH"
   }
-}
+}