@drift-labs/sdk 0.2.0-master.37 → 0.2.0-master.38

package/lib/admin.d.ts

@@ -36,12 +36,15 @@ export declare class Admin extends ClearingHouse {
     updatePerpMarketOracle(perpMarketIndex: number, oracle: PublicKey, oracleSource: OracleSource): Promise<TransactionSignature>;
     updatePerpMarketStepSizeAndTickSize(perpMarketIndex: number, stepSize: BN, tickSize: BN): Promise<TransactionSignature>;
     updatePerpMarketMinOrderSize(perpMarketIndex: number, orderSize: BN): Promise<TransactionSignature>;
+    updateSpotMarketStepSizeAndTickSize(spotMarketIndex: number, stepSize: BN, tickSize: BN): Promise<TransactionSignature>;
+    updateSpotMarketMinOrderSize(spotMarketIndex: number, orderSize: BN): Promise<TransactionSignature>;
     updatePerpMarketExpiry(perpMarketIndex: number, expiryTs: BN): Promise<TransactionSignature>;
     updateSpotMarketOracle(spotMarketIndex: number, oracle: PublicKey, oracleSource: OracleSource): Promise<TransactionSignature>;
     updateSpotMarketExpiry(spotMarketIndex: number, expiryTs: BN): Promise<TransactionSignature>;
     updateWhitelistMint(whitelistMint?: PublicKey): Promise<TransactionSignature>;
     updateDiscountMint(discountMint: PublicKey): Promise<TransactionSignature>;
     updateSpotMarketMarginWeights(spotMarketIndex: number, initialAssetWeight: number, maintenanceAssetWeight: number, initialLiabilityWeight: number, maintenanceLiabilityWeight: number, imfFactor?: number): Promise<TransactionSignature>;
+    updateSpotMarketBorrowRate(spotMarketIndex: number, optimalUtilization: number, optimalBorrowRate: number, optimalMaxRate: number): Promise<TransactionSignature>;
     updateSpotMarketAssetTier(spotMarketIndex: number, assetTier: AssetTier): Promise<TransactionSignature>;
     updateSpotMarketStatus(spotMarketIndex: number, marketStatus: MarketStatus): Promise<TransactionSignature>;
     updatePerpMarketStatus(perpMarketIndex: number, marketStatus: MarketStatus): Promise<TransactionSignature>;

package/lib/admin.js

@@ -401,6 +401,24 @@ class Admin extends clearingHouse_1.ClearingHouse {
             },
         });
     }
+    async updateSpotMarketStepSizeAndTickSize(spotMarketIndex, stepSize, tickSize) {
+        return await this.program.rpc.updateSpotMarketStepSizeAndTickSize(stepSize, tickSize, {
+            accounts: {
+                admin: this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
+            },
+        });
+    }
+    async updateSpotMarketMinOrderSize(spotMarketIndex, orderSize) {
+        return await this.program.rpc.updateSpotMarketMinOrderSize(orderSize, {
+            accounts: {
+                admin: this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
+            },
+        });
+    }
     async updatePerpMarketExpiry(perpMarketIndex, expiryTs) {
         return await this.program.rpc.updatePerpMarketExpiry(expiryTs, {
             accounts: {
@@ -454,6 +472,15 @@ class Admin extends clearingHouse_1.ClearingHouse {
             },
         });
     }
+    async updateSpotMarketBorrowRate(spotMarketIndex, optimalUtilization, optimalBorrowRate, optimalMaxRate) {
+        return await this.program.rpc.updateSpotMarketBorrowRate(optimalUtilization, optimalBorrowRate, optimalMaxRate, {
+            accounts: {
+                admin: this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
+            },
+        });
+    }
     async updateSpotMarketAssetTier(spotMarketIndex, assetTier) {
         return await this.program.rpc.updateSpotMarketAssetTier(assetTier, {
             accounts: {

package/lib/clearingHouse.d.ts

@@ -168,6 +168,7 @@ export declare class ClearingHouse {
     getPlaceSpotOrderIx(orderParams: OptionalOrderParams): Promise<TransactionInstruction>;
     fillSpotOrder(userAccountPublicKey: PublicKey, user: UserAccount, order?: Order, fulfillmentConfig?: SerumV3FulfillmentConfigAccount, makerInfo?: MakerInfo, referrerInfo?: ReferrerInfo): Promise<TransactionSignature>;
     getFillSpotOrderIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, order?: Order, fulfillmentConfig?: SerumV3FulfillmentConfigAccount, makerInfo?: MakerInfo, referrerInfo?: ReferrerInfo): Promise<TransactionInstruction>;
+    addSpotFulfillmentAccounts(marketIndex: number, remainingAccounts: AccountMeta[], fulfillmentConfig?: SerumV3FulfillmentConfigAccount): void;
     addSerumRemainingAccounts(marketIndex: number, remainingAccounts: AccountMeta[], fulfillmentConfig: SerumV3FulfillmentConfigAccount): void;
     triggerOrder(userAccountPublicKey: PublicKey, user: UserAccount, order: Order): Promise<TransactionSignature>;
     getTriggerOrderIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, order: Order): Promise<TransactionInstruction>;

package/lib/clearingHouse.js

@@ -1271,9 +1271,7 @@ class ClearingHouse {
         }
         const orderId = order.orderId;
         const makerOrderId = makerInfo ? makerInfo.order.orderId : null;
-        if (fulfillmentConfig) {
-            this.addSerumRemainingAccounts(marketIndex, remainingAccounts, fulfillmentConfig);
-        }
+        this.addSpotFulfillmentAccounts(marketIndex, remainingAccounts, fulfillmentConfig);
         return await this.program.instruction.fillSpotOrder(orderId, fulfillmentConfig ? fulfillmentConfig.fulfillmentType : null, makerOrderId, {
             accounts: {
                 state: await this.getStatePublicKey(),
@@ -1286,6 +1284,23 @@ class ClearingHouse {
             remainingAccounts,
         });
     }
+    addSpotFulfillmentAccounts(marketIndex, remainingAccounts, fulfillmentConfig) {
+        if (fulfillmentConfig) {
+            this.addSerumRemainingAccounts(marketIndex, remainingAccounts, fulfillmentConfig);
+        }
+        else {
+            remainingAccounts.push({
+                pubkey: this.getSpotMarketAccount(marketIndex).vault,
+                isWritable: false,
+                isSigner: false,
+            });
+            remainingAccounts.push({
+                pubkey: this.getQuoteSpotMarketAccount().vault,
+                isWritable: false,
+                isSigner: false,
+            });
+        }
+    }
     addSerumRemainingAccounts(marketIndex, remainingAccounts, fulfillmentConfig) {
         remainingAccounts.push({
             pubkey: fulfillmentConfig.pubkey,
@@ -1540,9 +1555,7 @@ class ClearingHouse {
                 isSigner: false,
             });
         }
-        if (fulfillmentConfig) {
-            this.addSerumRemainingAccounts(orderParams.marketIndex, remainingAccounts, fulfillmentConfig);
-        }
+        this.addSpotFulfillmentAccounts(orderParams.marketIndex, remainingAccounts, fulfillmentConfig);
         return await this.program.instruction.placeAndTakeSpotOrder(orderParams, fulfillmentConfig ? fulfillmentConfig.fulfillmentType : null, makerOrderId, {
             accounts: {
                 state: await this.getStatePublicKey(),
@@ -1583,9 +1596,7 @@ class ClearingHouse {
                 isSigner: false,
             });
         }
-        if (fulfillmentConfig) {
-            this.addSerumRemainingAccounts(orderParams.marketIndex, remainingAccounts, fulfillmentConfig);
-        }
+        this.addSpotFulfillmentAccounts(orderParams.marketIndex, remainingAccounts, fulfillmentConfig);
         const takerOrderId = takerInfo.order.orderId;
         return await this.program.instruction.placeAndMakeSpotOrder(orderParams, takerOrderId, fulfillmentConfig ? fulfillmentConfig.fulfillmentType : null, {
             accounts: {

package/lib/clearingHouseUser.js

@@ -125,7 +125,7 @@ class ClearingHouseUser {
      */
     getLPBidAsks(marketIndex) {
         const position = this.getUserPosition(marketIndex);
-        if (position.lpShares.eq(numericConstants_1.ZERO)) {
+        if (position === undefined || position.lpShares.eq(numericConstants_1.ZERO)) {
             return [numericConstants_1.ZERO, numericConstants_1.ZERO];
         }
         const market = this.clearingHouse.getPerpMarketAccount(marketIndex);

package/lib/idl/clearing_house.json

@@ -2708,6 +2708,40 @@
                 }
             ]
         },
+        {
+            "name": "updateSpotMarketBorrowRate",
+            "accounts": [
+                {
+                    "name": "admin",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "spotMarket",
+                    "isMut": true,
+                    "isSigner": false
+                }
+            ],
+            "args": [
+                {
+                    "name": "optimalUtilization",
+                    "type": "u32"
+                },
+                {
+                    "name": "optimalBorrowRate",
+                    "type": "u32"
+                },
+                {
+                    "name": "maxBorrowRate",
+                    "type": "u32"
+                }
+            ]
+        },
         {
             "name": "updateSpotMarketMaxTokenDeposits",
             "accounts": [
@@ -2771,6 +2805,62 @@
                 }
             ]
         },
+        {
+            "name": "updateSpotMarketStepSizeAndTickSize",
+            "accounts": [
+                {
+                    "name": "admin",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "spotMarket",
+                    "isMut": true,
+                    "isSigner": false
+                }
+            ],
+            "args": [
+                {
+                    "name": "stepSize",
+                    "type": "u64"
+                },
+                {
+                    "name": "tickSize",
+                    "type": "u64"
+                }
+            ]
+        },
+        {
+            "name": "updateSpotMarketMinOrderSize",
+            "accounts": [
+                {
+                    "name": "admin",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "spotMarket",
+                    "isMut": true,
+                    "isSigner": false
+                }
+            ],
+            "args": [
+                {
+                    "name": "orderSize",
+                    "type": "u64"
+                }
+            ]
+        },
         {
             "name": "updatePerpMarketStatus",
             "accounts": [

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "0.2.0-master.37",
+	"version": "0.2.0-master.38",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/admin.ts

@@ -753,6 +753,43 @@ export class Admin extends ClearingHouse {
 		});
 	}
 
+	public async updateSpotMarketStepSizeAndTickSize(
+		spotMarketIndex: number,
+		stepSize: BN,
+		tickSize: BN
+	): Promise<TransactionSignature> {
+		return await this.program.rpc.updateSpotMarketStepSizeAndTickSize(
+			stepSize,
+			tickSize,
+			{
+				accounts: {
+					admin: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					spotMarket: await getSpotMarketPublicKey(
+						this.program.programId,
+						spotMarketIndex
+					),
+				},
+			}
+		);
+	}
+
+	public async updateSpotMarketMinOrderSize(
+		spotMarketIndex: number,
+		orderSize: BN
+	): Promise<TransactionSignature> {
+		return await this.program.rpc.updateSpotMarketMinOrderSize(orderSize, {
+			accounts: {
+				admin: this.wallet.publicKey,
+				state: await this.getStatePublicKey(),
+				spotMarket: await getSpotMarketPublicKey(
+					this.program.programId,
+					spotMarketIndex
+				),
+			},
+		});
+	}
+
 	public async updatePerpMarketExpiry(
 		perpMarketIndex: number,
 		expiryTs: BN
@@ -852,6 +889,29 @@ export class Admin extends ClearingHouse {
 		);
 	}
 
+	public async updateSpotMarketBorrowRate(
+		spotMarketIndex: number,
+		optimalUtilization: number,
+		optimalBorrowRate: number,
+		optimalMaxRate: number
+	): Promise<TransactionSignature> {
+		return await this.program.rpc.updateSpotMarketBorrowRate(
+			optimalUtilization,
+			optimalBorrowRate,
+			optimalMaxRate,
+			{
+				accounts: {
+					admin: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					spotMarket: await getSpotMarketPublicKey(
+						this.program.programId,
+						spotMarketIndex
+					),
+				},
+			}
+		);
+	}
+
 	public async updateSpotMarketAssetTier(
 		spotMarketIndex: number,
 		assetTier: AssetTier

package/src/clearingHouse.ts

@@ -2166,13 +2166,11 @@ export class ClearingHouse {
 		const orderId = order.orderId;
 		const makerOrderId = makerInfo ? makerInfo.order.orderId : null;
 
-		if (fulfillmentConfig) {
-			this.addSerumRemainingAccounts(
-				marketIndex,
-				remainingAccounts,
-				fulfillmentConfig
-			);
-		}
+		this.addSpotFulfillmentAccounts(
+			marketIndex,
+			remainingAccounts,
+			fulfillmentConfig
+		);
 
 		return await this.program.instruction.fillSpotOrder(
 			orderId,
@@ -2192,6 +2190,31 @@ export class ClearingHouse {
 		);
 	}
 
+	addSpotFulfillmentAccounts(
+		marketIndex: number,
+		remainingAccounts: AccountMeta[],
+		fulfillmentConfig?: SerumV3FulfillmentConfigAccount
+	) {
+		if (fulfillmentConfig) {
+			this.addSerumRemainingAccounts(
+				marketIndex,
+				remainingAccounts,
+				fulfillmentConfig
+			);
+		} else {
+			remainingAccounts.push({
+				pubkey: this.getSpotMarketAccount(marketIndex).vault,
+				isWritable: false,
+				isSigner: false,
+			});
+			remainingAccounts.push({
+				pubkey: this.getQuoteSpotMarketAccount().vault,
+				isWritable: false,
+				isSigner: false,
+			});
+		}
+	}
+
 	addSerumRemainingAccounts(
 		marketIndex: number,
 		remainingAccounts: AccountMeta[],
@@ -2556,13 +2579,11 @@ export class ClearingHouse {
 			});
 		}
 
-		if (fulfillmentConfig) {
-			this.addSerumRemainingAccounts(
-				orderParams.marketIndex,
-				remainingAccounts,
-				fulfillmentConfig
-			);
-		}
+		this.addSpotFulfillmentAccounts(
+			orderParams.marketIndex,
+			remainingAccounts,
+			fulfillmentConfig
+		);
 
 		return await this.program.instruction.placeAndTakeSpotOrder(
 			orderParams,
@@ -2635,13 +2656,11 @@ export class ClearingHouse {
 			});
 		}
 
-		if (fulfillmentConfig) {
-			this.addSerumRemainingAccounts(
-				orderParams.marketIndex,
-				remainingAccounts,
-				fulfillmentConfig
-			);
-		}
+		this.addSpotFulfillmentAccounts(
+			orderParams.marketIndex,
+			remainingAccounts,
+			fulfillmentConfig
+		);
 
 		const takerOrderId = takerInfo.order.orderId;
 		return await this.program.instruction.placeAndMakeSpotOrder(

package/src/clearingHouseUser.ts

@@ -214,7 +214,7 @@ export class ClearingHouseUser {
 	 */
 	public getLPBidAsks(marketIndex: number): [BN, BN] {
 		const position = this.getUserPosition(marketIndex);
-		if (position.lpShares.eq(ZERO)) {
+		if (position === undefined || position.lpShares.eq(ZERO)) {
 			return [ZERO, ZERO];
 		}
 

package/src/idl/clearing_house.json

@@ -2708,6 +2708,40 @@
         }
       ]
     },
+    {
+      "name": "updateSpotMarketBorrowRate",
+      "accounts": [
+        {
+          "name": "admin",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "spotMarket",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "optimalUtilization",
+          "type": "u32"
+        },
+        {
+          "name": "optimalBorrowRate",
+          "type": "u32"
+        },
+        {
+          "name": "maxBorrowRate",
+          "type": "u32"
+        }
+      ]
+    },
     {
       "name": "updateSpotMarketMaxTokenDeposits",
       "accounts": [
@@ -2771,6 +2805,62 @@
         }
       ]
     },
+    {
+      "name": "updateSpotMarketStepSizeAndTickSize",
+      "accounts": [
+        {
+          "name": "admin",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "spotMarket",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "stepSize",
+          "type": "u64"
+        },
+        {
+          "name": "tickSize",
+          "type": "u64"
+        }
+      ]
+    },
+    {
+      "name": "updateSpotMarketMinOrderSize",
+      "accounts": [
+        {
+          "name": "admin",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "spotMarket",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "orderSize",
+          "type": "u64"
+        }
+      ]
+    },
     {
       "name": "updatePerpMarketStatus",
       "accounts": [