@drift-labs/sdk 2.0.9 → 2.0.11

package/lib/adminClient.d.ts

@@ -42,6 +42,7 @@ export declare class AdminClient extends DriftClient {
     updateSpotMarketMinOrderSize(spotMarketIndex: number, orderSize: BN): Promise<TransactionSignature>;
     updatePerpMarketExpiry(perpMarketIndex: number, expiryTs: BN): Promise<TransactionSignature>;
     updateSpotMarketOracle(spotMarketIndex: number, oracle: PublicKey, oracleSource: OracleSource): Promise<TransactionSignature>;
+    updateSpotMarketOrdersEnabled(spotMarketIndex: number, ordersEnabled: boolean): Promise<TransactionSignature>;
     updateSpotMarketExpiry(spotMarketIndex: number, expiryTs: BN): Promise<TransactionSignature>;
     updateWhitelistMint(whitelistMint?: PublicKey): Promise<TransactionSignature>;
     updateDiscountMint(discountMint: PublicKey): Promise<TransactionSignature>;

package/lib/adminClient.js

@@ -449,7 +449,7 @@ class AdminClient extends driftClient_1.DriftClient {
         });
     }
     async updateSpotMarketOracle(spotMarketIndex, oracle, oracleSource) {
-        return await this.program.rpc.updatePerpMarketOracle(oracle, oracleSource, {
+        return await this.program.rpc.updateSpotMarketOracle(oracle, oracleSource, {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
@@ -458,6 +458,15 @@ class AdminClient extends driftClient_1.DriftClient {
             },
         });
     }
+    async updateSpotMarketOrdersEnabled(spotMarketIndex, ordersEnabled) {
+        return await this.program.rpc.updateSpotMarketOrdersEnabled(ordersEnabled, {
+            accounts: {
+                admin: this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
+            },
+        });
+    }
     async updateSpotMarketExpiry(spotMarketIndex, expiryTs) {
         return await this.program.rpc.updateSpotMarketExpiry(expiryTs, {
             accounts: {

package/lib/driftClient.d.ts

@@ -82,6 +82,7 @@ export declare class DriftClient {
     getInitializeUserStatsIx(): Promise<TransactionInstruction>;
     updateUserName(name: string, subAccountId?: number): Promise<TransactionSignature>;
     updateUserCustomMarginRatio(marginRatio: number, subAccountId?: number): Promise<TransactionSignature>;
+    updateUserMarginTradingEnabled(marginTradingEnabled: boolean, subAccountId?: number): Promise<TransactionSignature>;
     updateUserDelegate(delegate: PublicKey, subAccountId?: number): Promise<TransactionSignature>;
     getUserAccountsForDelegate(delegate: PublicKey): Promise<UserAccount[]>;
     getUserAccountsForAuthority(authority: PublicKey): Promise<UserAccount[]>;

package/lib/driftClient.js

@@ -333,6 +333,14 @@ class DriftClient {
             },
         });
     }
+    async updateUserMarginTradingEnabled(marginTradingEnabled, subAccountId = 0) {
+        return await this.program.rpc.updateUserMarginTradingEnabled(subAccountId, marginTradingEnabled, {
+            accounts: {
+                user: await this.getUserAccountPublicKey(),
+                authority: this.wallet.publicKey,
+            },
+        });
+    }
     async updateUserDelegate(delegate, subAccountId = 0) {
         return await this.program.rpc.updateUserDelegate(subAccountId, delegate, {
             accounts: {

package/lib/factory/bigNum.js

@@ -316,19 +316,15 @@ class BigNum {
         let val = usingCustomPrecision
             ? this.prettyPrint(useTradePrecision, precisionOverride)
             : BigNum.fromPrint(this.toFixed(2), new anchor_1.BN(2)).prettyPrint();
-        // Append two trailing zeroes if not using custom precision
+        // Append trailing zeroes out to 2 decimal places if not using custom precision
         if (!usingCustomPrecision) {
             const [_, rightSide] = val.split(BigNum.delim);
             const trailingLength = (_a = rightSide === null || rightSide === void 0 ? void 0 : rightSide.length) !== null && _a !== void 0 ? _a : 0;
-            if (trailingLength < 2) {
-                const numHasDecimals = this.print().includes(BigNum.delim);
-                // Handle case where pretty print won't include the decimal point
-                if (trailingLength === 0 && numHasDecimals) {
-                    val = `${val}.00`;
-                }
-                else {
-                    val = `${val}${new Array(2 - trailingLength).fill('0').join('')}`;
-                }
+            if (trailingLength === 0) {
+                val = `${val}${BigNum.delim}00`;
+            }
+            else if (trailingLength === 1) {
+                val = `${val}0`;
             }
         }
         return `${prefix}${val.replace('-', '')}`;

package/lib/idl/drift.json

@@ -733,6 +733,31 @@
                 }
             ]
         },
+        {
+            "name": "updateUserMarginTradingEnabled",
+            "accounts": [
+                {
+                    "name": "user",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "authority",
+                    "isMut": false,
+                    "isSigner": true
+                }
+            ],
+            "args": [
+                {
+                    "name": "subAccountId",
+                    "type": "u16"
+                },
+                {
+                    "name": "marginTradingEnabled",
+                    "type": "bool"
+                }
+            ]
+        },
         {
             "name": "updateUserDelegate",
             "accounts": [

package/lib/userMap/userMap.d.ts

@@ -1,4 +1,4 @@
-import { User, DriftClient, OrderRecord, UserSubscriptionConfig } from '..';
+import { User, DriftClient, OrderRecord, UserSubscriptionConfig, WrappedEvent } from '..';
 import { PublicKey } from '@solana/web3.js';
 export interface UserMapInterface {
     fetchAllUsers(): Promise<void>;
@@ -37,5 +37,7 @@ export declare class UserMap implements UserMapInterface {
      */
     getUserAuthority(key: string): PublicKey | undefined;
     updateWithOrderRecord(record: OrderRecord): Promise<void>;
+    updateWithEventRecord(record: WrappedEvent<any>): Promise<void>;
     values(): IterableIterator<User>;
+    size(): number;
 }

package/lib/userMap/userMap.js

@@ -80,8 +80,51 @@ class UserMap {
             await this.addPubkey(record.user);
         }
     }
+    async updateWithEventRecord(record) {
+        if (record.eventType === 'DepositRecord') {
+            const depositRecord = record;
+            await this.mustGet(depositRecord.user.toString());
+        }
+        else if (record.eventType === 'FundingPaymentRecord') {
+            const fundingPaymentRecord = record;
+            await this.mustGet(fundingPaymentRecord.user.toString());
+        }
+        else if (record.eventType === 'LiquidationRecord') {
+            const liqRecord = record;
+            await this.mustGet(liqRecord.user.toString());
+            await this.mustGet(liqRecord.liquidator.toString());
+        }
+        else if (record.eventType === 'OrderRecord') {
+            const orderRecord = record;
+            await this.updateWithOrderRecord(orderRecord);
+        }
+        else if (record.eventType === 'OrderActionRecord') {
+            const actionRecord = record;
+            if (actionRecord.taker) {
+                await this.mustGet(actionRecord.taker.toString());
+            }
+            if (actionRecord.maker) {
+                await this.mustGet(actionRecord.maker.toString());
+            }
+        }
+        else if (record.eventType === 'SettlePnlRecord') {
+            const settlePnlRecord = record;
+            await this.mustGet(settlePnlRecord.user.toString());
+        }
+        else if (record.eventType === 'NewUserRecord') {
+            const newUserRecord = record;
+            await this.mustGet(newUserRecord.user.toString());
+        }
+        else if (record.eventType === 'LPRecord') {
+            const lpRecord = record;
+            await this.mustGet(lpRecord.user.toString());
+        }
+    }
     values() {
         return this.userMap.values();
     }
+    size() {
+        return this.userMap.size;
+    }
 }
 exports.UserMap = UserMap;

package/lib/userMap/userStatsMap.d.ts

@@ -1,4 +1,4 @@
-import { DriftClient, OrderRecord, UserStats, UserStatsSubscriptionConfig } from '..';
+import { DriftClient, OrderRecord, UserStats, UserStatsSubscriptionConfig, WrappedEvent } from '..';
 import { PublicKey } from '@solana/web3.js';
 import { UserMap } from './userMap';
 export declare class UserStatsMap {
@@ -12,8 +12,10 @@ export declare class UserStatsMap {
     fetchAllUserStats(): Promise<void>;
     addUserStat(authority: PublicKey): Promise<void>;
     updateWithOrderRecord(record: OrderRecord, userMap: UserMap): Promise<void>;
+    updateWithEventRecord(record: WrappedEvent<any>, userMap?: UserMap): Promise<void>;
     has(authorityPublicKey: string): boolean;
     get(authorityPublicKey: string): UserStats;
     mustGet(authorityPublicKey: string): Promise<UserStats>;
     values(): IterableIterator<UserStats>;
+    size(): number;
 }

package/lib/userMap/userStatsMap.js

@@ -49,6 +49,71 @@ class UserStatsMap {
             this.addUserStat(user.getUserAccount().authority);
         }
     }
+    async updateWithEventRecord(record, userMap) {
+        if (record.eventType === 'DepositRecord') {
+            const depositRecord = record;
+            await this.mustGet(depositRecord.userAuthority.toString());
+        }
+        else if (record.eventType === 'FundingPaymentRecord') {
+            const fundingPaymentRecord = record;
+            await this.mustGet(fundingPaymentRecord.userAuthority.toString());
+        }
+        else if (record.eventType === 'LiquidationRecord') {
+            if (!userMap) {
+                return;
+            }
+            const liqRecord = record;
+            const user = await userMap.mustGet(liqRecord.user.toString());
+            await this.mustGet(user.getUserAccount().authority.toString());
+            const liquidatorUser = await userMap.mustGet(liqRecord.liquidator.toString());
+            await this.mustGet(liquidatorUser.getUserAccount().authority.toString());
+        }
+        else if (record.eventType === 'OrderRecord') {
+            if (!userMap) {
+                return;
+            }
+            const orderRecord = record;
+            await userMap.updateWithOrderRecord(orderRecord);
+        }
+        else if (record.eventType === 'OrderActionRecord') {
+            if (!userMap) {
+                return;
+            }
+            const actionRecord = record;
+            if (actionRecord.taker) {
+                const taker = await userMap.mustGet(actionRecord.taker.toString());
+                await this.mustGet(taker.getUserAccount().authority.toString());
+            }
+            if (actionRecord.maker) {
+                const maker = await userMap.mustGet(actionRecord.maker.toString());
+                await this.mustGet(maker.getUserAccount().authority.toString());
+            }
+        }
+        else if (record.eventType === 'SettlePnlRecord') {
+            if (!userMap) {
+                return;
+            }
+            const settlePnlRecord = record;
+            const user = await userMap.mustGet(settlePnlRecord.user.toString());
+            await this.mustGet(user.getUserAccount().authority.toString());
+        }
+        else if (record.eventType === 'NewUserRecord') {
+            const newUserRecord = record;
+            await this.mustGet(newUserRecord.userAuthority.toString());
+        }
+        else if (record.eventType === 'LPRecord') {
+            if (!userMap) {
+                return;
+            }
+            const lpRecord = record;
+            const user = await userMap.mustGet(lpRecord.user.toString());
+            await this.mustGet(user.getUserAccount().authority.toString());
+        }
+        else if (record.eventType === 'InsuranceFundStakeRecord') {
+            const ifStakeRecord = record;
+            await this.mustGet(ifStakeRecord.userAuthority.toString());
+        }
+    }
     has(authorityPublicKey) {
         return this.userStatsMap.has(authorityPublicKey);
     }
@@ -64,5 +129,8 @@ class UserStatsMap {
     values() {
         return this.userStatsMap.values();
     }
+    size() {
+        return this.userStatsMap.size;
+    }
 }
 exports.UserStatsMap = UserStatsMap;

package/package.json

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

package/src/adminClient.ts

@@ -852,7 +852,7 @@ export class AdminClient extends DriftClient {
 		oracle: PublicKey,
 		oracleSource: OracleSource
 	): Promise<TransactionSignature> {
-		return await this.program.rpc.updatePerpMarketOracle(oracle, oracleSource, {
+		return await this.program.rpc.updateSpotMarketOracle(oracle, oracleSource, {
 			accounts: {
 				admin: this.wallet.publicKey,
 				state: await this.getStatePublicKey(),
@@ -865,6 +865,22 @@ export class AdminClient extends DriftClient {
 		});
 	}
 
+	public async updateSpotMarketOrdersEnabled(
+		spotMarketIndex: number,
+		ordersEnabled: boolean
+	): Promise<TransactionSignature> {
+		return await this.program.rpc.updateSpotMarketOrdersEnabled(ordersEnabled, {
+			accounts: {
+				admin: this.wallet.publicKey,
+				state: await this.getStatePublicKey(),
+				spotMarket: await getSpotMarketPublicKey(
+					this.program.programId,
+					spotMarketIndex
+				),
+			},
+		});
+	}
+
 	public async updateSpotMarketExpiry(
 		spotMarketIndex: number,
 		expiryTs: BN

package/src/driftClient.ts

@@ -556,6 +556,22 @@ export class DriftClient {
 		);
 	}
 
+	public async updateUserMarginTradingEnabled(
+		marginTradingEnabled: boolean,
+		subAccountId = 0
+	): Promise<TransactionSignature> {
+		return await this.program.rpc.updateUserMarginTradingEnabled(
+			subAccountId,
+			marginTradingEnabled,
+			{
+				accounts: {
+					user: await this.getUserAccountPublicKey(),
+					authority: this.wallet.publicKey,
+				},
+			}
+		);
+	}
+
 	public async updateUserDelegate(
 		delegate: PublicKey,
 		subAccountId = 0

package/src/factory/bigNum.ts

@@ -481,21 +481,15 @@ export class BigNum {
 			? this.prettyPrint(useTradePrecision, precisionOverride)
 			: BigNum.fromPrint(this.toFixed(2), new BN(2)).prettyPrint();
 
-		// Append two trailing zeroes if not using custom precision
+		// Append trailing zeroes out to 2 decimal places if not using custom precision
 		if (!usingCustomPrecision) {
 			const [_, rightSide] = val.split(BigNum.delim);
-
 			const trailingLength = rightSide?.length ?? 0;
 
-			if (trailingLength < 2) {
-				const numHasDecimals = this.print().includes(BigNum.delim);
-
-				// Handle case where pretty print won't include the decimal point
-				if (trailingLength === 0 && numHasDecimals) {
-					val = `${val}.00`;
-				} else {
-					val = `${val}${new Array(2 - trailingLength).fill('0').join('')}`;
-				}
+			if (trailingLength === 0) {
+				val = `${val}${BigNum.delim}00`;
+			} else if (trailingLength === 1) {
+				val = `${val}0`;
 			}
 		}
 

package/src/idl/drift.json

@@ -733,6 +733,31 @@
         }
       ]
     },
+    {
+      "name": "updateUserMarginTradingEnabled",
+      "accounts": [
+        {
+          "name": "user",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "authority",
+          "isMut": false,
+          "isSigner": true
+        }
+      ],
+      "args": [
+        {
+          "name": "subAccountId",
+          "type": "u16"
+        },
+        {
+          "name": "marginTradingEnabled",
+          "type": "bool"
+        }
+      ]
+    },
     {
       "name": "updateUserDelegate",
       "accounts": [

package/src/userMap/userMap.ts

@@ -5,6 +5,14 @@ import {
 	bulkPollingUserSubscribe,
 	OrderRecord,
 	UserSubscriptionConfig,
+	WrappedEvent,
+	DepositRecord,
+	FundingPaymentRecord,
+	LiquidationRecord,
+	OrderActionRecord,
+	SettlePnlRecord,
+	NewUserRecord,
+	LPRecord,
 } from '..';
 import { ProgramAccount } from '@project-serum/anchor';
 
@@ -120,7 +128,47 @@ export class UserMap implements UserMapInterface {
 		}
 	}
 
+	public async updateWithEventRecord(record: WrappedEvent<any>) {
+		if (record.eventType === 'DepositRecord') {
+			const depositRecord = record as DepositRecord;
+			await this.mustGet(depositRecord.user.toString());
+		} else if (record.eventType === 'FundingPaymentRecord') {
+			const fundingPaymentRecord = record as FundingPaymentRecord;
+			await this.mustGet(fundingPaymentRecord.user.toString());
+		} else if (record.eventType === 'LiquidationRecord') {
+			const liqRecord = record as LiquidationRecord;
+
+			await this.mustGet(liqRecord.user.toString());
+			await this.mustGet(liqRecord.liquidator.toString());
+		} else if (record.eventType === 'OrderRecord') {
+			const orderRecord = record as OrderRecord;
+			await this.updateWithOrderRecord(orderRecord);
+		} else if (record.eventType === 'OrderActionRecord') {
+			const actionRecord = record as OrderActionRecord;
+
+			if (actionRecord.taker) {
+				await this.mustGet(actionRecord.taker.toString());
+			}
+			if (actionRecord.maker) {
+				await this.mustGet(actionRecord.maker.toString());
+			}
+		} else if (record.eventType === 'SettlePnlRecord') {
+			const settlePnlRecord = record as SettlePnlRecord;
+			await this.mustGet(settlePnlRecord.user.toString());
+		} else if (record.eventType === 'NewUserRecord') {
+			const newUserRecord = record as NewUserRecord;
+			await this.mustGet(newUserRecord.user.toString());
+		} else if (record.eventType === 'LPRecord') {
+			const lpRecord = record as LPRecord;
+			await this.mustGet(lpRecord.user.toString());
+		}
+	}
+
 	public values(): IterableIterator<User> {
 		return this.userMap.values();
 	}
+
+	public size(): number {
+		return this.userMap.size;
+	}
 }

package/src/userMap/userStatsMap.ts

@@ -6,6 +6,15 @@ import {
 	UserStats,
 	UserStatsSubscriptionConfig,
 	bulkPollingUserStatsSubscribe,
+	WrappedEvent,
+	DepositRecord,
+	FundingPaymentRecord,
+	LiquidationRecord,
+	OrderActionRecord,
+	SettlePnlRecord,
+	NewUserRecord,
+	LPRecord,
+	InsuranceFundStakeRecord,
 } from '..';
 import { ProgramAccount } from '@project-serum/anchor';
 import { PublicKey } from '@solana/web3.js';
@@ -87,6 +96,73 @@ export class UserStatsMap {
 		}
 	}
 
+	public async updateWithEventRecord(
+		record: WrappedEvent<any>,
+		userMap?: UserMap
+	) {
+		if (record.eventType === 'DepositRecord') {
+			const depositRecord = record as DepositRecord;
+			await this.mustGet(depositRecord.userAuthority.toString());
+		} else if (record.eventType === 'FundingPaymentRecord') {
+			const fundingPaymentRecord = record as FundingPaymentRecord;
+			await this.mustGet(fundingPaymentRecord.userAuthority.toString());
+		} else if (record.eventType === 'LiquidationRecord') {
+			if (!userMap) {
+				return;
+			}
+
+			const liqRecord = record as LiquidationRecord;
+
+			const user = await userMap.mustGet(liqRecord.user.toString());
+			await this.mustGet(user.getUserAccount().authority.toString());
+
+			const liquidatorUser = await userMap.mustGet(
+				liqRecord.liquidator.toString()
+			);
+			await this.mustGet(liquidatorUser.getUserAccount().authority.toString());
+		} else if (record.eventType === 'OrderRecord') {
+			if (!userMap) {
+				return;
+			}
+			const orderRecord = record as OrderRecord;
+			await userMap.updateWithOrderRecord(orderRecord);
+		} else if (record.eventType === 'OrderActionRecord') {
+			if (!userMap) {
+				return;
+			}
+			const actionRecord = record as OrderActionRecord;
+
+			if (actionRecord.taker) {
+				const taker = await userMap.mustGet(actionRecord.taker.toString());
+				await this.mustGet(taker.getUserAccount().authority.toString());
+			}
+			if (actionRecord.maker) {
+				const maker = await userMap.mustGet(actionRecord.maker.toString());
+				await this.mustGet(maker.getUserAccount().authority.toString());
+			}
+		} else if (record.eventType === 'SettlePnlRecord') {
+			if (!userMap) {
+				return;
+			}
+			const settlePnlRecord = record as SettlePnlRecord;
+			const user = await userMap.mustGet(settlePnlRecord.user.toString());
+			await this.mustGet(user.getUserAccount().authority.toString());
+		} else if (record.eventType === 'NewUserRecord') {
+			const newUserRecord = record as NewUserRecord;
+			await this.mustGet(newUserRecord.userAuthority.toString());
+		} else if (record.eventType === 'LPRecord') {
+			if (!userMap) {
+				return;
+			}
+			const lpRecord = record as LPRecord;
+			const user = await userMap.mustGet(lpRecord.user.toString());
+			await this.mustGet(user.getUserAccount().authority.toString());
+		} else if (record.eventType === 'InsuranceFundStakeRecord') {
+			const ifStakeRecord = record as InsuranceFundStakeRecord;
+			await this.mustGet(ifStakeRecord.userAuthority.toString());
+		}
+	}
+
 	public has(authorityPublicKey: string): boolean {
 		return this.userStatsMap.has(authorityPublicKey);
 	}
@@ -105,4 +181,8 @@ export class UserStatsMap {
 	public values(): IterableIterator<UserStats> {
 		return this.userStatsMap.values();
 	}
+
+	public size(): number {
+		return this.userStatsMap.size;
+	}
 }