@meteora-ag/dlmm 1.5.0 → 1.5.1-test.2

package/dist/index.js

@@ -10359,11 +10359,10 @@ var DLMM = class {
    */
   static async create(connection, dlmm, opt) {
     const cluster = _optionalChain([opt, 'optionalAccess', _38 => _38.cluster]) || "mainnet-beta";
-    const provider = new (0, _anchor.AnchorProvider)(
-      connection,
-      {},
-      _anchor.AnchorProvider.defaultOptions()
-    );
+    const provider = new (0, _anchor.AnchorProvider)(connection, {}, {
+      ..._anchor.AnchorProvider.defaultOptions(),
+      commitment: "confirmed"
+    });
     const program = new (0, _anchor.Program)(
       IDL,
       _nullishCoalesce(_optionalChain([opt, 'optionalAccess', _39 => _39.programId]), () => ( LBCLMM_PROGRAM_IDS[cluster])),
@@ -11345,7 +11344,9 @@ var DLMM = class {
       tokenBadgeX,
       tokenBadgeY
     ]);
-    const presetParameterState = await program.account.presetParameter2.fetch(presetParameter);
+    const presetParameterState = await program.account.presetParameter2.fetch(
+      presetParameter
+    );
     const existsPool = await this.getPairPubkeyIfExists(
       connection,
       tokenX,
@@ -12545,7 +12546,9 @@ var DLMM = class {
     slippage
   }) {
     const maxActiveBinSlippage = slippage ? Math.ceil(slippage / (this.lbPair.binStep / 100)) : MAX_ACTIVE_BIN_SLIPPAGE;
-    const positionAccount = await this.program.account.positionV2.fetch(positionPubKey);
+    const positionAccount = await this.program.account.positionV2.fetch(
+      positionPubKey
+    );
     const { lowerBinId, upperBinId, binIds } = this.processXYAmountDistribution(xYAmountDistribution);
     if (lowerBinId < positionAccount.lowerBinId)
       throw new Error(
@@ -12989,11 +12992,21 @@ var DLMM = class {
     owner,
     position
   }) {
+    const preInstructions = [];
+    console.log(
+      position.positionData.feeX.toString(),
+      position.positionData.feeY.toString()
+    );
+    if (!position.positionData.feeX.isZero() || !position.positionData.feeY.isZero()) {
+      const claimIx = await this.createClaimSwapFeeMethod({ owner, position });
+      preInstructions.push(...claimIx.instructions);
+      console.log("\u{1F680} ~ DLMM ~ claimIx:", claimIx);
+    }
     const closePositionIx = await this.program.methods.closePosition2().accounts({
       rentReceiver: owner,
       position: position.publicKey,
       sender: owner
-    }).instruction();
+    }).preInstructions(preInstructions).instruction();
     const setCUIx = await getEstimatedComputeUnitIxWithBuffer(
       this.program.provider.connection,
       [closePositionIx],