@drift-labs/sdk 0.1.18-orders.1 → 0.1.18-orders.2

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"
@@ -3277,6 +3604,19 @@
                     {
                         "name": "referrer",
                         "type": "publicKey"
+                    },
+                    {
+                        "name": "oraclePriceOffset",
+                        "type": "i128"
+                    },
+                    {
+                        "name": "padding",
+                        "type": {
+                            "array": [
+                                "u16",
+                                3
+                            ]
+                        }
                     }
                 ]
             }
@@ -3715,6 +4055,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"
         }
     ]
 }

package/lib/index.d.ts

@@ -1,15 +1,20 @@
-import { BN } from '@project-serum/anchor';
+import BN from 'bn.js';
+import { PublicKey } from '@solana/web3.js';
 export * from './mockUSDCFaucet';
 export * from './pythClient';
 export * from './types';
 export * from './constants/markets';
-export * from './accounts/defaultHistoryAccountSubscriber';
-export * from './accounts/defaultClearingHouseAccountSubscriber';
+export * from './accounts/webSocketClearingHouseAccountSubscriber';
+export * from './accounts/bulkAccountLoader';
+export * from './accounts/pollingClearingHouseAccountSubscriber';
+export * from './accounts/pollingTokenAccountSubscriber';
 export * from './accounts/types';
 export * from './addresses';
 export * from './admin';
 export * from './clearingHouseUser';
 export * from './clearingHouse';
+export * from './factory/clearingHouse';
+export * from './factory/clearingHouseUser';
 export * from './math/conversion';
 export * from './math/funding';
 export * from './math/insuranceFund';
@@ -27,4 +32,4 @@ export * from './config';
 export * from './constants/numericConstants';
 export * from './util/computeUnits';
 export * from './util/tps';
-export { BN };
+export { BN, PublicKey };

package/lib/index.js

@@ -9,21 +9,30 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BN = void 0;
-const anchor_1 = require("@project-serum/anchor");
-Object.defineProperty(exports, "BN", { enumerable: true, get: function () { return anchor_1.BN; } });
+exports.PublicKey = exports.BN = void 0;
+const bn_js_1 = __importDefault(require("bn.js"));
+exports.BN = bn_js_1.default;
+const web3_js_1 = require("@solana/web3.js");
+Object.defineProperty(exports, "PublicKey", { enumerable: true, get: function () { return web3_js_1.PublicKey; } });
 __exportStar(require("./mockUSDCFaucet"), exports);
 __exportStar(require("./pythClient"), exports);
 __exportStar(require("./types"), exports);
 __exportStar(require("./constants/markets"), exports);
-__exportStar(require("./accounts/defaultHistoryAccountSubscriber"), exports);
-__exportStar(require("./accounts/defaultClearingHouseAccountSubscriber"), exports);
+__exportStar(require("./accounts/webSocketClearingHouseAccountSubscriber"), exports);
+__exportStar(require("./accounts/bulkAccountLoader"), exports);
+__exportStar(require("./accounts/pollingClearingHouseAccountSubscriber"), exports);
+__exportStar(require("./accounts/pollingTokenAccountSubscriber"), exports);
 __exportStar(require("./accounts/types"), exports);
 __exportStar(require("./addresses"), exports);
 __exportStar(require("./admin"), exports);
 __exportStar(require("./clearingHouseUser"), exports);
 __exportStar(require("./clearingHouse"), exports);
+__exportStar(require("./factory/clearingHouse"), exports);
+__exportStar(require("./factory/clearingHouseUser"), exports);
 __exportStar(require("./math/conversion"), exports);
 __exportStar(require("./math/funding"), exports);
 __exportStar(require("./math/insuranceFund"), exports);

package/lib/math/funding.js

@@ -242,7 +242,10 @@ exports.calculateLongShortFundingRateAndLiveTwaps = calculateLongShortFundingRat
 function calculateFundingPool(market) {
     // todo
     const totalFeeLB = market.amm.totalFee.div(new anchor_1.BN(2));
-    const feePool = anchor_1.BN.max(numericConstants_1.ZERO, market.amm.totalFeeMinusDistributions.sub(totalFeeLB));
+    const feePool = anchor_1.BN.max(numericConstants_1.ZERO, market.amm.totalFeeMinusDistributions
+        .sub(totalFeeLB)
+        .mul(new anchor_1.BN(2))
+        .div(new anchor_1.BN(3)));
     return feePool;
 }
 exports.calculateFundingPool = calculateFundingPool;

package/lib/math/utils.d.ts

@@ -1,2 +1,2 @@
-/// <reference types="bn.js" />
-export declare const squareRootBN: (n: any, closeness?: import("bn.js")) => any;
+import BN from 'bn.js';
+export declare const squareRootBN: (n: any, closeness?: BN) => any;

package/lib/math/utils.js

@@ -1,15 +1,18 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.squareRootBN = void 0;
-const bn_js_1 = require("bn.js");
-const squareRootBN = (n, closeness = new bn_js_1.BN(1)) => {
+const bn_js_1 = __importDefault(require("bn.js"));
+const squareRootBN = (n, closeness = new bn_js_1.default(1)) => {
     // Assuming the sqrt of n as n only
     let x = n;
     // The closed guess will be stored in the root
     let root;
     // To count the number of iterations
     let count = 0;
-    const TWO = new bn_js_1.BN(2);
+    const TWO = new bn_js_1.default(2);
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     while (count < Number.MAX_SAFE_INTEGER) {
         count++;

package/lib/orderParams.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="bn.js" />
 import { OrderParams, OrderTriggerCondition, PositionDirection } from './types';
 import { BN } from '@project-serum/anchor';
-export declare function getLimitOrderParams(marketIndex: BN, direction: PositionDirection, baseAssetAmount: BN, price: BN, reduceOnly: boolean, discountToken?: boolean, referrer?: boolean): OrderParams;
-export declare function getStopOrderParams(marketIndex: BN, direction: PositionDirection, baseAssetAmount: BN, triggerPrice: BN, triggerCondition: OrderTriggerCondition, reduceOnly: boolean, discountToken?: boolean, referrer?: boolean): OrderParams;
-export declare function getStopLimitOrderParams(marketIndex: BN, direction: PositionDirection, baseAssetAmount: BN, price: BN, triggerPrice: BN, triggerCondition: OrderTriggerCondition, reduceOnly: boolean, discountToken?: boolean, referrer?: boolean): OrderParams;
+export declare function getLimitOrderParams(marketIndex: BN, direction: PositionDirection, baseAssetAmount: BN, price: BN, reduceOnly: boolean, discountToken?: boolean, referrer?: boolean, userOrderId?: number): OrderParams;
+export declare function getStopOrderParams(marketIndex: BN, direction: PositionDirection, baseAssetAmount: BN, triggerPrice: BN, triggerCondition: OrderTriggerCondition, reduceOnly: boolean, discountToken?: boolean, referrer?: boolean, userOrderId?: number): OrderParams;
+export declare function getStopLimitOrderParams(marketIndex: BN, direction: PositionDirection, baseAssetAmount: BN, price: BN, triggerPrice: BN, triggerCondition: OrderTriggerCondition, reduceOnly: boolean, discountToken?: boolean, referrer?: boolean, userOrderId?: number): OrderParams;
 export declare function getMarketOrderParams(marketIndex: BN, direction: PositionDirection, quoteAssetAmount: BN, baseAssetAmount: BN, reduceOnly: boolean, price?: BN, discountToken?: boolean, referrer?: boolean): OrderParams;