@drift-labs/sdk 0.1.18-orders.0 → 0.1.18-orders.4

package/lib/examples/makeTradeExample.js

@@ -53,7 +53,7 @@ const main = () => __awaiter(void 0, void 0, void 0, function* () {
     // Get current price
     const solMarketInfo = __2.Markets.find((market) => market.baseAssetSymbol === 'SOL');
     const currentMarketPrice = __2.calculateMarkPrice(clearingHouse.getMarket(solMarketInfo.marketIndex));
-    const formattedPrice = __2.convertToNumber(currentMarketPrice, __2.QUOTE_PRECISION);
+    const formattedPrice = __2.convertToNumber(currentMarketPrice, __2.MARK_PRICE_PRECISION);
     console.log(`Current Market Price is $${formattedPrice}`);
     // Estimate the slippage for a $5000 LONG trade
     const solMarketAccount = clearingHouse.getMarket(solMarketInfo.marketIndex);

package/lib/factory/clearingHouse.d.ts

@@ -0,0 +1,25 @@
+import { ConfirmOptions, Connection, PublicKey } from '@solana/web3.js';
+import { IWallet } from '../types';
+import { BulkAccountLoader } from '../accounts/bulkAccountLoader';
+import { TxSender } from '../tx/types';
+import { ClearingHouse } from '../clearingHouse';
+import { Admin } from '../admin';
+export declare type ClearingHouseConfigType = 'websocket' | 'polling' | 'custom';
+declare type BaseClearingHouseConfig = {
+    type: ClearingHouseConfigType;
+    connection: Connection;
+    wallet: IWallet;
+    programID: PublicKey;
+    opts?: ConfirmOptions;
+    txSender?: TxSender;
+};
+declare type WebSocketClearingHouseConfiguration = BaseClearingHouseConfig;
+declare type PollingClearingHouseConfiguration = BaseClearingHouseConfig & {
+    accountLoader: BulkAccountLoader;
+};
+declare type ClearingHouseConfig = PollingClearingHouseConfiguration | WebSocketClearingHouseConfiguration;
+export declare function getWebSocketClearingHouseConfig(connection: Connection, wallet: IWallet, programID: PublicKey, opts?: ConfirmOptions, txSender?: TxSender): WebSocketClearingHouseConfiguration;
+export declare function getPollingClearingHouseConfig(connection: Connection, wallet: IWallet, programID: PublicKey, accountLoader: BulkAccountLoader, opts?: ConfirmOptions, txSender?: TxSender): PollingClearingHouseConfiguration;
+export declare function getClearingHouse(config: ClearingHouseConfig): ClearingHouse;
+export declare function getAdmin(config: ClearingHouseConfig): Admin;
+export {};

package/lib/factory/clearingHouse.js

@@ -0,0 +1,64 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAdmin = exports.getClearingHouse = exports.getPollingClearingHouseConfig = exports.getWebSocketClearingHouseConfig = void 0;
+const anchor_1 = require("@project-serum/anchor");
+const clearingHouse_1 = require("../clearingHouse");
+const clearing_house_json_1 = __importDefault(require("../idl/clearing_house.json"));
+const webSocketClearingHouseAccountSubscriber_1 = require("../accounts/webSocketClearingHouseAccountSubscriber");
+const defaultTxSender_1 = require("../tx/defaultTxSender");
+const pollingClearingHouseAccountSubscriber_1 = require("../accounts/pollingClearingHouseAccountSubscriber");
+const admin_1 = require("../admin");
+function getWebSocketClearingHouseConfig(connection, wallet, programID, opts = anchor_1.Provider.defaultOptions(), txSender) {
+    return {
+        type: 'websocket',
+        connection,
+        wallet,
+        programID,
+        opts,
+        txSender,
+    };
+}
+exports.getWebSocketClearingHouseConfig = getWebSocketClearingHouseConfig;
+function getPollingClearingHouseConfig(connection, wallet, programID, accountLoader, opts = anchor_1.Provider.defaultOptions(), txSender) {
+    return {
+        type: 'polling',
+        connection,
+        wallet,
+        programID,
+        accountLoader,
+        opts,
+        txSender,
+    };
+}
+exports.getPollingClearingHouseConfig = getPollingClearingHouseConfig;
+function getClearingHouse(config) {
+    const provider = new anchor_1.Provider(config.connection, config.wallet, config.opts);
+    const program = new anchor_1.Program(clearing_house_json_1.default, config.programID, provider);
+    let accountSubscriber;
+    if (config.type === 'websocket') {
+        accountSubscriber = new webSocketClearingHouseAccountSubscriber_1.WebSocketClearingHouseAccountSubscriber(program);
+    }
+    else if (config.type === 'polling') {
+        accountSubscriber = new pollingClearingHouseAccountSubscriber_1.PollingClearingHouseAccountSubscriber(program, config.accountLoader);
+    }
+    const txSender = config.txSender || new defaultTxSender_1.DefaultTxSender(provider);
+    return new clearingHouse_1.ClearingHouse(config.connection, config.wallet, program, accountSubscriber, txSender, config.opts);
+}
+exports.getClearingHouse = getClearingHouse;
+function getAdmin(config) {
+    const provider = new anchor_1.Provider(config.connection, config.wallet, config.opts);
+    const program = new anchor_1.Program(clearing_house_json_1.default, config.programID, provider);
+    let accountSubscriber;
+    if (config.type === 'websocket') {
+        accountSubscriber = new webSocketClearingHouseAccountSubscriber_1.WebSocketClearingHouseAccountSubscriber(program);
+    }
+    else if (config.type === 'polling') {
+        accountSubscriber = new pollingClearingHouseAccountSubscriber_1.PollingClearingHouseAccountSubscriber(program, config.accountLoader);
+    }
+    const txSender = config.txSender || new defaultTxSender_1.DefaultTxSender(provider);
+    return new admin_1.Admin(config.connection, config.wallet, program, accountSubscriber, txSender, config.opts);
+}
+exports.getAdmin = getAdmin;

package/lib/factory/clearingHouseUser.d.ts

@@ -0,0 +1,19 @@
+import { PublicKey } from '@solana/web3.js';
+import { ClearingHouse } from '../clearingHouse';
+import { BulkAccountLoader } from '../accounts/bulkAccountLoader';
+import { ClearingHouseUser } from '../clearingHouseUser';
+export declare type ClearingHouseUserConfigType = 'websocket' | 'polling' | 'custom';
+declare type BaseClearingHouseUserConfig = {
+    type: ClearingHouseUserConfigType;
+    clearingHouse: ClearingHouse;
+    authority: PublicKey;
+};
+declare type WebSocketClearingHouseUserConfig = BaseClearingHouseUserConfig;
+declare type PollingClearingHouseUserConfig = BaseClearingHouseUserConfig & {
+    accountLoader: BulkAccountLoader;
+};
+declare type ClearingHouseUserConfig = PollingClearingHouseUserConfig | WebSocketClearingHouseUserConfig;
+export declare function getWebSocketClearingHouseUserConfig(clearingHouse: ClearingHouse, authority: PublicKey): WebSocketClearingHouseUserConfig;
+export declare function getPollingClearingHouseUserConfig(clearingHouse: ClearingHouse, authority: PublicKey, accountLoader: BulkAccountLoader): PollingClearingHouseUserConfig;
+export declare function getClearingHouseUser(config: ClearingHouseUserConfig): ClearingHouseUser;
+export {};

package/lib/factory/clearingHouseUser.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getClearingHouseUser = exports.getPollingClearingHouseUserConfig = exports.getWebSocketClearingHouseUserConfig = void 0;
+const clearingHouseUser_1 = require("../clearingHouseUser");
+const webSocketUserAccountSubscriber_1 = require("../accounts/webSocketUserAccountSubscriber");
+const pollingUserAccountSubscriber_1 = require("../accounts/pollingUserAccountSubscriber");
+function getWebSocketClearingHouseUserConfig(clearingHouse, authority) {
+    return {
+        type: 'websocket',
+        clearingHouse,
+        authority,
+    };
+}
+exports.getWebSocketClearingHouseUserConfig = getWebSocketClearingHouseUserConfig;
+function getPollingClearingHouseUserConfig(clearingHouse, authority, accountLoader) {
+    return {
+        type: 'polling',
+        clearingHouse,
+        authority,
+        accountLoader,
+    };
+}
+exports.getPollingClearingHouseUserConfig = getPollingClearingHouseUserConfig;
+function getClearingHouseUser(config) {
+    let accountSubscriber;
+    if (config.type === 'websocket') {
+        accountSubscriber = new webSocketUserAccountSubscriber_1.WebSocketUserAccountSubscriber(config.clearingHouse.program, config.authority);
+    }
+    else if (config.type === 'polling') {
+        accountSubscriber = new pollingUserAccountSubscriber_1.PollingUserAccountSubscriber(config.clearingHouse.program, config.authority, config.accountLoader);
+    }
+    return new clearingHouseUser_1.ClearingHouseUser(config.clearingHouse, config.authority, accountSubscriber);
+}
+exports.getClearingHouseUser = getClearingHouseUser;

package/lib/idl/clearing_house.json

@@ -604,13 +604,69 @@
             ]
         },
         {
-            "name": "fillOrder",
+            "name": "cancelOrderByUserId",
             "accounts": [
                 {
                     "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "orderState",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "user",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "authority",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "markets",
                     "isMut": true,
                     "isSigner": false
                 },
+                {
+                    "name": "userPositions",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "userOrders",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "fundingPaymentHistory",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "orderHistory",
+                    "isMut": true,
+                    "isSigner": false
+                }
+            ],
+            "args": [
+                {
+                    "name": "userOrderId",
+                    "type": "u8"
+                }
+            ]
+        },
+        {
+            "name": "fillOrder",
+            "accounts": [
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
                 {
                     "name": "orderState",
                     "isMut": false,
@@ -666,6 +722,11 @@
                     "isMut": true,
                     "isSigner": false
                 },
+                {
+                    "name": "extendedCurveHistory",
+                    "isMut": true,
+                    "isSigner": false
+                },
                 {
                     "name": "oracle",
                     "isMut": false,
@@ -737,6 +798,11 @@
                     "isMut": true,
                     "isSigner": false
                 },
+                {
+                    "name": "extendedCurveHistory",
+                    "isMut": true,
+                    "isSigner": false
+                },
                 {
                     "name": "oracle",
                     "isMut": false,
@@ -1043,6 +1109,78 @@
                 }
             ]
         },
+        {
+            "name": "updateAmmOracleTwap",
+            "accounts": [
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "markets",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "oracle",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "admin",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "curveHistory",
+                    "isMut": true,
+                    "isSigner": false
+                }
+            ],
+            "args": [
+                {
+                    "name": "marketIndex",
+                    "type": "u64"
+                }
+            ]
+        },
+        {
+            "name": "resetAmmOracleTwap",
+            "accounts": [
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "markets",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "oracle",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "admin",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "curveHistory",
+                    "isMut": true,
+                    "isSigner": false
+                }
+            ],
+            "args": [
+                {
+                    "name": "marketIndex",
+                    "type": "u64"
+                }
+            ]
+        },
         {
             "name": "initializeUser",
             "accounts": [
@@ -1284,6 +1422,11 @@
                     "isMut": true,
                     "isSigner": false
                 },
+                {
+                    "name": "oracle",
+                    "isMut": false,
+                    "isSigner": false
+                },
                 {
                     "name": "curveHistory",
                     "isMut": true,
@@ -1301,6 +1444,32 @@
                 }
             ]
         },
+        {
+            "name": "updateCurveHistory",
+            "accounts": [
+                {
+                    "name": "admin",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "state",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "extendedCurveHistory",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "curveHistory",
+                    "isMut": false,
+                    "isSigner": false
+                }
+            ],
+            "args": []
+        },
         {
             "name": "updateMarginRatio",
             "accounts": [
@@ -1771,7 +1940,7 @@
                         "type": "u64"
                     },
                     {
-                        "name": "depositRecords",
+                        "name": "curveRecords",
                         "type": {
                             "array": [
                                 {
@@ -1784,6 +1953,29 @@
                 ]
             }
         },
+        {
+            "name": "ExtendedCurveHistory",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "head",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "curveRecords",
+                        "type": {
+                            "array": [
+                                {
+                                    "defined": "ExtendedCurveRecord"
+                                },
+                                1024
+                            ]
+                        }
+                    }
+                ]
+            }
+        },
         {
             "name": "DepositHistory",
             "type": {
@@ -1940,6 +2132,15 @@
                     {
                         "name": "minOrderQuoteAssetAmount",
                         "type": "u128"
+                    },
+                    {
+                        "name": "padding",
+                        "type": {
+                            "array": [
+                                "u128",
+                                10
+                            ]
+                        }
                     }
                 ]
             }
@@ -2093,6 +2294,10 @@
                         "name": "orderState",
                         "type": "publicKey"
                     },
+                    {
+                        "name": "extendedCurveHistory",
+                        "type": "publicKey"
+                    },
                     {
                         "name": "padding0",
                         "type": "u128"
@@ -2108,14 +2313,6 @@
                     {
                         "name": "padding3",
                         "type": "u128"
-                    },
-                    {
-                        "name": "padding4",
-                        "type": "u128"
-                    },
-                    {
-                        "name": "padding5",
-                        "type": "u128"
                     }
                 ]
             }
@@ -2292,6 +2489,10 @@
                             "defined": "PositionDirection"
                         }
                     },
+                    {
+                        "name": "userOrderId",
+                        "type": "u8"
+                    },
                     {
                         "name": "quoteAssetAmount",
                         "type": "u128"
@@ -2335,6 +2536,22 @@
                         "type": {
                             "defined": "OrderParamsOptionalAccounts"
                         }
+                    },
+                    {
+                        "name": "positionLimit",
+                        "type": "u128"
+                    },
+                    {
+                        "name": "oraclePriceOffset",
+                        "type": "u128"
+                    },
+                    {
+                        "name": "padding0",
+                        "type": "bool"
+                    },
+                    {
+                        "name": "padding1",
+                        "type": "bool"
                     }
                 ]
             }
@@ -2435,6 +2652,103 @@
                 ]
             }
         },
+        {
+            "name": "ExtendedCurveRecord",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "ts",
+                        "type": "i64"
+                    },
+                    {
+                        "name": "recordId",
+                        "type": "u128"
+                    },
+                    {
+                        "name": "marketIndex",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "pegMultiplierBefore",
+                        "type": "u128"
+                    },
+                    {
+                        "name": "baseAssetReserveBefore",
+                        "type": "u128"
+                    },
+                    {
+                        "name": "quoteAssetReserveBefore",
+                        "type": "u128"
+                    },
+                    {
+                        "name": "sqrtKBefore",
+                        "type": "u128"
+                    },
+                    {
+                        "name": "pegMultiplierAfter",
+                        "type": "u128"
+                    },
+                    {
+                        "name": "baseAssetReserveAfter",
+                        "type": "u128"
+                    },
+                    {
+                        "name": "quoteAssetReserveAfter",
+                        "type": "u128"
+                    },
+                    {
+                        "name": "sqrtKAfter",
+                        "type": "u128"
+                    },
+                    {
+                        "name": "baseAssetAmountLong",
+                        "type": "u128"
+                    },
+                    {
+                        "name": "baseAssetAmountShort",
+                        "type": "u128"
+                    },
+                    {
+                        "name": "baseAssetAmount",
+                        "type": "i128"
+                    },
+                    {
+                        "name": "openInterest",
+                        "type": "u128"
+                    },
+                    {
+                        "name": "totalFee",
+                        "type": "u128"
+                    },
+                    {
+                        "name": "totalFeeMinusDistributions",
+                        "type": "u128"
+                    },
+                    {
+                        "name": "adjustmentCost",
+                        "type": "i128"
+                    },
+                    {
+                        "name": "oraclePrice",
+                        "type": "i128"
+                    },
+                    {
+                        "name": "tradeRecord",
+                        "type": "u128"
+                    },
+                    {
+                        "name": "padding",
+                        "type": {
+                            "array": [
+                                "u128",
+                                5
+                            ]
+                        }
+                    }
+                ]
+            }
+        },
         {
             "name": "DepositRecord",
             "type": {
@@ -2783,16 +3097,16 @@
                         "type": "i64"
                     },
                     {
-                        "name": "minimumBaseAssetTradeSize",
-                        "type": "u128"
+                        "name": "lastOraclePrice",
+                        "type": "i128"
                     },
                     {
-                        "name": "padding0",
-                        "type": "u64"
+                        "name": "minimumBaseAssetTradeSize",
+                        "type": "u128"
                     },
                     {
                         "name": "padding1",
-                        "type": "u128"
+                        "type": "u64"
                     },
                     {
                         "name": "padding2",
@@ -2861,6 +3175,15 @@
                     {
                         "name": "fillerReward",
                         "type": "u128"
+                    },
+                    {
+                        "name": "padding",
+                        "type": {
+                            "array": [
+                                "u64",
+                                10
+                            ]
+                        }
                     }
                 ]
             }
@@ -3212,6 +3535,10 @@
                         "name": "orderId",
                         "type": "u128"
                     },
+                    {
+                        "name": "userOrderId",
+                        "type": "u8"
+                    },
                     {
                         "name": "marketIndex",
                         "type": "u64"
@@ -3220,6 +3547,10 @@
                         "name": "price",
                         "type": "u128"
                     },
+                    {
+                        "name": "userBaseAssetAmount",
+                        "type": "i128"
+                    },
                     {
                         "name": "quoteAssetAmount",
                         "type": "u128"
@@ -3277,6 +3608,19 @@
                     {
                         "name": "referrer",
                         "type": "publicKey"
+                    },
+                    {
+                        "name": "oraclePriceOffset",
+                        "type": "i128"
+                    },
+                    {
+                        "name": "padding",
+                        "type": {
+                            "array": [
+                                "u16",
+                                3
+                            ]
+                        }
                     }
                 ]
             }
@@ -3394,10 +3738,10 @@
                         "name": "Limit"
                     },
                     {
-                        "name": "Stop"
+                        "name": "TriggerMarket"
                     },
                     {
-                        "name": "StopLimit"
+                        "name": "TriggerLimit"
                     }
                 ]
             }
@@ -3715,6 +4059,11 @@
             "code": 6054,
             "name": "MarketOrderMustBeInPlaceAndFill",
             "msg": "Market order must be in place and fill"
+        },
+        {
+            "code": 6055,
+            "name": "UserOrderIdAlreadyInUse",
+            "msg": "User Order Id Already In Use"
         }
     ]
 }