@stabbleorg/mclmm-sdk 0.3.0 → 0.3.2

package/lib/index.js

@@ -7940,25 +7940,6 @@ var PositionManager = class {
       (0, import_token4.getSyncNativeInstruction)({ account: ata })
     ];
   }
-  buildUnwrapSolInstruction(params) {
-    const { payer, owner, destination, ata } = params;
-    return [
-      // There's a chance user might have deleted the ATA - create it with idempotent just to be sure.
-      (0, import_token4.getCreateAssociatedTokenIdempotentInstruction)({
-        payer,
-        ata,
-        owner,
-        mint: (0, import_kit53.address)(NATIVE_MINT.toString()),
-        tokenProgram: import_token4.TOKEN_PROGRAM_ADDRESS,
-        systemProgram: SYSTEM_PROGRAM_ID
-      }),
-      (0, import_token4.getCloseAccountInstruction)({
-        account: ata,
-        destination,
-        owner
-      })
-    ];
-  }
   /**
    * Build partial unwrap SOL instructions using a temp account:
    * 1. Create temp account
@@ -8349,6 +8330,24 @@ var PositionManager = class {
     );
     const extBitmapAccount = isOverflow ? await PdaUtils.getTickArrayBitmapExtensionPda(poolState.address) : void 0;
     const remAccounts = extBitmapAccount ? [{ address: extBitmapAccount[0], role: import_kit53.AccountRole.WRITABLE }] : [];
+    const createRecipientAta0Ix = (0, import_token4.getCreateAssociatedTokenIdempotentInstruction)(
+      {
+        payer: ownerInfo.wallet,
+        ata: ownerInfo.tokenAccountA,
+        owner: ownerInfo.wallet.address,
+        mint: poolState.data.tokenMint0,
+        tokenProgram: import_token4.TOKEN_PROGRAM_ADDRESS
+      }
+    );
+    const createRecipientAta1Ix = (0, import_token4.getCreateAssociatedTokenIdempotentInstruction)(
+      {
+        payer: ownerInfo.wallet,
+        ata: ownerInfo.tokenAccountB,
+        owner: ownerInfo.wallet.address,
+        mint: poolState.data.tokenMint1,
+        tokenProgram: import_token4.TOKEN_PROGRAM_ADDRESS
+      }
+    );
     const instruction = getDecreaseLiquidityV2Instruction({
       nftOwner: ownerInfo.wallet,
       nftAccount: positionNftAccount,
@@ -8371,31 +8370,24 @@ var PositionManager = class {
       ...instruction,
       accounts: [...instruction.accounts, ...remAccounts]
     };
-    const instructions = [ixWithRemAccounts];
+    const instructions = [
+      createRecipientAta0Ix,
+      createRecipientAta1Ix,
+      ixWithRemAccounts
+    ];
     if (isNative) {
       const destination = ownerInfo.wallet.address;
-      const isFullWithdrawal = liquidity === ownerPosition.liquidity;
       const isTokenANative = poolState.data.tokenMint0.toString() === NATIVE_MINT.toString();
       const wsolAta = isTokenANative ? ownerInfo.tokenAccountA : ownerInfo.tokenAccountB;
       const amount = isTokenANative ? amountMinA : amountMinB;
-      if (isFullWithdrawal) {
-        const unwrapIxs = this.buildUnwrapSolInstruction({
-          payer: ownerInfo.wallet,
-          ata: wsolAta,
-          owner: ownerInfo.wallet.address,
-          destination
-        });
-        instructions.push(...unwrapIxs);
-      } else {
-        const { instructions: partialUnwrapIxs, signers: partialSigners } = await this.buildPartialUnwrapSolInstructions({
-          payer: ownerInfo.wallet,
-          sourceAta: wsolAta,
-          destination,
-          amount
-        });
-        instructions.push(...partialUnwrapIxs);
-        signers.push(...partialSigners);
-      }
+      const { instructions: unwrapIxs, signers: unwrapSigners } = await this.buildPartialUnwrapSolInstructions({
+        payer: ownerInfo.wallet,
+        sourceAta: wsolAta,
+        destination,
+        amount
+      });
+      instructions.push(...unwrapIxs);
+      signers.push(...unwrapSigners);
     }
     return {
       instructions,

package/lib/index.mjs

@@ -8519,25 +8519,6 @@ var PositionManager = class {
       getSyncNativeInstruction({ account: ata })
     ];
   }
-  buildUnwrapSolInstruction(params) {
-    const { payer, owner, destination, ata } = params;
-    return [
-      // There's a chance user might have deleted the ATA - create it with idempotent just to be sure.
-      getCreateAssociatedTokenIdempotentInstruction({
-        payer,
-        ata,
-        owner,
-        mint: address4(NATIVE_MINT.toString()),
-        tokenProgram: TOKEN_PROGRAM_ADDRESS3,
-        systemProgram: SYSTEM_PROGRAM_ID
-      }),
-      getCloseAccountInstruction({
-        account: ata,
-        destination,
-        owner
-      })
-    ];
-  }
   /**
    * Build partial unwrap SOL instructions using a temp account:
    * 1. Create temp account
@@ -8928,6 +8909,24 @@ var PositionManager = class {
     );
     const extBitmapAccount = isOverflow ? await PdaUtils.getTickArrayBitmapExtensionPda(poolState.address) : void 0;
     const remAccounts = extBitmapAccount ? [{ address: extBitmapAccount[0], role: AccountRole2.WRITABLE }] : [];
+    const createRecipientAta0Ix = getCreateAssociatedTokenIdempotentInstruction(
+      {
+        payer: ownerInfo.wallet,
+        ata: ownerInfo.tokenAccountA,
+        owner: ownerInfo.wallet.address,
+        mint: poolState.data.tokenMint0,
+        tokenProgram: TOKEN_PROGRAM_ADDRESS3
+      }
+    );
+    const createRecipientAta1Ix = getCreateAssociatedTokenIdempotentInstruction(
+      {
+        payer: ownerInfo.wallet,
+        ata: ownerInfo.tokenAccountB,
+        owner: ownerInfo.wallet.address,
+        mint: poolState.data.tokenMint1,
+        tokenProgram: TOKEN_PROGRAM_ADDRESS3
+      }
+    );
     const instruction = getDecreaseLiquidityV2Instruction({
       nftOwner: ownerInfo.wallet,
       nftAccount: positionNftAccount,
@@ -8950,31 +8949,24 @@ var PositionManager = class {
       ...instruction,
       accounts: [...instruction.accounts, ...remAccounts]
     };
-    const instructions = [ixWithRemAccounts];
+    const instructions = [
+      createRecipientAta0Ix,
+      createRecipientAta1Ix,
+      ixWithRemAccounts
+    ];
     if (isNative) {
       const destination = ownerInfo.wallet.address;
-      const isFullWithdrawal = liquidity === ownerPosition.liquidity;
       const isTokenANative = poolState.data.tokenMint0.toString() === NATIVE_MINT.toString();
       const wsolAta = isTokenANative ? ownerInfo.tokenAccountA : ownerInfo.tokenAccountB;
       const amount = isTokenANative ? amountMinA : amountMinB;
-      if (isFullWithdrawal) {
-        const unwrapIxs = this.buildUnwrapSolInstruction({
-          payer: ownerInfo.wallet,
-          ata: wsolAta,
-          owner: ownerInfo.wallet.address,
-          destination
-        });
-        instructions.push(...unwrapIxs);
-      } else {
-        const { instructions: partialUnwrapIxs, signers: partialSigners } = await this.buildPartialUnwrapSolInstructions({
-          payer: ownerInfo.wallet,
-          sourceAta: wsolAta,
-          destination,
-          amount
-        });
-        instructions.push(...partialUnwrapIxs);
-        signers.push(...partialSigners);
-      }
+      const { instructions: unwrapIxs, signers: unwrapSigners } = await this.buildPartialUnwrapSolInstructions({
+        payer: ownerInfo.wallet,
+        sourceAta: wsolAta,
+        destination,
+        amount
+      });
+      instructions.push(...unwrapIxs);
+      signers.push(...unwrapSigners);
     }
     return {
       instructions,

package/lib/position-manager.d.ts

@@ -5,7 +5,6 @@ export declare class PositionManager {
     private readonly config;
     constructor(config: ClmmSdkConfig);
     private buildWrapSolInstructions;
-    private buildUnwrapSolInstruction;
     /**
      * Build partial unwrap SOL instructions using a temp account:
      * 1. Create temp account

package/lib/position-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"position-manager.d.ts","sourceRoot":"","sources":["../src/position-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"position-manager.d.ts","sourceRoot":"","sources":["../src/position-manager.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stabbleorg/mclmm-sdk",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "SDK for Stabble's margin-enabled concentrated liquidity market maker",
   "main": "lib/index.js",
   "module": "lib/index.mjs",