@drift-labs/sdk 0.2.0-master.26 → 0.2.0-master.28

package/lib/userMap/userStatsMap.js

@@ -0,0 +1,68 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UserStatsMap = void 0;
+const __1 = require("..");
+const web3_js_1 = require("@solana/web3.js");
+class UserStatsMap {
+    constructor(clearingHouse, accountSubscription) {
+        /**
+         * map from authority pubkey to ClearingHouseUserStats
+         */
+        this.userStatsMap = new Map();
+        this.clearingHouse = clearingHouse;
+        this.accountSubscription = accountSubscription;
+    }
+    async fetchAllUserStats() {
+        const userStatArray = [];
+        const programUserAccounts = (await this.clearingHouse.program.account.userStats.all());
+        for (const programUserAccount of programUserAccounts) {
+            const userStat = programUserAccount.account;
+            if (this.userStatsMap.has(userStat.authority.toString())) {
+                continue;
+            }
+            const chUserStat = new __1.ClearingHouseUserStats({
+                clearingHouse: this.clearingHouse,
+                userStatsAccountPublicKey: (0, __1.getUserStatsAccountPublicKey)(this.clearingHouse.program.programId, userStat.authority),
+                accountSubscription: this.accountSubscription,
+            });
+            userStatArray.push(chUserStat);
+        }
+        if (this.accountSubscription.type === 'polling') {
+            await (0, __1.bulkPollingUserStatsSubscribe)(userStatArray, this.accountSubscription.accountLoader);
+        }
+        for (const userStat of userStatArray) {
+            this.userStatsMap.set(userStat.getAccount().authority.toString(), userStat);
+        }
+    }
+    async addUserStat(authority) {
+        const userStat = new __1.ClearingHouseUserStats({
+            clearingHouse: this.clearingHouse,
+            userStatsAccountPublicKey: (0, __1.getUserStatsAccountPublicKey)(this.clearingHouse.program.programId, authority),
+            accountSubscription: this.accountSubscription,
+        });
+        await userStat.subscribe();
+        this.userStatsMap.set(authority.toString(), userStat);
+    }
+    async updateWithOrderRecord(record, userMap) {
+        if (!this.has(record.user.toString())) {
+            const takerUserAccount = await userMap.mustGet(record.user.toString());
+            this.addUserStat(takerUserAccount.getUserAccount().authority);
+        }
+    }
+    has(authorityPublicKey) {
+        return this.userStatsMap.has(authorityPublicKey);
+    }
+    get(authorityPublicKey) {
+        return this.userStatsMap.get(authorityPublicKey);
+    }
+    async mustGet(authorityPublicKey) {
+        if (!this.has(authorityPublicKey)) {
+            await this.addUserStat(new web3_js_1.PublicKey(authorityPublicKey));
+        }
+        return this.get(authorityPublicKey);
+    }
+    values() {
+        return this.userStatsMap.values();
+    }
+}
+exports.UserStatsMap = UserStatsMap;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "0.2.0-master.26",
+	"version": "0.2.0-master.28",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",
@@ -14,7 +14,9 @@
 		"build": "yarn clean && tsc",
 		"clean": "rm -rf lib",
 		"test": "mocha -r ts-node/register tests/**/*.ts",
-		"patch-and-pub": "npm version patch --force && npm publish"
+		"patch-and-pub": "npm version patch --force && npm publish",
+		"prettify": "prettier --check './src/***/*.ts'",
+		"prettify:fix": "prettier --write './{src,tests}/***/*.ts'"
 	},
 	"keywords": [
 		"drift-labs",
@@ -48,7 +50,8 @@
 		"eslint-config-prettier": "^8.3.0",
 		"eslint-plugin-prettier": "^3.4.0",
 		"mocha": "^10.0.0",
-		"ts-node": "^10.8.0"
+		"ts-node": "^10.8.0",
+		"prettier": "^2.4.1"
 	},
 	"description": "SDK for Drift Protocol v1",
 	"engines": {

package/src/accounts/pollingClearingHouseAccountSubscriber.ts

@@ -409,6 +409,10 @@ export class PollingClearingHouseAccountSubscriber
 		return this.spotMarket.get(marketIndex.toNumber());
 	}
 
+	public getSpotMarketAccountsAndSlots(): DataAndSlot<SpotMarketAccount>[] {
+		return Array.from(this.spotMarket.values());
+	}
+
 	public getOraclePriceDataAndSlot(
 		oraclePublicKey: PublicKey
 	): DataAndSlot<OraclePriceData> | undefined {

package/src/accounts/types.ts

@@ -54,6 +54,7 @@ export interface ClearingHouseAccountSubscriber {
 	getSpotMarketAccountAndSlot(
 		marketIndex: BN
 	): DataAndSlot<SpotMarketAccount> | undefined;
+	getSpotMarketAccountsAndSlots(): DataAndSlot<SpotMarketAccount>[];
 	getOraclePriceDataAndSlot(
 		oraclePublicKey: PublicKey
 	): DataAndSlot<OraclePriceData> | undefined;

package/src/accounts/webSocketClearingHouseAccountSubscriber.ts

@@ -313,6 +313,12 @@ export class WebSocketClearingHouseAccountSubscriber
 			.dataAndSlot;
 	}
 
+	public getSpotMarketAccountsAndSlots(): DataAndSlot<SpotMarketAccount>[] {
+		return Array.from(this.spotMarketAccountSubscribers.values()).map(
+			(subscriber) => subscriber.dataAndSlot
+		);
+	}
+
 	public getOraclePriceDataAndSlot(
 		oraclePublicKey: PublicKey
 	): DataAndSlot<OraclePriceData> | undefined {

package/src/admin.ts

@@ -274,6 +274,19 @@ export class Admin extends ClearingHouse {
 		});
 	}
 
+	public async updateConcentrationScale(
+		marketIndex: BN,
+		concentrationScale: BN
+	): Promise<TransactionSignature> {
+		return await this.program.rpc.updateConcentrationScale(concentrationScale, {
+			accounts: {
+				state: await this.getStatePublicKey(),
+				admin: this.wallet.publicKey,
+				market: await getMarketPublicKey(this.program.programId, marketIndex),
+			},
+		});
+	}
+
 	public async moveAmmToPrice(
 		perpMarketIndex: BN,
 		targetPrice: BN
@@ -654,14 +667,31 @@ export class Admin extends ClearingHouse {
 	public async updateSpotMarketIfFactor(
 		marketIndex: BN,
 		userIfFactor: BN,
-		totalIfFactor: BN,
-		liquidationIfFactor: BN
+		totalIfFactor: BN
 	): Promise<TransactionSignature> {
 		return await this.program.rpc.updateSpotMarketIfFactor(
 			marketIndex,
 			userIfFactor,
 			totalIfFactor,
-			liquidationIfFactor,
+			{
+				accounts: {
+					admin: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					spotMarket: await getSpotMarketPublicKey(
+						this.program.programId,
+						marketIndex
+					),
+				},
+			}
+		);
+	}
+
+	public async updateSpotMarketRevenueSettlePeriod(
+		marketIndex: BN,
+		revenueSettlePeriod: BN
+	): Promise<TransactionSignature> {
+		return await this.program.rpc.updateSpotMarketRevenueSettlePeriod(
+			revenueSettlePeriod,
 			{
 				accounts: {
 					admin: this.wallet.publicKey,
@@ -830,13 +860,25 @@ export class Admin extends ClearingHouse {
 		});
 	}
 
-	public async updateAuctionDuration(
-		minDuration: BN | number,
-		maxDuration: BN | number
+	public async updatePerpAuctionDuration(
+		minDuration: BN | number
 	): Promise<TransactionSignature> {
-		return await this.program.rpc.updateAuctionDuration(
+		return await this.program.rpc.updatePerpAuctionDuration(
 			typeof minDuration === 'number' ? minDuration : minDuration.toNumber(),
-			typeof maxDuration === 'number' ? maxDuration : maxDuration.toNumber(),
+			{
+				accounts: {
+					admin: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+				},
+			}
+		);
+	}
+
+	public async updateSpotAuctionDuration(
+		defaultAuctionDuration: number
+	): Promise<TransactionSignature> {
+		return await this.program.rpc.updateSpotAuctionDuration(
+			defaultAuctionDuration,
 			{
 				accounts: {
 					admin: this.wallet.publicKey,

package/src/clearingHouse.ts

@@ -305,6 +305,12 @@ export class ClearingHouse {
 		return this.accountSubscriber.getSpotMarketAccountAndSlot(marketIndex).data;
 	}
 
+	public getSpotMarketAccounts(): SpotMarketAccount[] {
+		return this.accountSubscriber
+			.getSpotMarketAccountsAndSlots()
+			.map((value) => value.data);
+	}
+
 	public getQuoteSpotMarketAccount(): SpotMarketAccount {
 		return this.accountSubscriber.getSpotMarketAccountAndSlot(
 			QUOTE_SPOT_MARKET_INDEX
@@ -472,6 +478,22 @@ export class ClearingHouse {
 		});
 	}
 
+	public async updateUserCustomMarginRatio(
+		marginRatio: number,
+		userId = 0
+	): Promise<TransactionSignature> {
+		return await this.program.rpc.updateUserCustomMarginRatio(
+			userId,
+			marginRatio,
+			{
+				accounts: {
+					user: await this.getUserAccountPublicKey(),
+					authority: this.wallet.publicKey,
+				},
+			}
+		);
+	}
+
 	public getUser(userId?: number): ClearingHouseUser {
 		userId = userId ?? this.activeUserId;
 		if (!this.users.has(userId)) {
@@ -595,7 +617,7 @@ export class ClearingHouse {
 			perpMarketAccountMap.set(params.readablePerpMarketIndex.toNumber(), {
 				pubkey: marketAccount.pubkey,
 				isSigner: false,
-				isWritable: true,
+				isWritable: false,
 			});
 			oracleAccountMap.set(marketAccount.amm.oracle.toString(), {
 				pubkey: marketAccount.amm.oracle,
@@ -3177,6 +3199,13 @@ export class ClearingHouse {
 		return oracleData;
 	}
 
+	public getOracleDataForSpotMarket(marketIndex: BN): OraclePriceData {
+		const oracleKey = this.getSpotMarketAccount(marketIndex).oracle;
+		const oracleData = this.getOraclePriceDataAndSlot(oracleKey).data;
+
+		return oracleData;
+	}
+
 	public async initializeInsuranceFundStake(
 		marketIndex: BN
 	): Promise<TransactionSignature> {