@drift-labs/sdk 0.2.0-master.40 → 0.2.0-master.42

package/lib/accounts/pollingUserAccountSubscriber.d.ts

@@ -20,7 +20,7 @@ export declare class PollingUserAccountSubscriber implements UserAccountSubscrib
     addToAccountLoader(): Promise<void>;
     fetchIfUnloaded(): Promise<void>;
     fetch(): Promise<void>;
-    didSubscriptionSucceed(): boolean;
+    doAccountsExist(): boolean;
     unsubscribe(): Promise<void>;
     assertIsSubscribed(): void;
     getUserAccountAndSlot(): DataAndSlot<UserAccount>;

package/lib/accounts/pollingUserAccountSubscriber.js

@@ -18,18 +18,12 @@ class PollingUserAccountSubscriber {
             return true;
         }
         await this.addToAccountLoader();
-        let subscriptionSucceeded = false;
-        let retries = 0;
-        while (!subscriptionSucceeded && retries < 5) {
-            await this.fetchIfUnloaded();
-            subscriptionSucceeded = this.didSubscriptionSucceed();
-            retries++;
-        }
-        if (subscriptionSucceeded) {
+        await this.fetchIfUnloaded();
+        if (this.doAccountsExist()) {
             this.eventEmitter.emit('update');
         }
-        this.isSubscribed = subscriptionSucceeded;
-        return subscriptionSucceeded;
+        this.isSubscribed = true;
+        return true;
     }
     async addToAccountLoader() {
         if (this.accountsToPoll.size > 0) {
@@ -78,7 +72,7 @@ class PollingUserAccountSubscriber {
             }
         }
     }
-    didSubscriptionSucceed() {
+    doAccountsExist() {
         let success = true;
         for (const [_, accountToPoll] of this.accountsToPoll) {
             if (!this[accountToPoll.key]) {

package/lib/accounts/pollingUserStatsAccountSubscriber.d.ts

@@ -20,7 +20,7 @@ export declare class PollingUserStatsAccountSubscriber implements UserStatsAccou
     addToAccountLoader(): Promise<void>;
     fetchIfUnloaded(): Promise<void>;
     fetch(): Promise<void>;
-    didSubscriptionSucceed(): boolean;
+    doAccountsExist(): boolean;
     unsubscribe(): Promise<void>;
     assertIsSubscribed(): void;
     getUserStatsAccountAndSlot(): DataAndSlot<UserStatsAccount>;

package/lib/accounts/pollingUserStatsAccountSubscriber.js

@@ -18,18 +18,12 @@ class PollingUserStatsAccountSubscriber {
             return true;
         }
         await this.addToAccountLoader();
-        let subscriptionSucceeded = false;
-        let retries = 0;
-        while (!subscriptionSucceeded && retries < 5) {
-            await this.fetchIfUnloaded();
-            subscriptionSucceeded = this.didSubscriptionSucceed();
-            retries++;
-        }
-        if (subscriptionSucceeded) {
+        await this.fetchIfUnloaded();
+        if (this.doAccountsExist()) {
             this.eventEmitter.emit('update');
         }
-        this.isSubscribed = subscriptionSucceeded;
-        return subscriptionSucceeded;
+        this.isSubscribed = true;
+        return true;
     }
     async addToAccountLoader() {
         if (this.accountsToPoll.size > 0) {
@@ -78,7 +72,7 @@ class PollingUserStatsAccountSubscriber {
             }
         }
     }
-    didSubscriptionSucceed() {
+    doAccountsExist() {
         let success = true;
         for (const [_, accountToPoll] of this.accountsToPoll) {
             if (!this[accountToPoll.key]) {

package/lib/config.js

@@ -7,7 +7,7 @@ exports.configs = {
     devnet: {
         ENV: 'devnet',
         PYTH_ORACLE_MAPPING_ADDRESS: 'BmA9Z6FjioHJPpjT39QazZyhDRUdZy2ezwx4GiDdE2u2',
-        CLEARING_HOUSE_PROGRAM_ID: 'H4G1xzAoqSW8n1Edmeowqsgc895tSNCeDPafYjv4Md7i',
+        CLEARING_HOUSE_PROGRAM_ID: '4PzAUP84r19y2whicgTysCiqxw5aHabLHyDh3oJiAtqe',
         USDC_MINT_ADDRESS: '8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2',
         SERUM_V3: 'DESVgJVGajEgKGXhb6XmqDHGz3VjdgP7rEVESBgxmroY',
         V2_ALPHA_TICKET_MINT_ADDRESS: 'DeEiGWfCMP9psnLGkxGrBBMEAW5Jv8bBGMN8DCtFRCyB',

package/lib/dlob/DLOB.js

@@ -146,8 +146,7 @@ class DLOB {
         }
     }
     getListForOrder(order) {
-        const isInactiveTriggerOrder = (0, __1.isOneOfVariant)(order.orderType, ['triggerMarket', 'triggerLimit']) &&
-            !order.triggered;
+        const isInactiveTriggerOrder = (0, __1.mustBeTriggered)(order) && !(0, __1.isTriggered)(order);
         let type;
         if (isInactiveTriggerOrder) {
             type = 'trigger';
@@ -391,8 +390,7 @@ class DLOB {
                 // skip order if user is being liquidated/bankrupt
                 if (bestGenerator.next.value.userAccount !== undefined) {
                     const user = this.userMap.get(bestGenerator.next.value.userAccount.toString());
-                    if ((user === null || user === void 0 ? void 0 : user.getUserAccount().isBeingLiquidated) ||
-                        (user === null || user === void 0 ? void 0 : user.getUserAccount().isBankrupt)) {
+                    if (user === null || user === void 0 ? void 0 : user.isBeingLiquidated()) {
                         bestGenerator.next = bestGenerator.generator.next();
                         continue;
                     }
@@ -452,8 +450,7 @@ class DLOB {
                 // skip order if user is being liquidated/bankrupt
                 if (bestGenerator.next.value.userAccount !== undefined) {
                     const user = this.userMap.get(bestGenerator.next.value.userAccount.toString());
-                    if ((user === null || user === void 0 ? void 0 : user.getUserAccount().isBeingLiquidated) ||
-                        (user === null || user === void 0 ? void 0 : user.getUserAccount().isBankrupt)) {
+                    if (user === null || user === void 0 ? void 0 : user.isBeingLiquidated()) {
                         bestGenerator.next = bestGenerator.generator.next();
                         continue;
                     }
@@ -492,8 +489,9 @@ class DLOB {
             };
         }
         const { takerNode, makerNode, makerSide } = this.determineMakerAndTaker(askNode, bidNode);
-        // If order doesn't have limit price, cant be maker
-        if (!(0, __1.hasLimitPrice)(makerNode.order, slot)) {
+        // If maker is market order and auction is complete, cant be maker
+        if ((0, __1.isMarketOrder)(makerNode.order) &&
+            (0, __1.isAuctionComplete)(makerNode.order, slot)) {
             return {
                 crossingNodes: [],
                 exhaustedSide: makerSide,

package/lib/driftClient.d.ts

@@ -84,6 +84,7 @@ export declare class DriftClient {
     updateUserCustomMarginRatio(marginRatio: number, subAccountId?: number): Promise<TransactionSignature>;
     updateUserDelegate(delegate: PublicKey, subAccountId?: number): Promise<TransactionSignature>;
     getUserAccountsForDelegate(delegate: PublicKey): Promise<UserAccount[]>;
+    getUserAccountsForAuthority(authority: PublicKey): Promise<UserAccount[]>;
     deleteUser(subAccountId?: number): Promise<TransactionSignature>;
     getUser(subAccountId?: number): User;
     getUsers(): User[];
@@ -203,12 +204,12 @@ export declare class DriftClient {
     settlePNLIx(settleeUserAccountPublicKey: PublicKey, settleeUserAccount: UserAccount, marketIndex: number): Promise<TransactionInstruction>;
     liquidatePerp(userAccountPublicKey: PublicKey, userAccount: UserAccount, marketIndex: number, maxBaseAssetAmount: BN, limitPrice?: BN): Promise<TransactionSignature>;
     getLiquidatePerpIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, marketIndex: number, maxBaseAssetAmount: BN, limitPrice?: BN): Promise<TransactionInstruction>;
-    liquidateSpot(userAccountPublicKey: PublicKey, userAccount: UserAccount, assetMarketIndex: number, liabilityMarketIndex: number, maxLiabilityTransfer: BN): Promise<TransactionSignature>;
-    getLiquidateSpotIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, assetMarketIndex: number, liabilityMarketIndex: number, maxLiabilityTransfer: BN): Promise<TransactionInstruction>;
-    liquidateBorrowForPerpPnl(userAccountPublicKey: PublicKey, userAccount: UserAccount, perpMarketIndex: number, liabilityMarketIndex: number, maxLiabilityTransfer: BN): Promise<TransactionSignature>;
-    getLiquidateBorrowForPerpPnlIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, perpMarketIndex: number, liabilityMarketIndex: number, maxLiabilityTransfer: BN): Promise<TransactionInstruction>;
-    liquidatePerpPnlForDeposit(userAccountPublicKey: PublicKey, userAccount: UserAccount, perpMarketIndex: number, assetMarketIndex: number, maxPnlTransfer: BN): Promise<TransactionSignature>;
-    getLiquidatePerpPnlForDepositIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, perpMarketIndex: number, assetMarketIndex: number, maxPnlTransfer: BN): Promise<TransactionInstruction>;
+    liquidateSpot(userAccountPublicKey: PublicKey, userAccount: UserAccount, assetMarketIndex: number, liabilityMarketIndex: number, maxLiabilityTransfer: BN, limitPrice?: BN): Promise<TransactionSignature>;
+    getLiquidateSpotIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, assetMarketIndex: number, liabilityMarketIndex: number, maxLiabilityTransfer: BN, limitPrice?: BN): Promise<TransactionInstruction>;
+    liquidateBorrowForPerpPnl(userAccountPublicKey: PublicKey, userAccount: UserAccount, perpMarketIndex: number, liabilityMarketIndex: number, maxLiabilityTransfer: BN, limitPrice?: BN): Promise<TransactionSignature>;
+    getLiquidateBorrowForPerpPnlIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, perpMarketIndex: number, liabilityMarketIndex: number, maxLiabilityTransfer: BN, limitPrice?: BN): Promise<TransactionInstruction>;
+    liquidatePerpPnlForDeposit(userAccountPublicKey: PublicKey, userAccount: UserAccount, perpMarketIndex: number, assetMarketIndex: number, maxPnlTransfer: BN, limitPrice?: BN): Promise<TransactionSignature>;
+    getLiquidatePerpPnlForDepositIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, perpMarketIndex: number, assetMarketIndex: number, maxPnlTransfer: BN, limitPrice?: BN): Promise<TransactionInstruction>;
     resolvePerpBankruptcy(userAccountPublicKey: PublicKey, userAccount: UserAccount, marketIndex: number): Promise<TransactionSignature>;
     getResolvePerpBankruptcyIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, marketIndex: number): Promise<TransactionInstruction>;
     resolveSpotBankruptcy(userAccountPublicKey: PublicKey, userAccount: UserAccount, marketIndex: number): Promise<TransactionSignature>;

package/lib/driftClient.js

@@ -353,6 +353,18 @@ class DriftClient {
         ]);
         return programAccounts.map((programAccount) => programAccount.account);
     }
+    async getUserAccountsForAuthority(authority) {
+        const programAccounts = await this.program.account.user.all([
+            {
+                memcmp: {
+                    offset: 8,
+                    /** data to match, as base-58 encoded string and limited to less than 129 bytes */
+                    bytes: bs58_1.default.encode(authority.toBuffer()),
+                },
+            },
+        ]);
+        return programAccounts.map((programAccount) => programAccount.account);
+    }
     async deleteUser(subAccountId = 0) {
         var _a;
         const userAccountPublicKey = (0, pda_1.getUserAccountPublicKeySync)(this.program.programId, this.wallet.publicKey, subAccountId);
@@ -1752,13 +1764,13 @@ class DriftClient {
             remainingAccounts: remainingAccounts,
         });
     }
-    async liquidateSpot(userAccountPublicKey, userAccount, assetMarketIndex, liabilityMarketIndex, maxLiabilityTransfer) {
-        const { txSig, slot } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getLiquidateSpotIx(userAccountPublicKey, userAccount, assetMarketIndex, liabilityMarketIndex, maxLiabilityTransfer)), [], this.opts);
+    async liquidateSpot(userAccountPublicKey, userAccount, assetMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, limitPrice) {
+        const { txSig, slot } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getLiquidateSpotIx(userAccountPublicKey, userAccount, assetMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, limitPrice)), [], this.opts);
         this.spotMarketLastSlotCache.set(assetMarketIndex, slot);
         this.spotMarketLastSlotCache.set(liabilityMarketIndex, slot);
         return txSig;
     }
-    async getLiquidateSpotIx(userAccountPublicKey, userAccount, assetMarketIndex, liabilityMarketIndex, maxLiabilityTransfer) {
+    async getLiquidateSpotIx(userAccountPublicKey, userAccount, assetMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, limitPrice) {
         const userStatsPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, userAccount.authority);
         const liquidatorPublicKey = await this.getUserAccountPublicKey();
         const liquidatorStatsPublicKey = await this.getUserStatsAccountPublicKey();
@@ -1767,7 +1779,7 @@ class DriftClient {
             useMarketLastSlotCache: true,
             writableSpotMarketIndexes: [liabilityMarketIndex, assetMarketIndex],
         });
-        return await this.program.instruction.liquidateSpot(assetMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, {
+        return await this.program.instruction.liquidateSpot(assetMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, limitPrice || null, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 authority: this.wallet.publicKey,
@@ -1779,13 +1791,13 @@ class DriftClient {
             remainingAccounts: remainingAccounts,
         });
     }
-    async liquidateBorrowForPerpPnl(userAccountPublicKey, userAccount, perpMarketIndex, liabilityMarketIndex, maxLiabilityTransfer) {
-        const { txSig, slot } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getLiquidateBorrowForPerpPnlIx(userAccountPublicKey, userAccount, perpMarketIndex, liabilityMarketIndex, maxLiabilityTransfer)), [], this.opts);
+    async liquidateBorrowForPerpPnl(userAccountPublicKey, userAccount, perpMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, limitPrice) {
+        const { txSig, slot } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getLiquidateBorrowForPerpPnlIx(userAccountPublicKey, userAccount, perpMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, limitPrice)), [], this.opts);
         this.perpMarketLastSlotCache.set(perpMarketIndex, slot);
         this.spotMarketLastSlotCache.set(liabilityMarketIndex, slot);
         return txSig;
     }
-    async getLiquidateBorrowForPerpPnlIx(userAccountPublicKey, userAccount, perpMarketIndex, liabilityMarketIndex, maxLiabilityTransfer) {
+    async getLiquidateBorrowForPerpPnlIx(userAccountPublicKey, userAccount, perpMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, limitPrice) {
         const userStatsPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, userAccount.authority);
         const liquidatorPublicKey = await this.getUserAccountPublicKey();
         const liquidatorStatsPublicKey = await this.getUserStatsAccountPublicKey();
@@ -1794,7 +1806,7 @@ class DriftClient {
             writablePerpMarketIndexes: [perpMarketIndex],
             writableSpotMarketIndexes: [liabilityMarketIndex],
         });
-        return await this.program.instruction.liquidateBorrowForPerpPnl(perpMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, {
+        return await this.program.instruction.liquidateBorrowForPerpPnl(perpMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, limitPrice || null, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 authority: this.wallet.publicKey,
@@ -1806,13 +1818,13 @@ class DriftClient {
             remainingAccounts: remainingAccounts,
         });
     }
-    async liquidatePerpPnlForDeposit(userAccountPublicKey, userAccount, perpMarketIndex, assetMarketIndex, maxPnlTransfer) {
-        const { txSig, slot } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getLiquidatePerpPnlForDepositIx(userAccountPublicKey, userAccount, perpMarketIndex, assetMarketIndex, maxPnlTransfer)), [], this.opts);
+    async liquidatePerpPnlForDeposit(userAccountPublicKey, userAccount, perpMarketIndex, assetMarketIndex, maxPnlTransfer, limitPrice) {
+        const { txSig, slot } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getLiquidatePerpPnlForDepositIx(userAccountPublicKey, userAccount, perpMarketIndex, assetMarketIndex, maxPnlTransfer, limitPrice)), [], this.opts);
         this.perpMarketLastSlotCache.set(perpMarketIndex, slot);
         this.spotMarketLastSlotCache.set(assetMarketIndex, slot);
         return txSig;
     }
-    async getLiquidatePerpPnlForDepositIx(userAccountPublicKey, userAccount, perpMarketIndex, assetMarketIndex, maxPnlTransfer) {
+    async getLiquidatePerpPnlForDepositIx(userAccountPublicKey, userAccount, perpMarketIndex, assetMarketIndex, maxPnlTransfer, limitPrice) {
         const userStatsPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, userAccount.authority);
         const liquidatorPublicKey = await this.getUserAccountPublicKey();
         const liquidatorStatsPublicKey = await this.getUserStatsAccountPublicKey();
@@ -1821,7 +1833,7 @@ class DriftClient {
             writablePerpMarketIndexes: [perpMarketIndex],
             writableSpotMarketIndexes: [assetMarketIndex],
         });
-        return await this.program.instruction.liquidatePerpPnlForDeposit(perpMarketIndex, assetMarketIndex, maxPnlTransfer, {
+        return await this.program.instruction.liquidatePerpPnlForDeposit(perpMarketIndex, assetMarketIndex, maxPnlTransfer, limitPrice || null, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 authority: this.wallet.publicKey,

package/lib/events/types.d.ts

@@ -1,5 +1,5 @@
 import { Commitment, TransactionSignature } from '@solana/web3.js';
-import { DepositRecord, FundingPaymentRecord, FundingRateRecord, LiquidationRecord, NewUserRecord, OrderActionRecord, OrderRecord, SettlePnlRecord, LPRecord, InsuranceFundRecord, SpotInterestRecord } from '../index';
+import { DepositRecord, FundingPaymentRecord, FundingRateRecord, LiquidationRecord, NewUserRecord, OrderActionRecord, OrderRecord, SettlePnlRecord, LPRecord, InsuranceFundRecord, SpotInterestRecord, InsuranceFundStakeRecord, CurveRecord } from '../index';
 export declare type EventSubscriptionOptions = {
     eventTypes?: EventType[];
     maxEventsPerType?: number;
@@ -33,6 +33,8 @@ export declare type EventMap = {
     LPRecord: Event<LPRecord>;
     InsuranceFundRecord: Event<InsuranceFundRecord>;
     SpotInterestRecord: Event<SpotInterestRecord>;
+    InsuranceFundStakeRecord: Event<InsuranceFundStakeRecord>;
+    CurveRecord: Event<CurveRecord>;
 };
 export declare type EventType = keyof EventMap;
 export interface EventSubscriberEvents {

package/lib/events/types.js

@@ -14,6 +14,8 @@ exports.DefaultEventSubscriptionOptions = {
         'LPRecord',
         'InsuranceFundRecord',
         'SpotInterestRecord',
+        'InsuranceFundStakeRecord',
+        'CurveRecord',
     ],
     maxEventsPerType: 4096,
     orderBy: 'blockchain',