@drift-labs/sdk 2.19.0 → 2.20.0-beta.0

package/lib/driftClient.d.ts

@@ -186,8 +186,8 @@ export declare class DriftClient {
     getCancelOrderByUserIdIx(userOrderId: number): Promise<TransactionInstruction>;
     cancelOrders(marketType?: MarketType, marketIndex?: number, direction?: PositionDirection, txParams?: TxParams): Promise<TransactionSignature>;
     getCancelOrdersIx(marketType: MarketType | null, marketIndex: number | null, direction: PositionDirection | null): Promise<TransactionInstruction>;
-    fillPerpOrder(userAccountPublicKey: PublicKey, user: UserAccount, order?: Pick<Order, 'marketIndex' | 'orderId'>, makerInfo?: MakerInfo, referrerInfo?: ReferrerInfo, txParams?: TxParams): Promise<TransactionSignature>;
-    getFillPerpOrderIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, order: Pick<Order, 'marketIndex' | 'orderId'>, makerInfo?: MakerInfo, referrerInfo?: ReferrerInfo): Promise<TransactionInstruction>;
+    fillPerpOrder(userAccountPublicKey: PublicKey, user: UserAccount, order?: Pick<Order, 'marketIndex' | 'orderId'>, makerInfo?: MakerInfo | MakerInfo[], referrerInfo?: ReferrerInfo, txParams?: TxParams): Promise<TransactionSignature>;
+    getFillPerpOrderIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, order: Pick<Order, 'marketIndex' | 'orderId'>, makerInfo?: MakerInfo | MakerInfo[], referrerInfo?: ReferrerInfo): Promise<TransactionInstruction>;
     placeSpotOrder(orderParams: OptionalOrderParams, txParams?: TxParams): Promise<TransactionSignature>;
     getPlaceSpotOrderIx(orderParams: OptionalOrderParams): Promise<TransactionInstruction>;
     fillSpotOrder(userAccountPublicKey: PublicKey, user: UserAccount, order?: Order, fulfillmentConfig?: SerumV3FulfillmentConfigAccount, makerInfo?: MakerInfo, referrerInfo?: ReferrerInfo, txParams?: TxParams): Promise<TransactionSignature>;

package/lib/driftClient.js

@@ -1261,41 +1261,49 @@ class DriftClient {
         const marketIndex = order
             ? order.marketIndex
             : userAccount.orders.find((order) => order.orderId === userAccount.nextOrderId - 1).marketIndex;
+        makerInfo = Array.isArray(makerInfo)
+            ? makerInfo
+            : makerInfo
+                ? [makerInfo]
+                : [];
         const userAccounts = [userAccount];
-        if (makerInfo !== undefined) {
-            userAccounts.push(makerInfo.makerUserAccount);
+        for (const maker of makerInfo) {
+            userAccounts.push(maker.makerUserAccount);
         }
         const remainingAccounts = this.getRemainingAccounts({
             userAccounts,
             writablePerpMarketIndexes: [marketIndex],
         });
-        if (makerInfo) {
+        for (const maker of makerInfo) {
             remainingAccounts.push({
-                pubkey: makerInfo.maker,
+                pubkey: maker.maker,
                 isWritable: true,
                 isSigner: false,
             });
             remainingAccounts.push({
-                pubkey: makerInfo.makerStats,
+                pubkey: maker.makerStats,
                 isWritable: true,
                 isSigner: false,
             });
         }
         if (referrerInfo) {
-            remainingAccounts.push({
-                pubkey: referrerInfo.referrer,
-                isWritable: true,
-                isSigner: false,
-            });
-            remainingAccounts.push({
-                pubkey: referrerInfo.referrerStats,
-                isWritable: true,
-                isSigner: false,
-            });
+            const referrerIsMaker = makerInfo.find((maker) => maker.maker.equals(referrerInfo.referrer)) !==
+                undefined;
+            if (!referrerIsMaker) {
+                remainingAccounts.push({
+                    pubkey: referrerInfo.referrer,
+                    isWritable: true,
+                    isSigner: false,
+                });
+                remainingAccounts.push({
+                    pubkey: referrerInfo.referrerStats,
+                    isWritable: true,
+                    isSigner: false,
+                });
+            }
         }
         const orderId = order.orderId;
-        const makerOrderId = makerInfo ? makerInfo.order.orderId : null;
-        return await this.program.instruction.fillPerpOrder(orderId, makerOrderId, {
+        return await this.program.instruction.fillPerpOrder(orderId, null, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 filler: fillerPublicKey,

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.19.0",
+    "version": "2.20.0-beta.0",
     "name": "drift",
     "instructions": [
         {
@@ -6207,6 +6207,7 @@
                     {
                         "name": "Match",
                         "fields": [
+                            "publicKey",
                             {
                                 "defined": "usize"
                             }
@@ -8604,6 +8605,56 @@
             "code": 6227,
             "name": "TierViolationLiquidatingPerpPnl",
             "msg": "TierViolationLiquidatingPerpPnl"
+        },
+        {
+            "code": 6228,
+            "name": "CouldNotLoadUserData",
+            "msg": "CouldNotLoadUserData"
+        },
+        {
+            "code": 6229,
+            "name": "UserWrongMutability",
+            "msg": "UserWrongMutability"
+        },
+        {
+            "code": 6230,
+            "name": "InvalidUserAccount",
+            "msg": "InvalidUserAccount"
+        },
+        {
+            "code": 6231,
+            "name": "CouldNotLoadUserStatsData",
+            "msg": "CouldNotLoadUserData"
+        },
+        {
+            "code": 6232,
+            "name": "UserStatsWrongMutability",
+            "msg": "UserWrongMutability"
+        },
+        {
+            "code": 6233,
+            "name": "InvalidUserStatsAccount",
+            "msg": "InvalidUserAccount"
+        },
+        {
+            "code": 6234,
+            "name": "UserNotFound",
+            "msg": "UserNotFound"
+        },
+        {
+            "code": 6235,
+            "name": "UnableToLoadUserAccount",
+            "msg": "UnableToLoadUserAccount"
+        },
+        {
+            "code": 6236,
+            "name": "UserStatsNotFound",
+            "msg": "UserStatsNotFound"
+        },
+        {
+            "code": 6237,
+            "name": "UnableToLoadUserStatsAccount",
+            "msg": "UnableToLoadUserStatsAccount"
         }
     ]
 }

package/lib/types.d.ts

@@ -928,7 +928,7 @@ export declare type MakerInfo = {
     maker: PublicKey;
     makerStats: PublicKey;
     makerUserAccount: UserAccount;
-    order: Order;
+    order?: Order;
 };
 export declare type TakerInfo = {
     taker: PublicKey;

package/package.json

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

package/src/driftClient.ts

@@ -2214,7 +2214,7 @@ export class DriftClient {
 		userAccountPublicKey: PublicKey,
 		user: UserAccount,
 		order?: Pick<Order, 'marketIndex' | 'orderId'>,
-		makerInfo?: MakerInfo,
+		makerInfo?: MakerInfo | MakerInfo[],
 		referrerInfo?: ReferrerInfo,
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
@@ -2240,7 +2240,7 @@ export class DriftClient {
 		userAccountPublicKey: PublicKey,
 		userAccount: UserAccount,
 		order: Pick<Order, 'marketIndex' | 'orderId'>,
-		makerInfo?: MakerInfo,
+		makerInfo?: MakerInfo | MakerInfo[],
 		referrerInfo?: ReferrerInfo
 	): Promise<TransactionInstruction> {
 		const userStatsPublicKey = getUserStatsAccountPublicKey(
@@ -2257,45 +2257,54 @@ export class DriftClient {
 					(order) => order.orderId === userAccount.nextOrderId - 1
 			  ).marketIndex;
 
+		makerInfo = Array.isArray(makerInfo)
+			? makerInfo
+			: makerInfo
+			? [makerInfo]
+			: [];
+
 		const userAccounts = [userAccount];
-		if (makerInfo !== undefined) {
-			userAccounts.push(makerInfo.makerUserAccount);
+		for (const maker of makerInfo) {
+			userAccounts.push(maker.makerUserAccount);
 		}
 		const remainingAccounts = this.getRemainingAccounts({
 			userAccounts,
 			writablePerpMarketIndexes: [marketIndex],
 		});
 
-		if (makerInfo) {
+		for (const maker of makerInfo) {
 			remainingAccounts.push({
-				pubkey: makerInfo.maker,
+				pubkey: maker.maker,
 				isWritable: true,
 				isSigner: false,
 			});
 			remainingAccounts.push({
-				pubkey: makerInfo.makerStats,
+				pubkey: maker.makerStats,
 				isWritable: true,
 				isSigner: false,
 			});
 		}
 
 		if (referrerInfo) {
-			remainingAccounts.push({
-				pubkey: referrerInfo.referrer,
-				isWritable: true,
-				isSigner: false,
-			});
-			remainingAccounts.push({
-				pubkey: referrerInfo.referrerStats,
-				isWritable: true,
-				isSigner: false,
-			});
+			const referrerIsMaker =
+				makerInfo.find((maker) => maker.maker.equals(referrerInfo.referrer)) !==
+				undefined;
+			if (!referrerIsMaker) {
+				remainingAccounts.push({
+					pubkey: referrerInfo.referrer,
+					isWritable: true,
+					isSigner: false,
+				});
+				remainingAccounts.push({
+					pubkey: referrerInfo.referrerStats,
+					isWritable: true,
+					isSigner: false,
+				});
+			}
 		}
 
 		const orderId = order.orderId;
-		const makerOrderId = makerInfo ? makerInfo.order.orderId : null;
-
-		return await this.program.instruction.fillPerpOrder(orderId, makerOrderId, {
+		return await this.program.instruction.fillPerpOrder(orderId, null, {
 			accounts: {
 				state: await this.getStatePublicKey(),
 				filler: fillerPublicKey,

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.19.0",
+  "version": "2.20.0-beta.0",
   "name": "drift",
   "instructions": [
     {
@@ -6207,6 +6207,7 @@
           {
             "name": "Match",
             "fields": [
+              "publicKey",
               {
                 "defined": "usize"
               }
@@ -8604,6 +8605,56 @@
       "code": 6227,
       "name": "TierViolationLiquidatingPerpPnl",
       "msg": "TierViolationLiquidatingPerpPnl"
+    },
+    {
+      "code": 6228,
+      "name": "CouldNotLoadUserData",
+      "msg": "CouldNotLoadUserData"
+    },
+    {
+      "code": 6229,
+      "name": "UserWrongMutability",
+      "msg": "UserWrongMutability"
+    },
+    {
+      "code": 6230,
+      "name": "InvalidUserAccount",
+      "msg": "InvalidUserAccount"
+    },
+    {
+      "code": 6231,
+      "name": "CouldNotLoadUserStatsData",
+      "msg": "CouldNotLoadUserData"
+    },
+    {
+      "code": 6232,
+      "name": "UserStatsWrongMutability",
+      "msg": "UserWrongMutability"
+    },
+    {
+      "code": 6233,
+      "name": "InvalidUserStatsAccount",
+      "msg": "InvalidUserAccount"
+    },
+    {
+      "code": 6234,
+      "name": "UserNotFound",
+      "msg": "UserNotFound"
+    },
+    {
+      "code": 6235,
+      "name": "UnableToLoadUserAccount",
+      "msg": "UnableToLoadUserAccount"
+    },
+    {
+      "code": 6236,
+      "name": "UserStatsNotFound",
+      "msg": "UserStatsNotFound"
+    },
+    {
+      "code": 6237,
+      "name": "UnableToLoadUserStatsAccount",
+      "msg": "UnableToLoadUserStatsAccount"
     }
   ]
 }

package/src/types.ts

@@ -902,7 +902,7 @@ export type MakerInfo = {
 	maker: PublicKey;
 	makerStats: PublicKey;
 	makerUserAccount: UserAccount;
-	order: Order;
+	order?: Order;
 };
 
 export type TakerInfo = {