@meteora-ag/dlmm 1.6.0-rc.24 → 1.6.0-rc.26

package/dist/index.js

@@ -13567,7 +13567,7 @@ function createProgram(connection, opt) {
     _anchor.AnchorProvider.defaultOptions()
   );
   return new (0, _anchor.Program)(
-    { ...dlmm_default, address: LBCLMM_PROGRAM_IDS[cluster] },
+    { ...dlmm_default, address: _nullishCoalesce(_optionalChain([opt, 'optionalAccess', _44 => _44.programId]), () => ( LBCLMM_PROGRAM_IDS[cluster])) },
     provider
   );
 }
@@ -13575,9 +13575,9 @@ function decodeAccount(program, accountName, buffer) {
   return program.coder.accounts.decode(accountName, buffer);
 }
 function getAccountDiscriminator(accountName) {
-  return _optionalChain([dlmm_default, 'access', _44 => _44.accounts, 'access', _45 => _45.find, 'call', _46 => _46(
+  return _optionalChain([dlmm_default, 'access', _45 => _45.accounts, 'access', _46 => _46.find, 'call', _47 => _47(
     (acc) => acc.name.toLowerCase() === accountName.toLowerCase()
-  ), 'optionalAccess', _47 => _47.discriminator]);
+  ), 'optionalAccess', _48 => _48.discriminator]);
 }
 function capSlippagePercentage(slippage) {
   if (slippage > 100) {
@@ -14124,7 +14124,7 @@ var DLMM = class {
       connection,
       accountsToFetch
     );
-    const lbPairAccountInfoBuffer = _optionalChain([accountsInfo, 'access', _48 => _48[0], 'optionalAccess', _49 => _49.data]);
+    const lbPairAccountInfoBuffer = _optionalChain([accountsInfo, 'access', _49 => _49[0], 'optionalAccess', _50 => _50.data]);
     if (!lbPairAccountInfoBuffer)
       throw new Error(`LB Pair account ${dlmm.toBase58()} not found`);
     const lbPairAccInfo = decodeAccount(
@@ -14132,7 +14132,7 @@ var DLMM = class {
       "lbPair",
       lbPairAccountInfoBuffer
     );
-    const binArrayBitMapAccountInfoBuffer = _optionalChain([accountsInfo, 'access', _50 => _50[1], 'optionalAccess', _51 => _51.data]);
+    const binArrayBitMapAccountInfoBuffer = _optionalChain([accountsInfo, 'access', _51 => _51[1], 'optionalAccess', _52 => _52.data]);
     let binArrayBitMapExtensionAccInfo = null;
     if (binArrayBitMapAccountInfoBuffer) {
       binArrayBitMapExtensionAccInfo = decodeAccount(
@@ -14141,7 +14141,7 @@ var DLMM = class {
         binArrayBitMapAccountInfoBuffer
       );
     }
-    const clockAccountInfoBuffer = _optionalChain([accountsInfo, 'access', _52 => _52[2], 'optionalAccess', _53 => _53.data]);
+    const clockAccountInfoBuffer = _optionalChain([accountsInfo, 'access', _53 => _53[2], 'optionalAccess', _54 => _54.data]);
     if (!clockAccountInfoBuffer)
       throw new Error(`Clock account not found`);
     const clock = ClockLayout.decode(clockAccountInfoBuffer);
@@ -14294,14 +14294,14 @@ var DLMM = class {
       accountsToFetch
     );
     const clockAccount = accountsInfo.pop();
-    const clockAccountInfoBuffer = _optionalChain([clockAccount, 'optionalAccess', _54 => _54.data]);
+    const clockAccountInfoBuffer = _optionalChain([clockAccount, 'optionalAccess', _55 => _55.data]);
     if (!clockAccountInfoBuffer)
       throw new Error(`Clock account not found`);
     const clock = ClockLayout.decode(clockAccountInfoBuffer);
     const lbPairArraysMap = /* @__PURE__ */ new Map();
     for (let i = 0; i < dlmmList.length; i++) {
       const lbPairPubKey = dlmmList[i];
-      const lbPairAccountInfoBuffer = _optionalChain([accountsInfo, 'access', _55 => _55[i], 'optionalAccess', _56 => _56.data]);
+      const lbPairAccountInfoBuffer = _optionalChain([accountsInfo, 'access', _56 => _56[i], 'optionalAccess', _57 => _57.data]);
       if (!lbPairAccountInfoBuffer)
         throw new Error(`LB Pair account ${lbPairPubKey.toBase58()} not found`);
       const lbPairAccInfo = decodeAccount(
@@ -14315,7 +14315,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', _57 => _57[i], 'optionalAccess', _58 => _58.data]);
+      const binArrayBitMapAccountInfoBuffer = _optionalChain([accountsInfo, 'access', _58 => _58[i], 'optionalAccess', _59 => _59.data]);
       if (binArrayBitMapAccountInfoBuffer) {
         const binArrayBitMapExtensionAccInfo = decodeAccount(
           program,
@@ -14645,8 +14645,8 @@ var DLMM = class {
       const { mintX, mintY, rewardMint0, rewardMint1 } = lbPairMintMap.get(
         lbPair.toBase58()
       );
-      const reserveXBalance = _nullishCoalesce(_optionalChain([lbPairReserveMap, 'access', _59 => _59.get, 'call', _60 => _60(lbPair.toBase58()), 'optionalAccess', _61 => _61.reserveX]), () => ( BigInt(0)));
-      const reserveYBalance = _nullishCoalesce(_optionalChain([lbPairReserveMap, 'access', _62 => _62.get, 'call', _63 => _63(lbPair.toBase58()), 'optionalAccess', _64 => _64.reserveY]), () => ( BigInt(0)));
+      const reserveXBalance = _nullishCoalesce(_optionalChain([lbPairReserveMap, 'access', _60 => _60.get, 'call', _61 => _61(lbPair.toBase58()), 'optionalAccess', _62 => _62.reserveX]), () => ( BigInt(0)));
+      const reserveYBalance = _nullishCoalesce(_optionalChain([lbPairReserveMap, 'access', _63 => _63.get, 'call', _64 => _64(lbPair.toBase58()), 'optionalAccess', _65 => _65.reserveY]), () => ( BigInt(0)));
       const { tokenXProgram, tokenYProgram } = getTokenProgramId(lbPairAcc);
       const tokenX = {
         publicKey: lbPairAcc.tokenXMint,
@@ -14684,7 +14684,7 @@ var DLMM = class {
           tokenX,
           tokenY,
           lbPairPositionsData: [
-            ..._nullishCoalesce(_optionalChain([positionsMap, 'access', _65 => _65.get, 'call', _66 => _66(lbPair.toBase58()), 'optionalAccess', _67 => _67.lbPairPositionsData]), () => ( [])),
+            ..._nullishCoalesce(_optionalChain([positionsMap, 'access', _66 => _66.get, 'call', _67 => _67(lbPair.toBase58()), 'optionalAccess', _68 => _68.lbPairPositionsData]), () => ( [])),
             {
               publicKey: positionPubkey,
               positionData,
@@ -15258,13 +15258,12 @@ var DLMM = class {
     const binArraysPubkey = /* @__PURE__ */ new Set();
     let shouldStop = false;
     let activeIdToLoop = this.lbPair.activeId;
-    console.log(this.program.programId.toBase58());
     while (!shouldStop) {
       const binArrayIndex = findNextBinArrayIndexWithLiquidity(
         swapForY,
         new (0, _anchor.BN)(activeIdToLoop),
         this.lbPair,
-        _nullishCoalesce(_optionalChain([this, 'access', _68 => _68.binArrayBitmapExtension, 'optionalAccess', _69 => _69.account]), () => ( null))
+        _nullishCoalesce(_optionalChain([this, 'access', _69 => _69.binArrayBitmapExtension, 'optionalAccess', _70 => _70.account]), () => ( null))
       );
       if (binArrayIndex === null)
         shouldStop = true;
@@ -15284,10 +15283,10 @@ var DLMM = class {
     const accountsToFetch = Array.from(binArraysPubkey).map(
       (pubkey) => new (0, _web3js.PublicKey)(pubkey)
     );
-    const binArraysAccInfoBuffer = (await chunkedGetMultipleAccountInfos(
+    const binArraysAccInfoBuffer = await chunkedGetMultipleAccountInfos(
       this.program.provider.connection,
       accountsToFetch
-    )).filter(Boolean);
+    );
     const binArrays = await Promise.all(
       binArraysAccInfoBuffer.map(async (accInfo, idx) => {
         const account = decodeAccount(
@@ -15595,8 +15594,8 @@ var DLMM = class {
             position,
             this.tokenX.mint,
             this.tokenY.mint,
-            _optionalChain([this, 'access', _70 => _70.rewards, 'access', _71 => _71[0], 'optionalAccess', _72 => _72.mint]),
-            _optionalChain([this, 'access', _73 => _73.rewards, 'access', _74 => _74[1], 'optionalAccess', _75 => _75.mint]),
+            _optionalChain([this, 'access', _71 => _71.rewards, 'access', _72 => _72[0], 'optionalAccess', _73 => _73.mint]),
+            _optionalChain([this, 'access', _74 => _74.rewards, 'access', _75 => _75[1], 'optionalAccess', _76 => _76.mint]),
             positionBinArraysMapV2
           ),
           version: position.version()
@@ -15749,8 +15748,8 @@ var DLMM = class {
         position,
         this.tokenX.mint,
         this.tokenY.mint,
-        _optionalChain([this, 'access', _76 => _76.rewards, 'access', _77 => _77[0], 'optionalAccess', _78 => _78.mint]),
-        _optionalChain([this, 'access', _79 => _79.rewards, 'access', _80 => _80[1], 'optionalAccess', _81 => _81.mint]),
+        _optionalChain([this, 'access', _77 => _77.rewards, 'access', _78 => _78[0], 'optionalAccess', _79 => _79.mint]),
+        _optionalChain([this, 'access', _80 => _80.rewards, 'access', _81 => _81[1], 'optionalAccess', _82 => _82.mint]),
         binArrayMap
       ),
       version: position.version()
@@ -16807,7 +16806,9 @@ var DLMM = class {
         const setCUIx = await getEstimatedComputeUnitIxWithBuffer(
           this.program.provider.connection,
           ixs,
-          user
+          user,
+          0.3
+          // Extra 30% buffer CU
         );
         return [setCUIx, ...ixs];
       })
@@ -16924,7 +16925,7 @@ var DLMM = class {
         swapForY,
         activeId,
         this.lbPair,
-        _nullishCoalesce(_optionalChain([this, 'access', _82 => _82.binArrayBitmapExtension, 'optionalAccess', _83 => _83.account]), () => ( null)),
+        _nullishCoalesce(_optionalChain([this, 'access', _83 => _83.binArrayBitmapExtension, 'optionalAccess', _84 => _84.account]), () => ( null)),
         binArrays
       );
       if (binArrayAccountToSwap == null) {
@@ -16989,7 +16990,7 @@ var DLMM = class {
           swapForY,
           activeId,
           this.lbPair,
-          _nullishCoalesce(_optionalChain([this, 'access', _84 => _84.binArrayBitmapExtension, 'optionalAccess', _85 => _85.account]), () => ( null)),
+          _nullishCoalesce(_optionalChain([this, 'access', _85 => _85.binArrayBitmapExtension, 'optionalAccess', _86 => _86.account]), () => ( null)),
           binArrays
         );
         if (binArrayAccountToSwap == null) {
@@ -17086,7 +17087,7 @@ var DLMM = class {
         swapForY,
         activeId,
         this.lbPair,
-        _nullishCoalesce(_optionalChain([this, 'access', _86 => _86.binArrayBitmapExtension, 'optionalAccess', _87 => _87.account]), () => ( null)),
+        _nullishCoalesce(_optionalChain([this, 'access', _87 => _87.binArrayBitmapExtension, 'optionalAccess', _88 => _88.account]), () => ( null)),
         binArrays
       );
       if (binArrayAccountToSwap == null) {
@@ -17174,7 +17175,7 @@ var DLMM = class {
           swapForY,
           activeId,
           this.lbPair,
-          _nullishCoalesce(_optionalChain([this, 'access', _88 => _88.binArrayBitmapExtension, 'optionalAccess', _89 => _89.account]), () => ( null)),
+          _nullishCoalesce(_optionalChain([this, 'access', _89 => _89.binArrayBitmapExtension, 'optionalAccess', _90 => _90.account]), () => ( null)),
           binArrays
         );
         if (binArrayAccountToSwap == null) {
@@ -18520,7 +18521,7 @@ var DLMM = class {
       swapForY,
       new (0, _anchor.BN)(activeBinId),
       this.lbPair,
-      _nullishCoalesce(_optionalChain([this, 'access', _90 => _90.binArrayBitmapExtension, 'optionalAccess', _91 => _91.account]), () => ( null))
+      _nullishCoalesce(_optionalChain([this, 'access', _91 => _91.binArrayBitmapExtension, 'optionalAccess', _92 => _92.account]), () => ( null))
     );
     if (toBinArrayIndex === null)
       return true;
@@ -18557,7 +18558,7 @@ var DLMM = class {
       swapForY,
       new (0, _anchor.BN)(activeBinId),
       this.lbPair,
-      _nullishCoalesce(_optionalChain([this, 'access', _92 => _92.binArrayBitmapExtension, 'optionalAccess', _93 => _93.account]), () => ( null))
+      _nullishCoalesce(_optionalChain([this, 'access', _93 => _93.binArrayBitmapExtension, 'optionalAccess', _94 => _94.account]), () => ( null))
     );
     const marketPriceBinArrayIndex = binIdToBinArrayIndex(
       new (0, _anchor.BN)(marketPriceBinId)
@@ -18593,7 +18594,7 @@ var DLMM = class {
     let binArrayBitmapExtension = null;
     if (binArrayBitMapExtensionPubkey) {
       binArrayBitmapExtension = binArrayBitMapExtensionPubkey;
-      if (!_optionalChain([binArrayAccounts, 'optionalAccess', _94 => _94[0]])) {
+      if (!_optionalChain([binArrayAccounts, 'optionalAccess', _95 => _95[0]])) {
         const initializeBitmapExtensionIx = await this.program.methods.initializeBinArrayBitmapExtension().accountsPartial({
           binArrayBitmapExtension: binArrayBitMapExtensionPubkey,
           funder: owner,
@@ -18602,10 +18603,10 @@ var DLMM = class {
         preInstructions.push(initializeBitmapExtensionIx);
       }
     }
-    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _95 => _95[1]])) {
+    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _96 => _96[1]])) {
       fromBinArray = fromBinArrayPubkey;
     }
-    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _96 => _96[2]]) && !!toBinArrayIndex) {
+    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _97 => _97[2]]) && !!toBinArrayIndex) {
       toBinArray = toBinArrayPubkey;
     }
     const { blockhash, lastValidBlockHeight } = await this.program.provider.connection.getLatestBlockhash("confirmed");
@@ -19511,7 +19512,7 @@ var DLMM = class {
         );
       })
     );
-    const version = _nullishCoalesce(_optionalChain([binArrays, 'access', _97 => _97.find, 'call', _98 => _98((binArray) => binArray != null), 'optionalAccess', _99 => _99.version]), () => ( 1));
+    const version = _nullishCoalesce(_optionalChain([binArrays, 'access', _98 => _98.find, 'call', _99 => _99((binArray) => binArray != null), 'optionalAccess', _100 => _100.version]), () => ( 1));
     return Array.from(
       enumerateBins(
         binsById,