@drift-labs/sdk 0.2.0-master.33 → 0.2.0-master.35

package/lib/admin.d.ts

@@ -52,5 +52,6 @@ export declare class Admin extends ClearingHouse {
     updatePerpMarketMaxFillReserveFraction(perpMarketIndex: number, maxBaseAssetAmountRatio: number): Promise<TransactionSignature>;
     updateMaxSlippageRatio(perpMarketIndex: number, maxSlippageRatio: number): Promise<TransactionSignature>;
     updatePerpMarketMaxImbalances(perpMarketIndex: number, unrealizedMaxImbalance: BN, maxRevenueWithdrawPerPeriod: BN, quoteMaxInsurance: BN): Promise<TransactionSignature>;
+    updatePerpMarketMaxOpenInterest(perpMarketIndex: number, maxOpenInterest: BN): Promise<TransactionSignature>;
     updateSerumVault(srmVault: PublicKey): Promise<TransactionSignature>;
 }

package/lib/admin.js

@@ -541,6 +541,15 @@ class Admin extends clearingHouse_1.ClearingHouse {
             },
         });
     }
+    async updatePerpMarketMaxOpenInterest(perpMarketIndex, maxOpenInterest) {
+        return await this.program.rpc.updatePerpMarketMaxOpenInterest(maxOpenInterest, {
+            accounts: {
+                admin: this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
+            },
+        });
+    }
     async updateSerumVault(srmVault) {
         return await this.program.rpc.updateSerumVault({
             accounts: {

package/lib/clearingHouse.d.ts

@@ -147,9 +147,9 @@ export declare class ClearingHouse {
         txSig: TransactionSignature;
         signedFillTx: Transaction;
     }>;
-    placeOrder(orderParams: OptionalOrderParams): Promise<TransactionSignature>;
+    placePerpOrder(orderParams: OptionalOrderParams): Promise<TransactionSignature>;
     getOrderParams(optionalOrderParams: OptionalOrderParams, marketType: MarketType): OrderParams;
-    getPlaceOrderIx(orderParams: OptionalOrderParams): Promise<TransactionInstruction>;
+    getPlacePerpOrderIx(orderParams: OptionalOrderParams): Promise<TransactionInstruction>;
     updateAMMs(marketIndexes: number[]): Promise<TransactionSignature>;
     getUpdateAMMsIx(marketIndexes: number[]): Promise<TransactionInstruction>;
     settleExpiredMarket(marketIndex: number): Promise<TransactionSignature>;
@@ -161,8 +161,8 @@ export declare class ClearingHouse {
     getCancelOrderByUserIdIx(userOrderId: number): Promise<TransactionInstruction>;
     cancelOrders(marketType?: MarketType, marketIndex?: number, direction?: PositionDirection): Promise<TransactionSignature>;
     getCancelOrdersIx(marketType: MarketType | null, marketIndex: number | null, direction: PositionDirection | null): Promise<TransactionInstruction>;
-    fillOrder(userAccountPublicKey: PublicKey, user: UserAccount, order?: Pick<Order, 'marketIndex' | 'orderId'>, makerInfo?: MakerInfo, referrerInfo?: ReferrerInfo): Promise<TransactionSignature>;
-    getFillOrderIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, order: Pick<Order, 'marketIndex' | 'orderId'>, makerInfo?: MakerInfo, referrerInfo?: ReferrerInfo): Promise<TransactionInstruction>;
+    fillPerpOrder(userAccountPublicKey: PublicKey, user: UserAccount, order?: Pick<Order, 'marketIndex' | 'orderId'>, makerInfo?: MakerInfo, referrerInfo?: ReferrerInfo): Promise<TransactionSignature>;
+    getFillPerpOrderIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, order: Pick<Order, 'marketIndex' | 'orderId'>, makerInfo?: MakerInfo, referrerInfo?: ReferrerInfo): Promise<TransactionInstruction>;
     placeSpotOrder(orderParams: OptionalOrderParams): Promise<TransactionSignature>;
     getPlaceSpotOrderIx(orderParams: OptionalOrderParams): Promise<TransactionInstruction>;
     fillSpotOrder(userAccountPublicKey: PublicKey, user: UserAccount, order?: Order, fulfillmentConfig?: SerumV3FulfillmentConfigAccount, makerInfo?: MakerInfo, referrerInfo?: ReferrerInfo): Promise<TransactionSignature>;
@@ -170,10 +170,10 @@ export declare class ClearingHouse {
     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>;
-    placeAndTake(orderParams: OptionalOrderParams, makerInfo?: MakerInfo, referrerInfo?: ReferrerInfo): Promise<TransactionSignature>;
-    getPlaceAndTakeIx(orderParams: OptionalOrderParams, makerInfo?: MakerInfo, referrerInfo?: ReferrerInfo): Promise<TransactionInstruction>;
-    placeAndMake(orderParams: OptionalOrderParams, takerInfo: TakerInfo, referrerInfo?: ReferrerInfo): Promise<TransactionSignature>;
-    getPlaceAndMakeIx(orderParams: OptionalOrderParams, takerInfo: TakerInfo, referrerInfo?: ReferrerInfo): Promise<TransactionInstruction>;
+    placeAndTakePerpOrder(orderParams: OptionalOrderParams, makerInfo?: MakerInfo, referrerInfo?: ReferrerInfo): Promise<TransactionSignature>;
+    getPlaceAndTakePerpOrderIx(orderParams: OptionalOrderParams, makerInfo?: MakerInfo, referrerInfo?: ReferrerInfo): Promise<TransactionInstruction>;
+    placeAndMakePerpOrder(orderParams: OptionalOrderParams, takerInfo: TakerInfo, referrerInfo?: ReferrerInfo): Promise<TransactionSignature>;
+    getPlaceAndMakePerpOrderIx(orderParams: OptionalOrderParams, takerInfo: TakerInfo, referrerInfo?: ReferrerInfo): Promise<TransactionInstruction>;
     placeAndTakeSpotOrder(orderParams: OptionalOrderParams, fulfillmentConfig?: SerumV3FulfillmentConfigAccount, makerInfo?: MakerInfo, referrerInfo?: ReferrerInfo): Promise<TransactionSignature>;
     getPlaceAndTakeSpotOrderIx(orderParams: OptionalOrderParams, fulfillmentConfig?: SerumV3FulfillmentConfigAccount, makerInfo?: MakerInfo, referrerInfo?: ReferrerInfo): Promise<TransactionInstruction>;
     placeAndMakeSpotOrder(orderParams: OptionalOrderParams, takerInfo: TakerInfo, referrerInfo?: ReferrerInfo): Promise<TransactionSignature>;

package/lib/clearingHouse.js

@@ -891,7 +891,7 @@ class ClearingHouse {
         });
     }
     async openPosition(direction, amount, marketIndex, limitPrice) {
-        return await this.placeAndTake({
+        return await this.placeAndTakePerpOrder({
             orderType: types_1.OrderType.MARKET,
             marketIndex,
             direction,
@@ -913,8 +913,8 @@ class ClearingHouse {
     async sendMarketOrderAndGetSignedFillTx(orderParams, userAccountPublicKey, userAccount) {
         const marketIndex = orderParams.marketIndex;
         const orderId = userAccount.nextOrderId;
-        const marketOrderTx = (0, utils_1.wrapInTx)(await this.getPlaceOrderIx(orderParams));
-        const fillTx = (0, utils_1.wrapInTx)(await this.getFillOrderIx(userAccountPublicKey, userAccount, {
+        const marketOrderTx = (0, utils_1.wrapInTx)(await this.getPlacePerpOrderIx(orderParams));
+        const fillTx = (0, utils_1.wrapInTx)(await this.getFillPerpOrderIx(userAccountPublicKey, userAccount, {
             orderId,
             marketIndex,
         }));
@@ -929,8 +929,8 @@ class ClearingHouse {
         this.marketLastSlotCache.set(orderParams.marketIndex, slot);
         return { txSig, signedFillTx };
     }
-    async placeOrder(orderParams) {
-        const { txSig, slot } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getPlaceOrderIx(orderParams)), [], this.opts);
+    async placePerpOrder(orderParams) {
+        const { txSig, slot } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getPlacePerpOrderIx(orderParams)), [], this.opts);
         this.marketLastSlotCache.set(orderParams.marketIndex, slot);
         return txSig;
     }
@@ -939,7 +939,7 @@ class ClearingHouse {
             marketType,
         });
     }
-    async getPlaceOrderIx(orderParams) {
+    async getPlacePerpOrderIx(orderParams) {
         orderParams = this.getOrderParams(orderParams, types_1.MarketType.PERP);
         const userAccountPublicKey = await this.getUserAccountPublicKey();
         const remainingAccounts = this.getRemainingAccounts({
@@ -947,7 +947,7 @@ class ClearingHouse {
             useMarketLastSlotCache: true,
             readablePerpMarketIndex: orderParams.marketIndex,
         });
-        return await this.program.instruction.placeOrder(orderParams, {
+        return await this.program.instruction.placePerpOrder(orderParams, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 user: userAccountPublicKey,
@@ -1100,11 +1100,11 @@ class ClearingHouse {
             remainingAccounts,
         });
     }
-    async fillOrder(userAccountPublicKey, user, order, makerInfo, referrerInfo) {
-        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getFillOrderIx(userAccountPublicKey, user, order, makerInfo, referrerInfo)), [], this.opts);
+    async fillPerpOrder(userAccountPublicKey, user, order, makerInfo, referrerInfo) {
+        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getFillPerpOrderIx(userAccountPublicKey, user, order, makerInfo, referrerInfo)), [], this.opts);
         return txSig;
     }
-    async getFillOrderIx(userAccountPublicKey, userAccount, order, makerInfo, referrerInfo) {
+    async getFillPerpOrderIx(userAccountPublicKey, userAccount, order, makerInfo, referrerInfo) {
         const userStatsPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, userAccount.authority);
         const fillerPublicKey = await this.getUserAccountPublicKey();
         const fillerStatsPublicKey = this.getUserStatsAccountPublicKey();
@@ -1145,7 +1145,7 @@ class ClearingHouse {
         }
         const orderId = order.orderId;
         const makerOrderId = makerInfo ? makerInfo.order.orderId : null;
-        return await this.program.instruction.fillOrder(orderId, makerOrderId, {
+        return await this.program.instruction.fillPerpOrder(orderId, makerOrderId, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 filler: fillerPublicKey,
@@ -1352,12 +1352,12 @@ class ClearingHouse {
             remainingAccounts,
         });
     }
-    async placeAndTake(orderParams, makerInfo, referrerInfo) {
-        const { txSig, slot } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getPlaceAndTakeIx(orderParams, makerInfo, referrerInfo)), [], this.opts);
+    async placeAndTakePerpOrder(orderParams, makerInfo, referrerInfo) {
+        const { txSig, slot } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getPlaceAndTakePerpOrderIx(orderParams, makerInfo, referrerInfo)), [], this.opts);
         this.marketLastSlotCache.set(orderParams.marketIndex, slot);
         return txSig;
     }
-    async getPlaceAndTakeIx(orderParams, makerInfo, referrerInfo) {
+    async getPlaceAndTakePerpOrderIx(orderParams, makerInfo, referrerInfo) {
         orderParams = this.getOrderParams(orderParams, types_1.MarketType.PERP);
         const userStatsPublicKey = await this.getUserStatsAccountPublicKey();
         const userAccountPublicKey = await this.getUserAccountPublicKey();
@@ -1396,7 +1396,7 @@ class ClearingHouse {
                 isSigner: false,
             });
         }
-        return await this.program.instruction.placeAndTake(orderParams, makerOrderId, {
+        return await this.program.instruction.placeAndTakePerpOrder(orderParams, makerOrderId, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 user: userAccountPublicKey,
@@ -1406,12 +1406,12 @@ class ClearingHouse {
             remainingAccounts,
         });
     }
-    async placeAndMake(orderParams, takerInfo, referrerInfo) {
-        const { txSig, slot } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getPlaceAndMakeIx(orderParams, takerInfo, referrerInfo)), [], this.opts);
+    async placeAndMakePerpOrder(orderParams, takerInfo, referrerInfo) {
+        const { txSig, slot } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getPlaceAndMakePerpOrderIx(orderParams, takerInfo, referrerInfo)), [], this.opts);
         this.marketLastSlotCache.set(orderParams.marketIndex, slot);
         return txSig;
     }
-    async getPlaceAndMakeIx(orderParams, takerInfo, referrerInfo) {
+    async getPlaceAndMakePerpOrderIx(orderParams, takerInfo, referrerInfo) {
         orderParams = this.getOrderParams(orderParams, types_1.MarketType.PERP);
         const userStatsPublicKey = this.getUserStatsAccountPublicKey();
         const userAccountPublicKey = await this.getUserAccountPublicKey();
@@ -1433,7 +1433,7 @@ class ClearingHouse {
             });
         }
         const takerOrderId = takerInfo.order.orderId;
-        return await this.program.instruction.placeAndMake(orderParams, takerOrderId, {
+        return await this.program.instruction.placeAndMakePerpOrder(orderParams, takerOrderId, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 user: userAccountPublicKey,
@@ -1555,7 +1555,7 @@ class ClearingHouse {
         if (!userPosition) {
             throw Error(`No position in market ${marketIndex.toString()}`);
         }
-        return await this.placeAndTake({
+        return await this.placeAndTakePerpOrder({
             orderType: types_1.OrderType.MARKET,
             marketIndex,
             direction: (0, position_1.findDirectionToClose)(userPosition),

package/lib/clearingHouseUser.js

@@ -114,7 +114,7 @@ class ClearingHouseUser {
         const position = this.getUserPosition(marketIndex);
         const [lpOpenBids, lpOpenAsks] = this.getLPBidAsks(marketIndex);
         const totalOpenBids = lpOpenBids.add(position.openBids);
-        const totalOpenAsks = lpOpenAsks.sub(position.openAsks);
+        const totalOpenAsks = lpOpenAsks.add(position.openAsks);
         return [totalOpenBids, totalOpenAsks];
     }
     /**

package/lib/config.js

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

package/lib/constants/numericConstants.d.ts

@@ -35,6 +35,7 @@ export declare const SPOT_MARKET_IMF_PRECISION: BN;
 export declare const LIQUIDATION_FEE_PRECISION: BN;
 export declare const QUOTE_PRECISION: BN;
 export declare const PRICE_PRECISION: BN;
+export declare const FUNDING_RATE_PRECISION: BN;
 export declare const FUNDING_RATE_BUFFER_PRECISION: BN;
 export declare const PEG_PRECISION: BN;
 export declare const AMM_RESERVE_PRECISION: BN;

package/lib/constants/numericConstants.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LAMPORTS_EXP = exports.LAMPORTS_PRECISION = exports.QUOTE_SPOT_MARKET_INDEX = exports.ONE_YEAR = exports.BID_ASK_SPREAD_PRECISION = exports.MARGIN_PRECISION = exports.AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO = exports.PRICE_TO_QUOTE_PRECISION = exports.PRICE_DIV_PEG = exports.AMM_TO_QUOTE_PRECISION_RATIO = exports.BASE_PRECISION_EXP = exports.BASE_PRECISION = exports.AMM_RESERVE_PRECISION = exports.PEG_PRECISION = exports.FUNDING_RATE_BUFFER_PRECISION = exports.PRICE_PRECISION = exports.QUOTE_PRECISION = exports.LIQUIDATION_FEE_PRECISION = exports.SPOT_MARKET_IMF_PRECISION = exports.SPOT_MARKET_IMF_PRECISION_EXP = exports.SPOT_MARKET_BALANCE_PRECISION = exports.SPOT_MARKET_BALANCE_PRECISION_EXP = exports.SPOT_MARKET_WEIGHT_PRECISION = exports.SPOT_MARKET_UTILIZATION_PRECISION = exports.SPOT_MARKET_UTILIZATION_PRECISION_EXP = exports.SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION = exports.SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION_EXP = exports.SPOT_MARKET_RATE_PRECISION = exports.SPOT_MARKET_RATE_PRECISION_EXP = exports.AMM_RESERVE_PRECISION_EXP = exports.PEG_PRECISION_EXP = exports.FUNDING_RATE_PRECISION_EXP = exports.PRICE_PRECISION_EXP = exports.FUNDING_RATE_BUFFER_PRECISION_EXP = exports.QUOTE_PRECISION_EXP = exports.MAX_LEVERAGE = exports.TEN_MILLION = exports.BN_MAX = exports.TEN_THOUSAND = exports.TEN = exports.NINE = exports.EIGHT = exports.SEVEN = exports.SIX = exports.FIVE = exports.FOUR = exports.THREE = exports.TWO = exports.ONE = exports.ZERO = void 0;
+exports.LAMPORTS_PRECISION = exports.QUOTE_SPOT_MARKET_INDEX = exports.ONE_YEAR = exports.BID_ASK_SPREAD_PRECISION = exports.MARGIN_PRECISION = exports.AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO = exports.PRICE_TO_QUOTE_PRECISION = exports.PRICE_DIV_PEG = exports.AMM_TO_QUOTE_PRECISION_RATIO = exports.BASE_PRECISION_EXP = exports.BASE_PRECISION = exports.AMM_RESERVE_PRECISION = exports.PEG_PRECISION = exports.FUNDING_RATE_BUFFER_PRECISION = exports.FUNDING_RATE_PRECISION = exports.PRICE_PRECISION = exports.QUOTE_PRECISION = exports.LIQUIDATION_FEE_PRECISION = exports.SPOT_MARKET_IMF_PRECISION = exports.SPOT_MARKET_IMF_PRECISION_EXP = exports.SPOT_MARKET_BALANCE_PRECISION = exports.SPOT_MARKET_BALANCE_PRECISION_EXP = exports.SPOT_MARKET_WEIGHT_PRECISION = exports.SPOT_MARKET_UTILIZATION_PRECISION = exports.SPOT_MARKET_UTILIZATION_PRECISION_EXP = exports.SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION = exports.SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION_EXP = exports.SPOT_MARKET_RATE_PRECISION = exports.SPOT_MARKET_RATE_PRECISION_EXP = exports.AMM_RESERVE_PRECISION_EXP = exports.PEG_PRECISION_EXP = exports.FUNDING_RATE_PRECISION_EXP = exports.PRICE_PRECISION_EXP = exports.FUNDING_RATE_BUFFER_PRECISION_EXP = exports.QUOTE_PRECISION_EXP = exports.MAX_LEVERAGE = exports.TEN_MILLION = exports.BN_MAX = exports.TEN_THOUSAND = exports.TEN = exports.NINE = exports.EIGHT = exports.SEVEN = exports.SIX = exports.FIVE = exports.FOUR = exports.THREE = exports.TWO = exports.ONE = exports.ZERO = void 0;
+exports.LAMPORTS_EXP = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const __1 = require("../");
 exports.ZERO = new __1.BN(0);
@@ -21,7 +22,7 @@ exports.MAX_LEVERAGE = new __1.BN(5);
 exports.QUOTE_PRECISION_EXP = new __1.BN(6);
 exports.FUNDING_RATE_BUFFER_PRECISION_EXP = new __1.BN(3);
 exports.PRICE_PRECISION_EXP = new __1.BN(6);
-exports.FUNDING_RATE_PRECISION_EXP = exports.PRICE_PRECISION_EXP.mul(exports.FUNDING_RATE_BUFFER_PRECISION_EXP);
+exports.FUNDING_RATE_PRECISION_EXP = exports.PRICE_PRECISION_EXP.add(exports.FUNDING_RATE_BUFFER_PRECISION_EXP);
 exports.PEG_PRECISION_EXP = new __1.BN(6);
 exports.AMM_RESERVE_PRECISION_EXP = new __1.BN(9);
 exports.SPOT_MARKET_RATE_PRECISION_EXP = new __1.BN(6);
@@ -38,6 +39,7 @@ exports.SPOT_MARKET_IMF_PRECISION = new __1.BN(10).pow(exports.SPOT_MARKET_IMF_P
 exports.LIQUIDATION_FEE_PRECISION = new __1.BN(1000000);
 exports.QUOTE_PRECISION = new __1.BN(10).pow(exports.QUOTE_PRECISION_EXP);
 exports.PRICE_PRECISION = new __1.BN(10).pow(exports.PRICE_PRECISION_EXP);
+exports.FUNDING_RATE_PRECISION = new __1.BN(10).pow(exports.FUNDING_RATE_PRECISION_EXP);
 exports.FUNDING_RATE_BUFFER_PRECISION = new __1.BN(10).pow(exports.FUNDING_RATE_BUFFER_PRECISION_EXP);
 exports.PEG_PRECISION = new __1.BN(10).pow(exports.PEG_PRECISION_EXP);
 exports.AMM_RESERVE_PRECISION = new __1.BN(10).pow(exports.AMM_RESERVE_PRECISION_EXP);

package/lib/idl/clearing_house.json

@@ -247,7 +247,7 @@
             ]
         },
         {
-            "name": "placeOrder",
+            "name": "placePerpOrder",
             "accounts": [
                 {
                     "name": "state",
@@ -373,7 +373,7 @@
             ]
         },
         {
-            "name": "placeAndTake",
+            "name": "placeAndTakePerpOrder",
             "accounts": [
                 {
                     "name": "state",
@@ -412,7 +412,7 @@
             ]
         },
         {
-            "name": "placeAndMake",
+            "name": "placeAndMakePerpOrder",
             "accounts": [
                 {
                     "name": "state",
@@ -772,7 +772,7 @@
             "args": []
         },
         {
-            "name": "fillOrder",
+            "name": "fillPerpOrder",
             "accounts": [
                 {
                     "name": "state",
@@ -3276,6 +3276,32 @@
                 }
             ]
         },
+        {
+            "name": "updatePerpMarketMaxOpenInterest",
+            "accounts": [
+                {
+                    "name": "admin",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "perpMarket",
+                    "isMut": true,
+                    "isSigner": false
+                }
+            ],
+            "args": [
+                {
+                    "name": "maxOpenInterest",
+                    "type": "u128"
+                }
+            ]
+        },
         {
             "name": "updateAdmin",
             "accounts": [
@@ -4089,6 +4115,10 @@
                         "name": "settledPerpPnl",
                         "type": "i64"
                     },
+                    {
+                        "name": "cumulativeSpotFees",
+                        "type": "i64"
+                    },
                     {
                         "name": "nextOrderId",
                         "type": "u32"
@@ -4684,6 +4714,10 @@
                         "name": "baseAssetAmountWithUnsettledLp",
                         "type": "i128"
                     },
+                    {
+                        "name": "maxOpenInterest",
+                        "type": "u128"
+                    },
                     {
                         "name": "quoteAssetAmountLong",
                         "type": "i128"
@@ -5371,6 +5405,15 @@
                     {
                         "name": "auctionDuration",
                         "type": "u8"
+                    },
+                    {
+                        "name": "padding",
+                        "type": {
+                            "array": [
+                                "u8",
+                                2
+                            ]
+                        }
                     }
                 ]
             }
@@ -7568,6 +7611,16 @@
             "code": 6134,
             "name": "ReduceOnlyWithdrawIncreasedRisk",
             "msg": "Reduce Only Withdraw Increased Risk"
+        },
+        {
+            "code": 6135,
+            "name": "MaxOpenInterest",
+            "msg": "Max Open Interest"
+        },
+        {
+            "code": 6136,
+            "name": "CantResolvePerpBankruptcy",
+            "msg": "Cant Resolve Perp Bankruptcy"
         }
     ]
 }

package/lib/types.d.ts

@@ -630,9 +630,6 @@ export declare type AMM = {
     totalFeeMinusDistributions: BN;
     totalFeeWithdrawn: BN;
     totalFee: BN;
-    cumulativeFundingPaymentPerLp: BN;
-    cumulativeFeePerLp: BN;
-    cumulativeNetBaseAssetAmountPerLp: BN;
     userLpShares: BN;
     baseAssetAmountWithUnsettledLp: BN;
     orderStepSize: BN;

package/package.json

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

package/src/admin.ts

@@ -1007,6 +1007,25 @@ export class Admin extends ClearingHouse {
 		);
 	}
 
+	public async updatePerpMarketMaxOpenInterest(
+		perpMarketIndex: number,
+		maxOpenInterest: BN
+	): Promise<TransactionSignature> {
+		return await this.program.rpc.updatePerpMarketMaxOpenInterest(
+			maxOpenInterest,
+			{
+				accounts: {
+					admin: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					perpMarket: await getPerpMarketPublicKey(
+						this.program.programId,
+						perpMarketIndex
+					),
+				},
+			}
+		);
+	}
+
 	public async updateSerumVault(
 		srmVault: PublicKey
 	): Promise<TransactionSignature> {

package/src/clearingHouse.ts

@@ -1561,7 +1561,7 @@ export class ClearingHouse {
 		marketIndex: number,
 		limitPrice?: BN
 	): Promise<TransactionSignature> {
-		return await this.placeAndTake({
+		return await this.placeAndTakePerpOrder({
 			orderType: OrderType.MARKET,
 			marketIndex,
 			direction,
@@ -1591,9 +1591,9 @@ export class ClearingHouse {
 		const marketIndex = orderParams.marketIndex;
 		const orderId = userAccount.nextOrderId;
 
-		const marketOrderTx = wrapInTx(await this.getPlaceOrderIx(orderParams));
+		const marketOrderTx = wrapInTx(await this.getPlacePerpOrderIx(orderParams));
 		const fillTx = wrapInTx(
-			await this.getFillOrderIx(userAccountPublicKey, userAccount, {
+			await this.getFillPerpOrderIx(userAccountPublicKey, userAccount, {
 				orderId,
 				marketIndex,
 			})
@@ -1624,11 +1624,11 @@ export class ClearingHouse {
 		return { txSig, signedFillTx };
 	}
 
-	public async placeOrder(
+	public async placePerpOrder(
 		orderParams: OptionalOrderParams
 	): Promise<TransactionSignature> {
 		const { txSig, slot } = await this.txSender.send(
-			wrapInTx(await this.getPlaceOrderIx(orderParams)),
+			wrapInTx(await this.getPlacePerpOrderIx(orderParams)),
 			[],
 			this.opts
 		);
@@ -1645,7 +1645,7 @@ export class ClearingHouse {
 		});
 	}
 
-	public async getPlaceOrderIx(
+	public async getPlacePerpOrderIx(
 		orderParams: OptionalOrderParams
 	): Promise<TransactionInstruction> {
 		orderParams = this.getOrderParams(orderParams, MarketType.PERP);
@@ -1657,7 +1657,7 @@ export class ClearingHouse {
 			readablePerpMarketIndex: orderParams.marketIndex,
 		});
 
-		return await this.program.instruction.placeOrder(orderParams, {
+		return await this.program.instruction.placePerpOrder(orderParams, {
 			accounts: {
 				state: await this.getStatePublicKey(),
 				user: userAccountPublicKey,
@@ -1895,7 +1895,7 @@ export class ClearingHouse {
 		);
 	}
 
-	public async fillOrder(
+	public async fillPerpOrder(
 		userAccountPublicKey: PublicKey,
 		user: UserAccount,
 		order?: Pick<Order, 'marketIndex' | 'orderId'>,
@@ -1904,7 +1904,7 @@ export class ClearingHouse {
 	): Promise<TransactionSignature> {
 		const { txSig } = await this.txSender.send(
 			wrapInTx(
-				await this.getFillOrderIx(
+				await this.getFillPerpOrderIx(
 					userAccountPublicKey,
 					user,
 					order,
@@ -1918,7 +1918,7 @@ export class ClearingHouse {
 		return txSig;
 	}
 
-	public async getFillOrderIx(
+	public async getFillPerpOrderIx(
 		userAccountPublicKey: PublicKey,
 		userAccount: UserAccount,
 		order: Pick<Order, 'marketIndex' | 'orderId'>,
@@ -1977,7 +1977,7 @@ export class ClearingHouse {
 		const orderId = order.orderId;
 		const makerOrderId = makerInfo ? makerInfo.order.orderId : null;
 
-		return await this.program.instruction.fillOrder(orderId, makerOrderId, {
+		return await this.program.instruction.fillPerpOrder(orderId, makerOrderId, {
 			accounts: {
 				state: await this.getStatePublicKey(),
 				filler: fillerPublicKey,
@@ -2275,14 +2275,18 @@ export class ClearingHouse {
 		});
 	}
 
-	public async placeAndTake(
+	public async placeAndTakePerpOrder(
 		orderParams: OptionalOrderParams,
 		makerInfo?: MakerInfo,
 		referrerInfo?: ReferrerInfo
 	): Promise<TransactionSignature> {
 		const { txSig, slot } = await this.txSender.send(
 			wrapInTx(
-				await this.getPlaceAndTakeIx(orderParams, makerInfo, referrerInfo)
+				await this.getPlaceAndTakePerpOrderIx(
+					orderParams,
+					makerInfo,
+					referrerInfo
+				)
 			),
 			[],
 			this.opts
@@ -2291,7 +2295,7 @@ export class ClearingHouse {
 		return txSig;
 	}
 
-	public async getPlaceAndTakeIx(
+	public async getPlaceAndTakePerpOrderIx(
 		orderParams: OptionalOrderParams,
 		makerInfo?: MakerInfo,
 		referrerInfo?: ReferrerInfo
@@ -2338,7 +2342,7 @@ export class ClearingHouse {
 			});
 		}
 
-		return await this.program.instruction.placeAndTake(
+		return await this.program.instruction.placeAndTakePerpOrder(
 			orderParams,
 			makerOrderId,
 			{
@@ -2353,14 +2357,18 @@ export class ClearingHouse {
 		);
 	}
 
-	public async placeAndMake(
+	public async placeAndMakePerpOrder(
 		orderParams: OptionalOrderParams,
 		takerInfo: TakerInfo,
 		referrerInfo?: ReferrerInfo
 	): Promise<TransactionSignature> {
 		const { txSig, slot } = await this.txSender.send(
 			wrapInTx(
-				await this.getPlaceAndMakeIx(orderParams, takerInfo, referrerInfo)
+				await this.getPlaceAndMakePerpOrderIx(
+					orderParams,
+					takerInfo,
+					referrerInfo
+				)
 			),
 			[],
 			this.opts
@@ -2371,7 +2379,7 @@ export class ClearingHouse {
 		return txSig;
 	}
 
-	public async getPlaceAndMakeIx(
+	public async getPlaceAndMakePerpOrderIx(
 		orderParams: OptionalOrderParams,
 		takerInfo: TakerInfo,
 		referrerInfo?: ReferrerInfo
@@ -2400,7 +2408,7 @@ export class ClearingHouse {
 		}
 
 		const takerOrderId = takerInfo.order.orderId;
-		return await this.program.instruction.placeAndMake(
+		return await this.program.instruction.placeAndMakePerpOrder(
 			orderParams,
 			takerOrderId,
 			{
@@ -2596,7 +2604,7 @@ export class ClearingHouse {
 			throw Error(`No position in market ${marketIndex.toString()}`);
 		}
 
-		return await this.placeAndTake({
+		return await this.placeAndTakePerpOrder({
 			orderType: OrderType.MARKET,
 			marketIndex,
 			direction: findDirectionToClose(userPosition),

package/src/clearingHouseUser.ts

@@ -201,7 +201,7 @@ export class ClearingHouseUser {
 		const [lpOpenBids, lpOpenAsks] = this.getLPBidAsks(marketIndex);
 
 		const totalOpenBids = lpOpenBids.add(position.openBids);
-		const totalOpenAsks = lpOpenAsks.sub(position.openAsks);
+		const totalOpenAsks = lpOpenAsks.add(position.openAsks);
 
 		return [totalOpenBids, totalOpenAsks];
 	}

package/src/config.ts

@@ -29,7 +29,7 @@ export const configs: { [key in DriftEnv]: DriftConfig } = {
 	devnet: {
 		ENV: 'devnet',
 		PYTH_ORACLE_MAPPING_ADDRESS: 'BmA9Z6FjioHJPpjT39QazZyhDRUdZy2ezwx4GiDdE2u2',
-		CLEARING_HOUSE_PROGRAM_ID: 'FPVkWvcQgc4aCS8TrKo5c8GqTbKMauvzpADdqzRT2WbT',
+		CLEARING_HOUSE_PROGRAM_ID: 'BJG3o4CURrokB7huNyiHptYepAtHXj4YfefJiPgzUULV',
 		USDC_MINT_ADDRESS: '8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2',
 		SERUM_V3: 'DESVgJVGajEgKGXhb6XmqDHGz3VjdgP7rEVESBgxmroY',
 		V2_ALPHA_TICKET_MINT_ADDRESS:

package/src/constants/numericConstants.ts

@@ -21,7 +21,7 @@ export const MAX_LEVERAGE = new BN(5);
 export const QUOTE_PRECISION_EXP = new BN(6);
 export const FUNDING_RATE_BUFFER_PRECISION_EXP = new BN(3);
 export const PRICE_PRECISION_EXP = new BN(6);
-export const FUNDING_RATE_PRECISION_EXP = PRICE_PRECISION_EXP.mul(
+export const FUNDING_RATE_PRECISION_EXP = PRICE_PRECISION_EXP.add(
 	FUNDING_RATE_BUFFER_PRECISION_EXP
 );
 export const PEG_PRECISION_EXP = new BN(6);
@@ -56,6 +56,9 @@ export const LIQUIDATION_FEE_PRECISION = new BN(1000000);
 
 export const QUOTE_PRECISION = new BN(10).pow(QUOTE_PRECISION_EXP);
 export const PRICE_PRECISION = new BN(10).pow(PRICE_PRECISION_EXP);
+export const FUNDING_RATE_PRECISION = new BN(10).pow(
+	FUNDING_RATE_PRECISION_EXP
+);
 export const FUNDING_RATE_BUFFER_PRECISION = new BN(10).pow(
 	FUNDING_RATE_BUFFER_PRECISION_EXP
 );

package/src/idl/clearing_house.json

@@ -247,7 +247,7 @@
       ]
     },
     {
-      "name": "placeOrder",
+      "name": "placePerpOrder",
       "accounts": [
         {
           "name": "state",
@@ -373,7 +373,7 @@
       ]
     },
     {
-      "name": "placeAndTake",
+      "name": "placeAndTakePerpOrder",
       "accounts": [
         {
           "name": "state",
@@ -412,7 +412,7 @@
       ]
     },
     {
-      "name": "placeAndMake",
+      "name": "placeAndMakePerpOrder",
       "accounts": [
         {
           "name": "state",
@@ -772,7 +772,7 @@
       "args": []
     },
     {
-      "name": "fillOrder",
+      "name": "fillPerpOrder",
       "accounts": [
         {
           "name": "state",
@@ -3276,6 +3276,32 @@
         }
       ]
     },
+    {
+      "name": "updatePerpMarketMaxOpenInterest",
+      "accounts": [
+        {
+          "name": "admin",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "perpMarket",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "maxOpenInterest",
+          "type": "u128"
+        }
+      ]
+    },
     {
       "name": "updateAdmin",
       "accounts": [
@@ -4089,6 +4115,10 @@
             "name": "settledPerpPnl",
             "type": "i64"
           },
+          {
+            "name": "cumulativeSpotFees",
+            "type": "i64"
+          },
           {
             "name": "nextOrderId",
             "type": "u32"
@@ -4684,6 +4714,10 @@
             "name": "baseAssetAmountWithUnsettledLp",
             "type": "i128"
           },
+          {
+            "name": "maxOpenInterest",
+            "type": "u128"
+          },
           {
             "name": "quoteAssetAmountLong",
             "type": "i128"
@@ -5371,6 +5405,15 @@
           {
             "name": "auctionDuration",
             "type": "u8"
+          },
+          {
+            "name": "padding",
+            "type": {
+              "array": [
+                "u8",
+                2
+              ]
+            }
           }
         ]
       }
@@ -7568,6 +7611,16 @@
       "code": 6134,
       "name": "ReduceOnlyWithdrawIncreasedRisk",
       "msg": "Reduce Only Withdraw Increased Risk"
+    },
+    {
+      "code": 6135,
+      "name": "MaxOpenInterest",
+      "msg": "Max Open Interest"
+    },
+    {
+      "code": 6136,
+      "name": "CantResolvePerpBankruptcy",
+      "msg": "Cant Resolve Perp Bankruptcy"
     }
   ]
 }

package/src/types.ts

@@ -576,9 +576,6 @@ export type AMM = {
 	totalFeeMinusDistributions: BN;
 	totalFeeWithdrawn: BN;
 	totalFee: BN;
-	cumulativeFundingPaymentPerLp: BN;
-	cumulativeFeePerLp: BN;
-	cumulativeNetBaseAssetAmountPerLp: BN;
 	userLpShares: BN;
 	baseAssetAmountWithUnsettledLp: BN;
 	orderStepSize: BN;

package/tests/dlob/helpers.ts

@@ -19,8 +19,8 @@ import {
 	UserMapInterface,
 	Wallet,
 	OrderRecord,
+	ExchangeStatus,
 } from '../../src';
-import { ExchangeStatus } from '../../lib';
 
 export const mockPerpPosition: PerpPosition = {
 	baseAssetAmount: new BN(0),
@@ -73,9 +73,6 @@ export const mockAMM: AMM = {
 	totalFeeMinusDistributions: new BN(0),
 	totalFeeWithdrawn: new BN(0),
 	totalFee: new BN(0),
-	cumulativeFundingPaymentPerLp: new BN(0),
-	cumulativeFeePerLp: new BN(0),
-	cumulativeNetBaseAssetAmountPerLp: new BN(0),
 	userLpShares: new BN(0),
 	baseAssetAmountWithUnsettledLp: new BN(0),
 	orderStepSize: new BN(0),

package/tests/dlob/test.ts

@@ -19,6 +19,7 @@ import {
 	Order,
 	isMarketOrder,
 	isLimitOrder,
+	ZERO,
 } from '../../src';
 
 import {
@@ -27,7 +28,6 @@ import {
 	mockStateAccount,
 	MockUserMap,
 } from './helpers';
-import { ZERO } from '../../lib';
 
 function insertOrderToDLOB(
 	dlob: DLOB,
@@ -194,14 +194,14 @@ function printCrossedNodes(n: NodeToFill, slot: number) {
 		}`
 	);
 	console.log(
-		`node: (mkt: ${isMarketOrder(n.node.order)}, lim: ${isLimitOrder(
-			n.node.order
+		`node: (mkt: ${isMarketOrder(n.node.order!)}, lim: ${isLimitOrder(
+			n.node.order!
 		)})`
 	);
 	if (n.makerNode) {
 		console.log(
-			`mkrnode: (mkt: ${isMarketOrder(n.makerNode.order)}, lim: ${isLimitOrder(
-				n.makerNode.order
+			`mkrnode: (mkt: ${isMarketOrder(n.makerNode.order!)}, lim: ${isLimitOrder(
+				n.makerNode.order!
 			)})`
 		);
 	}