@meteora-ag/dlmm 1.0.24 → 1.0.25-rc1

package/dist/index.js

@@ -8991,7 +8991,8 @@ var DLMM = class {
     position
   }) {
     const preInstructions = [];
-    const tokensInvolved = [this.tokenX.publicKey, this.tokenY.publicKey];
+    const pairTokens = [this.tokenX.publicKey, this.tokenY.publicKey];
+    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(_web3js.PublicKey.default)) {
@@ -8999,13 +9000,22 @@ var DLMM = class {
       }
     }
     const createATAAccAndIx = await Promise.all(
-      tokensInvolved.map(
-        (token) => getOrCreateATAInstruction(
-          this.program.provider.connection,
-          token,
-          owner
-        )
-      )
+      tokensInvolved.map((token) => {
+        if (!position.positionData.feeOwner.equals(_web3js.PublicKey.default) && pairTokens.some((t) => t.equals(token))) {
+          return getOrCreateATAInstruction(
+            this.program.provider.connection,
+            token,
+            position.positionData.feeOwner,
+            owner
+          );
+        } else {
+          return getOrCreateATAInstruction(
+            this.program.provider.connection,
+            token,
+            owner
+          );
+        }
+      })
     );
     createATAAccAndIx.forEach(({ ix }) => ix && preInstructions.push(ix));
     const claimAllSwapFeeTxs = await this.createClaimSwapFeeMethod({
@@ -9057,21 +9067,39 @@ var DLMM = class {
     positions
   }) {
     const preInstructions = [];
-    const tokensInvolved = [this.tokenX.publicKey, this.tokenY.publicKey];
+    const pairsToken = [this.tokenX.publicKey, this.tokenY.publicKey];
+    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(_web3js.PublicKey.default)) {
         tokensInvolved.push(this.lbPair.rewardInfos[i].mint);
       }
     }
-    const createATAAccAndIx = await Promise.all(
-      tokensInvolved.map(
-        (token) => getOrCreateATAInstruction(
-          this.program.provider.connection,
-          token,
-          owner
-        )
+    const customFeeOwners = [
+      ...new Set(
+        positions.filter((p) => !p.positionData.feeOwner.equals(_web3js.PublicKey.default)).map((p) => p.positionData.feeOwner)
       )
+    ];
+    const createATAAccAndIx = await Promise.all(
+      tokensInvolved.map((token) => {
+        if (customFeeOwners.length > 0 && pairsToken.some((p) => p.equals(token))) {
+          return customFeeOwners.map(
+            (customOwner) => getOrCreateATAInstruction(
+              this.program.provider.connection,
+              token,
+              customOwner,
+              owner
+            )
+          );
+        }
+        return [
+          getOrCreateATAInstruction(
+            this.program.provider.connection,
+            token,
+            owner
+          )
+        ];
+      }).flat()
     );
     createATAAccAndIx.forEach(({ ix }) => ix && preInstructions.push(ix));
     const claimAllSwapFeeTxs = (await Promise.all(