@drift-labs/sdk 0.2.0-master.11 → 0.2.0-master.14

package/lib/events/eventList.js

@@ -40,6 +40,9 @@ class EventList {
             if (currentNode.next !== undefined) {
                 newNode.next.prev = newNode;
             }
+            else {
+                this.tail = newNode;
+            }
             currentNode.next = newNode;
             newNode.prev = currentNode;
         }

package/lib/events/types.d.ts

@@ -1,5 +1,5 @@
 import { Commitment, TransactionSignature } from '@solana/web3.js';
-import { DepositRecord, FundingPaymentRecord, FundingRateRecord, LiquidationRecord, OrderRecord } from '../index';
+import { DepositRecord, FundingPaymentRecord, FundingRateRecord, LiquidationRecord, OrderRecord, SettlePnlRecord } from '../index';
 export declare type EventSubscriptionOptions = {
     eventTypes?: EventType[];
     maxEventsPerType?: number;
@@ -27,6 +27,7 @@ export declare type EventMap = {
     LiquidationRecord: Event<LiquidationRecord>;
     FundingRateRecord: Event<FundingRateRecord>;
     OrderRecord: Event<OrderRecord>;
+    SettlePnlRecord: Event<SettlePnlRecord>;
 };
 export declare type EventType = keyof EventMap;
 export interface EventSubscriberEvents {

package/lib/factory/bigNum.d.ts

@@ -6,6 +6,7 @@ export declare class BigNum {
     static delim: string;
     static spacer: string;
     constructor(val: BN | number | string, precisionVal?: BN | number | string);
+    private bigNumFromParam;
     add(bn: BigNum): BigNum;
     sub(bn: BigNum): BigNum;
     mul(bn: BigNum | BN): BigNum;

package/lib/factory/bigNum.js

@@ -10,6 +10,9 @@ class BigNum {
         this.val = new anchor_1.BN(val);
         this.precision = new anchor_1.BN(precisionVal);
     }
+    bigNumFromParam(bn) {
+        return anchor_1.BN.isBN(bn) ? BigNum.from(bn) : bn;
+    }
     add(bn) {
         (0, assert_1.assert)(bn.precision.eq(this.precision), 'Adding unequal precisions');
         return BigNum.from(this.val.add(bn.val), this.precision);
@@ -19,7 +22,7 @@ class BigNum {
         return BigNum.from(this.val.sub(bn.val), this.precision);
     }
     mul(bn) {
-        const mulVal = bn instanceof BigNum ? bn : BigNum.from(bn);
+        const mulVal = this.bigNumFromParam(bn);
         return BigNum.from(this.val.mul(mulVal.val), this.precision.add(mulVal.precision));
     }
     /**
@@ -28,12 +31,12 @@ class BigNum {
      * @returns
      */
     scalarMul(bn) {
-        if (bn instanceof anchor_1.BN)
+        if (anchor_1.BN.isBN(bn))
             return BigNum.from(this.val.mul(bn), this.precision);
         return BigNum.from(this.val.mul(bn.val), this.precision.add(bn.precision)).shift(bn.precision.neg());
     }
     div(bn) {
-        if (bn instanceof anchor_1.BN)
+        if (anchor_1.BN.isBN(bn))
             return BigNum.from(this.val.div(bn), this.precision);
         return BigNum.from(this.val.div(bn.val), this.precision.sub(bn.precision));
     }
@@ -73,35 +76,35 @@ class BigNum {
             .toPrecision(precision);
     }
     gt(bn, ignorePrecision) {
-        const comparisonVal = bn instanceof BigNum ? bn : BigNum.from(bn);
+        const comparisonVal = this.bigNumFromParam(bn);
         if (!ignorePrecision && !comparisonVal.eq(numericConstants_1.ZERO)) {
             (0, assert_1.assert)(comparisonVal.precision.eq(this.precision), 'Trying to compare numbers with different precision. Yo can opt to ignore precision using the ignorePrecision parameter');
         }
         return this.val.gt(comparisonVal.val);
     }
     lt(bn, ignorePrecision) {
-        const comparisonVal = bn instanceof BigNum ? bn : BigNum.from(bn);
+        const comparisonVal = this.bigNumFromParam(bn);
         if (!ignorePrecision && !comparisonVal.val.eq(numericConstants_1.ZERO)) {
             (0, assert_1.assert)(comparisonVal.precision.eq(this.precision), 'Trying to compare numbers with different precision. Yo can opt to ignore precision using the ignorePrecision parameter');
         }
         return this.val.lt(comparisonVal.val);
     }
     gte(bn, ignorePrecision) {
-        const comparisonVal = bn instanceof BigNum ? bn : BigNum.from(bn);
+        const comparisonVal = this.bigNumFromParam(bn);
         if (!ignorePrecision && !comparisonVal.val.eq(numericConstants_1.ZERO)) {
             (0, assert_1.assert)(comparisonVal.precision.eq(this.precision), 'Trying to compare numbers with different precision. Yo can opt to ignore precision using the ignorePrecision parameter');
         }
         return this.val.gte(comparisonVal.val);
     }
     lte(bn, ignorePrecision) {
-        const comparisonVal = bn instanceof BigNum ? bn : BigNum.from(bn);
+        const comparisonVal = this.bigNumFromParam(bn);
         if (!ignorePrecision && !comparisonVal.val.eq(numericConstants_1.ZERO)) {
             (0, assert_1.assert)(comparisonVal.precision.eq(this.precision), 'Trying to compare numbers with different precision. Yo can opt to ignore precision using the ignorePrecision parameter');
         }
         return this.val.lte(comparisonVal.val);
     }
     eq(bn, ignorePrecision) {
-        const comparisonVal = bn instanceof BigNum ? bn : BigNum.from(bn);
+        const comparisonVal = this.bigNumFromParam(bn);
         if (!ignorePrecision && !comparisonVal.val.eq(numericConstants_1.ZERO)) {
             (0, assert_1.assert)(comparisonVal.precision.eq(this.precision), 'Trying to compare numbers with different precision. Yo can opt to ignore precision using the ignorePrecision parameter');
         }
@@ -149,8 +152,14 @@ class BigNum {
         // remove leading zeroes
         printString = printString.replace(/^0+/, '');
         // add zero if leading delim
-        if (printString[0] === BigNum.delim)
-            printString = `0${printString}`;
+        if (this.isNeg()) {
+            if (printString[1] === BigNum.delim)
+                printString = printString.replace('-.', '-0.');
+        }
+        else {
+            if (printString[0] === BigNum.delim)
+                printString = `0${printString}`;
+        }
         // remove trailing delim
         if (printString[printString.length - 1] === BigNum.delim)
             printString = printString.slice(0, printString.length - 1);
@@ -261,10 +270,27 @@ class BigNum {
      * @returns
      */
     toNotional(useTradePrecision, precisionOverride) {
+        var _a;
         const prefix = `${this.lt(BigNum.zero()) ? `-` : ``}$`;
-        const val = useTradePrecision || precisionOverride
+        const usingCustomPrecision = true && (useTradePrecision || precisionOverride);
+        let val = usingCustomPrecision
             ? this.prettyPrint(useTradePrecision, precisionOverride)
             : BigNum.fromPrint(this.toFixed(2), new anchor_1.BN(2)).prettyPrint();
+        // Append two trailing zeroes if not using custom precision
+        if (!usingCustomPrecision) {
+            const [_, rightSide] = val.split(BigNum.delim);
+            const trailingLength = (_a = rightSide === null || rightSide === void 0 ? void 0 : rightSide.length) !== null && _a !== void 0 ? _a : 0;
+            if (trailingLength < 2) {
+                const numHasDecimals = this.print().includes(BigNum.delim);
+                // Handle case where pretty print won't include the decimal point
+                if (trailingLength === 0 && numHasDecimals) {
+                    val = `${val}.00`;
+                }
+                else {
+                    val = `${val}${new Array(2 - trailingLength).fill('0').join('')}`;
+                }
+            }
+        }
         return `${prefix}${val.replace('-', '')}`;
     }
     toMillified(precision = 3) {