@meteora-ag/dlmm 1.3.11 → 1.3.12-rc.0

package/dist/index.mjs

@@ -11,8 +11,8 @@ import {
   getAssociatedTokenAddressSync as getAssociatedTokenAddressSync2
 } from "@solana/spl-token";
 import {
-  ComputeBudgetProgram as ComputeBudgetProgram2,
-  PublicKey as PublicKey6,
+  ComputeBudgetProgram as ComputeBudgetProgram3,
+  PublicKey as PublicKey7,
   SYSVAR_CLOCK_PUBKEY,
   SYSVAR_RENT_PUBKEY,
   SystemProgram as SystemProgram2,
@@ -5511,9 +5511,9 @@ import {
   getMint
 } from "@solana/spl-token";
 import {
-  ComputeBudgetProgram,
+  ComputeBudgetProgram as ComputeBudgetProgram2,
   SystemProgram,
-  TransactionInstruction
+  TransactionInstruction as TransactionInstruction2
 } from "@solana/web3.js";
 
 // src/dlmm/helpers/math.ts
@@ -6472,22 +6472,51 @@ function generateBinAmount(amount, binStep, binId, tokenXDecimal, tokenYDecimal,
   return new BN5(c1.sub(c0).floor().toString());
 }
 
-// src/dlmm/helpers/index.ts
-import { getSimulationComputeUnits } from "@solana-developers/helpers";
-
 // src/dlmm/helpers/computeUnit.ts
+import { ComputeBudgetProgram, PublicKey as PublicKey2, TransactionMessage, VersionedTransaction } from "@solana/web3.js";
 var DEFAULT_ADD_LIQUIDITY_CU = 8e5;
 var MIN_CU_BUFFER = 5e4;
 var MAX_CU_BUFFER = 2e5;
+var getSimulationComputeUnits = async (connection, instructions, payer, lookupTables, commitment = "confirmed") => {
+  const testInstructions = [
+    // Set an arbitrarily high number in simulation
+    // so we can be sure the transaction will succeed
+    // and get the real compute units used
+    ComputeBudgetProgram.setComputeUnitLimit({ units: 14e5 }),
+    ...instructions
+  ];
+  const testTransaction = new VersionedTransaction(
+    new TransactionMessage({
+      instructions: testInstructions,
+      payerKey: payer,
+      // RecentBlockhash can by any public key during simulation
+      // since 'replaceRecentBlockhash' is set to 'true' below
+      recentBlockhash: PublicKey2.default.toString()
+    }).compileToV0Message(lookupTables)
+  );
+  const rpcResponse = await connection.simulateTransaction(testTransaction, {
+    replaceRecentBlockhash: true,
+    sigVerify: false,
+    commitment
+  });
+  if (rpcResponse?.value?.err) {
+    const logs = rpcResponse.value.logs?.join("\n  \u2022 ") || "No logs available";
+    throw new Error(
+      `Transaction simulation failed:
+  \u2022${logs}` + JSON.stringify(rpcResponse?.value?.err)
+    );
+  }
+  return rpcResponse.value.unitsConsumed || null;
+};
 
 // src/dlmm/helpers/derive.ts
-import { PublicKey as PublicKey2 } from "@solana/web3.js";
+import { PublicKey as PublicKey3 } from "@solana/web3.js";
 function sortTokenMints(tokenX, tokenY) {
   const [minKey, maxKey] = tokenX.toBuffer().compare(tokenY.toBuffer()) == 1 ? [tokenY, tokenX] : [tokenX, tokenY];
   return [minKey, maxKey];
 }
 function derivePresetParameter(binStep, programId) {
-  return PublicKey2.findProgramAddressSync(
+  return PublicKey3.findProgramAddressSync(
     [
       Buffer.from("preset_parameter"),
       new Uint8Array(binStep.toArrayLike(Buffer, "le", 2))
@@ -6496,7 +6525,7 @@ function derivePresetParameter(binStep, programId) {
   );
 }
 function derivePresetParameter2(binStep, baseFactor, programId) {
-  return PublicKey2.findProgramAddressSync(
+  return PublicKey3.findProgramAddressSync(
     [
       Buffer.from("preset_parameter"),
       new Uint8Array(binStep.toArrayLike(Buffer, "le", 2)),
@@ -6507,7 +6536,7 @@ function derivePresetParameter2(binStep, baseFactor, programId) {
 }
 function deriveLbPair2(tokenX, tokenY, binStep, baseFactor, programId) {
   const [minKey, maxKey] = sortTokenMints(tokenX, tokenY);
-  return PublicKey2.findProgramAddressSync(
+  return PublicKey3.findProgramAddressSync(
     [
       minKey.toBuffer(),
       maxKey.toBuffer(),
@@ -6519,7 +6548,7 @@ function deriveLbPair2(tokenX, tokenY, binStep, baseFactor, programId) {
 }
 function deriveLbPair(tokenX, tokenY, binStep, programId) {
   const [minKey, maxKey] = sortTokenMints(tokenX, tokenY);
-  return PublicKey2.findProgramAddressSync(
+  return PublicKey3.findProgramAddressSync(
     [
       minKey.toBuffer(),
       maxKey.toBuffer(),
@@ -6530,14 +6559,14 @@ function deriveLbPair(tokenX, tokenY, binStep, programId) {
 }
 function deriveCustomizablePermissionlessLbPair(tokenX, tokenY, programId) {
   const [minKey, maxKey] = sortTokenMints(tokenX, tokenY);
-  return PublicKey2.findProgramAddressSync(
+  return PublicKey3.findProgramAddressSync(
     [ILM_BASE.toBuffer(), minKey.toBuffer(), maxKey.toBuffer()],
     programId
   );
 }
 function derivePermissionLbPair(baseKey, tokenX, tokenY, binStep, programId) {
   const [minKey, maxKey] = sortTokenMints(tokenX, tokenY);
-  return PublicKey2.findProgramAddressSync(
+  return PublicKey3.findProgramAddressSync(
     [
       baseKey.toBuffer(),
       minKey.toBuffer(),
@@ -6548,7 +6577,7 @@ function derivePermissionLbPair(baseKey, tokenX, tokenY, binStep, programId) {
   );
 }
 function deriveOracle(lbPair, programId) {
-  return PublicKey2.findProgramAddressSync(
+  return PublicKey3.findProgramAddressSync(
     [Buffer.from("oracle"), lbPair.toBytes()],
     programId
   );
@@ -6562,7 +6591,7 @@ function derivePosition(lbPair, base, lowerBinId, width, programId) {
   } else {
     lowerBinIdBytes = new Uint8Array(lowerBinId.toArrayLike(Buffer, "le", 4));
   }
-  return PublicKey2.findProgramAddressSync(
+  return PublicKey3.findProgramAddressSync(
     [
       Buffer.from("position"),
       lbPair.toBuffer(),
@@ -6582,13 +6611,13 @@ function deriveBinArray(lbPair, index, programId) {
   } else {
     binArrayBytes = new Uint8Array(index.toArrayLike(Buffer, "le", 8));
   }
-  return PublicKey2.findProgramAddressSync(
+  return PublicKey3.findProgramAddressSync(
     [Buffer.from("bin_array"), lbPair.toBytes(), binArrayBytes],
     programId
   );
 }
 function deriveReserve(token, lbPair, programId) {
-  return PublicKey2.findProgramAddressSync(
+  return PublicKey3.findProgramAddressSync(
     [lbPair.toBuffer(), token.toBuffer()],
     programId
   );
@@ -6596,7 +6625,7 @@ function deriveReserve(token, lbPair, programId) {
 
 // src/dlmm/helpers/binArray.ts
 import { BN as BN7 } from "@coral-xyz/anchor";
-import { PublicKey as PublicKey3 } from "@solana/web3.js";
+import { PublicKey as PublicKey4 } from "@solana/web3.js";
 
 // src/dlmm/types/index.ts
 import {
@@ -6784,7 +6813,7 @@ function isOverflowDefaultBinArrayBitmap(binArrayIndex) {
   return binArrayIndex.gt(maxBinArrayIndex) || binArrayIndex.lt(minBinArrayIndex);
 }
 function deriveBinArrayBitmapExtension(lbPair, programId) {
-  return PublicKey3.findProgramAddressSync(
+  return PublicKey4.findProgramAddressSync(
     [Buffer.from("bitmap"), lbPair.toBytes()],
     programId
   );
@@ -6933,7 +6962,7 @@ function getBinArraysRequiredByPositionRange(pair, fromBinId, toBinId, programId
     binArrays.set(upperBinArray.toBase58(), upperBinArrayIndex);
   }
   return Array.from(binArrays, ([key, index]) => ({
-    key: new PublicKey3(key),
+    key: new PublicKey4(key),
     index
   }));
 }
@@ -7606,7 +7635,7 @@ function toStrategyParameters({
 
 // src/dlmm/helpers/lbPair.ts
 import { AnchorProvider, Program as Program2 } from "@coral-xyz/anchor";
-import { PublicKey as PublicKey4 } from "@solana/web3.js";
+import { PublicKey as PublicKey5 } from "@solana/web3.js";
 async function getTokensMintFromPoolAddress(connection, poolAddress, opt) {
   const provider = new AnchorProvider(
     connection,
@@ -7619,7 +7648,7 @@ async function getTokensMintFromPoolAddress(connection, poolAddress, opt) {
     provider
   );
   const poolAccount = await program.account.lbPair.fetchNullable(
-    new PublicKey4(poolAddress)
+    new PublicKey5(poolAddress)
   );
   if (!poolAccount)
     throw new Error("Pool account not found");
@@ -7705,7 +7734,7 @@ var wrapSOLInstruction = (from, to, amount) => {
       toPubkey: to,
       lamports: amount
     }),
-    new TransactionInstruction({
+    new TransactionInstruction2({
       keys: [
         {
           pubkey: to,
@@ -7774,7 +7803,7 @@ var getEstimatedComputeUnitIxWithBuffer = async (connection, instructions, feePa
     console.error("Error::getEstimatedComputeUnitUsageWithBuffer", error);
     return 14e5;
   });
-  return ComputeBudgetProgram.setComputeUnitLimit({ units });
+  return ComputeBudgetProgram2.setComputeUnitLimit({ units });
 };
 
 // src/dlmm/index.ts
@@ -8146,10 +8175,10 @@ var DLMM = class {
       lbPairSetV2.add(lbPair.toBase58());
     });
     const binArrayPubkeyArrayV2 = Array.from(binArrayPubkeySetV2).map(
-      (pubkey) => new PublicKey6(pubkey)
+      (pubkey) => new PublicKey7(pubkey)
     );
     const lbPairArrayV2 = Array.from(lbPairSetV2).map(
-      (pubkey) => new PublicKey6(pubkey)
+      (pubkey) => new PublicKey7(pubkey)
     );
     const [clockAccInfo, ...binArraysAccInfo] = await chunkedGetMultipleAccountInfos(connection, [
       SYSVAR_CLOCK_PUBKEY,
@@ -8577,7 +8606,7 @@ var DLMM = class {
         shouldStop = true;
     }
     const accountsToFetch = Array.from(binArraysPubkey).map(
-      (pubkey) => new PublicKey6(pubkey)
+      (pubkey) => new PublicKey7(pubkey)
     );
     const binArraysAccInfoBuffer = await chunkedGetMultipleAccountInfos(
       this.program.provider.connection,
@@ -8846,7 +8875,7 @@ var DLMM = class {
       binArrayPubkeySetV2.add(upperBinArrayPubKey.toBase58());
     });
     const binArrayPubkeyArrayV2 = Array.from(binArrayPubkeySetV2).map(
-      (pubkey) => new PublicKey6(pubkey)
+      (pubkey) => new PublicKey7(pubkey)
     );
     const lbPairAndBinArrays = await chunkedGetMultipleAccountInfos(
       this.program.provider.connection,
@@ -9807,7 +9836,7 @@ var DLMM = class {
       this.program.programId
     );
     const preInstructions = [];
-    const walletToReceiveFee = feeOwner.equals(PublicKey6.default) ? user : feeOwner;
+    const walletToReceiveFee = feeOwner.equals(PublicKey7.default) ? user : feeOwner;
     const [
       { ataPubKey: userTokenX, ix: createPayerTokenXIx },
       { ataPubKey: userTokenY, ix: createPayerTokenYIx },
@@ -9865,7 +9894,7 @@ var DLMM = class {
       postInstructions.push(claimSwapFeeIx);
       for (let i = 0; i < 2; i++) {
         const rewardInfo = this.lbPair.rewardInfos[i];
-        if (!rewardInfo || rewardInfo.mint.equals(PublicKey6.default))
+        if (!rewardInfo || rewardInfo.mint.equals(PublicKey7.default))
           continue;
         const { ataPubKey, ix: rewardAtaIx } = await getOrCreateATAInstruction(
           this.program.provider.connection,
@@ -10680,11 +10709,11 @@ var DLMM = class {
     const tokensInvolved = [...pairTokens];
     for (let i = 0; i < 2; i++) {
       const rewardMint = this.lbPair.rewardInfos[i].mint;
-      if (!tokensInvolved.some((pubkey) => rewardMint.equals(pubkey)) && !rewardMint.equals(PublicKey6.default)) {
+      if (!tokensInvolved.some((pubkey) => rewardMint.equals(pubkey)) && !rewardMint.equals(PublicKey7.default)) {
         tokensInvolved.push(this.lbPair.rewardInfos[i].mint);
       }
     }
-    const feeOwner = position.positionData.feeOwner.equals(PublicKey6.default) ? owner : position.positionData.feeOwner;
+    const feeOwner = position.positionData.feeOwner.equals(PublicKey7.default) ? owner : position.positionData.feeOwner;
     const createATAAccAndIx = await Promise.all(
       tokensInvolved.map((token) => {
         if (pairTokens.some((t) => t.equals(token))) {
@@ -10944,7 +10973,7 @@ var DLMM = class {
           );
         }
         addLiquidityIxs.push([
-          ComputeBudgetProgram2.setComputeUnitLimit({
+          ComputeBudgetProgram3.setComputeUnitLimit({
             units: DEFAULT_ADD_LIQUIDITY_CU
           }),
           ...instructions
@@ -11231,7 +11260,7 @@ var DLMM = class {
     const tokensInvolved = [...pairsToken];
     for (let i = 0; i < 2; i++) {
       const rewardMint = this.lbPair.rewardInfos[i].mint;
-      if (!tokensInvolved.some((pubkey) => rewardMint.equals(pubkey)) && !rewardMint.equals(PublicKey6.default)) {
+      if (!tokensInvolved.some((pubkey) => rewardMint.equals(pubkey)) && !rewardMint.equals(PublicKey7.default)) {
         tokensInvolved.push(this.lbPair.rewardInfos[i].mint);
       }
     }
@@ -11241,9 +11270,9 @@ var DLMM = class {
     const feeOwners = [
       .../* @__PURE__ */ new Set([
         owner.toBase58(),
-        ...positions.filter((p) => !p.positionData.feeOwner.equals(PublicKey6.default)).map((p) => p.positionData.feeOwner.toBase58())
+        ...positions.filter((p) => !p.positionData.feeOwner.equals(PublicKey7.default)).map((p) => p.positionData.feeOwner.toBase58())
       ])
-    ].map((pk) => new PublicKey6(pk));
+    ].map((pk) => new PublicKey7(pk));
     const createATAAccAndIx = await Promise.all(
       tokensInvolved.map((token) => {
         if (pairsToken.some((p) => p.equals(token))) {
@@ -11577,7 +11606,7 @@ var DLMM = class {
       const preActivationSwapPoint = this.lbPair.activationPoint.sub(
         this.lbPair.preActivationDuration
       );
-      const activationPoint = !this.lbPair.preActivationSwapAddress.equals(PublicKey6.default) && this.lbPair.preActivationSwapAddress.equals(swapInitiator) ? preActivationSwapPoint : this.lbPair.activationPoint;
+      const activationPoint = !this.lbPair.preActivationSwapAddress.equals(PublicKey7.default) && this.lbPair.preActivationSwapAddress.equals(swapInitiator) ? preActivationSwapPoint : this.lbPair.activationPoint;
       if (currentPoint < activationPoint) {
         return true;
       }
@@ -11631,7 +11660,7 @@ var DLMM = class {
       const liquidityShare = positionVersion === 0 /* V1 */ ? position.liquidityShares[binIdxInPosition] : position.liquidityShares[binIdxInPosition].shrn(64);
       for (let j = 0; j < 2; j++) {
         const pairRewardInfo = lbPair.rewardInfos[j];
-        if (!pairRewardInfo.mint.equals(PublicKey6.default)) {
+        if (!pairRewardInfo.mint.equals(PublicKey7.default)) {
           let rewardPerTokenStored = binState.rewardPerTokenStored[j];
           if (i == lbPair.activeId && !binState.liquiditySupply.isZero()) {
             const currentTime = new BN10(
@@ -11992,7 +12021,7 @@ var DLMM = class {
     const claimTransactions = [];
     for (let i = 0; i < 2; i++) {
       const rewardInfo = this.lbPair.rewardInfos[i];
-      if (!rewardInfo || rewardInfo.mint.equals(PublicKey6.default))
+      if (!rewardInfo || rewardInfo.mint.equals(PublicKey7.default))
         continue;
       const preInstructions = [];
       const { ataPubKey, ix } = await getOrCreateATAInstruction(
@@ -12045,7 +12074,7 @@ var DLMM = class {
       this.pubkey,
       this.program.programId
     );
-    const walletToReceiveFee = feeOwner.equals(PublicKey6.default) ? owner : feeOwner;
+    const walletToReceiveFee = feeOwner.equals(PublicKey7.default) ? owner : feeOwner;
     const preInstructions = [];
     const [
       { ataPubKey: userTokenX, ix: createInTokenAccountIx },