@raydium-io/raydium-sdk-v2 0.0.27-alpha → 0.0.29-alpha

package/src/raydium/cpmm/cpmm.ts

@@ -422,50 +422,40 @@ export default class CpmmModule extends ModuleBase {
     const txBuilder = this.createTxBuilder();
 
     const [mintA, mintB] = [new PublicKey(poolInfo.mintA.address), new PublicKey(poolInfo.mintB.address)];
-    const mintAUseSOLBalance = mintA.equals(NATIVE_MINT);
-    const mintBUseSOLBalance = mintB.equals(NATIVE_MINT);
 
-    const { account: mintATokenAccount, instructionParams: _mintATokenAccountIns } =
-      await this.scope.account.getOrCreateTokenAccount({
-        tokenProgram: poolInfo.mintA.programId,
-        mint: new PublicKey(poolInfo.mintA.address),
-        owner: this.scope.ownerPubKey,
-
-        createInfo: mintAUseSOLBalance
-          ? {
-              payer: this.scope.ownerPubKey,
-              amount: baseIn ? swapResult.sourceAmountSwapped : 0,
-            }
-          : undefined,
-        skipCloseAccount: !mintAUseSOLBalance,
-        notUseTokenAccount: mintAUseSOLBalance,
-        associatedOnly: false,
-        checkCreateATAOwner,
-      });
-
-    txBuilder.addInstruction(_mintATokenAccountIns || {});
+    const mintATokenAcc = await this.scope.account.getCreatedTokenAccount({
+      programId: new PublicKey(poolInfo.mintA.programId ?? TOKEN_PROGRAM_ID),
+      mint: mintA,
+      associatedOnly: false,
+    });
 
-    const { account: mintBTokenAccount, instructionParams: _mintBTokenAccountIns } =
-      await this.scope.account.getOrCreateTokenAccount({
-        tokenProgram: poolInfo.mintA.programId,
-        mint: new PublicKey(poolInfo.mintA.address),
-        owner: this.scope.ownerPubKey,
+    const mintBTokenAcc = await this.scope.account.getCreatedTokenAccount({
+      programId: new PublicKey(poolInfo.mintB.programId ?? TOKEN_PROGRAM_ID),
+      mint: mintB,
+      associatedOnly: false,
+    });
 
-        createInfo: mintBUseSOLBalance
-          ? {
-              payer: this.scope.ownerPubKey,
-              amount: baseIn ? 0 : swapResult.sourceAmountSwapped,
-            }
-          : undefined,
-        skipCloseAccount: !mintAUseSOLBalance,
-        notUseTokenAccount: mintAUseSOLBalance,
-        associatedOnly: false,
-        checkCreateATAOwner,
-      });
+    const { tokenAccount: _mintATokenAcc, ...mintATokenAccInstruction } = await this.scope.account.handleTokenAccount({
+      side: baseIn ? "in" : "out",
+      amount: baseIn ? swapResult.sourceAmountSwapped : swapResult.destinationAmountSwapped,
+      mint: mintA,
+      tokenAccount: mintATokenAcc,
+      bypassAssociatedCheck,
+      checkCreateATAOwner,
+    });
+    txBuilder.addInstruction(mintATokenAccInstruction);
 
-    txBuilder.addInstruction(_mintBTokenAccountIns || {});
+    const { tokenAccount: _mintBTokenAcc, ...mintBTokenAccInstruction } = await this.scope.account.handleTokenAccount({
+      side: baseIn ? "out" : "in",
+      amount: baseIn ? swapResult.destinationAmountSwapped : swapResult.sourceAmountSwapped,
+      mint: mintB,
+      tokenAccount: mintBTokenAcc,
+      bypassAssociatedCheck,
+      checkCreateATAOwner,
+    });
+    txBuilder.addInstruction(mintBTokenAccInstruction);
 
-    if (!mintATokenAccount && !mintBTokenAccount)
+    if (!_mintATokenAcc && !_mintBTokenAcc)
       this.logAndCreateError("cannot found target token accounts", "tokenAccounts", this.scope.account.tokenAccounts);
 
     const poolKeys = await this.getCpmmPoolKeys(poolInfo.id);
@@ -479,8 +469,8 @@ export default class CpmmModule extends ModuleBase {
               new PublicKey(poolKeys.authority),
               new PublicKey(poolKeys.config.id),
               new PublicKey(poolInfo.id),
-              mintATokenAccount!,
-              mintBTokenAccount!,
+              _mintATokenAcc!,
+              _mintBTokenAcc!,
               new PublicKey(poolKeys.vault.A),
               new PublicKey(poolKeys.vault.B),
               new PublicKey(poolInfo.mintA.programId ?? TOKEN_PROGRAM_ID),
@@ -499,8 +489,8 @@ export default class CpmmModule extends ModuleBase {
               new PublicKey(poolKeys.config.id),
               new PublicKey(poolInfo.id),
 
-              mintBTokenAccount!,
-              mintATokenAccount!,
+              _mintBTokenAcc!,
+              _mintATokenAcc!,
 
               new PublicKey(poolKeys.vault.B),
               new PublicKey(poolKeys.vault.A),