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

package/lib/accounts/pollingClearingHouseAccountSubscriber.d.ts

@@ -53,6 +53,7 @@ export declare class PollingClearingHouseAccountSubscriber implements ClearingHo
     getMarketAccountAndSlot(marketIndex: BN): DataAndSlot<PerpMarketAccount> | undefined;
     getMarketAccountsAndSlots(): DataAndSlot<PerpMarketAccount>[];
     getSpotMarketAccountAndSlot(marketIndex: BN): DataAndSlot<SpotMarketAccount> | undefined;
+    getSpotMarketAccountsAndSlots(): DataAndSlot<SpotMarketAccount>[];
     getOraclePriceDataAndSlot(oraclePublicKey: PublicKey): DataAndSlot<OraclePriceData> | undefined;
 }
 declare type ClearingHouseAccounts = {

package/lib/accounts/pollingClearingHouseAccountSubscriber.js

@@ -262,6 +262,9 @@ class PollingClearingHouseAccountSubscriber {
     getSpotMarketAccountAndSlot(marketIndex) {
         return this.spotMarket.get(marketIndex.toNumber());
     }
+    getSpotMarketAccountsAndSlots() {
+        return Array.from(this.spotMarket.values());
+    }
     getOraclePriceDataAndSlot(oraclePublicKey) {
         this.assertIsSubscribed();
         if (oraclePublicKey.equals(web3_js_1.PublicKey.default)) {

package/lib/accounts/types.d.ts

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

package/lib/accounts/webSocketClearingHouseAccountSubscriber.d.ts

@@ -45,5 +45,6 @@ export declare class WebSocketClearingHouseAccountSubscriber implements Clearing
     getMarketAccountAndSlot(marketIndex: BN): DataAndSlot<PerpMarketAccount> | undefined;
     getMarketAccountsAndSlots(): DataAndSlot<PerpMarketAccount>[];
     getSpotMarketAccountAndSlot(marketIndex: BN): DataAndSlot<SpotMarketAccount> | undefined;
+    getSpotMarketAccountsAndSlots(): DataAndSlot<SpotMarketAccount>[];
     getOraclePriceDataAndSlot(oraclePublicKey: PublicKey): DataAndSlot<OraclePriceData> | undefined;
 }

package/lib/accounts/webSocketClearingHouseAccountSubscriber.js

@@ -181,6 +181,9 @@ class WebSocketClearingHouseAccountSubscriber {
         return this.spotMarketAccountSubscribers.get(marketIndex.toNumber())
             .dataAndSlot;
     }
+    getSpotMarketAccountsAndSlots() {
+        return Array.from(this.spotMarketAccountSubscribers.values()).map((subscriber) => subscriber.dataAndSlot);
+    }
     getOraclePriceDataAndSlot(oraclePublicKey) {
         this.assertIsSubscribed();
         if (oraclePublicKey.equals(web3_js_1.PublicKey.default)) {

package/lib/admin.d.ts

@@ -10,6 +10,7 @@ export declare class Admin extends ClearingHouse {
     initializeMarket(priceOracle: PublicKey, baseAssetReserve: BN, quoteAssetReserve: BN, periodicity: BN, pegMultiplier?: BN, oracleSource?: OracleSource, marginRatioInitial?: number, marginRatioMaintenance?: number, liquidationFee?: BN): Promise<TransactionSignature>;
     moveAmmPrice(marketIndex: BN, baseAssetReserve: BN, quoteAssetReserve: BN, sqrtK?: BN): Promise<TransactionSignature>;
     updateK(sqrtK: BN, marketIndex: BN): Promise<TransactionSignature>;
+    updateConcentrationScale(marketIndex: BN, concentrationScale: BN): Promise<TransactionSignature>;
     moveAmmToPrice(perpMarketIndex: BN, targetPrice: BN): Promise<TransactionSignature>;
     repegAmmCurve(newPeg: BN, marketIndex: BN): Promise<TransactionSignature>;
     updateAmmOracleTwap(marketIndex: BN): Promise<TransactionSignature>;
@@ -32,7 +33,8 @@ export declare class Admin extends ClearingHouse {
     updateFee(fees: FeeStructure): Promise<TransactionSignature>;
     updateOracleGuardRails(oracleGuardRails: OracleGuardRails): Promise<TransactionSignature>;
     updateWithdrawGuardThreshold(marketIndex: BN, withdrawGuardThreshold: BN): Promise<TransactionSignature>;
-    updateSpotMarketIfFactor(marketIndex: BN, userIfFactor: BN, totalIfFactor: BN, liquidationIfFactor: BN): Promise<TransactionSignature>;
+    updateSpotMarketIfFactor(marketIndex: BN, userIfFactor: BN, totalIfFactor: BN): Promise<TransactionSignature>;
+    updateSpotMarketRevenueSettlePeriod(marketIndex: BN, revenueSettlePeriod: BN): Promise<TransactionSignature>;
     updateInsuranceWithdrawEscrowPeriod(marketIndex: BN, insuranceWithdrawEscrowPeriod: BN): Promise<TransactionSignature>;
     updateLpCooldownTime(marketIndex: BN, cooldownTime: BN): Promise<TransactionSignature>;
     updateMarketOracle(marketIndex: BN, oracle: PublicKey, oracleSource: OracleSource): Promise<TransactionSignature>;
@@ -45,7 +47,8 @@ export declare class Admin extends ClearingHouse {
     updateFundingPaused(fundingPaused: boolean): Promise<TransactionSignature>;
     updateExchangePaused(exchangePaused: boolean): Promise<TransactionSignature>;
     disableAdminControlsPrices(): Promise<TransactionSignature>;
-    updateAuctionDuration(minDuration: BN | number, maxDuration: BN | number): Promise<TransactionSignature>;
+    updatePerpAuctionDuration(minDuration: BN | number): Promise<TransactionSignature>;
+    updateSpotAuctionDuration(defaultAuctionDuration: number): Promise<TransactionSignature>;
     updateMaxBaseAssetAmountRatio(marketIndex: BN, maxBaseAssetAmountRatio: number): Promise<TransactionSignature>;
     updateMaxSlippageRatio(marketIndex: BN, maxSlippageRatio: number): Promise<TransactionSignature>;
     updateMarketMaxImbalances(marketIndex: BN, unrealizedMaxImbalance: BN, maxRevenueWithdrawPerPeriod: BN, quoteMaxInsurance: BN): Promise<TransactionSignature>;

package/lib/admin.js

@@ -148,6 +148,15 @@ class Admin extends clearingHouse_1.ClearingHouse {
             },
         });
     }
+    async updateConcentrationScale(marketIndex, concentrationScale) {
+        return await this.program.rpc.updateConcentrationScale(concentrationScale, {
+            accounts: {
+                state: await this.getStatePublicKey(),
+                admin: this.wallet.publicKey,
+                market: await (0, pda_1.getMarketPublicKey)(this.program.programId, marketIndex),
+            },
+        });
+    }
     async moveAmmToPrice(perpMarketIndex, targetPrice) {
         const market = this.getPerpMarketAccount(perpMarketIndex);
         const [direction, tradeSize, _] = (0, trade_1.calculateTargetPriceTrade)(market, targetPrice, new anchor_1.BN(1000), 'quote', undefined //todo
@@ -373,8 +382,17 @@ class Admin extends clearingHouse_1.ClearingHouse {
             },
         });
     }
-    async updateSpotMarketIfFactor(marketIndex, userIfFactor, totalIfFactor, liquidationIfFactor) {
-        return await this.program.rpc.updateSpotMarketIfFactor(marketIndex, userIfFactor, totalIfFactor, liquidationIfFactor, {
+    async updateSpotMarketIfFactor(marketIndex, userIfFactor, totalIfFactor) {
+        return await this.program.rpc.updateSpotMarketIfFactor(marketIndex, userIfFactor, totalIfFactor, {
+            accounts: {
+                admin: this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, marketIndex),
+            },
+        });
+    }
+    async updateSpotMarketRevenueSettlePeriod(marketIndex, revenueSettlePeriod) {
+        return await this.program.rpc.updateSpotMarketRevenueSettlePeriod(revenueSettlePeriod, {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
@@ -484,8 +502,16 @@ class Admin extends clearingHouse_1.ClearingHouse {
             },
         });
     }
-    async updateAuctionDuration(minDuration, maxDuration) {
-        return await this.program.rpc.updateAuctionDuration(typeof minDuration === 'number' ? minDuration : minDuration.toNumber(), typeof maxDuration === 'number' ? maxDuration : maxDuration.toNumber(), {
+    async updatePerpAuctionDuration(minDuration) {
+        return await this.program.rpc.updatePerpAuctionDuration(typeof minDuration === 'number' ? minDuration : minDuration.toNumber(), {
+            accounts: {
+                admin: this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+            },
+        });
+    }
+    async updateSpotAuctionDuration(defaultAuctionDuration) {
+        return await this.program.rpc.updateSpotAuctionDuration(defaultAuctionDuration, {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),

package/lib/clearingHouse.d.ts

@@ -53,6 +53,7 @@ export declare class ClearingHouse {
     getPerpMarketAccount(marketIndex: BN | number): PerpMarketAccount | undefined;
     getPerpMarketAccounts(): PerpMarketAccount[];
     getSpotMarketAccount(marketIndex: BN | number): SpotMarketAccount | undefined;
+    getSpotMarketAccounts(): SpotMarketAccount[];
     getQuoteSpotMarketAccount(): SpotMarketAccount;
     getOraclePriceDataAndSlot(oraclePublicKey: PublicKey): DataAndSlot<OraclePriceData> | undefined;
     getSerumV3FulfillmentConfig(serumMarket: PublicKey): Promise<SerumV3FulfillmentConfigAccount>;
@@ -69,6 +70,7 @@ export declare class ClearingHouse {
     getInitializeUserInstructions(userId?: number, name?: string, referrerInfo?: ReferrerInfo): Promise<[PublicKey, TransactionInstruction]>;
     getInitializeUserStatsIx(): Promise<TransactionInstruction>;
     updateUserName(name: string, userId?: number): Promise<TransactionSignature>;
+    updateUserCustomMarginRatio(marginRatio: number, userId?: number): Promise<TransactionSignature>;
     getUser(userId?: number): ClearingHouseUser;
     getUsers(): ClearingHouseUser[];
     getUserStats(): ClearingHouseUserStats;

package/lib/clearingHouse.js

@@ -188,6 +188,11 @@ class ClearingHouse {
         marketIndex = marketIndex instanceof anchor_1.BN ? marketIndex : new anchor_1.BN(marketIndex);
         return this.accountSubscriber.getSpotMarketAccountAndSlot(marketIndex).data;
     }
+    getSpotMarketAccounts() {
+        return this.accountSubscriber
+            .getSpotMarketAccountsAndSlots()
+            .map((value) => value.data);
+    }
     getQuoteSpotMarketAccount() {
         return this.accountSubscriber.getSpotMarketAccountAndSlot(numericConstants_1.QUOTE_SPOT_MARKET_INDEX).data;
     }
@@ -296,6 +301,14 @@ class ClearingHouse {
             },
         });
     }
+    async updateUserCustomMarginRatio(marginRatio, userId = 0) {
+        return await this.program.rpc.updateUserCustomMarginRatio(userId, marginRatio, {
+            accounts: {
+                user: await this.getUserAccountPublicKey(),
+                authority: this.wallet.publicKey,
+            },
+        });
+    }
     getUser(userId) {
         userId = userId !== null && userId !== void 0 ? userId : this.activeUserId;
         if (!this.users.has(userId)) {
@@ -384,7 +397,7 @@ 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,

package/lib/clearingHouseUser.d.ts

@@ -6,7 +6,7 @@ import StrictEventEmitter from 'strict-event-emitter-types';
 import { ClearingHouse } from './clearingHouse';
 import { MarginCategory, Order, UserAccount, PerpPosition } from './types';
 import { UserAccountSubscriber, UserAccountEvents, DataAndSlot } from './accounts/types';
-import { PositionDirection, BN } from '.';
+import { PositionDirection, BN, SpotMarketAccount } from '.';
 import { OraclePriceData } from './oracles/types';
 import { ClearingHouseUserConfig } from './clearingHouseUserConfig';
 export declare class ClearingHouseUser {
@@ -70,7 +70,7 @@ export declare class ClearingHouseUser {
     /**
      * @returns The margin requirement of a certain type (Initial or Maintenance) in USDC. : QUOTE_PRECISION
      */
-    getMarginRequirement(type: MarginCategory, liquidationBuffer?: BN): BN;
+    getMarginRequirement(marginCategory: MarginCategory, liquidationBuffer?: BN): BN;
     /**
      * @returns The initial margin requirement in USDC. : QUOTE_PRECISION
      */
@@ -89,8 +89,10 @@ export declare class ClearingHouseUser {
      * @returns : Precision QUOTE_PRECISION
      */
     getUnrealizedFundingPNL(marketIndex?: BN): BN;
-    getSpotMarketLiabilityValue(marketIndex?: BN, withWeightMarginCategory?: MarginCategory, liquidationBuffer?: BN): BN;
-    getSpotMarketAssetValue(marketIndex?: BN, withWeightMarginCategory?: MarginCategory): BN;
+    getSpotMarketLiabilityValue(marketIndex?: BN, marginCategory?: MarginCategory, liquidationBuffer?: BN, includeOpenOrders?: boolean): BN;
+    getSpotLiabilityValue(tokenAmount: BN, oraclePriceData: OraclePriceData, spotMarketAccount: SpotMarketAccount, marginCategory?: MarginCategory, liquidationBuffer?: BN): BN;
+    getSpotMarketAssetValue(marketIndex?: BN, marginCategory?: MarginCategory, includeOpenOrders?: boolean): BN;
+    getSpotAssetValue(tokenAmount: BN, oraclePriceData: OraclePriceData, spotMarketAccount: SpotMarketAccount, marginCategory?: MarginCategory): BN;
     getNetSpotMarketValue(withWeightMarginCategory?: MarginCategory): BN;
     /**
      * calculates TotalCollateral: collateral + unrealized pnl
@@ -101,12 +103,12 @@ export declare class ClearingHouseUser {
      * calculates sum of position value across all positions in margin system
      * @returns : Precision QUOTE_PRECISION
      */
-    getTotalPositionValue(): BN;
+    getTotalPerpPositionValue(marginCategory?: MarginCategory, liquidationBuffer?: BN, includeOpenOrders?: boolean): BN;
     /**
      * calculates position value in margin system
      * @returns : Precision QUOTE_PRECISION
      */
-    getPositionValue(marketIndex: BN, oraclePriceData: OraclePriceData): BN;
+    getPerpPositionValue(marketIndex: BN, oraclePriceData: OraclePriceData): BN;
     getPositionSide(currentPosition: Pick<PerpPosition, 'baseAssetAmount'>): PositionDirection | undefined;
     /**
      * calculates average exit price (optionally for closing up to 100% of position)
@@ -117,7 +119,7 @@ export declare class ClearingHouseUser {
      * calculates current user leverage across all positions
      * @returns : Precision TEN_THOUSAND
      */
-    getLeverage(): BN;
+    getLeverage(marginCategory?: MarginCategory): BN;
     /**
      * calculates max allowable leverage exceeding hitting requirement category
      * @params category {Initial, Partial, Maintenance}
@@ -128,7 +130,7 @@ export declare class ClearingHouseUser {
      * calculates margin ratio: total collateral / |total position value|
      * @returns : Precision TEN_THOUSAND
      */
-    getMarginRatio(): BN;
+    getMarginRatio(marginCategory?: MarginCategory): BN;
     canBeLiquidated(): boolean;
     /**
      * Checks if any user position cumulative funding differs from respective market cumulative funding
@@ -191,7 +193,7 @@ export declare class ClearingHouseUser {
      * @param marketToIgnore
      * @returns positionValue : Precision QUOTE_PRECISION
      */
-    private getTotalPositionValueExcludingMarket;
+    private getTotalPerpPositionValueExcludingMarket;
     private getOracleDataForMarket;
     private getOracleDataForSpotMarket;
 }