@drift-labs/sdk 0.2.0-master.36 → 0.2.0-master.38

package/lib/clearingHouseUser.js

@@ -71,6 +71,7 @@ class ClearingHouseUser {
             marketIndex,
             quoteAssetAmount: numericConstants_1.ZERO,
             quoteEntryAmount: numericConstants_1.ZERO,
+            quoteBreakEvenAmount: numericConstants_1.ZERO,
             openOrders: 0,
             openBids: numericConstants_1.ZERO,
             openAsks: numericConstants_1.ZERO,
@@ -124,7 +125,7 @@ class ClearingHouseUser {
      */
     getLPBidAsks(marketIndex) {
         const position = this.getUserPosition(marketIndex);
-        if (position.lpShares.eq(numericConstants_1.ZERO)) {
+        if (position === undefined || position.lpShares.eq(numericConstants_1.ZERO)) {
             return [numericConstants_1.ZERO, numericConstants_1.ZERO];
         }
         const market = this.clearingHouse.getPerpMarketAccount(marketIndex);
@@ -443,30 +444,9 @@ class ClearingHouseUser {
                 perpPosition.baseAssetAmount =
                     settledPosition.baseAssetAmount.add(dustBaa);
                 perpPosition.quoteAssetAmount = settledPosition.quoteAssetAmount;
-                // open orders
-                let openAsks;
-                if (market.amm.maxBaseAssetReserve > market.amm.baseAssetReserve) {
-                    openAsks = market.amm.maxBaseAssetReserve
-                        .sub(market.amm.baseAssetReserve)
-                        .mul(perpPosition.lpShares)
-                        .div(market.amm.sqrtK)
-                        .mul(new _1.BN(-1));
-                }
-                else {
-                    openAsks = numericConstants_1.ZERO;
-                }
-                let openBids;
-                if (market.amm.minBaseAssetReserve < market.amm.baseAssetReserve) {
-                    openBids = market.amm.baseAssetReserve
-                        .sub(market.amm.minBaseAssetReserve)
-                        .mul(perpPosition.lpShares)
-                        .div(market.amm.sqrtK);
-                }
-                else {
-                    openBids = numericConstants_1.ZERO;
-                }
-                perpPosition.openAsks = perpPosition.openAsks.add(openAsks);
-                perpPosition.openBids = perpPosition.openBids.add(openBids);
+                const [totalOpenBids, totalOpenAsks] = this.getPerpBidAsks(market.marketIndex);
+                perpPosition.openAsks = totalOpenAsks;
+                perpPosition.openBids = totalOpenBids;
             }
             let valuationPrice = this.getOracleDataForPerpMarket(market.marketIndex).price;
             if ((0, types_1.isVariant)(market.status, 'settlement')) {
@@ -673,6 +653,7 @@ class ClearingHouseUser {
             remainderBaseAssetAmount: 0,
             quoteAssetAmount: new _1.BN(0),
             lastCumulativeFundingRate: numericConstants_1.ZERO,
+            quoteBreakEvenAmount: new _1.BN(0),
             quoteEntryAmount: new _1.BN(0),
             openOrders: 0,
             openBids: new _1.BN(0),
@@ -903,7 +884,7 @@ class ClearingHouseUser {
         const precisionIncrease = numericConstants_1.TEN.pow(new _1.BN(spotMarket.decimals - 6));
         const amountWithdrawable = freeCollateral
             .mul(numericConstants_1.MARGIN_PRECISION)
-            .div(spotMarket.initialAssetWeight)
+            .div(new _1.BN(spotMarket.initialAssetWeight))
             .mul(numericConstants_1.PRICE_PRECISION)
             .div(oracleData.price)
             .mul(precisionIncrease);
@@ -923,7 +904,7 @@ class ClearingHouseUser {
                 : freeCollateral;
             const maxLiabilityAllowed = freeCollatAfterWithdraw
                 .mul(numericConstants_1.MARGIN_PRECISION)
-                .div(spotMarket.initialLiabilityWeight)
+                .div(new _1.BN(spotMarket.initialLiabilityWeight))
                 .mul(numericConstants_1.PRICE_PRECISION)
                 .div(oracleData.price)
                 .mul(precisionIncrease);

package/lib/config.js

@@ -7,7 +7,7 @@ exports.configs = {
     devnet: {
         ENV: 'devnet',
         PYTH_ORACLE_MAPPING_ADDRESS: 'BmA9Z6FjioHJPpjT39QazZyhDRUdZy2ezwx4GiDdE2u2',
-        CLEARING_HOUSE_PROGRAM_ID: 'BJG3o4CURrokB7huNyiHptYepAtHXj4YfefJiPgzUULV',
+        CLEARING_HOUSE_PROGRAM_ID: 'jAEeKs9twxAJmXZHqS2p459xW7FMDjoyvuqthRo9qGS',
         USDC_MINT_ADDRESS: '8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2',
         SERUM_V3: 'DESVgJVGajEgKGXhb6XmqDHGz3VjdgP7rEVESBgxmroY',
         V2_ALPHA_TICKET_MINT_ADDRESS: 'DeEiGWfCMP9psnLGkxGrBBMEAW5Jv8bBGMN8DCtFRCyB',

package/lib/factory/bigNum.d.ts

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

package/lib/factory/bigNum.js

@@ -10,6 +10,10 @@ class BigNum {
         this.val = new anchor_1.BN(val);
         this.precision = new anchor_1.BN(precisionVal);
     }
+    static setLocale(locale) {
+        BigNum.delim = (1.1).toLocaleString(locale).slice(1, 2) || '.';
+        BigNum.spacer = (1000).toLocaleString(locale).slice(1, 2) || ',';
+    }
     bigNumFromParam(bn) {
         return anchor_1.BN.isBN(bn) ? BigNum.from(bn) : bn;
     }
@@ -381,7 +385,21 @@ class BigNum {
      * @returns
      */
     toNum() {
-        return parseFloat(this.print());
+        let printedValue = this.print();
+        // Must convert any non-US delimiters and spacers to US format before using parseFloat
+        if (BigNum.delim !== '.' || BigNum.spacer !== ',') {
+            printedValue = printedValue
+                .split('')
+                .map((char) => {
+                if (char === BigNum.delim)
+                    return '.';
+                if (char === BigNum.spacer)
+                    return ',';
+                return char;
+            })
+                .join('');
+        }
+        return parseFloat(printedValue);
     }
     static fromJSON(json) {
         return BigNum.from(new anchor_1.BN(json.val), new anchor_1.BN(json.precision));
@@ -407,10 +425,14 @@ class BigNum {
         // Handle empty number edge cases
         if (!val)
             return BigNum.from(numericConstants_1.ZERO, precisionShift);
-        if (!val.replace(BigNum.delim, ''))
+        if (!val.replace(BigNum.delim, '')) {
             return BigNum.from(numericConstants_1.ZERO, precisionShift);
-        const [leftSide, rightSide] = val.split(BigNum.delim);
-        const rawBn = new anchor_1.BN(`${leftSide !== null && leftSide !== void 0 ? leftSide : ''}${rightSide !== null && rightSide !== void 0 ? rightSide : ''}`);
+        }
+        const sides = val.split(BigNum.delim);
+        const rightSide = sides[1];
+        const leftSide = sides[0].replace(/\D/g, '');
+        const bnInput = `${leftSide !== null && leftSide !== void 0 ? leftSide : ''}${rightSide !== null && rightSide !== void 0 ? rightSide : ''}`;
+        const rawBn = new anchor_1.BN(bnInput);
         const rightSideLength = (_a = rightSide === null || rightSide === void 0 ? void 0 : rightSide.length) !== null && _a !== void 0 ? _a : 0;
         const totalShift = precisionShift
             ? precisionShift.sub(new anchor_1.BN(rightSideLength))