@drift-labs/sdk 0.1.23-master.3 → 0.1.25-master.0

package/lib/accounts/bulkAccountLoader.d.ts

@@ -15,6 +15,8 @@ export declare class BulkAccountLoader {
     intervalId?: NodeJS.Timer;
     loadPromise?: Promise<void>;
     loadPromiseResolver: () => void;
+    loggingEnabled: boolean;
+    lastUpdate: number;
     constructor(connection: Connection, commitment: Commitment, pollingFrequency: number);
     addAccount(publicKey: PublicKey, callback: (buffer: Buffer) => void): string;
     removeAccount(publicKey: PublicKey, callbackId: string): void;

package/lib/accounts/bulkAccountLoader.js

@@ -10,13 +10,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BulkAccountLoader = void 0;
+const web3_js_1 = require("@solana/web3.js");
 const uuid_1 = require("uuid");
 const GET_MULTIPLE_ACCOUNTS_CHUNK_SIZE = 99;
+const fiveMinutes = 5 * 60 * 1000;
 class BulkAccountLoader {
     constructor(connection, commitment, pollingFrequency) {
         this.accountsToLoad = new Map();
         this.accountData = new Map();
         this.errorCallbacks = new Map();
+        this.loggingEnabled = false;
+        this.lastUpdate = Date.now();
         this.connection = connection;
         this.commitment = commitment;
         this.pollingFrequency = pollingFrequency;
@@ -78,6 +82,9 @@ class BulkAccountLoader {
             this.loadPromise = new Promise((resolver) => {
                 this.loadPromiseResolver = resolver;
             });
+            if (this.loggingEnabled) {
+                console.log('Loading accounts');
+            }
             try {
                 const chunks = this.chunks(Array.from(this.accountsToLoad.values()), GET_MULTIPLE_ACCOUNTS_CHUNK_SIZE);
                 yield Promise.all(chunks.map((chunk) => {
@@ -94,6 +101,15 @@ class BulkAccountLoader {
             finally {
                 this.loadPromiseResolver();
                 this.loadPromise = undefined;
+                const now = Date.now();
+                if (now - this.lastUpdate > fiveMinutes) {
+                    if (this.loggingEnabled) {
+                        console.log("Haven't seen updated account in five minutes. Bulk account loader creating new Connection Object");
+                    }
+                    this.connection = new web3_js_1.Connection(
+                    // @ts-ignore
+                    this.connection._rpcEndpoint, this.connection.commitment);
+                }
             }
         });
     }
@@ -108,17 +124,8 @@ class BulkAccountLoader {
                 }),
                 { commitment: this.commitment },
             ];
-            let rpcResponse;
-            try {
-                // @ts-ignore
-                rpcResponse = yield this.connection._rpcRequest('getMultipleAccounts', args);
-            }
-            catch (e) {
-                for (const [_, callback] of this.errorCallbacks) {
-                    callback(e);
-                }
-                return;
-            }
+            // @ts-ignore
+            const rpcResponse = yield this.connection._rpcRequest('getMultipleAccounts', args);
             const newSlot = rpcResponse.result.context.slot;
             for (const i in accountsToLoad) {
                 const accountToLoad = accountsToLoad[i];
@@ -136,6 +143,7 @@ class BulkAccountLoader {
                         buffer: newBuffer,
                     });
                     this.handleAccountCallbacks(accountToLoad, newBuffer);
+                    this.lastUpdate = Date.now();
                     continue;
                 }
                 if (newSlot <= oldRPCResponse.slot) {
@@ -148,6 +156,7 @@ class BulkAccountLoader {
                         buffer: newBuffer,
                     });
                     this.handleAccountCallbacks(accountToLoad, newBuffer);
+                    this.lastUpdate = Date.now();
                 }
             }
         });
@@ -165,12 +174,18 @@ class BulkAccountLoader {
         if (this.intervalId) {
             return;
         }
+        if (this.loggingEnabled) {
+            console.log(`startPolling`);
+        }
         this.intervalId = setInterval(this.load.bind(this), this.pollingFrequency);
     }
     stopPolling() {
         if (this.intervalId) {
             clearInterval(this.intervalId);
             this.intervalId = undefined;
+            if (this.loggingEnabled) {
+                console.log(`stopPolling`);
+            }
         }
     }
 }

package/lib/addresses.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/admin.d.ts

@@ -11,7 +11,7 @@ export declare class Admin extends ClearingHouse {
         TransactionSignature
     ]>;
     initializeOrderState(): Promise<TransactionSignature>;
-    initializeMarket(marketIndex: BN, priceOracle: PublicKey, baseAssetReserve: BN, quoteAssetReserve: BN, periodicity: BN, pegMultiplier?: BN): Promise<TransactionSignature>;
+    initializeMarket(marketIndex: BN, priceOracle: PublicKey, baseAssetReserve: BN, quoteAssetReserve: BN, periodicity: BN, pegMultiplier?: BN, oracleSource?: OracleSource, marginRatioInitial?: number, marginRatioPartial?: number, marginRatioMaintenance?: number): Promise<TransactionSignature>;
     moveAmmPrice(baseAssetReserve: BN, quoteAssetReserve: BN, marketIndex: BN): Promise<TransactionSignature>;
     updateK(sqrtK: BN, marketIndex: BN): Promise<TransactionSignature>;
     updateCurveHistory(): Promise<TransactionSignature>;
@@ -23,7 +23,7 @@ export declare class Admin extends ClearingHouse {
     withdrawFees(marketIndex: BN, amount: BN, recipient: PublicKey): Promise<TransactionSignature>;
     withdrawFromInsuranceVaultToMarket(marketIndex: BN, amount: BN): Promise<TransactionSignature>;
     updateAdmin(admin: PublicKey): Promise<TransactionSignature>;
-    updateMarginRatio(marginRatioInitial: BN, marginRatioPartial: BN, marginRatioMaintenance: BN): Promise<TransactionSignature>;
+    updateMarginRatio(marketIndex: BN, marginRatioInitial: number, marginRatioPartial: number, marginRatioMaintenance: number): Promise<TransactionSignature>;
     updatePartialLiquidationClosePercentage(numerator: BN, denominator: BN): Promise<TransactionSignature>;
     updatePartialLiquidationPenaltyPercentage(numerator: BN, denominator: BN): Promise<TransactionSignature>;
     updateFullLiquidationPenaltyPercentage(numerator: BN, denominator: BN): Promise<TransactionSignature>;

package/lib/admin.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -30,6 +34,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Admin = void 0;
 const web3_js_1 = require("@solana/web3.js");
+const types_1 = require("./types");
 const anchor_1 = require("@project-serum/anchor");
 const anchor = __importStar(require("@project-serum/anchor"));
 const addresses_1 = require("./addresses");
@@ -136,12 +141,12 @@ class Admin extends clearingHouse_1.ClearingHouse {
             return yield this.txSender.send(initializeOrderStateTx, [orderHistory], this.opts);
         });
     }
-    initializeMarket(marketIndex, priceOracle, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier = numericConstants_1.PEG_PRECISION) {
+    initializeMarket(marketIndex, priceOracle, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier = numericConstants_1.PEG_PRECISION, oracleSource = types_1.OracleSource.PYTH, marginRatioInitial = 2000, marginRatioPartial = 625, marginRatioMaintenance = 500) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.getMarketsAccount().markets[marketIndex.toNumber()].initialized) {
                 throw Error(`MarketIndex ${marketIndex.toNumber()} already initialized`);
             }
-            const initializeMarketTx = yield this.program.transaction.initializeMarket(marketIndex, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier, {
+            const initializeMarketTx = yield this.program.transaction.initializeMarket(marketIndex, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier, oracleSource, marginRatioInitial, marginRatioPartial, marginRatioMaintenance, {
                 accounts: {
                     state: yield this.getStatePublicKey(),
                     admin: this.wallet.publicKey,
@@ -322,12 +327,13 @@ class Admin extends clearingHouse_1.ClearingHouse {
             });
         });
     }
-    updateMarginRatio(marginRatioInitial, marginRatioPartial, marginRatioMaintenance) {
+    updateMarginRatio(marketIndex, marginRatioInitial, marginRatioPartial, marginRatioMaintenance) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.program.rpc.updateMarginRatio(marginRatioInitial, marginRatioPartial, marginRatioMaintenance, {
+            return yield this.program.rpc.updateMarginRatio(marketIndex, marginRatioInitial, marginRatioPartial, marginRatioMaintenance, {
                 accounts: {
                     admin: this.wallet.publicKey,
                     state: yield this.getStatePublicKey(),
+                    markets: this.getStateAccount().markets,
                 },
             });
         });

package/lib/clearingHouse.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -189,6 +193,8 @@ class ClearingHouse {
         this.program = newProgram;
         this.userAccountPublicKey = undefined;
         this.userAccount = undefined;
+        this.userOrdersAccountPublicKey = undefined;
+        this.userOrdersExist = undefined;
     }
     initializeUserAccount() {
         return __awaiter(this, void 0, void 0, function* () {

package/lib/clearingHouseUser.d.ts

@@ -4,7 +4,7 @@ import { PublicKey } from '@solana/web3.js';
 import { EventEmitter } from 'events';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { ClearingHouse } from './clearingHouse';
-import { Order, UserAccount, UserOrdersAccount, UserPosition, UserPositionsAccount } from './types';
+import { MarginCategory, Order, UserAccount, UserOrdersAccount, UserPosition, UserPositionsAccount } from './types';
 import { UserAccountSubscriber, UserAccountEvents } from './accounts/types';
 import { PositionDirection, BN } from '.';
 export declare class ClearingHouseUser {
@@ -62,12 +62,17 @@ export declare class ClearingHouseUser {
      * calculates Buying Power = FC * MAX_LEVERAGE
      * @returns : Precision QUOTE_PRECISION
      */
-    getBuyingPower(): BN;
+    getBuyingPower(marketIndex: BN | number): BN;
     /**
-     * calculates Free Collateral = (TC - TPV) * MAX_LEVERAGE
+     * calculates Free Collateral = Total collateral - initial margin requirement
      * @returns : Precision QUOTE_PRECISION
      */
     getFreeCollateral(): BN;
+    getInitialMarginRequirement(): BN;
+    /**
+     * @returns The partial margin requirement in USDC. : QUOTE_PRECISION
+     */
+    getPartialMarginRequirement(): BN;
     /**
      * calculates unrealized position price pnl
      * @returns : Precision QUOTE_PRECISION
@@ -109,7 +114,7 @@ export declare class ClearingHouseUser {
      * @params category {Initial, Partial, Maintenance}
      * @returns : Precision TEN_THOUSAND
      */
-    getMaxLeverage(category?: 'Initial' | 'Partial' | 'Maintenance'): BN;
+    getMaxLeverage(marketIndex: BN | number, category?: MarginCategory): BN;
     /**
      * calculates margin ratio: total collateral / |total position value|
      * @returns : Precision TEN_THOUSAND
@@ -123,20 +128,12 @@ export declare class ClearingHouseUser {
     needsToSettleFundingPayment(): boolean;
     /**
      * Calculate the liquidation price of a position, with optional parameter to calculate the liquidation price after a trade
-     * @param targetMarket
-     * @param positionBaseSizeChange // change in position size to calculate liquidation price for : Precision 10^13
-     * @param partial
-     * @returns Precision : MARK_PRICE_PRECISION
-     */
-    liquidationPriceOld(targetMarket: Pick<UserPosition, 'marketIndex'>, positionBaseSizeChange?: BN, partial?: boolean): BN;
-    /**
-     * Calculate the liquidation price of a position, with optional parameter to calculate the liquidation price after a trade
-     * @param targetMarket
+     * @param marketPosition
      * @param positionBaseSizeChange // change in position size to calculate liquidation price for : Precision 10^13
      * @param partial
      * @returns Precision : MARK_PRICE_PRECISION
      */
-    liquidationPrice(targetMarket: Pick<UserPosition, 'marketIndex'>, positionBaseSizeChange?: BN, partial?: boolean): BN;
+    liquidationPrice(marketPosition: Pick<UserPosition, 'marketIndex'>, positionBaseSizeChange?: BN, partial?: boolean): BN;
     /**
      * Calculates the estimated liquidation price for a position after closing a quote amount of the position.
      * @param positionMarketIndex
@@ -163,10 +160,9 @@ export declare class ClearingHouseUser {
      *
      * @param targetMarketIndex
      * @param tradeSide
-     * @param userMaxLeverageSetting - leverage : Precision TEN_THOUSAND
      * @returns tradeSizeAllowed : Precision QUOTE_PRECISION
      */
-    getMaxTradeSizeUSDC(targetMarketIndex: BN, tradeSide: PositionDirection, userMaxLeverageSetting: BN): BN;
+    getMaxTradeSizeUSDC(targetMarketIndex: BN, tradeSide: PositionDirection): BN;
     /**
      * Returns the leverage ratio for the account after adding (or subtracting) the given quote size to the given position
      * @param targetMarketIndex
@@ -187,5 +183,4 @@ export declare class ClearingHouseUser {
      * @returns positionValue : Precision QUOTE_PRECISION
      */
     private getTotalPositionValueExcludingMarket;
-    canFillOrder(order: Order): boolean;
 }