@drift-labs/sdk 2.37.1-beta.1 → 2.37.1-beta.11

package/lib/tx/retryTxSender.js

@@ -1,17 +1,13 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RetryTxSender = void 0;
-const web3_js_1 = require("@solana/web3.js");
 const anchor_1 = require("@coral-xyz/anchor");
-const assert_1 = __importDefault(require("assert"));
-const bs58_1 = __importDefault(require("bs58"));
+const baseTxSender_1 = require("./baseTxSender");
 const DEFAULT_TIMEOUT = 35000;
 const DEFAULT_RETRY = 8000;
-class RetryTxSender {
+class RetryTxSender extends baseTxSender_1.BaseTxSender {
     constructor({ connection, wallet, opts = anchor_1.AnchorProvider.defaultOptions(), timeout = DEFAULT_TIMEOUT, retrySleep = DEFAULT_RETRY, additionalConnections = new Array(), }) {
+        super({ connection, wallet, opts, timeout, additionalConnections });
         this.timoutCount = 0;
         this.connection = connection;
         this.wallet = wallet;
@@ -20,66 +16,11 @@ class RetryTxSender {
         this.retrySleep = retrySleep;
         this.additionalConnections = additionalConnections;
     }
-    async send(tx, additionalSigners, opts, preSigned) {
-        if (additionalSigners === undefined) {
-            additionalSigners = [];
-        }
-        if (opts === undefined) {
-            opts = this.opts;
-        }
-        const signedTx = preSigned
-            ? tx
-            : await this.prepareTx(tx, additionalSigners, opts);
-        return this.sendRawTransaction(signedTx.serialize(), opts);
-    }
-    async prepareTx(tx, additionalSigners, opts) {
-        tx.feePayer = this.wallet.publicKey;
-        tx.recentBlockhash = (await this.connection.getRecentBlockhash(opts.preflightCommitment)).blockhash;
-        additionalSigners
-            .filter((s) => s !== undefined)
-            .forEach((kp) => {
-            tx.partialSign(kp);
+    async sleep(reference) {
+        return new Promise((resolve) => {
+            reference.resolve = resolve;
+            setTimeout(resolve, this.retrySleep);
         });
-        const signedTx = await this.wallet.signTransaction(tx);
-        return signedTx;
-    }
-    async getVersionedTransaction(ixs, lookupTableAccounts, additionalSigners, opts) {
-        if (additionalSigners === undefined) {
-            additionalSigners = [];
-        }
-        if (opts === undefined) {
-            opts = this.opts;
-        }
-        const message = new web3_js_1.TransactionMessage({
-            payerKey: this.wallet.publicKey,
-            recentBlockhash: (await this.connection.getRecentBlockhash(opts.preflightCommitment)).blockhash,
-            instructions: ixs,
-        }).compileToV0Message(lookupTableAccounts);
-        const tx = new web3_js_1.VersionedTransaction(message);
-        return tx;
-    }
-    async sendVersionedTransaction(tx, additionalSigners, opts, preSigned) {
-        let signedTx;
-        if (preSigned) {
-            signedTx = tx;
-            // @ts-ignore
-        }
-        else if (this.wallet.payer) {
-            // @ts-ignore
-            tx.sign((additionalSigners !== null && additionalSigners !== void 0 ? additionalSigners : []).concat(this.wallet.payer));
-            signedTx = tx;
-        }
-        else {
-            additionalSigners === null || additionalSigners === void 0 ? void 0 : additionalSigners.filter((s) => s !== undefined).forEach((kp) => {
-                tx.sign([kp]);
-            });
-            // @ts-ignore
-            signedTx = await this.wallet.signTransaction(tx);
-        }
-        if (opts === undefined) {
-            opts = this.opts;
-        }
-        return this.sendRawTransaction(signedTx.serialize(), opts);
     }
     async sendRawTransaction(rawTransaction, opts) {
         const startTime = this.getTimestamp();
@@ -130,97 +71,5 @@ class RetryTxSender {
         }
         return { txSig: txid, slot };
     }
-    async confirmTransaction(signature, commitment) {
-        let decodedSignature;
-        try {
-            decodedSignature = bs58_1.default.decode(signature);
-        }
-        catch (err) {
-            throw new Error('signature must be base58 encoded: ' + signature);
-        }
-        (0, assert_1.default)(decodedSignature.length === 64, 'signature has invalid length');
-        const start = Date.now();
-        const subscriptionCommitment = commitment || this.opts.commitment;
-        const subscriptionIds = new Array();
-        const connections = [this.connection, ...this.additionalConnections];
-        let response = null;
-        const promises = connections.map((connection, i) => {
-            let subscriptionId;
-            const confirmPromise = new Promise((resolve, reject) => {
-                try {
-                    subscriptionId = connection.onSignature(signature, (result, context) => {
-                        subscriptionIds[i] = undefined;
-                        response = {
-                            context,
-                            value: result,
-                        };
-                        resolve(null);
-                    }, subscriptionCommitment);
-                }
-                catch (err) {
-                    reject(err);
-                }
-            });
-            subscriptionIds.push(subscriptionId);
-            return confirmPromise;
-        });
-        try {
-            await this.promiseTimeout(promises, this.timeout);
-        }
-        finally {
-            for (const [i, subscriptionId] of subscriptionIds.entries()) {
-                if (subscriptionId) {
-                    connections[i].removeSignatureListener(subscriptionId);
-                }
-            }
-        }
-        if (response === null) {
-            this.timoutCount += 1;
-            const duration = (Date.now() - start) / 1000;
-            throw new Error(`Transaction was not confirmed in ${duration.toFixed(2)} seconds. It is unknown if it succeeded or failed. Check signature ${signature} using the Solana Explorer or CLI tools.`);
-        }
-        return response;
-    }
-    getTimestamp() {
-        return new Date().getTime();
-    }
-    async sleep(reference) {
-        return new Promise((resolve) => {
-            reference.resolve = resolve;
-            setTimeout(resolve, this.retrySleep);
-        });
-    }
-    promiseTimeout(promises, timeoutMs) {
-        let timeoutId;
-        const timeoutPromise = new Promise((resolve) => {
-            timeoutId = setTimeout(() => resolve(null), timeoutMs);
-        });
-        return Promise.race([...promises, timeoutPromise]).then((result) => {
-            clearTimeout(timeoutId);
-            return result;
-        });
-    }
-    sendToAdditionalConnections(rawTx, opts) {
-        this.additionalConnections.map((connection) => {
-            connection.sendRawTransaction(rawTx, opts).catch((e) => {
-                console.error(
-                // @ts-ignore
-                `error sending tx to additional connection ${connection._rpcEndpoint}`);
-                console.error(e);
-            });
-        });
-    }
-    addAdditionalConnection(newConnection) {
-        const alreadyUsingConnection = this.additionalConnections.filter((connection) => {
-            // @ts-ignore
-            return connection._rpcEndpoint === newConnection.rpcEndpoint;
-        }).length > 0;
-        if (!alreadyUsingConnection) {
-            this.additionalConnections.push(newConnection);
-        }
-    }
-    getTimeoutCount() {
-        return this.timoutCount;
-    }
 }
 exports.RetryTxSender = RetryTxSender;

package/lib/types.d.ts

@@ -50,6 +50,9 @@ export declare class UserStatus {
     static readonly BANKRUPT: {
         bankrupt: {};
     };
+    static readonly REDUCE_ONLY: {
+        reduceOnly: {};
+    };
 }
 export declare class ContractType {
     static readonly PERPETUAL: {
@@ -818,6 +821,7 @@ export type AMM = {
     bidQuoteAssetReserve: BN;
     askBaseAssetReserve: BN;
     askQuoteAssetReserve: BN;
+    perLpBase: number;
 };
 export type PerpPosition = {
     baseAssetAmount: BN;
@@ -834,6 +838,7 @@ export type PerpPosition = {
     remainderBaseAssetAmount: number;
     lastBaseAssetAmountPerLp: BN;
     lastQuoteAssetAmountPerLp: BN;
+    perLpBase: number;
 };
 export type UserStatsAccount = {
     numberOfSubAccounts: number;
@@ -1114,3 +1119,16 @@ export type PerpMarketExtendedInfo = {
     pnlPoolValue: BN;
     contractTier: ContractTier;
 };
+export type HealthComponents = {
+    deposits: HealthComponent[];
+    borrows: HealthComponent[];
+    perpPositions: HealthComponent[];
+    perpPnl: HealthComponent[];
+};
+export type HealthComponent = {
+    marketIndex: number;
+    size: BN;
+    value: BN;
+    weight: BN;
+    weightedValue: BN;
+};

package/lib/types.js

@@ -33,6 +33,7 @@ exports.UserStatus = UserStatus;
 UserStatus.ACTIVE = { active: {} };
 UserStatus.BEING_LIQUIDATED = { beingLiquidated: {} };
 UserStatus.BANKRUPT = { bankrupt: {} };
+UserStatus.REDUCE_ONLY = { reduceOnly: {} };
 class ContractType {
 }
 exports.ContractType = ContractType;

package/lib/user.d.ts

@@ -3,7 +3,7 @@ import { PublicKey } from '@solana/web3.js';
 import { EventEmitter } from 'events';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { DriftClient } from './driftClient';
-import { MarginCategory, Order, UserAccount, PerpPosition, SpotPosition, PerpMarketAccount } from './types';
+import { MarginCategory, Order, UserAccount, PerpPosition, SpotPosition, PerpMarketAccount, HealthComponents } from './types';
 import { UserAccountSubscriber, UserAccountEvents, DataAndSlot } from './accounts/types';
 import { PositionDirection, BN, SpotMarketAccount, MarketType } from '.';
 import { OraclePriceData } from './oracles/types';
@@ -101,10 +101,10 @@ export declare class User {
     getPerpBuyingPower(marketIndex: number, collateralBuffer?: any): BN;
     getPerpBuyingPowerFromFreeCollateralAndBaseAssetAmount(marketIndex: number, freeCollateral: BN, baseAssetAmount: BN): BN;
     /**
-     * calculates Free Collateral = Total collateral - initial margin requirement
+     * calculates Free Collateral = Total collateral - margin requirement
      * @returns : Precision QUOTE_PRECISION
      */
-    getFreeCollateral(): BN;
+    getFreeCollateral(marginCategory?: MarginCategory): BN;
     /**
      * @returns The margin requirement of a certain type (Initial or Maintenance) in USDC. : QUOTE_PRECISION
      */
@@ -153,6 +153,12 @@ export declare class User {
      * @returns : number (value from [0, 100])
      */
     getHealth(): number;
+    calculateWeightedPerpPositionValue(perpPosition: PerpPosition, marginCategory?: MarginCategory, liquidationBuffer?: BN, includeOpenOrders?: boolean, strict?: boolean): BN;
+    /**
+     * calculates position value of a single perp market in margin system
+     * @returns : Precision QUOTE_PRECISION
+     */
+    getPerpMarketLiabilityValue(marketIndex: number, marginCategory?: MarginCategory, liquidationBuffer?: BN, includeOpenOrders?: boolean, strict?: boolean): BN;
     /**
      * calculates sum of position value across all positions in margin system
      * @returns : Precision QUOTE_PRECISION
@@ -352,6 +358,9 @@ export declare class User {
         perpTier: number;
         spotTier: number;
     };
+    getHealthComponents({ marginCategory, }: {
+        marginCategory: MarginCategory;
+    }): HealthComponents;
     /**
      * Get the total position value, excluding any position coming from the given target market
      * @param marketToIgnore