@meteora-ag/dlmm 1.0.39-rc.34 → 1.0.39-rc.36

package/dist/index.js

@@ -5848,6 +5848,10 @@ function findSetBit(startIndex, endIndex, binArrayBitmapExtension) {
       const binArrayOffset = getBinArrayOffset(i);
       const bitmapOffset = getBitmapOffset(i);
       const bitmapChunks = i > 0 ? binArrayBitmapExtension.positiveBinArrayBitmap[bitmapOffset] : binArrayBitmapExtension.negativeBinArrayBitmap[bitmapOffset];
+      console.log(
+        "\u{1F680} ~ bitmapChunks:",
+        _optionalChain([bitmapChunks, 'optionalAccess', _18 => _18.map, 'call', _19 => _19((b) => b.toString())])
+      );
       const bitmap = buildBitmapFromU64Arrays(bitmapChunks, 1 /* U512 */);
       if (bitmap.testn(binArrayOffset)) {
         return i;
@@ -5946,6 +5950,17 @@ function findNextBinArrayIndexWithLiquidity(swapForY, activeId, lbPairState, bin
             startBinArrayIndex = BIN_ARRAY_BITMAP_SIZE;
           }
         } else {
+          console.log(
+            ">>>> finNext",
+            startBinArrayIndex.toNumber(),
+            maxBinArrayIndex.toNumber(),
+            binArrayBitmapExtension.negativeBinArrayBitmap.map(
+              (t) => t.map((b) => b.toString())
+            ),
+            binArrayBitmapExtension.positiveBinArrayBitmap.map(
+              (t) => t.map((b) => b.toString())
+            )
+          );
           const binArrayIndex = findSetBit(
             startBinArrayIndex.toNumber(),
             maxBinArrayIndex.toNumber(),
@@ -5962,7 +5977,6 @@ function findNextBinArrayIndexWithLiquidity(swapForY, activeId, lbPairState, bin
       const bitmapType = 0 /* U1024 */;
       const bitmapDetail = bitmapTypeDetail(bitmapType);
       const offset = startBinArrayIndex.add(BIN_ARRAY_BITMAP_SIZE);
-      console.log(_optionalChain([lbPairState, 'access', _18 => _18.binArrayBitmap, 'optionalAccess', _19 => _19.map, 'call', _20 => _20((b) => b.toString())]));
       const bitmap = buildBitmapFromU64Arrays(
         lbPairState.binArrayBitmap,
         bitmapType
@@ -6513,7 +6527,7 @@ async function getTokensMintFromPoolAddress(connection, poolAddress, opt) {
   );
   const program = new (0, _anchor.Program)(
     IDL,
-    LBCLMM_PROGRAM_IDS[_nullishCoalesce(_optionalChain([opt, 'optionalAccess', _21 => _21.cluster]), () => ( "mainnet-beta"))],
+    LBCLMM_PROGRAM_IDS[_nullishCoalesce(_optionalChain([opt, 'optionalAccess', _20 => _20.cluster]), () => ( "mainnet-beta"))],
     provider
   );
   const poolAccount = await program.account.lbPair.fetchNullable(
@@ -6587,7 +6601,7 @@ async function getTokenBalance(conn, tokenAccount) {
 var parseLogs = (eventParser, logs) => {
   if (!logs.length)
     throw new Error("No logs found");
-  for (const event of _optionalChain([eventParser, 'optionalAccess', _22 => _22.parseLogs, 'call', _23 => _23(logs)])) {
+  for (const event of _optionalChain([eventParser, 'optionalAccess', _21 => _21.parseLogs, 'call', _22 => _22(logs)])) {
     return event.data;
   }
   throw new Error("No events found");
@@ -6683,13 +6697,13 @@ var DLMM = class {
     );
     const program = new (0, _anchor.Program)(
       IDL,
-      LBCLMM_PROGRAM_IDS[_nullishCoalesce(_optionalChain([opt, 'optionalAccess', _24 => _24.cluster]), () => ( "mainnet-beta"))],
+      LBCLMM_PROGRAM_IDS[_nullishCoalesce(_optionalChain([opt, 'optionalAccess', _23 => _23.cluster]), () => ( "mainnet-beta"))],
       provider
     );
     return program.account.lbPair.all();
   }
   static async getPairPubkeyIfExists(connection, tokenX, tokenY, binStep, baseFactor, opt) {
-    const cluster = _optionalChain([opt, 'optionalAccess', _25 => _25.cluster]) || "mainnet-beta";
+    const cluster = _optionalChain([opt, 'optionalAccess', _24 => _24.cluster]) || "mainnet-beta";
     const provider = new (0, _anchor.AnchorProvider)(
       connection,
       {},
@@ -6732,7 +6746,7 @@ var DLMM = class {
    * @returns The `create` function returns a `Promise` that resolves to a `DLMM` object.
    */
   static async create(connection, dlmm, opt) {
-    const cluster = _optionalChain([opt, 'optionalAccess', _26 => _26.cluster]) || "mainnet-beta";
+    const cluster = _optionalChain([opt, 'optionalAccess', _25 => _25.cluster]) || "mainnet-beta";
     const provider = new (0, _anchor.AnchorProvider)(
       connection,
       {},
@@ -6748,14 +6762,14 @@ var DLMM = class {
       connection,
       accountsToFetch
     );
-    const lbPairAccountInfoBuffer = _optionalChain([accountsInfo, 'access', _27 => _27[0], 'optionalAccess', _28 => _28.data]);
+    const lbPairAccountInfoBuffer = _optionalChain([accountsInfo, 'access', _26 => _26[0], 'optionalAccess', _27 => _27.data]);
     if (!lbPairAccountInfoBuffer)
       throw new Error(`LB Pair account ${dlmm.toBase58()} not found`);
     const lbPairAccInfo = program.coder.accounts.decode(
       "lbPair",
       lbPairAccountInfoBuffer
     );
-    const binArrayBitMapAccountInfoBuffer = _optionalChain([accountsInfo, 'access', _29 => _29[1], 'optionalAccess', _30 => _30.data]);
+    const binArrayBitMapAccountInfoBuffer = _optionalChain([accountsInfo, 'access', _28 => _28[1], 'optionalAccess', _29 => _29.data]);
     let binArrayBitMapExtensionAccInfo = null;
     if (binArrayBitMapAccountInfoBuffer) {
       binArrayBitMapExtensionAccInfo = program.coder.accounts.decode(
@@ -6819,7 +6833,7 @@ var DLMM = class {
    * objects.
    */
   static async createMultiple(connection, dlmmList, opt) {
-    const cluster = _optionalChain([opt, 'optionalAccess', _31 => _31.cluster]) || "mainnet-beta";
+    const cluster = _optionalChain([opt, 'optionalAccess', _30 => _30.cluster]) || "mainnet-beta";
     const provider = new (0, _anchor.AnchorProvider)(
       connection,
       {},
@@ -6837,7 +6851,7 @@ var DLMM = class {
     const lbPairArraysMap = /* @__PURE__ */ new Map();
     for (let i = 0; i < dlmmList.length; i++) {
       const lbPairPubKey = dlmmList[i];
-      const lbPairAccountInfoBuffer = _optionalChain([accountsInfo, 'access', _32 => _32[i], 'optionalAccess', _33 => _33.data]);
+      const lbPairAccountInfoBuffer = _optionalChain([accountsInfo, 'access', _31 => _31[i], 'optionalAccess', _32 => _32.data]);
       if (!lbPairAccountInfoBuffer)
         throw new Error(`LB Pair account ${lbPairPubKey.toBase58()} not found`);
       const binArrayAccInfo = program.coder.accounts.decode(
@@ -6850,7 +6864,7 @@ var DLMM = class {
     for (let i = dlmmList.length; i < accountsInfo.length; i++) {
       const index = i - dlmmList.length;
       const lbPairPubkey = dlmmList[index];
-      const binArrayBitMapAccountInfoBuffer = _optionalChain([accountsInfo, 'access', _34 => _34[i], 'optionalAccess', _35 => _35.data]);
+      const binArrayBitMapAccountInfoBuffer = _optionalChain([accountsInfo, 'access', _33 => _33[i], 'optionalAccess', _34 => _34.data]);
       if (binArrayBitMapAccountInfoBuffer) {
         const binArrayBitMapExtensionAccInfo = program.coder.accounts.decode(
           "binArrayBitmapExtension",
@@ -6933,7 +6947,7 @@ var DLMM = class {
     );
     const program = new (0, _anchor.Program)(
       IDL,
-      LBCLMM_PROGRAM_IDS[_nullishCoalesce(_optionalChain([opt, 'optionalAccess', _36 => _36.cluster]), () => ( "mainnet-beta"))],
+      LBCLMM_PROGRAM_IDS[_nullishCoalesce(_optionalChain([opt, 'optionalAccess', _35 => _35.cluster]), () => ( "mainnet-beta"))],
       provider
     );
     const presetParameter = await program.account.presetParameter.all();
@@ -6951,7 +6965,7 @@ var DLMM = class {
    * Pair account, and the value is an object of PositionInfo
    */
   static async getAllLbPairPositionsByUser(connection, userPubKey, opt) {
-    const cluster = _optionalChain([opt, 'optionalAccess', _37 => _37.cluster]) || "mainnet-beta";
+    const cluster = _optionalChain([opt, 'optionalAccess', _36 => _36.cluster]) || "mainnet-beta";
     const provider = new (0, _anchor.AnchorProvider)(
       connection,
       {},
@@ -7186,8 +7200,8 @@ var DLMM = class {
       const { mintXDecimal, mintYDecimal } = lbPairMintMap.get(
         lbPair.toBase58()
       );
-      const reserveXBalance = _nullishCoalesce(_optionalChain([lbPairReserveMap, 'access', _38 => _38.get, 'call', _39 => _39(lbPair.toBase58()), 'optionalAccess', _40 => _40.reserveX]), () => ( BigInt(0)));
-      const reserveYBalance = _nullishCoalesce(_optionalChain([lbPairReserveMap, 'access', _41 => _41.get, 'call', _42 => _42(lbPair.toBase58()), 'optionalAccess', _43 => _43.reserveY]), () => ( BigInt(0)));
+      const reserveXBalance = _nullishCoalesce(_optionalChain([lbPairReserveMap, 'access', _37 => _37.get, 'call', _38 => _38(lbPair.toBase58()), 'optionalAccess', _39 => _39.reserveX]), () => ( BigInt(0)));
+      const reserveYBalance = _nullishCoalesce(_optionalChain([lbPairReserveMap, 'access', _40 => _40.get, 'call', _41 => _41(lbPair.toBase58()), 'optionalAccess', _42 => _42.reserveY]), () => ( BigInt(0)));
       const tokenX = {
         publicKey: lbPairAcc.tokenXMint,
         reserve: lbPairAcc.reserveX,
@@ -7219,7 +7233,7 @@ var DLMM = class {
           tokenX,
           tokenY,
           lbPairPositionsData: [
-            ..._nullishCoalesce(_optionalChain([positionsMap, 'access', _44 => _44.get, 'call', _45 => _45(lbPair.toBase58()), 'optionalAccess', _46 => _46.lbPairPositionsData]), () => ( [])),
+            ..._nullishCoalesce(_optionalChain([positionsMap, 'access', _43 => _43.get, 'call', _44 => _44(lbPair.toBase58()), 'optionalAccess', _45 => _45.lbPairPositionsData]), () => ( [])),
             {
               publicKey: positionPubKey,
               positionData,
@@ -7255,8 +7269,8 @@ var DLMM = class {
         getTokenDecimals(program.provider.connection, lbPairAcc.tokenXMint),
         getTokenDecimals(program.provider.connection, lbPairAcc.tokenYMint)
       ]);
-      const reserveXBalance = _nullishCoalesce(_optionalChain([lbPairReserveMapV2, 'access', _47 => _47.get, 'call', _48 => _48(lbPair.toBase58()), 'optionalAccess', _49 => _49.reserveX]), () => ( BigInt(0)));
-      const reserveYBalance = _nullishCoalesce(_optionalChain([lbPairReserveMapV2, 'access', _50 => _50.get, 'call', _51 => _51(lbPair.toBase58()), 'optionalAccess', _52 => _52.reserveY]), () => ( BigInt(0)));
+      const reserveXBalance = _nullishCoalesce(_optionalChain([lbPairReserveMapV2, 'access', _46 => _46.get, 'call', _47 => _47(lbPair.toBase58()), 'optionalAccess', _48 => _48.reserveX]), () => ( BigInt(0)));
+      const reserveYBalance = _nullishCoalesce(_optionalChain([lbPairReserveMapV2, 'access', _49 => _49.get, 'call', _50 => _50(lbPair.toBase58()), 'optionalAccess', _51 => _51.reserveY]), () => ( BigInt(0)));
       const tokenX = {
         publicKey: lbPairAcc.tokenXMint,
         reserve: lbPairAcc.reserveX,
@@ -7288,7 +7302,7 @@ var DLMM = class {
           tokenX,
           tokenY,
           lbPairPositionsData: [
-            ..._nullishCoalesce(_optionalChain([positionsMap, 'access', _53 => _53.get, 'call', _54 => _54(lbPair.toBase58()), 'optionalAccess', _55 => _55.lbPairPositionsData]), () => ( [])),
+            ..._nullishCoalesce(_optionalChain([positionsMap, 'access', _52 => _52.get, 'call', _53 => _53(lbPair.toBase58()), 'optionalAccess', _54 => _54.lbPairPositionsData]), () => ( [])),
             {
               publicKey: positionPubKey,
               positionData,
@@ -7301,7 +7315,7 @@ var DLMM = class {
     return positionsMap;
   }
   static async migratePosition(connection, positions, newPositions, walletPubkey, opt) {
-    const cluster = _optionalChain([opt, 'optionalAccess', _56 => _56.cluster]) || "mainnet-beta";
+    const cluster = _optionalChain([opt, 'optionalAccess', _55 => _55.cluster]) || "mainnet-beta";
     const provider = new (0, _anchor.AnchorProvider)(
       connection,
       {},
@@ -7540,7 +7554,7 @@ var DLMM = class {
         swapForY,
         new (0, _anchor.BN)(activeIdToLoop),
         this.lbPair,
-        _nullishCoalesce(_optionalChain([this, 'access', _57 => _57.binArrayBitmapExtension, 'optionalAccess', _58 => _58.account]), () => ( null))
+        _nullishCoalesce(_optionalChain([this, 'access', _56 => _56.binArrayBitmapExtension, 'optionalAccess', _57 => _57.account]), () => ( null))
       );
       if (binArrayIndex === null)
         shouldStop = true;
@@ -8976,7 +8990,7 @@ var DLMM = class {
         swapForY,
         activeId,
         this.lbPair,
-        _optionalChain([this, 'access', _59 => _59.binArrayBitmapExtension, 'optionalAccess', _60 => _60.account]),
+        _optionalChain([this, 'access', _58 => _58.binArrayBitmapExtension, 'optionalAccess', _59 => _59.account]),
         binArrays
       );
       if (binArrayAccountToSwap == null) {
@@ -9083,7 +9097,7 @@ var DLMM = class {
         swapForY,
         activeId,
         this.lbPair,
-        _nullishCoalesce(_optionalChain([this, 'access', _61 => _61.binArrayBitmapExtension, 'optionalAccess', _62 => _62.account]), () => ( null)),
+        _nullishCoalesce(_optionalChain([this, 'access', _60 => _60.binArrayBitmapExtension, 'optionalAccess', _61 => _61.account]), () => ( null)),
         binArrays
       );
       if (binArrayAccountToSwap == null) {
@@ -9809,7 +9823,7 @@ var DLMM = class {
       swapForY,
       new (0, _anchor.BN)(activeBinId),
       this.lbPair,
-      _nullishCoalesce(_optionalChain([this, 'access', _63 => _63.binArrayBitmapExtension, 'optionalAccess', _64 => _64.account]), () => ( null))
+      _nullishCoalesce(_optionalChain([this, 'access', _62 => _62.binArrayBitmapExtension, 'optionalAccess', _63 => _63.account]), () => ( null))
     );
     if (toBinArrayIndex === null)
       return true;
@@ -9846,7 +9860,7 @@ var DLMM = class {
       swapForY,
       new (0, _anchor.BN)(activeBinId),
       this.lbPair,
-      _nullishCoalesce(_optionalChain([this, 'access', _65 => _65.binArrayBitmapExtension, 'optionalAccess', _66 => _66.account]), () => ( null))
+      _nullishCoalesce(_optionalChain([this, 'access', _64 => _64.binArrayBitmapExtension, 'optionalAccess', _65 => _65.account]), () => ( null))
     );
     const accountsToFetch = [];
     const [binArrayBitMapExtensionPubkey] = deriveBinArrayBitmapExtension(
@@ -9877,13 +9891,13 @@ var DLMM = class {
     let fromBinArray = null;
     let toBinArray = null;
     let binArrayBitmapExtension = null;
-    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _67 => _67[0]])) {
+    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _66 => _66[0]])) {
       binArrayBitmapExtension = binArrayBitMapExtensionPubkey;
     }
-    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _68 => _68[1]])) {
+    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _67 => _67[1]])) {
       fromBinArray = fromBinArrayPubkey;
     }
-    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _69 => _69[2]]) && !!toBinArrayIndex) {
+    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _68 => _68[2]]) && !!toBinArrayIndex) {
       toBinArray = toBinArrayPubkey;
     }
     const { blockhash, lastValidBlockHeight } = await this.program.provider.connection.getLatestBlockhash("confirmed");
@@ -10520,7 +10534,7 @@ var DLMMError = class extends Error {
       const anchorError = _anchor.AnchorError.parse(
         JSON.parse(JSON.stringify(error)).logs
       );
-      if (_optionalChain([anchorError, 'optionalAccess', _70 => _70.program, 'access', _71 => _71.toBase58, 'call', _72 => _72()]) === LBCLMM_PROGRAM_IDS["mainnet-beta"]) {
+      if (_optionalChain([anchorError, 'optionalAccess', _69 => _69.program, 'access', _70 => _70.toBase58, 'call', _71 => _71()]) === LBCLMM_PROGRAM_IDS["mainnet-beta"]) {
         _errorCode = anchorError.error.errorCode.number;
         _errorName = anchorError.error.errorCode.code;
         _errorMessage = anchorError.error.errorMessage;