sol-trade-sdk 0.1.0 → 0.1.2

package/dist/index.js

@@ -373,7 +373,36 @@ function effectivePumpMintTokenProgram(mint, protocolParams) {
   return import_spl_token.TOKEN_2022_PROGRAM_ID;
 }
 function effectiveQuoteMint(protocolParams) {
-  return isUsablePubkey(protocolParams.quoteMint) ? protocolParams.quoteMint : import_spl_token.NATIVE_MINT;
+  if (!isUsablePubkey(protocolParams.quoteMint) || protocolParams.quoteMint.equals(SOL_TOKEN_ACCOUNT2)) {
+    return import_spl_token.NATIVE_MINT;
+  }
+  return protocolParams.quoteMint;
+}
+function usesPumpFunV2Layout(protocolParams) {
+  return isUsablePubkey(protocolParams.quoteMint) && !protocolParams.quoteMint.equals(SOL_TOKEN_ACCOUNT2);
+}
+function isSolQuoteMint(mint) {
+  return mint.equals(SOL_TOKEN_ACCOUNT2) || mint.equals(import_spl_token.NATIVE_MINT);
+}
+function validateV2BuyQuoteMint(inputMint, quoteMint) {
+  if (isSolQuoteMint(quoteMint)) {
+    if (inputMint.equals(SOL_TOKEN_ACCOUNT2) || inputMint.equals(import_spl_token.NATIVE_MINT)) return;
+  } else if (inputMint.equals(quoteMint)) {
+    return;
+  }
+  throw new Error(
+    `PumpFun V2 buy input_mint ${inputMint.toBase58()} does not match quote_mint ${quoteMint.toBase58()}; USDC quote pools must be bought with USDC, not SOL`
+  );
+}
+function validateV2SellQuoteMint(outputMint, quoteMint) {
+  if (isSolQuoteMint(quoteMint)) {
+    if (outputMint.equals(SOL_TOKEN_ACCOUNT2) || outputMint.equals(import_spl_token.NATIVE_MINT)) return;
+  } else if (outputMint.equals(quoteMint)) {
+    return;
+  }
+  throw new Error(
+    `PumpFun V2 sell output_mint ${outputMint.toBase58()} does not match quote_mint ${quoteMint.toBase58()}; USDC quote pools settle to USDC, not SOL`
+  );
 }
 function associatedTokenAddress(mint, owner, tokenProgram) {
   return (0, import_spl_token.getAssociatedTokenAddressSync)(
@@ -384,6 +413,28 @@ function associatedTokenAddress(mint, owner, tokenProgram) {
     import_spl_token.ASSOCIATED_TOKEN_PROGRAM_ID
   );
 }
+function pushCreateOrWrapUserTokenAccount(instructions, payer, ata, mint, tokenProgram, amount) {
+  instructions.push(
+    (0, import_spl_token.createAssociatedTokenAccountIdempotentInstruction)(
+      payer,
+      ata,
+      payer,
+      mint,
+      tokenProgram,
+      import_spl_token.ASSOCIATED_TOKEN_PROGRAM_ID
+    )
+  );
+  if (mint.equals(import_spl_token.NATIVE_MINT)) {
+    instructions.push(
+      import_web32.SystemProgram.transfer({
+        fromPubkey: payer,
+        toPubkey: ata,
+        lamports: amount
+      })
+    );
+    instructions.push((0, import_spl_token.createSyncNativeInstruction)(ata));
+  }
+}
 function getBuyTokenAmountFromSolAmount(amount, bondingCurve, creator) {
   if (amount === 0n || bondingCurve.virtualTokenReserves === 0n) {
     return 0n;
@@ -413,21 +464,23 @@ function getSellSolAmountFromTokenAmount(amount, bondingCurve, creator) {
 function buildPumpFunBuyInstructions(params) {
   const {
     payer,
+    inputMint = SOL_TOKEN_ACCOUNT2,
     outputMint,
     inputAmount,
     slippageBasisPoints = BigInt(1e3),
     fixedOutputAmount,
     createOutputMintAta = true,
     createInputMintAta = false,
+    closeInputMintAta = false,
     protocolParams,
-    useExactSolAmount = true,
-    usePumpFunV2 = false
+    useExactSolAmount = true
   } = params;
-  if (usePumpFunV2 || protocolParams.useV2Ix || isUsablePubkey(protocolParams.quoteMint)) {
+  if (usesPumpFunV2Layout(protocolParams)) {
     return buildPumpFunBuyV2Instructions({
       ...params,
+      inputMint,
       createInputMintAta,
-      usePumpFunV2: true
+      closeInputMintAta
     });
   }
   if (inputAmount === BigInt(0)) {
@@ -451,34 +504,41 @@ function buildPumpFunBuyInstructions(params) {
   const userVolumeAccumulator = getPumpFunUserVolumeAccumulatorPda(payerPubkey);
   if (createOutputMintAta) {
     instructions.push(
-      (0, import_spl_token.createAssociatedTokenAccountInstruction)(
+      (0, import_spl_token.createAssociatedTokenAccountIdempotentInstruction)(
         payerPubkey,
         userTokenAccount,
         payerPubkey,
         outputMint,
-        tokenProgramId
+        tokenProgramId,
+        import_spl_token.ASSOCIATED_TOKEN_PROGRAM_ID
       )
     );
   }
   const feeRecipientPk = pumpFunFeeRecipientMeta(feeRecipient, bondingCurve.isMayhemMode);
   const bondingCurveV2 = getBondingCurveV2Pda(outputMint);
-  const trackVolume = bondingCurve.isCashbackCoin ? Buffer.from([1, 1]) : Buffer.from([1, 0]);
+  const trackVolume = bondingCurve.isCashbackCoin ? 1 : 0;
   const buyTokenAmount = fixedOutputAmount ? fixedOutputAmount : getBuyTokenAmountFromSolAmount(inputAmount, bondingCurve, creator);
   const maxSolCost = calculateWithSlippageBuy(inputAmount, slippageBasisPoints);
   let data;
-  if (useExactSolAmount) {
-    const minTokensOut = fixedOutputAmount ? fixedOutputAmount : calculateWithSlippageSell(buyTokenAmount, slippageBasisPoints);
-    data = Buffer.alloc(26);
+  if (fixedOutputAmount !== void 0) {
+    data = Buffer.alloc(25);
+    PUMPFUN_BUY_DISCRIMINATOR.copy(data, 0);
+    data.writeBigUInt64LE(fixedOutputAmount, 8);
+    data.writeBigUInt64LE(inputAmount, 16);
+    data[24] = trackVolume;
+  } else if (useExactSolAmount) {
+    const minTokensOut = calculateWithSlippageSell(buyTokenAmount, slippageBasisPoints);
+    data = Buffer.alloc(25);
     PUMPFUN_BUY_EXACT_SOL_IN_DISCRIMINATOR.copy(data, 0);
     data.writeBigUInt64LE(inputAmount, 8);
     data.writeBigUInt64LE(minTokensOut, 16);
-    trackVolume.copy(data, 24);
+    data[24] = trackVolume;
   } else {
-    data = Buffer.alloc(26);
+    data = Buffer.alloc(25);
     PUMPFUN_BUY_DISCRIMINATOR.copy(data, 0);
     data.writeBigUInt64LE(buyTokenAmount, 8);
     data.writeBigUInt64LE(maxSolCost, 16);
-    trackVolume.copy(data, 24);
+    data[24] = trackVolume;
   }
   const keys = [
     { pubkey: PUMPFUN_GLOBAL_ACCOUNT, isSigner: false, isWritable: false },
@@ -513,19 +573,19 @@ function buildPumpFunSellInstructions(params) {
   const {
     payer,
     inputMint,
+    outputMint = SOL_TOKEN_ACCOUNT2,
     inputAmount,
     slippageBasisPoints = BigInt(1e3),
     fixedOutputAmount,
     createOutputMintAta = false,
     closeInputMintAta = false,
-    protocolParams,
-    usePumpFunV2 = false
+    protocolParams
   } = params;
-  if (usePumpFunV2 || protocolParams.useV2Ix || isUsablePubkey(protocolParams.quoteMint)) {
+  if (usesPumpFunV2Layout(protocolParams)) {
     return buildPumpFunSellV2Instructions({
       ...params,
-      createOutputMintAta,
-      usePumpFunV2: true
+      outputMint,
+      createOutputMintAta
     });
   }
   if (inputAmount === BigInt(0)) {
@@ -605,12 +665,14 @@ function buildPumpFunSellInstructions(params) {
 function buildPumpFunBuyV2Instructions(params) {
   const {
     payer,
+    inputMint = SOL_TOKEN_ACCOUNT2,
     outputMint,
     inputAmount,
     slippageBasisPoints = BigInt(1e3),
     fixedOutputAmount,
     createOutputMintAta = true,
     createInputMintAta = false,
+    closeInputMintAta = false,
     protocolParams,
     useExactSolAmount = true
   } = params;
@@ -625,6 +687,7 @@ function buildPumpFunBuyV2Instructions(params) {
   const bondingCurveAddr = bondingCurve.account.equals(import_web32.PublicKey.default) || !bondingCurve.account ? getBondingCurvePda(outputMint) : bondingCurve.account;
   const baseTokenProgram = effectivePumpMintTokenProgram(outputMint, protocolParams);
   const quoteMint = effectiveQuoteMint(protocolParams);
+  validateV2BuyQuoteMint(inputMint, quoteMint);
   const quoteTokenProgram = import_spl_token.TOKEN_PROGRAM_ID;
   const associatedBaseBondingCurve = associatedTokenAddress(
     outputMint,
@@ -677,32 +740,39 @@ function buildPumpFunBuyV2Instructions(params) {
       )
     );
   }
-  if (createInputMintAta) {
-    instructions.push(
-      (0, import_spl_token.createAssociatedTokenAccountIdempotentInstruction)(
-        payerPubkey,
-        associatedQuoteUser,
-        payerPubkey,
-        quoteMint,
-        quoteTokenProgram,
-        import_spl_token.ASSOCIATED_TOKEN_PROGRAM_ID
-      )
-    );
-  }
   const buyTokenAmount = fixedOutputAmount ? fixedOutputAmount : getBuyTokenAmountFromSolAmount(inputAmount, bondingCurve, creator);
   const maxSolCost = calculateWithSlippageBuy(inputAmount, slippageBasisPoints);
   let data;
-  if (useExactSolAmount) {
-    const minTokensOut = fixedOutputAmount ? fixedOutputAmount : calculateWithSlippageSell(buyTokenAmount, slippageBasisPoints);
+  let quoteAmountToFund;
+  if (fixedOutputAmount !== void 0) {
+    data = Buffer.alloc(24);
+    PUMPFUN_BUY_V2_DISCRIMINATOR.copy(data, 0);
+    data.writeBigUInt64LE(fixedOutputAmount, 8);
+    data.writeBigUInt64LE(inputAmount, 16);
+    quoteAmountToFund = inputAmount;
+  } else if (useExactSolAmount) {
+    const minTokensOut = calculateWithSlippageSell(buyTokenAmount, slippageBasisPoints);
     data = Buffer.alloc(24);
     PUMPFUN_BUY_EXACT_QUOTE_IN_V2_DISCRIMINATOR.copy(data, 0);
     data.writeBigUInt64LE(inputAmount, 8);
     data.writeBigUInt64LE(minTokensOut, 16);
+    quoteAmountToFund = inputAmount;
   } else {
     data = Buffer.alloc(24);
     PUMPFUN_BUY_V2_DISCRIMINATOR.copy(data, 0);
     data.writeBigUInt64LE(buyTokenAmount, 8);
     data.writeBigUInt64LE(maxSolCost, 16);
+    quoteAmountToFund = maxSolCost;
+  }
+  if (createInputMintAta) {
+    pushCreateOrWrapUserTokenAccount(
+      instructions,
+      payerPubkey,
+      associatedQuoteUser,
+      quoteMint,
+      quoteTokenProgram,
+      quoteAmountToFund
+    );
   }
   const keys = [
     { pubkey: PUMPFUN_GLOBAL_ACCOUNT, isSigner: false, isWritable: false },
@@ -740,12 +810,24 @@ function buildPumpFunBuyV2Instructions(params) {
       data
     })
   );
+  if (closeInputMintAta && quoteMint.equals(import_spl_token.NATIVE_MINT)) {
+    instructions.push(
+      (0, import_spl_token.createCloseAccountInstruction)(
+        associatedQuoteUser,
+        payerPubkey,
+        payerPubkey,
+        [],
+        quoteTokenProgram
+      )
+    );
+  }
   return instructions;
 }
 function buildPumpFunSellV2Instructions(params) {
   const {
     payer,
     inputMint,
+    outputMint = SOL_TOKEN_ACCOUNT2,
     inputAmount,
     slippageBasisPoints = BigInt(1e3),
     fixedOutputAmount,
@@ -764,6 +846,7 @@ function buildPumpFunSellV2Instructions(params) {
   const bondingCurveAddr = bondingCurve.account.equals(import_web32.PublicKey.default) || !bondingCurve.account ? getBondingCurvePda(inputMint) : bondingCurve.account;
   const baseTokenProgram = effectivePumpMintTokenProgram(inputMint, protocolParams);
   const quoteMint = effectiveQuoteMint(protocolParams);
+  validateV2SellQuoteMint(outputMint, quoteMint);
   const quoteTokenProgram = import_spl_token.TOKEN_PROGRAM_ID;
   const associatedBaseBondingCurve = associatedTokenAddress(
     inputMint,
@@ -943,12 +1026,13 @@ function getBuyPrice(amount, virtualSolReserves, virtualTokenReserves, realToken
   const s = virtualTokenReserves - r;
   return s < realTokenReserves ? s : realTokenReserves;
 }
-var import_web32, import_spl_token, PUMPFUN_PROGRAM_ID, PUMPFUN_EVENT_AUTHORITY, PUMPFUN_FEE_PROGRAM, PUMPFUN_GLOBAL_VOLUME_ACCUMULATOR, PUMPFUN_FEE_CONFIG, PUMPFUN_GLOBAL_ACCOUNT, PUMPFUN_FEE_RECIPIENT, PUMPFUN_STANDARD_FEE_RECIPIENTS, PUMPFUN_PROTOCOL_EXTRA_FEE_RECIPIENTS, PUMPFUN_BUYBACK_FEE_RECIPIENTS, PUMPFUN_MAYHEM_FEE_RECIPIENTS, PUMPFUN_BUY_DISCRIMINATOR, PUMPFUN_BUY_EXACT_SOL_IN_DISCRIMINATOR, PUMPFUN_SELL_DISCRIMINATOR, PUMPFUN_BUY_V2_DISCRIMINATOR, PUMPFUN_SELL_V2_DISCRIMINATOR, PUMPFUN_BUY_EXACT_QUOTE_IN_V2_DISCRIMINATOR, PUMPFUN_CLAIM_CASHBACK_DISCRIMINATOR, PUMPFUN_BONDING_CURVE_SEED, PUMPFUN_BONDING_CURVE_V2_SEED, PUMPFUN_CREATOR_VAULT_SEED, PUMPFUN_USER_VOLUME_ACCUMULATOR_SEED, PUMPFUN_SHARING_CONFIG_SEED, MAX_SLIPPAGE_BPS, PUMPFUN_FEE_BASIS_POINTS, PUMPFUN_CREATOR_FEE_BASIS_POINTS, PHANTOM_DEFAULT_CREATOR_VAULT;
+var import_web32, import_spl_token, SOL_TOKEN_ACCOUNT2, PUMPFUN_PROGRAM_ID, PUMPFUN_EVENT_AUTHORITY, PUMPFUN_FEE_PROGRAM, PUMPFUN_GLOBAL_VOLUME_ACCUMULATOR, PUMPFUN_FEE_CONFIG, PUMPFUN_GLOBAL_ACCOUNT, PUMPFUN_FEE_RECIPIENT, PUMPFUN_STANDARD_FEE_RECIPIENTS, PUMPFUN_PROTOCOL_EXTRA_FEE_RECIPIENTS, PUMPFUN_BUYBACK_FEE_RECIPIENTS, PUMPFUN_MAYHEM_FEE_RECIPIENTS, PUMPFUN_BUY_DISCRIMINATOR, PUMPFUN_BUY_EXACT_SOL_IN_DISCRIMINATOR, PUMPFUN_SELL_DISCRIMINATOR, PUMPFUN_BUY_V2_DISCRIMINATOR, PUMPFUN_SELL_V2_DISCRIMINATOR, PUMPFUN_BUY_EXACT_QUOTE_IN_V2_DISCRIMINATOR, PUMPFUN_CLAIM_CASHBACK_DISCRIMINATOR, PUMPFUN_BONDING_CURVE_SEED, PUMPFUN_BONDING_CURVE_V2_SEED, PUMPFUN_CREATOR_VAULT_SEED, PUMPFUN_USER_VOLUME_ACCUMULATOR_SEED, PUMPFUN_SHARING_CONFIG_SEED, MAX_SLIPPAGE_BPS, PUMPFUN_FEE_BASIS_POINTS, PUMPFUN_CREATOR_FEE_BASIS_POINTS, PHANTOM_DEFAULT_CREATOR_VAULT;
 var init_pumpfun_builder = __esm({
   "src/instruction/pumpfun_builder.ts"() {
     "use strict";
     import_web32 = require("@solana/web3.js");
     import_spl_token = require("@solana/spl-token");
+    SOL_TOKEN_ACCOUNT2 = new import_web32.PublicKey("So11111111111111111111111111111111111111111");
     PUMPFUN_PROGRAM_ID = new import_web32.PublicKey(
       "6EF8rrecthR5Dkzon8Nwu78hRvfCKubJ14M5uBEwF6P"
     );
@@ -2414,34 +2498,38 @@ function buildRaydiumCpmmBuyInstructions(params) {
     throw new Error("Pool must contain WSOL or USDC");
   }
   const isBaseIn = baseMint.equals(WSOL_TOKEN_ACCOUNT2) || baseMint.equals(USDC_TOKEN_ACCOUNT2);
-  const mintTokenProgram = isBaseIn ? quoteTokenProgram : baseTokenProgram;
+  const inputMint = isBaseIn ? baseMint : quoteMint;
+  const inputTokenProgram = isBaseIn ? baseTokenProgram : quoteTokenProgram;
+  const expectedOutputMint = isBaseIn ? quoteMint : baseMint;
+  const outputTokenProgram = isBaseIn ? quoteTokenProgram : baseTokenProgram;
+  if (!outputMint.equals(expectedOutputMint)) {
+    throw new Error(`outputMint must match Raydium CPMM pool side ${expectedOutputMint.toBase58()}`);
+  }
   const poolState = protocolParams.poolState && !protocolParams.poolState.equals(import_web35.PublicKey.default) ? protocolParams.poolState : getRaydiumCpmmPoolPda(ammConfig, baseMint, quoteMint);
-  const swapResult = computeRaydiumCpmmSwapAmount(
+  const minimumAmountOut = fixedOutputAmount ?? computeRaydiumCpmmSwapAmount(
     baseReserve,
     quoteReserve,
     isBaseIn,
     inputAmount,
     slippageBasisPoints
-  );
-  const minimumAmountOut = fixedOutputAmount || swapResult.minAmountOut;
-  const inputMint = isWsol ? WSOL_TOKEN_ACCOUNT2 : USDC_TOKEN_ACCOUNT2;
+  ).minAmountOut;
   const inputTokenAccount = (0, import_spl_token3.getAssociatedTokenAddressSync)(
     inputMint,
     payerPubkey,
     true,
-    import_spl_token3.TOKEN_PROGRAM_ID
+    inputTokenProgram
   );
   const outputTokenAccount = (0, import_spl_token3.getAssociatedTokenAddressSync)(
     outputMint,
     payerPubkey,
     true,
-    mintTokenProgram
+    outputTokenProgram
   );
   const inputVaultAccount = (() => {
-    if (isWsol && baseMint.equals(inputMint) && baseVault && !baseVault.equals(import_web35.PublicKey.default)) {
+    if (baseMint.equals(inputMint) && baseVault && !baseVault.equals(import_web35.PublicKey.default)) {
       return baseVault;
     }
-    if (!isWsol && quoteMint.equals(inputMint) && quoteVault && !quoteVault.equals(import_web35.PublicKey.default)) {
+    if (quoteMint.equals(inputMint) && quoteVault && !quoteVault.equals(import_web35.PublicKey.default)) {
       return quoteVault;
     }
     return getRaydiumCpmmVaultPda(poolState, inputMint);
@@ -2456,34 +2544,43 @@ function buildRaydiumCpmmBuyInstructions(params) {
     return getRaydiumCpmmVaultPda(poolState, outputMint);
   })();
   const observationStateAccount = observationState && !observationState.equals(import_web35.PublicKey.default) ? observationState : getRaydiumCpmmObservationStatePda(poolState);
-  if (createInputMintAta && isWsol) {
-    const wsolAta = (0, import_spl_token3.getAssociatedTokenAddressSync)(import_spl_token3.NATIVE_MINT, payerPubkey, true);
+  if (createInputMintAta) {
+    const isInputWsol = inputMint.equals(WSOL_TOKEN_ACCOUNT2);
     instructions.push(
-      (0, import_spl_token3.createAssociatedTokenAccountInstruction)(
+      (0, import_spl_token3.createAssociatedTokenAccountIdempotentInstruction)(
         payerPubkey,
-        wsolAta,
+        inputTokenAccount,
         payerPubkey,
-        import_spl_token3.NATIVE_MINT,
-        import_spl_token3.TOKEN_PROGRAM_ID
+        inputMint,
+        inputTokenProgram
       )
     );
-    instructions.push((0, import_spl_token3.createSyncNativeInstruction)(wsolAta));
+    if (isInputWsol) {
+      instructions.push(
+        import_web35.SystemProgram.transfer({
+          fromPubkey: payerPubkey,
+          toPubkey: inputTokenAccount,
+          lamports: inputAmount
+        })
+      );
+      instructions.push((0, import_spl_token3.createSyncNativeInstruction)(inputTokenAccount));
+    }
   }
   if (createOutputMintAta) {
     instructions.push(
-      (0, import_spl_token3.createAssociatedTokenAccountInstruction)(
+      (0, import_spl_token3.createAssociatedTokenAccountIdempotentInstruction)(
         payerPubkey,
         outputTokenAccount,
         payerPubkey,
         outputMint,
-        mintTokenProgram
+        outputTokenProgram
       )
     );
   }
   const data = Buffer.alloc(24);
-  RAYDIUM_CPMM_SWAP_BASE_IN_DISCRIMINATOR.copy(data, 0);
+  (fixedOutputAmount !== void 0 ? RAYDIUM_CPMM_SWAP_BASE_OUT_DISCRIMINATOR : RAYDIUM_CPMM_SWAP_BASE_IN_DISCRIMINATOR).copy(data, 0);
   data.writeBigUInt64LE(inputAmount, 8);
-  data.writeBigUInt64LE(minimumAmountOut, 16);
+  data.writeBigUInt64LE(fixedOutputAmount ?? minimumAmountOut, 16);
   const accounts = [
     { pubkey: payerPubkey, isSigner: true, isWritable: true },
     { pubkey: RAYDIUM_CPMM_AUTHORITY, isSigner: false, isWritable: false },
@@ -2493,8 +2590,8 @@ function buildRaydiumCpmmBuyInstructions(params) {
     { pubkey: outputTokenAccount, isSigner: false, isWritable: true },
     { pubkey: inputVaultAccount, isSigner: false, isWritable: true },
     { pubkey: outputVaultAccount, isSigner: false, isWritable: true },
-    { pubkey: import_spl_token3.TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
-    { pubkey: mintTokenProgram, isSigner: false, isWritable: false },
+    { pubkey: inputTokenProgram, isSigner: false, isWritable: false },
+    { pubkey: outputTokenProgram, isSigner: false, isWritable: false },
     { pubkey: inputMint, isSigner: false, isWritable: false },
     { pubkey: outputMint, isSigner: false, isWritable: false },
     { pubkey: observationStateAccount, isSigner: false, isWritable: true }
@@ -2506,10 +2603,9 @@ function buildRaydiumCpmmBuyInstructions(params) {
       data
     })
   );
-  if (closeInputMintAta && isWsol) {
-    const wsolAta = (0, import_spl_token3.getAssociatedTokenAddressSync)(import_spl_token3.NATIVE_MINT, payerPubkey, true);
+  if (closeInputMintAta && inputMint.equals(WSOL_TOKEN_ACCOUNT2)) {
     instructions.push(
-      (0, import_spl_token3.createCloseAccountInstruction)(wsolAta, payerPubkey, payerPubkey, [], import_spl_token3.TOKEN_PROGRAM_ID)
+      (0, import_spl_token3.createCloseAccountInstruction)(inputTokenAccount, payerPubkey, payerPubkey, [], inputTokenProgram)
     );
   }
   return instructions;
@@ -2551,28 +2647,32 @@ function buildRaydiumCpmmSellInstructions(params) {
     throw new Error("Pool must contain WSOL or USDC");
   }
   const isQuoteOut = quoteMint.equals(WSOL_TOKEN_ACCOUNT2) || quoteMint.equals(USDC_TOKEN_ACCOUNT2);
-  const mintTokenProgram = isQuoteOut ? baseTokenProgram : quoteTokenProgram;
+  const expectedInputMint = isQuoteOut ? baseMint : quoteMint;
+  const inputTokenProgram = isQuoteOut ? baseTokenProgram : quoteTokenProgram;
+  const outputMint = isQuoteOut ? quoteMint : baseMint;
+  const outputTokenProgram = isQuoteOut ? quoteTokenProgram : baseTokenProgram;
+  if (!inputMint.equals(expectedInputMint)) {
+    throw new Error(`inputMint must match Raydium CPMM pool side ${expectedInputMint.toBase58()}`);
+  }
   const poolState = protocolParams.poolState && !protocolParams.poolState.equals(import_web35.PublicKey.default) ? protocolParams.poolState : getRaydiumCpmmPoolPda(ammConfig, baseMint, quoteMint);
-  const swapResult = computeRaydiumCpmmSwapAmount(
+  const minimumAmountOut = fixedOutputAmount ?? computeRaydiumCpmmSwapAmount(
     baseReserve,
     quoteReserve,
     isQuoteOut,
     inputAmount,
     slippageBasisPoints
-  );
-  const minimumAmountOut = fixedOutputAmount || swapResult.minAmountOut;
-  const outputMint = isWsol ? WSOL_TOKEN_ACCOUNT2 : USDC_TOKEN_ACCOUNT2;
+  ).minAmountOut;
   const inputTokenAccount = (0, import_spl_token3.getAssociatedTokenAddressSync)(
     inputMint,
     payerPubkey,
     true,
-    mintTokenProgram
+    inputTokenProgram
   );
   const outputTokenAccount = (0, import_spl_token3.getAssociatedTokenAddressSync)(
     outputMint,
     payerPubkey,
     true,
-    import_spl_token3.TOKEN_PROGRAM_ID
+    outputTokenProgram
   );
   const inputVaultAccount = (() => {
     if (baseMint.equals(inputMint) && baseVault && !baseVault.equals(import_web35.PublicKey.default)) {
@@ -2584,31 +2684,30 @@ function buildRaydiumCpmmSellInstructions(params) {
     return getRaydiumCpmmVaultPda(poolState, inputMint);
   })();
   const outputVaultAccount = (() => {
-    if (isWsol && baseMint.equals(outputMint) && baseVault && !baseVault.equals(import_web35.PublicKey.default)) {
+    if (baseMint.equals(outputMint) && baseVault && !baseVault.equals(import_web35.PublicKey.default)) {
       return baseVault;
     }
-    if (!isWsol && quoteMint.equals(outputMint) && quoteVault && !quoteVault.equals(import_web35.PublicKey.default)) {
+    if (quoteMint.equals(outputMint) && quoteVault && !quoteVault.equals(import_web35.PublicKey.default)) {
       return quoteVault;
     }
     return getRaydiumCpmmVaultPda(poolState, outputMint);
   })();
   const observationStateAccount = observationState && !observationState.equals(import_web35.PublicKey.default) ? observationState : getRaydiumCpmmObservationStatePda(poolState);
-  if (createOutputMintAta && isWsol) {
-    const wsolAta = (0, import_spl_token3.getAssociatedTokenAddressSync)(import_spl_token3.NATIVE_MINT, payerPubkey, true);
+  if (createOutputMintAta) {
     instructions.push(
-      (0, import_spl_token3.createAssociatedTokenAccountInstruction)(
+      (0, import_spl_token3.createAssociatedTokenAccountIdempotentInstruction)(
         payerPubkey,
-        wsolAta,
+        outputTokenAccount,
         payerPubkey,
-        import_spl_token3.NATIVE_MINT,
-        import_spl_token3.TOKEN_PROGRAM_ID
+        outputMint,
+        outputTokenProgram
       )
     );
   }
   const data = Buffer.alloc(24);
-  RAYDIUM_CPMM_SWAP_BASE_IN_DISCRIMINATOR.copy(data, 0);
+  (fixedOutputAmount !== void 0 ? RAYDIUM_CPMM_SWAP_BASE_OUT_DISCRIMINATOR : RAYDIUM_CPMM_SWAP_BASE_IN_DISCRIMINATOR).copy(data, 0);
   data.writeBigUInt64LE(inputAmount, 8);
-  data.writeBigUInt64LE(minimumAmountOut, 16);
+  data.writeBigUInt64LE(fixedOutputAmount ?? minimumAmountOut, 16);
   const accounts = [
     { pubkey: payerPubkey, isSigner: true, isWritable: true },
     { pubkey: RAYDIUM_CPMM_AUTHORITY, isSigner: false, isWritable: false },
@@ -2618,8 +2717,8 @@ function buildRaydiumCpmmSellInstructions(params) {
     { pubkey: outputTokenAccount, isSigner: false, isWritable: true },
     { pubkey: inputVaultAccount, isSigner: false, isWritable: true },
     { pubkey: outputVaultAccount, isSigner: false, isWritable: true },
-    { pubkey: mintTokenProgram, isSigner: false, isWritable: false },
-    { pubkey: import_spl_token3.TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
+    { pubkey: inputTokenProgram, isSigner: false, isWritable: false },
+    { pubkey: outputTokenProgram, isSigner: false, isWritable: false },
     { pubkey: inputMint, isSigner: false, isWritable: false },
     { pubkey: outputMint, isSigner: false, isWritable: false },
     { pubkey: observationStateAccount, isSigner: false, isWritable: true }
@@ -2631,10 +2730,9 @@ function buildRaydiumCpmmSellInstructions(params) {
       data
     })
   );
-  if (closeOutputMintAta && isWsol) {
-    const wsolAta = (0, import_spl_token3.getAssociatedTokenAddressSync)(import_spl_token3.NATIVE_MINT, payerPubkey, true);
+  if (closeOutputMintAta && outputMint.equals(WSOL_TOKEN_ACCOUNT2)) {
     instructions.push(
-      (0, import_spl_token3.createCloseAccountInstruction)(wsolAta, payerPubkey, payerPubkey, [], import_spl_token3.TOKEN_PROGRAM_ID)
+      (0, import_spl_token3.createCloseAccountInstruction)(outputTokenAccount, payerPubkey, payerPubkey, [], outputTokenProgram)
     );
   }
   if (closeInputMintAta) {
@@ -2644,7 +2742,7 @@ function buildRaydiumCpmmSellInstructions(params) {
         payerPubkey,
         payerPubkey,
         [],
-        mintTokenProgram
+        inputTokenProgram
       )
     );
   }
@@ -2829,10 +2927,44 @@ function computeRaydiumAmmV4SwapAmount(coinReserve, pcReserve, isCoinIn, amountI
   const minAmountOut = amountOut - amountOut * slippageBasisPoints / BigInt(1e4);
   return { amountOut, minAmountOut };
 }
+function isDefaultPublicKey(pubkey) {
+  return pubkey.equals(import_web36.PublicKey.default);
+}
+function isMintMatch(requested, expected) {
+  return requested.equals(expected) || expected.equals(import_spl_token4.NATIVE_MINT) && requested.equals(SOL_TOKEN_ACCOUNT3);
+}
+function ensureExpectedMint(label, requested, expected) {
+  if (!isDefaultPublicKey(requested) && !isMintMatch(requested, expected)) {
+    throw new Error(
+      `${label} must match the Raydium AMM v4 pool side (${expected.toBase58()}), got ${requested.toBase58()}`
+    );
+  }
+}
+function ensureMarketAccounts(params) {
+  const required = [
+    ["ammOpenOrders", params.ammOpenOrders],
+    ["ammTargetOrders", params.ammTargetOrders],
+    ["serumProgram", params.serumProgram],
+    ["serumMarket", params.serumMarket],
+    ["serumBids", params.serumBids],
+    ["serumAsks", params.serumAsks],
+    ["serumEventQueue", params.serumEventQueue],
+    ["serumCoinVaultAccount", params.serumCoinVaultAccount],
+    ["serumPcVaultAccount", params.serumPcVaultAccount],
+    ["serumVaultSigner", params.serumVaultSigner]
+  ];
+  for (const [name, account] of required) {
+    if (isDefaultPublicKey(account)) {
+      throw new Error(
+        `Raydium AMM v4 requires ${name}; pass real market accounts from the AMM/market state`
+      );
+    }
+  }
+}
 function buildRaydiumAmmV4BuyInstructions(params) {
   const {
     payer,
-    outputMint,
+    outputMint: requestedOutputMint,
     inputAmount,
     slippageBasisPoints = BigInt(1e3),
     fixedOutputAmount,
@@ -2854,9 +2986,20 @@ function buildRaydiumAmmV4BuyInstructions(params) {
     pcMint,
     tokenCoin,
     tokenPc,
+    ammOpenOrders,
+    ammTargetOrders,
+    serumProgram,
+    serumMarket,
+    serumBids,
+    serumAsks,
+    serumEventQueue,
+    serumCoinVaultAccount,
+    serumPcVaultAccount,
+    serumVaultSigner,
     coinReserve,
     pcReserve
   } = protocolParams;
+  ensureMarketAccounts(protocolParams);
   const isWsol = coinMint.equals(WSOL_TOKEN_ACCOUNT2) || pcMint.equals(WSOL_TOKEN_ACCOUNT2);
   const isUsdc = coinMint.equals(USDC_TOKEN_ACCOUNT2) || pcMint.equals(USDC_TOKEN_ACCOUNT2);
   if (!isWsol && !isUsdc) {
@@ -2870,8 +3013,10 @@ function buildRaydiumAmmV4BuyInstructions(params) {
     inputAmount,
     slippageBasisPoints
   );
-  const minimumAmountOut = fixedOutputAmount || swapResult.minAmountOut;
-  const inputMint = isWsol ? WSOL_TOKEN_ACCOUNT2 : USDC_TOKEN_ACCOUNT2;
+  const minimumAmountOut = fixedOutputAmount ?? swapResult.minAmountOut;
+  const inputMint = isBaseIn ? coinMint : pcMint;
+  const outputMint = isBaseIn ? pcMint : coinMint;
+  ensureExpectedMint("outputMint", requestedOutputMint, outputMint);
   const userSourceTokenAccount = (0, import_spl_token4.getAssociatedTokenAddressSync)(
     inputMint,
     payerPubkey,
@@ -2884,7 +3029,7 @@ function buildRaydiumAmmV4BuyInstructions(params) {
     true,
     import_spl_token4.TOKEN_PROGRAM_ID
   );
-  if (createInputMintAta && isWsol) {
+  if (createInputMintAta && inputMint.equals(WSOL_TOKEN_ACCOUNT2)) {
     const wsolAta = (0, import_spl_token4.getAssociatedTokenAddressSync)(import_spl_token4.NATIVE_MINT, payerPubkey, true);
     instructions.push(
       (0, import_spl_token4.createAssociatedTokenAccountInstruction)(
@@ -2895,7 +3040,24 @@ function buildRaydiumAmmV4BuyInstructions(params) {
         import_spl_token4.TOKEN_PROGRAM_ID
       )
     );
+    instructions.push(
+      import_web36.SystemProgram.transfer({
+        fromPubkey: payerPubkey,
+        toPubkey: wsolAta,
+        lamports: Number(inputAmount)
+      })
+    );
     instructions.push((0, import_spl_token4.createSyncNativeInstruction)(wsolAta));
+  } else if (createInputMintAta) {
+    instructions.push(
+      (0, import_spl_token4.createAssociatedTokenAccountInstruction)(
+        payerPubkey,
+        userSourceTokenAccount,
+        payerPubkey,
+        inputMint,
+        import_spl_token4.TOKEN_PROGRAM_ID
+      )
+    );
   }
   if (createOutputMintAta) {
     instructions.push(
@@ -2909,38 +3071,30 @@ function buildRaydiumAmmV4BuyInstructions(params) {
     );
   }
   const data = Buffer.alloc(17);
-  RAYDIUM_AMM_V4_SWAP_BASE_IN_DISCRIMINATOR.copy(data, 0);
+  (fixedOutputAmount !== void 0 ? RAYDIUM_AMM_V4_SWAP_BASE_OUT_DISCRIMINATOR : RAYDIUM_AMM_V4_SWAP_BASE_IN_DISCRIMINATOR).copy(data, 0);
   data.writeBigUInt64LE(inputAmount, 1);
   data.writeBigUInt64LE(minimumAmountOut, 9);
   const accounts = [
     { pubkey: import_spl_token4.TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
     { pubkey: amm, isSigner: false, isWritable: true },
     { pubkey: RAYDIUM_AMM_V4_AUTHORITY, isSigner: false, isWritable: false },
-    { pubkey: amm, isSigner: false, isWritable: true },
-    // Amm Open Orders (same as amm for simplicity)
+    { pubkey: ammOpenOrders, isSigner: false, isWritable: true },
+    { pubkey: ammTargetOrders, isSigner: false, isWritable: true },
     { pubkey: tokenCoin, isSigner: false, isWritable: true },
     // Pool Coin Token Account
     { pubkey: tokenPc, isSigner: false, isWritable: true },
     // Pool Pc Token Account
-    { pubkey: amm, isSigner: false, isWritable: false },
-    // Serum Program (placeholder)
-    { pubkey: amm, isSigner: false, isWritable: false },
-    // Serum Market (placeholder)
-    { pubkey: amm, isSigner: false, isWritable: false },
-    // Serum Bids (placeholder)
-    { pubkey: amm, isSigner: false, isWritable: false },
-    // Serum Asks (placeholder)
-    { pubkey: amm, isSigner: false, isWritable: false },
-    // Serum Event Queue (placeholder)
-    { pubkey: amm, isSigner: false, isWritable: false },
-    // Serum Coin Vault Account (placeholder)
-    { pubkey: amm, isSigner: false, isWritable: false },
-    // Serum Pc Vault Account (placeholder)
-    { pubkey: amm, isSigner: false, isWritable: false },
-    // Serum Vault Signer (placeholder)
+    { pubkey: serumProgram, isSigner: false, isWritable: false },
+    { pubkey: serumMarket, isSigner: false, isWritable: true },
+    { pubkey: serumBids, isSigner: false, isWritable: true },
+    { pubkey: serumAsks, isSigner: false, isWritable: true },
+    { pubkey: serumEventQueue, isSigner: false, isWritable: true },
+    { pubkey: serumCoinVaultAccount, isSigner: false, isWritable: true },
+    { pubkey: serumPcVaultAccount, isSigner: false, isWritable: true },
+    { pubkey: serumVaultSigner, isSigner: false, isWritable: false },
     { pubkey: userSourceTokenAccount, isSigner: false, isWritable: true },
     { pubkey: userDestinationTokenAccount, isSigner: false, isWritable: true },
-    { pubkey: payerPubkey, isSigner: true, isWritable: true }
+    { pubkey: payerPubkey, isSigner: true, isWritable: false }
   ];
   instructions.push(
     new import_web36.TransactionInstruction({
@@ -2949,7 +3103,7 @@ function buildRaydiumAmmV4BuyInstructions(params) {
       data
     })
   );
-  if (closeInputMintAta && isWsol) {
+  if (closeInputMintAta && inputMint.equals(WSOL_TOKEN_ACCOUNT2)) {
     const wsolAta = (0, import_spl_token4.getAssociatedTokenAddressSync)(import_spl_token4.NATIVE_MINT, payerPubkey, true);
     instructions.push(
       (0, import_spl_token4.createCloseAccountInstruction)(wsolAta, payerPubkey, payerPubkey, [], import_spl_token4.TOKEN_PROGRAM_ID)
@@ -2960,7 +3114,8 @@ function buildRaydiumAmmV4BuyInstructions(params) {
 function buildRaydiumAmmV4SellInstructions(params) {
   const {
     payer,
-    inputMint,
+    inputMint: requestedInputMint,
+    outputMint: requestedOutputMint,
     inputAmount,
     slippageBasisPoints = BigInt(1e3),
     fixedOutputAmount,
@@ -2982,9 +3137,20 @@ function buildRaydiumAmmV4SellInstructions(params) {
     pcMint,
     tokenCoin,
     tokenPc,
+    ammOpenOrders,
+    ammTargetOrders,
+    serumProgram,
+    serumMarket,
+    serumBids,
+    serumAsks,
+    serumEventQueue,
+    serumCoinVaultAccount,
+    serumPcVaultAccount,
+    serumVaultSigner,
     coinReserve,
     pcReserve
   } = protocolParams;
+  ensureMarketAccounts(protocolParams);
   const isWsol = coinMint.equals(WSOL_TOKEN_ACCOUNT2) || pcMint.equals(WSOL_TOKEN_ACCOUNT2);
   const isUsdc = coinMint.equals(USDC_TOKEN_ACCOUNT2) || pcMint.equals(USDC_TOKEN_ACCOUNT2);
   if (!isWsol && !isUsdc) {
@@ -2998,8 +3164,13 @@ function buildRaydiumAmmV4SellInstructions(params) {
     inputAmount,
     slippageBasisPoints
   );
-  const minimumAmountOut = fixedOutputAmount || swapResult.minAmountOut;
-  const outputMint = isWsol ? WSOL_TOKEN_ACCOUNT2 : USDC_TOKEN_ACCOUNT2;
+  const minimumAmountOut = fixedOutputAmount ?? swapResult.minAmountOut;
+  const outputMint = isBaseIn ? pcMint : coinMint;
+  const inputMint = isBaseIn ? coinMint : pcMint;
+  ensureExpectedMint("inputMint", requestedInputMint, inputMint);
+  if (requestedOutputMint) {
+    ensureExpectedMint("outputMint", requestedOutputMint, outputMint);
+  }
   const userSourceTokenAccount = (0, import_spl_token4.getAssociatedTokenAddressSync)(
     inputMint,
     payerPubkey,
@@ -3012,7 +3183,7 @@ function buildRaydiumAmmV4SellInstructions(params) {
     true,
     import_spl_token4.TOKEN_PROGRAM_ID
   );
-  if (createOutputMintAta && isWsol) {
+  if (createOutputMintAta && outputMint.equals(WSOL_TOKEN_ACCOUNT2)) {
     const wsolAta = (0, import_spl_token4.getAssociatedTokenAddressSync)(import_spl_token4.NATIVE_MINT, payerPubkey, true);
     instructions.push(
       (0, import_spl_token4.createAssociatedTokenAccountInstruction)(
@@ -3023,40 +3194,42 @@ function buildRaydiumAmmV4SellInstructions(params) {
         import_spl_token4.TOKEN_PROGRAM_ID
       )
     );
+  } else if (createOutputMintAta) {
+    instructions.push(
+      (0, import_spl_token4.createAssociatedTokenAccountInstruction)(
+        payerPubkey,
+        userDestinationTokenAccount,
+        payerPubkey,
+        outputMint,
+        import_spl_token4.TOKEN_PROGRAM_ID
+      )
+    );
   }
   const data = Buffer.alloc(17);
-  RAYDIUM_AMM_V4_SWAP_BASE_IN_DISCRIMINATOR.copy(data, 0);
+  (fixedOutputAmount !== void 0 ? RAYDIUM_AMM_V4_SWAP_BASE_OUT_DISCRIMINATOR : RAYDIUM_AMM_V4_SWAP_BASE_IN_DISCRIMINATOR).copy(data, 0);
   data.writeBigUInt64LE(inputAmount, 1);
   data.writeBigUInt64LE(minimumAmountOut, 9);
   const accounts = [
     { pubkey: import_spl_token4.TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
     { pubkey: amm, isSigner: false, isWritable: true },
     { pubkey: RAYDIUM_AMM_V4_AUTHORITY, isSigner: false, isWritable: false },
-    { pubkey: amm, isSigner: false, isWritable: true },
-    // Amm Open Orders
+    { pubkey: ammOpenOrders, isSigner: false, isWritable: true },
+    { pubkey: ammTargetOrders, isSigner: false, isWritable: true },
     { pubkey: tokenCoin, isSigner: false, isWritable: true },
     // Pool Coin Token Account
     { pubkey: tokenPc, isSigner: false, isWritable: true },
     // Pool Pc Token Account
-    { pubkey: amm, isSigner: false, isWritable: false },
-    // Serum Program
-    { pubkey: amm, isSigner: false, isWritable: false },
-    // Serum Market
-    { pubkey: amm, isSigner: false, isWritable: false },
-    // Serum Bids
-    { pubkey: amm, isSigner: false, isWritable: false },
-    // Serum Asks
-    { pubkey: amm, isSigner: false, isWritable: false },
-    // Serum Event Queue
-    { pubkey: amm, isSigner: false, isWritable: false },
-    // Serum Coin Vault Account
-    { pubkey: amm, isSigner: false, isWritable: false },
-    // Serum Pc Vault Account
-    { pubkey: amm, isSigner: false, isWritable: false },
-    // Serum Vault Signer
+    { pubkey: serumProgram, isSigner: false, isWritable: false },
+    { pubkey: serumMarket, isSigner: false, isWritable: true },
+    { pubkey: serumBids, isSigner: false, isWritable: true },
+    { pubkey: serumAsks, isSigner: false, isWritable: true },
+    { pubkey: serumEventQueue, isSigner: false, isWritable: true },
+    { pubkey: serumCoinVaultAccount, isSigner: false, isWritable: true },
+    { pubkey: serumPcVaultAccount, isSigner: false, isWritable: true },
+    { pubkey: serumVaultSigner, isSigner: false, isWritable: false },
     { pubkey: userSourceTokenAccount, isSigner: false, isWritable: true },
     { pubkey: userDestinationTokenAccount, isSigner: false, isWritable: true },
-    { pubkey: payerPubkey, isSigner: true, isWritable: true }
+    { pubkey: payerPubkey, isSigner: true, isWritable: false }
   ];
   instructions.push(
     new import_web36.TransactionInstruction({
@@ -3065,7 +3238,7 @@ function buildRaydiumAmmV4SellInstructions(params) {
       data
     })
   );
-  if (closeOutputMintAta && isWsol) {
+  if (closeOutputMintAta && outputMint.equals(WSOL_TOKEN_ACCOUNT2)) {
     const wsolAta = (0, import_spl_token4.getAssociatedTokenAddressSync)(import_spl_token4.NATIVE_MINT, payerPubkey, true);
     instructions.push(
       (0, import_spl_token4.createCloseAccountInstruction)(wsolAta, payerPubkey, payerPubkey, [], import_spl_token4.TOKEN_PROGRAM_ID)
@@ -3201,6 +3374,65 @@ function decodeAmmInfo(data) {
     return null;
   }
 }
+function decodeMarketState(data) {
+  if (data.length < MARKET_STATE_SIZE) {
+    return null;
+  }
+  try {
+    let offset = 5;
+    const readU64 = () => {
+      const val = data.readBigUInt64LE(offset);
+      offset += 8;
+      return val;
+    };
+    const readPubkey = () => {
+      const val = new import_web36.PublicKey(data.subarray(offset, offset + 32));
+      offset += 32;
+      return val;
+    };
+    readU64();
+    readPubkey();
+    const vaultSignerNonce = readU64();
+    readPubkey();
+    readPubkey();
+    const serumCoinVaultAccount = readPubkey();
+    readU64();
+    readU64();
+    const serumPcVaultAccount = readPubkey();
+    readU64();
+    readU64();
+    readU64();
+    readPubkey();
+    const serumEventQueue = readPubkey();
+    const serumBids = readPubkey();
+    const serumAsks = readPubkey();
+    return {
+      vaultSignerNonce,
+      serumCoinVaultAccount,
+      serumPcVaultAccount,
+      serumEventQueue,
+      serumBids,
+      serumAsks
+    };
+  } catch {
+    return null;
+  }
+}
+function deriveSerumVaultSigner(serumProgram, serumMarket, vaultSignerNonce) {
+  const nonce = Buffer.alloc(8);
+  nonce.writeBigUInt64LE(vaultSignerNonce);
+  try {
+    return import_web36.PublicKey.createProgramAddressSync(
+      [serumMarket.toBuffer(), nonce],
+      serumProgram
+    );
+  } catch {
+    return import_web36.PublicKey.createProgramAddressSync(
+      [serumMarket.toBuffer(), Buffer.from([Number(vaultSignerNonce & 0xffn)])],
+      serumProgram
+    );
+  }
+}
 async function fetchAmmInfo(connection, amm) {
   const account = await connection.getAccountInfo(amm);
   if (!account?.value?.data) {
@@ -3208,12 +3440,20 @@ async function fetchAmmInfo(connection, amm) {
   }
   return decodeAmmInfo(account.value.data);
 }
-var import_web36, import_spl_token4, RAYDIUM_AMM_V4_PROGRAM_ID, RAYDIUM_AMM_V4_AUTHORITY, RAYDIUM_AMM_V4_TRADE_FEE_NUMERATOR2, RAYDIUM_AMM_V4_TRADE_FEE_DENOMINATOR2, RAYDIUM_AMM_V4_SWAP_FEE_NUMERATOR2, RAYDIUM_AMM_V4_SWAP_FEE_DENOMINATOR2, RAYDIUM_AMM_V4_SWAP_BASE_IN_DISCRIMINATOR, RAYDIUM_AMM_V4_SWAP_BASE_OUT_DISCRIMINATOR, RAYDIUM_AMM_V4_POOL_SEED, AMM_INFO_SIZE;
+async function fetchMarketState(connection, market) {
+  const account = await connection.getAccountInfo(market);
+  if (!account?.value?.data) {
+    return null;
+  }
+  return decodeMarketState(account.value.data);
+}
+var import_web36, import_spl_token4, SOL_TOKEN_ACCOUNT3, RAYDIUM_AMM_V4_PROGRAM_ID, RAYDIUM_AMM_V4_AUTHORITY, RAYDIUM_AMM_V4_TRADE_FEE_NUMERATOR2, RAYDIUM_AMM_V4_TRADE_FEE_DENOMINATOR2, RAYDIUM_AMM_V4_SWAP_FEE_NUMERATOR2, RAYDIUM_AMM_V4_SWAP_FEE_DENOMINATOR2, RAYDIUM_AMM_V4_SWAP_BASE_IN_DISCRIMINATOR, RAYDIUM_AMM_V4_SWAP_BASE_OUT_DISCRIMINATOR, RAYDIUM_AMM_V4_POOL_SEED, AMM_INFO_SIZE, MARKET_STATE_SIZE;
 var init_raydium_amm_v4_builder = __esm({
   "src/instruction/raydium_amm_v4_builder.ts"() {
     "use strict";
     import_web36 = require("@solana/web3.js");
     import_spl_token4 = require("@solana/spl-token");
+    SOL_TOKEN_ACCOUNT3 = new import_web36.PublicKey("So11111111111111111111111111111111111111111");
     RAYDIUM_AMM_V4_PROGRAM_ID = new import_web36.PublicKey(
       "675kPX9MHTjS2zt1qfr1NYHuzeLXfQM9H24wFSUt1Mp8"
     );
@@ -3228,6 +3468,7 @@ var init_raydium_amm_v4_builder = __esm({
     RAYDIUM_AMM_V4_SWAP_BASE_OUT_DISCRIMINATOR = Buffer.from([11]);
     RAYDIUM_AMM_V4_POOL_SEED = Buffer.from("pool");
     AMM_INFO_SIZE = 752;
+    MARKET_STATE_SIZE = 388;
   }
 });
 
@@ -3239,11 +3480,24 @@ function getMeteoraDammV2EventAuthorityPda() {
   );
   return pda;
 }
+function isDefaultPublicKey2(pubkey) {
+  return pubkey.equals(import_web37.PublicKey.default);
+}
+function isMintMatch2(requested, expected) {
+  return requested.equals(expected) || expected.equals(import_spl_token5.NATIVE_MINT) && requested.equals(SOL_TOKEN_ACCOUNT4);
+}
+function ensureExpectedMint2(label, requested, expected) {
+  if (!isDefaultPublicKey2(requested) && !isMintMatch2(requested, expected)) {
+    throw new Error(
+      `${label} must match the Meteora DAMM v2 pool side (${expected.toBase58()}), got ${requested.toBase58()}`
+    );
+  }
+}
 function buildMeteoraDammV2BuyInstructions(params) {
   const {
     payer,
-    inputMint,
-    outputMint,
+    inputMint: requestedInputMint,
+    outputMint: requestedOutputMint,
     inputAmount,
     fixedOutputAmount,
     createInputMintAta = true,
@@ -3276,6 +3530,10 @@ function buildMeteoraDammV2BuyInstructions(params) {
     throw new Error("Pool must contain WSOL or USDC");
   }
   const isAIn = tokenAMint.equals(WSOL_TOKEN_ACCOUNT2) || tokenAMint.equals(USDC_TOKEN_ACCOUNT2);
+  const inputMint = isAIn ? tokenAMint : tokenBMint;
+  const outputMint = isAIn ? tokenBMint : tokenAMint;
+  ensureExpectedMint2("inputMint", requestedInputMint, inputMint);
+  ensureExpectedMint2("outputMint", requestedOutputMint, outputMint);
   const inputTokenAccount = (0, import_spl_token5.getAssociatedTokenAddressSync)(
     inputMint,
     payerPubkey,
@@ -3289,7 +3547,9 @@ function buildMeteoraDammV2BuyInstructions(params) {
     isAIn ? tokenBProgram : tokenAProgram
   );
   const eventAuthority = getMeteoraDammV2EventAuthorityPda();
-  if (createInputMintAta && isWsol) {
+  const inputTokenProgram = isAIn ? tokenAProgram : tokenBProgram;
+  const outputTokenProgram = isAIn ? tokenBProgram : tokenAProgram;
+  if (createInputMintAta && inputMint.equals(WSOL_TOKEN_ACCOUNT2)) {
     const wsolAta = (0, import_spl_token5.getAssociatedTokenAddressSync)(import_spl_token5.NATIVE_MINT, payerPubkey, true);
     instructions.push(
       (0, import_spl_token5.createAssociatedTokenAccountInstruction)(
@@ -3300,7 +3560,24 @@ function buildMeteoraDammV2BuyInstructions(params) {
         import_spl_token5.TOKEN_PROGRAM_ID
       )
     );
+    instructions.push(
+      import_web37.SystemProgram.transfer({
+        fromPubkey: payerPubkey,
+        toPubkey: wsolAta,
+        lamports: Number(inputAmount)
+      })
+    );
     instructions.push((0, import_spl_token5.createSyncNativeInstruction)(wsolAta));
+  } else if (createInputMintAta) {
+    instructions.push(
+      (0, import_spl_token5.createAssociatedTokenAccountInstruction)(
+        payerPubkey,
+        inputTokenAccount,
+        payerPubkey,
+        inputMint,
+        inputTokenProgram
+      )
+    );
   }
   if (createOutputMintAta) {
     instructions.push(
@@ -3309,14 +3586,15 @@ function buildMeteoraDammV2BuyInstructions(params) {
         outputTokenAccount,
         payerPubkey,
         outputMint,
-        import_spl_token5.TOKEN_PROGRAM_ID
+        outputTokenProgram
       )
     );
   }
-  const data = Buffer.alloc(24);
-  METEORA_DAMM_V2_SWAP_DISCRIMINATOR.copy(data, 0);
+  const data = Buffer.alloc(25);
+  METEORA_DAMM_V2_SWAP2_DISCRIMINATOR.copy(data, 0);
   data.writeBigUInt64LE(inputAmount, 8);
   data.writeBigUInt64LE(fixedOutputAmount, 16);
+  data.writeUInt8(METEORA_DAMM_V2_SWAP_MODE_PARTIAL_FILL, 24);
   const accounts = [
     { pubkey: METEORA_DAMM_V2_AUTHORITY, isSigner: false, isWritable: false },
     { pubkey: pool, isSigner: false, isWritable: true },
@@ -3329,8 +3607,6 @@ function buildMeteoraDammV2BuyInstructions(params) {
     { pubkey: payerPubkey, isSigner: true, isWritable: true },
     { pubkey: tokenAProgram, isSigner: false, isWritable: false },
     { pubkey: tokenBProgram, isSigner: false, isWritable: false },
-    { pubkey: METEORA_DAMM_V2_PROGRAM_ID, isSigner: false, isWritable: false },
-    // Referral Token Account (placeholder)
     { pubkey: eventAuthority, isSigner: false, isWritable: false },
     { pubkey: METEORA_DAMM_V2_PROGRAM_ID, isSigner: false, isWritable: false }
   ];
@@ -3341,7 +3617,7 @@ function buildMeteoraDammV2BuyInstructions(params) {
       data
     })
   );
-  if (closeInputMintAta && isWsol) {
+  if (closeInputMintAta && inputMint.equals(WSOL_TOKEN_ACCOUNT2)) {
     const wsolAta = (0, import_spl_token5.getAssociatedTokenAddressSync)(import_spl_token5.NATIVE_MINT, payerPubkey, true);
     instructions.push(
       (0, import_spl_token5.createCloseAccountInstruction)(wsolAta, payerPubkey, payerPubkey, [], import_spl_token5.TOKEN_PROGRAM_ID)
@@ -3352,8 +3628,8 @@ function buildMeteoraDammV2BuyInstructions(params) {
 function buildMeteoraDammV2SellInstructions(params) {
   const {
     payer,
-    inputMint,
-    outputMint,
+    inputMint: requestedInputMint,
+    outputMint: requestedOutputMint,
     inputAmount,
     fixedOutputAmount,
     createOutputMintAta = true,
@@ -3386,6 +3662,10 @@ function buildMeteoraDammV2SellInstructions(params) {
     throw new Error("Pool must contain WSOL or USDC");
   }
   const isAIn = tokenBMint.equals(WSOL_TOKEN_ACCOUNT2) || tokenBMint.equals(USDC_TOKEN_ACCOUNT2);
+  const inputMint = isAIn ? tokenAMint : tokenBMint;
+  const outputMint = isAIn ? tokenBMint : tokenAMint;
+  ensureExpectedMint2("inputMint", requestedInputMint, inputMint);
+  ensureExpectedMint2("outputMint", requestedOutputMint, outputMint);
   const inputTokenAccount = (0, import_spl_token5.getAssociatedTokenAddressSync)(
     inputMint,
     payerPubkey,
@@ -3399,7 +3679,9 @@ function buildMeteoraDammV2SellInstructions(params) {
     isAIn ? tokenBProgram : tokenAProgram
   );
   const eventAuthority = getMeteoraDammV2EventAuthorityPda();
-  if (createOutputMintAta && isWsol) {
+  const inputTokenProgram = isAIn ? tokenAProgram : tokenBProgram;
+  const outputTokenProgram = isAIn ? tokenBProgram : tokenAProgram;
+  if (createOutputMintAta && outputMint.equals(WSOL_TOKEN_ACCOUNT2)) {
     const wsolAta = (0, import_spl_token5.getAssociatedTokenAddressSync)(import_spl_token5.NATIVE_MINT, payerPubkey, true);
     instructions.push(
       (0, import_spl_token5.createAssociatedTokenAccountInstruction)(
@@ -3410,11 +3692,22 @@ function buildMeteoraDammV2SellInstructions(params) {
         import_spl_token5.TOKEN_PROGRAM_ID
       )
     );
+  } else if (createOutputMintAta) {
+    instructions.push(
+      (0, import_spl_token5.createAssociatedTokenAccountInstruction)(
+        payerPubkey,
+        outputTokenAccount,
+        payerPubkey,
+        outputMint,
+        outputTokenProgram
+      )
+    );
   }
-  const data = Buffer.alloc(24);
-  METEORA_DAMM_V2_SWAP_DISCRIMINATOR.copy(data, 0);
+  const data = Buffer.alloc(25);
+  METEORA_DAMM_V2_SWAP2_DISCRIMINATOR.copy(data, 0);
   data.writeBigUInt64LE(inputAmount, 8);
   data.writeBigUInt64LE(fixedOutputAmount, 16);
+  data.writeUInt8(METEORA_DAMM_V2_SWAP_MODE_PARTIAL_FILL, 24);
   const accounts = [
     { pubkey: METEORA_DAMM_V2_AUTHORITY, isSigner: false, isWritable: false },
     { pubkey: pool, isSigner: false, isWritable: true },
@@ -3427,8 +3720,6 @@ function buildMeteoraDammV2SellInstructions(params) {
     { pubkey: payerPubkey, isSigner: true, isWritable: true },
     { pubkey: tokenAProgram, isSigner: false, isWritable: false },
     { pubkey: tokenBProgram, isSigner: false, isWritable: false },
-    { pubkey: METEORA_DAMM_V2_PROGRAM_ID, isSigner: false, isWritable: false },
-    // Referral Token Account
     { pubkey: eventAuthority, isSigner: false, isWritable: false },
     { pubkey: METEORA_DAMM_V2_PROGRAM_ID, isSigner: false, isWritable: false }
   ];
@@ -3439,7 +3730,7 @@ function buildMeteoraDammV2SellInstructions(params) {
       data
     })
   );
-  if (closeOutputMintAta && isWsol) {
+  if (closeOutputMintAta && outputMint.equals(WSOL_TOKEN_ACCOUNT2)) {
     const wsolAta = (0, import_spl_token5.getAssociatedTokenAddressSync)(import_spl_token5.NATIVE_MINT, payerPubkey, true);
     instructions.push(
       (0, import_spl_token5.createCloseAccountInstruction)(wsolAta, payerPubkey, payerPubkey, [], import_spl_token5.TOKEN_PROGRAM_ID)
@@ -3509,12 +3800,13 @@ async function fetchMeteoraPool(connection, poolAddress) {
   }
   return decodeMeteoraPool(account.value.data.slice(8));
 }
-var import_web37, import_spl_token5, METEORA_DAMM_V2_PROGRAM_ID, METEORA_DAMM_V2_AUTHORITY, METEORA_DAMM_V2_SWAP_DISCRIMINATOR, METEORA_DAMM_V2_EVENT_AUTHORITY_SEED, METEORA_POOL_SIZE;
+var import_web37, import_spl_token5, SOL_TOKEN_ACCOUNT4, METEORA_DAMM_V2_PROGRAM_ID, METEORA_DAMM_V2_AUTHORITY, METEORA_DAMM_V2_SWAP_DISCRIMINATOR, METEORA_DAMM_V2_SWAP2_DISCRIMINATOR, METEORA_DAMM_V2_SWAP_MODE_PARTIAL_FILL, METEORA_DAMM_V2_EVENT_AUTHORITY_SEED, METEORA_POOL_SIZE;
 var init_meteora_damm_v2_builder = __esm({
   "src/instruction/meteora_damm_v2_builder.ts"() {
     "use strict";
     import_web37 = require("@solana/web3.js");
     import_spl_token5 = require("@solana/spl-token");
+    SOL_TOKEN_ACCOUNT4 = new import_web37.PublicKey("So11111111111111111111111111111111111111111");
     METEORA_DAMM_V2_PROGRAM_ID = new import_web37.PublicKey(
       "cpamdpZCGKUy5JxQXB4dcpGPiikHawvSWAd6mEn1sGG"
     );
@@ -3531,25 +3823,36 @@ var init_meteora_damm_v2_builder = __esm({
       135,
       200
     ]);
+    METEORA_DAMM_V2_SWAP2_DISCRIMINATOR = Buffer.from([
+      65,
+      75,
+      63,
+      76,
+      235,
+      91,
+      91,
+      136
+    ]);
+    METEORA_DAMM_V2_SWAP_MODE_PARTIAL_FILL = 1;
     METEORA_DAMM_V2_EVENT_AUTHORITY_SEED = Buffer.from("__event_authority");
     METEORA_POOL_SIZE = 1104;
   }
 });
 
 // src/common/spl-token.ts
-var import_web38, TOKEN_PROGRAM_ID6, TOKEN_2022_PROGRAM_ID2, ASSOCIATED_TOKEN_PROGRAM_ID, TokenInstructionBuilder, TokenUtil, WSOL_MINT2, NATIVE_MINT6, USDC_MINT2, USDT_MINT;
+var import_web38, TOKEN_PROGRAM_ID5, TOKEN_2022_PROGRAM_ID2, ASSOCIATED_TOKEN_PROGRAM_ID, TokenInstructionBuilder, TokenUtil, WSOL_MINT2, NATIVE_MINT5, USDC_MINT2, USDT_MINT;
 var init_spl_token = __esm({
   "src/common/spl-token.ts"() {
     "use strict";
     import_web38 = require("@solana/web3.js");
-    TOKEN_PROGRAM_ID6 = new import_web38.PublicKey("TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA");
+    TOKEN_PROGRAM_ID5 = new import_web38.PublicKey("TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA");
     TOKEN_2022_PROGRAM_ID2 = new import_web38.PublicKey("TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb");
     ASSOCIATED_TOKEN_PROGRAM_ID = new import_web38.PublicKey("ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL");
     TokenInstructionBuilder = class {
       /**
        * Create InitializeMint instruction
        */
-      static initializeMint(mint, decimals, mintAuthority, freezeAuthority, tokenProgram = TOKEN_PROGRAM_ID6) {
+      static initializeMint(mint, decimals, mintAuthority, freezeAuthority, tokenProgram = TOKEN_PROGRAM_ID5) {
         const keys = [
           { pubkey: mint, isSigner: false, isWritable: true },
           { pubkey: import_web38.SYSVAR_RENT_PUBKEY, isSigner: false, isWritable: false }
@@ -3572,7 +3875,7 @@ var init_spl_token = __esm({
       /**
        * Create InitializeAccount instruction
        */
-      static initializeAccount(account, mint, owner, tokenProgram = TOKEN_PROGRAM_ID6) {
+      static initializeAccount(account, mint, owner, tokenProgram = TOKEN_PROGRAM_ID5) {
         const keys = [
           { pubkey: account, isSigner: false, isWritable: true },
           { pubkey: mint, isSigner: false, isWritable: false },
@@ -3589,7 +3892,7 @@ var init_spl_token = __esm({
       /**
        * Create Transfer instruction
        */
-      static transfer(source, destination, owner, amount, multiSigners = [], tokenProgram = TOKEN_PROGRAM_ID6) {
+      static transfer(source, destination, owner, amount, multiSigners = [], tokenProgram = TOKEN_PROGRAM_ID5) {
         const keys = [
           { pubkey: source, isSigner: false, isWritable: true },
           { pubkey: destination, isSigner: false, isWritable: true },
@@ -3612,7 +3915,7 @@ var init_spl_token = __esm({
       /**
        * Create TransferChecked instruction
        */
-      static transferChecked(source, mint, destination, owner, amount, decimals, multiSigners = [], tokenProgram = TOKEN_PROGRAM_ID6) {
+      static transferChecked(source, mint, destination, owner, amount, decimals, multiSigners = [], tokenProgram = TOKEN_PROGRAM_ID5) {
         const keys = [
           { pubkey: source, isSigner: false, isWritable: true },
           { pubkey: mint, isSigner: false, isWritable: false },
@@ -3637,7 +3940,7 @@ var init_spl_token = __esm({
       /**
        * Create MintTo instruction
        */
-      static mintTo(mint, destination, authority, amount, multiSigners = [], tokenProgram = TOKEN_PROGRAM_ID6) {
+      static mintTo(mint, destination, authority, amount, multiSigners = [], tokenProgram = TOKEN_PROGRAM_ID5) {
         const keys = [
           { pubkey: mint, isSigner: false, isWritable: true },
           { pubkey: destination, isSigner: false, isWritable: true },
@@ -3660,7 +3963,7 @@ var init_spl_token = __esm({
       /**
        * Create Burn instruction
        */
-      static burn(account, mint, owner, amount, multiSigners = [], tokenProgram = TOKEN_PROGRAM_ID6) {
+      static burn(account, mint, owner, amount, multiSigners = [], tokenProgram = TOKEN_PROGRAM_ID5) {
         const keys = [
           { pubkey: account, isSigner: false, isWritable: true },
           { pubkey: mint, isSigner: false, isWritable: true },
@@ -3683,7 +3986,7 @@ var init_spl_token = __esm({
       /**
        * Create Approve instruction
        */
-      static approve(account, delegate, owner, amount, multiSigners = [], tokenProgram = TOKEN_PROGRAM_ID6) {
+      static approve(account, delegate, owner, amount, multiSigners = [], tokenProgram = TOKEN_PROGRAM_ID5) {
         const keys = [
           { pubkey: account, isSigner: false, isWritable: true },
           { pubkey: delegate, isSigner: false, isWritable: false },
@@ -3706,7 +4009,7 @@ var init_spl_token = __esm({
       /**
        * Create Revoke instruction
        */
-      static revoke(account, owner, multiSigners = [], tokenProgram = TOKEN_PROGRAM_ID6) {
+      static revoke(account, owner, multiSigners = [], tokenProgram = TOKEN_PROGRAM_ID5) {
         const keys = [
           { pubkey: account, isSigner: false, isWritable: true },
           { pubkey: owner, isSigner: multiSigners.length === 0, isWritable: false },
@@ -3726,7 +4029,7 @@ var init_spl_token = __esm({
       /**
        * Create CloseAccount instruction
        */
-      static closeAccount(account, destination, owner, multiSigners = [], tokenProgram = TOKEN_PROGRAM_ID6) {
+      static closeAccount(account, destination, owner, multiSigners = [], tokenProgram = TOKEN_PROGRAM_ID5) {
         const keys = [
           { pubkey: account, isSigner: false, isWritable: true },
           { pubkey: destination, isSigner: false, isWritable: true },
@@ -3747,7 +4050,7 @@ var init_spl_token = __esm({
       /**
        * Create SyncNative instruction (for WSOL accounts)
        */
-      static syncNative(nativeAccount, tokenProgram = TOKEN_PROGRAM_ID6) {
+      static syncNative(nativeAccount, tokenProgram = TOKEN_PROGRAM_ID5) {
         const keys = [{ pubkey: nativeAccount, isSigner: false, isWritable: true }];
         const data = Buffer.from([17 /* SyncNative */]);
         return new import_web38.TransactionInstruction({
@@ -3761,7 +4064,7 @@ var init_spl_token = __esm({
       /**
        * Calculate associated token account address
        */
-      static async getAssociatedTokenAddress(mint, owner, _allowOwnerOffCurve = false, tokenProgram = TOKEN_PROGRAM_ID6, associatedTokenProgram = ASSOCIATED_TOKEN_PROGRAM_ID) {
+      static async getAssociatedTokenAddress(mint, owner, _allowOwnerOffCurve = false, tokenProgram = TOKEN_PROGRAM_ID5, associatedTokenProgram = ASSOCIATED_TOKEN_PROGRAM_ID) {
         const [address] = await import_web38.PublicKey.findProgramAddress(
           [owner.toBuffer(), tokenProgram.toBuffer(), mint.toBuffer()],
           associatedTokenProgram
@@ -3771,7 +4074,7 @@ var init_spl_token = __esm({
       /**
        * Create associated token account idempotent instruction
        */
-      static createAssociatedTokenAccountIdempotentInstruction(payer, associatedToken, owner, mint, tokenProgram = TOKEN_PROGRAM_ID6, associatedTokenProgram = ASSOCIATED_TOKEN_PROGRAM_ID) {
+      static createAssociatedTokenAccountIdempotentInstruction(payer, associatedToken, owner, mint, tokenProgram = TOKEN_PROGRAM_ID5, associatedTokenProgram = ASSOCIATED_TOKEN_PROGRAM_ID) {
         const keys = [
           { pubkey: payer, isSigner: true, isWritable: true },
           { pubkey: associatedToken, isSigner: false, isWritable: true },
@@ -3791,7 +4094,7 @@ var init_spl_token = __esm({
       /**
        * Create associated token account instruction
        */
-      static createAssociatedTokenAccountInstruction(payer, associatedToken, owner, mint, tokenProgram = TOKEN_PROGRAM_ID6, associatedTokenProgram = ASSOCIATED_TOKEN_PROGRAM_ID) {
+      static createAssociatedTokenAccountInstruction(payer, associatedToken, owner, mint, tokenProgram = TOKEN_PROGRAM_ID5, associatedTokenProgram = ASSOCIATED_TOKEN_PROGRAM_ID) {
         const keys = [
           { pubkey: payer, isSigner: true, isWritable: true },
           { pubkey: associatedToken, isSigner: false, isWritable: true },
@@ -3837,7 +4140,7 @@ var init_spl_token = __esm({
       }
     };
     WSOL_MINT2 = new import_web38.PublicKey("So11111111111111111111111111111111111111112");
-    NATIVE_MINT6 = new import_web38.PublicKey("So11111111111111111111111111111111111111111");
+    NATIVE_MINT5 = new import_web38.PublicKey("So11111111111111111111111111111111111111111");
     USDC_MINT2 = new import_web38.PublicKey("EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v");
     USDT_MINT = new import_web38.PublicKey("Es9vMFrzaCERmJfrF4H2FYD4KCoNkY11McCe8BenwNYB");
   }
@@ -4106,28 +4409,6 @@ var init_confirm_any_signature = __esm({
   }
 });
 
-// src/common/map-pool.ts
-async function mapWithConcurrencyLimit(items, concurrency, fn) {
-  if (items.length === 0) return [];
-  const limit = Math.max(1, Math.min(concurrency, items.length));
-  const results = new Array(items.length);
-  let next = 0;
-  const worker = async () => {
-    for (; ; ) {
-      const i = next++;
-      if (i >= items.length) return;
-      results[i] = await fn(items[i], i);
-    }
-  };
-  await Promise.all(Array.from({ length: limit }, () => worker()));
-  return results;
-}
-var init_map_pool = __esm({
-  "src/common/map-pool.ts"() {
-    "use strict";
-  }
-});
-
 // src/execution/execution.ts
 function instructionAccountCount(ix) {
   if (ix.keys !== void 0) return ix.keys.length;
@@ -4584,12 +4865,22 @@ var init_params = __esm({
       }
     };
     RaydiumAmmV4Params = class _RaydiumAmmV4Params {
-      constructor(amm, coinMint, pcMint, tokenCoin, tokenPc, coinReserve, pcReserve) {
+      constructor(amm, coinMint, pcMint, tokenCoin, tokenPc, ammOpenOrders, ammTargetOrders, serumProgram, serumMarket, serumBids, serumAsks, serumEventQueue, serumCoinVaultAccount, serumPcVaultAccount, serumVaultSigner, coinReserve, pcReserve) {
         this.amm = amm;
         this.coinMint = coinMint;
         this.pcMint = pcMint;
         this.tokenCoin = tokenCoin;
         this.tokenPc = tokenPc;
+        this.ammOpenOrders = ammOpenOrders;
+        this.ammTargetOrders = ammTargetOrders;
+        this.serumProgram = serumProgram;
+        this.serumMarket = serumMarket;
+        this.serumBids = serumBids;
+        this.serumAsks = serumAsks;
+        this.serumEventQueue = serumEventQueue;
+        this.serumCoinVaultAccount = serumCoinVaultAccount;
+        this.serumPcVaultAccount = serumPcVaultAccount;
+        this.serumVaultSigner = serumVaultSigner;
         this.coinReserve = coinReserve;
         this.pcReserve = pcReserve;
       }
@@ -4598,6 +4889,16 @@ var init_params = __esm({
       pcMint;
       tokenCoin;
       tokenPc;
+      ammOpenOrders;
+      ammTargetOrders;
+      serumProgram;
+      serumMarket;
+      serumBids;
+      serumAsks;
+      serumEventQueue;
+      serumCoinVaultAccount;
+      serumPcVaultAccount;
+      serumVaultSigner;
       coinReserve;
       pcReserve;
       static async fromAmmAddressByRpc(connection, amm) {
@@ -4605,16 +4906,35 @@ var init_params = __esm({
         if (!ammInfo) {
           throw new Error("Raydium AMM account not found");
         }
+        const marketState = await fetchMarketState(wrapConnection(connection), ammInfo.market);
+        if (!marketState) {
+          throw new Error("Raydium AMM market account not found");
+        }
+        const serumVaultSigner = deriveSerumVaultSigner(
+          ammInfo.serumDex,
+          ammInfo.market,
+          marketState.vaultSignerNonce
+        );
         const coinBal = await connection.getTokenAccountBalance(ammInfo.tokenCoin);
         const pcBal = await connection.getTokenAccountBalance(ammInfo.tokenPc);
-        const coinReserve = Number(coinBal.value.amount);
-        const pcReserve = Number(pcBal.value.amount);
+        const coinReserve = BigInt(coinBal.value.amount);
+        const pcReserve = BigInt(pcBal.value.amount);
         return new _RaydiumAmmV4Params(
           amm,
           ammInfo.coinMint,
           ammInfo.pcMint,
           ammInfo.tokenCoin,
           ammInfo.tokenPc,
+          ammInfo.openOrders,
+          ammInfo.targetOrders,
+          ammInfo.serumDex,
+          ammInfo.market,
+          marketState.serumBids,
+          marketState.serumAsks,
+          marketState.serumEventQueue,
+          marketState.serumCoinVaultAccount,
+          marketState.serumPcVaultAccount,
+          serumVaultSigner,
           coinReserve,
           pcReserve
         );
@@ -5243,20 +5563,30 @@ var init_executor = __esm({
           }
         };
         const promises = clients.map(submitToClient);
-        try {
-          const result = await Promise.any(promises);
-          return result;
-        } catch {
-          const results = await Promise.allSettled(promises);
-          const errors = results.filter((r) => r.status === "rejected").map((r) => r.reason);
-          return {
-            signature: "",
-            success: false,
-            error: `All parallel submissions failed: ${errors.join(", ")}`,
-            latencyMs: 0,
-            blockhashUsed: ""
-          };
+        const pending = new Map(
+          promises.map((promise, index) => [
+            index,
+            promise.then((result) => ({ index, result }))
+          ])
+        );
+        const errors = [];
+        while (pending.size > 0) {
+          const { index, result } = await Promise.race(pending.values());
+          pending.delete(index);
+          if (result.success) {
+            return result;
+          }
+          if (result.error) {
+            errors.push(`${result.swqosType ?? "unknown"}: ${result.error}`);
+          }
         }
+        return {
+          signature: "",
+          success: false,
+          error: `All parallel submissions failed${errors.length ? `: ${errors.join(", ")}` : ""}`,
+          latencyMs: 0,
+          blockhashUsed: ""
+        };
       }
       /**
        * Submit to SWQoS clients sequentially - NO RPC
@@ -9034,6 +9364,28 @@ var init_perf = __esm({
   }
 });
 
+// src/common/map-pool.ts
+async function mapWithConcurrencyLimit(items, concurrency, fn) {
+  if (items.length === 0) return [];
+  const limit = Math.max(1, Math.min(concurrency, items.length));
+  const results = new Array(items.length);
+  let next = 0;
+  const worker = async () => {
+    for (; ; ) {
+      const i = next++;
+      if (i >= items.length) return;
+      results[i] = await fn(items[i], i);
+    }
+  };
+  await Promise.all(Array.from({ length: limit }, () => worker()));
+  return results;
+}
+var init_map_pool = __esm({
+  "src/common/map-pool.ts"() {
+    "use strict";
+  }
+});
+
 // src/common/nonce.ts
 async function fetchDurableNonceInfo(connection, nonceAccount) {
   const account = await connection.getAccountInfo(nonceAccount);
@@ -11381,12 +11733,15 @@ __export(index_exports, {
   KNOWN_PROGRAM_IDS: () => KNOWN_PROGRAM_IDS,
   KeyNotAvailableError: () => KeyNotAvailableError,
   LoggingMiddleware: () => LoggingMiddleware,
+  MARKET_STATE_SIZE: () => MARKET_STATE_SIZE,
   MAX_INSTRUCTIONS_WARN: () => MAX_INSTRUCTIONS_WARN,
   METEORA_DAMM_V2_AUTHORITY: () => METEORA_DAMM_V2_AUTHORITY,
   METEORA_DAMM_V2_EVENT_AUTHORITY_SEED: () => METEORA_DAMM_V2_EVENT_AUTHORITY_SEED,
   METEORA_DAMM_V2_PROGRAM: () => METEORA_DAMM_V2_PROGRAM,
   METEORA_DAMM_V2_PROGRAM_ID: () => METEORA_DAMM_V2_PROGRAM_ID,
+  METEORA_DAMM_V2_SWAP2_DISCRIMINATOR: () => METEORA_DAMM_V2_SWAP2_DISCRIMINATOR,
   METEORA_DAMM_V2_SWAP_DISCRIMINATOR: () => METEORA_DAMM_V2_SWAP_DISCRIMINATOR,
+  METEORA_DAMM_V2_SWAP_MODE_PARTIAL_FILL: () => METEORA_DAMM_V2_SWAP_MODE_PARTIAL_FILL,
   METEORA_POOL_SIZE: () => METEORA_POOL_SIZE,
   MeteoraDammV2Executor: () => MeteoraDammV2Executor,
   MeteoraDammV2Params: () => MeteoraDammV2Params,
@@ -11532,18 +11887,21 @@ __export(index_exports, {
   createTradeConfig: () => createTradeConfig,
   decodeAmmInfo: () => decodeAmmInfo,
   decodeBonkPoolState: () => decodeBonkPoolState,
+  decodeMarketState: () => decodeMarketState,
   decodeMeteoraPool: () => decodeMeteoraPool,
   decodePool: () => decodePool,
   decodeRaydiumCPMMpoolState: () => decodeRaydiumCPMMpoolState,
   defaultExecuteOptions: () => defaultExecuteOptions,
   defaultHotPathConfig: () => defaultHotPathConfig,
   defaultTradeExecuteOptions: () => defaultTradeExecuteOptions,
+  deriveSerumVaultSigner: () => deriveSerumVaultSigner,
   extractHintsFromLogs: () => extractHintsFromLogs,
   fetchAddressLookupTableAccount: () => fetchAddressLookupTableAccount,
   fetchAmmInfo: () => fetchAmmInfo,
   fetchBondingCurveAccount: () => fetchBondingCurveAccount,
   fetchBonkPoolState: () => fetchBonkPoolState,
   fetchDurableNonceInfo: () => fetchDurableNonceInfo,
+  fetchMarketState: () => fetchMarketState,
   fetchMeteoraPool: () => fetchMeteoraPool,
   fetchPool: () => fetchPool,
   fetchRaydiumCPMMpoolState: () => fetchRaydiumCPMMpoolState,
@@ -11603,6 +11961,8 @@ __export(index_exports, {
   parseAddressLookupTable: () => parseAddressLookupTable,
   perf: () => perf_exports,
   pumpFunFeeRecipientMeta: () => pumpFunFeeRecipientMeta,
+  pumpFunParamsFromParserTrade: () => pumpFunParamsFromParserTrade,
+  pumpSwapParamsFromParserTrade: () => pumpSwapParamsFromParserTrade,
   recommendedSenderThreadCoreIndices: () => recommendedSenderThreadCoreIndices,
   retryWithBackoff: () => retryWithBackoff,
   signWithKeypair: () => signWithKeypair,
@@ -11620,6 +11980,88 @@ __export(index_exports, {
   withStandardMiddlewares: () => withStandardMiddlewares
 });
 module.exports = __toCommonJS(index_exports);
+function normalizeSwqosConfigs(rpcUrl, configs) {
+  if (configs.length === 0 || configs.some((c) => c.type === "Default" /* Default */)) {
+    return configs;
+  }
+  return [
+    ...configs,
+    {
+      type: "Default" /* Default */,
+      region: "Default" /* Default */,
+      apiKey: "",
+      customUrl: rpcUrl
+    }
+  ];
+}
+function parserPublicKey(value) {
+  if (!value) return import_web321.PublicKey.default;
+  if (value instanceof import_web321.PublicKey) return value;
+  if (value === import_web321.PublicKey.default.toBase58()) return import_web321.PublicKey.default;
+  return new import_web321.PublicKey(value);
+}
+function pumpFunQuoteMintForLayout(quoteMint) {
+  if (quoteMint.equals(import_web321.PublicKey.default) || quoteMint.equals(CONSTANTS.SOL_TOKEN_ACCOUNT)) {
+    return import_web321.PublicKey.default;
+  }
+  return quoteMint;
+}
+function parserU64(value) {
+  if (value === void 0 || value === null || value === "") return 0;
+  const n = typeof value === "bigint" ? value : BigInt(value);
+  if (n > BigInt(Number.MAX_SAFE_INTEGER)) {
+    throw new TradeError(106, `parser u64 value ${n.toString()} exceeds JavaScript safe integer range`);
+  }
+  return Number(n);
+}
+function pumpFunParamsFromParserTrade(event, closeTokenAccountWhenSell) {
+  const quoteMint = parserPublicKey(event.quote_mint);
+  const legacySolQuote = quoteMint.equals(import_web321.PublicKey.default) || quoteMint.equals(CONSTANTS.SOL_TOKEN_ACCOUNT);
+  const hasVirtualQuote = event.virtual_quote_reserves !== void 0;
+  const hasRealQuote = event.real_quote_reserves !== void 0;
+  const virtualQuote = !legacySolQuote && hasVirtualQuote ? parserU64(event.virtual_quote_reserves) : parserU64(event.virtual_sol_reserves);
+  const realQuote = !legacySolQuote && hasRealQuote ? parserU64(event.real_quote_reserves) : parserU64(event.real_sol_reserves);
+  const creator = parserPublicKey(event.creator);
+  return {
+    bondingCurve: {
+      discriminator: 0,
+      account: parserPublicKey(event.bonding_curve),
+      virtualTokenReserves: parserU64(event.virtual_token_reserves),
+      virtualSolReserves: virtualQuote,
+      realTokenReserves: parserU64(event.real_token_reserves),
+      realSolReserves: realQuote,
+      tokenTotalSupply: 0,
+      complete: false,
+      creator,
+      isMayhemMode: !!event.mayhem_mode,
+      isCashbackCoin: !!event.is_cashback_coin
+    },
+    associatedBondingCurve: parserPublicKey(event.associated_bonding_curve),
+    creatorVault: parserPublicKey(event.creator_vault),
+    tokenProgram: parserPublicKey(event.token_program),
+    closeTokenAccountWhenSell,
+    feeRecipient: parserPublicKey(event.fee_recipient),
+    quoteMint: pumpFunQuoteMintForLayout(quoteMint),
+    observedTradeCreator: creator.equals(import_web321.PublicKey.default) ? void 0 : creator
+  };
+}
+function pumpSwapParamsFromParserTrade(event) {
+  return {
+    pool: parserPublicKey(event.pool),
+    baseMint: parserPublicKey(event.base_mint),
+    quoteMint: parserPublicKey(event.quote_mint),
+    poolBaseTokenAccount: parserPublicKey(event.pool_base_token_account),
+    poolQuoteTokenAccount: parserPublicKey(event.pool_quote_token_account),
+    poolBaseTokenReserves: parserU64(event.pool_base_token_reserves),
+    poolQuoteTokenReserves: parserU64(event.pool_quote_token_reserves),
+    coinCreatorVaultAta: parserPublicKey(event.coin_creator_vault_ata),
+    coinCreatorVaultAuthority: parserPublicKey(event.coin_creator_vault_authority),
+    baseTokenProgram: parserPublicKey(event.base_token_program),
+    quoteTokenProgram: parserPublicKey(event.quote_token_program),
+    isMayhemMode: !!event.is_mayhem_mode,
+    isCashbackCoin: !!event.is_cashback_coin
+  };
+}
 function recommendedSenderThreadCoreIndices(swqosCount, availableCores = (0, import_node_os.cpus)().length, fromEnd = true) {
   if (swqosCount <= 0 || availableCores <= 0) {
     return [];
@@ -11657,8 +12099,7 @@ function mapPumpFunParams(p) {
     feeSharingCreatorVaultIfActive: p.feeSharingCreatorVaultIfActive,
     closeTokenAccountWhenSell: p.closeTokenAccountWhenSell,
     feeRecipient: p.feeRecipient,
-    quoteMint: p.quoteMint,
-    useV2Ix: p.useV2Ix
+    quoteMint: p.quoteMint
   };
 }
 async function findPoolByMint2(connection, mint, dexType) {
@@ -11752,7 +12193,24 @@ function gasConfigFromStrategyValue(value, tradeType) {
     sellTipLamports: !isBuy ? tipLam : 0
   };
 }
-function expandSwqosGasTasks(effectiveSwqos, tradeType, execGas, configGas, gasStrategy, useStrategyRowMinTip, checkMinTip, withTip, swqosMod, mevProtection, rpcUrl, logEnabled) {
+async function collectUntilFirstSuccess(promises, isSuccess) {
+  if (promises.length === 0) return [];
+  const results = [];
+  const pending = new Map(
+    promises.map((promise, index) => [
+      index,
+      promise.then((result) => ({ index, result }))
+    ])
+  );
+  while (pending.size > 0) {
+    const { index, result } = await Promise.race(pending.values());
+    pending.delete(index);
+    results.push(result);
+    if (isSuccess(result)) return results;
+  }
+  return results;
+}
+function expandSwqosGasTasks(effectiveSwqos, tradeType, execGas, configGas, gasStrategy, useStrategyRowMinTip, checkMinTip, withTip, swqosMod, mevProtection, rpcUrl, logEnabled, getClient) {
   const out = [];
   if (execGas || configGas) {
     for (const cfg of effectiveSwqos) {
@@ -11777,10 +12235,7 @@ function expandSwqosGasTasks(effectiveSwqos, tradeType, execGas, configGas, gasS
       for (const row of matching) {
         const tipLamports = Math.floor(row.value.tip * 1e9);
         if (checkMinTip && withTip && cfg.type !== "Default" /* Default */) {
-          const client = swqosMod.ClientFactory.createClient(
-            mapSwqosToClientConfig(cfg, mevProtection),
-            rpcUrl
-          );
+          const client = getClient?.(cfg) ?? swqosMod.ClientFactory.createClient(mapSwqosToClientConfig(cfg, mevProtection), rpcUrl);
           const minLamports = Math.ceil(client.minTipSol() * 1e9);
           if (tipLamports < minLamports) {
             if (logEnabled) {
@@ -11818,7 +12273,7 @@ function filterSwqosConfigsForWithTip(configs, withTip) {
   if (withTip) return configs;
   return configs.filter((c) => c.type === "Default" /* Default */);
 }
-function filterSwqosConfigsByMinTip(swqosMod, configs, tradeType, gas, mevProtection, rpcUrl, logEnabled) {
+function filterSwqosConfigsByMinTip(swqosMod, configs, tradeType, gas, mevProtection, rpcUrl, logEnabled, getClient) {
   const tipLamports = gas ? tradeType === "Buy" /* Buy */ ? gas.buyTipLamports : gas.sellTipLamports : 0;
   const out = [];
   for (const cfg of configs) {
@@ -11826,10 +12281,7 @@ function filterSwqosConfigsByMinTip(swqosMod, configs, tradeType, gas, mevProtec
       out.push(cfg);
       continue;
     }
-    const client = swqosMod.ClientFactory.createClient(
-      mapSwqosToClientConfig(cfg, mevProtection),
-      rpcUrl
-    );
+    const client = getClient?.(cfg) ?? swqosMod.ClientFactory.createClient(mapSwqosToClientConfig(cfg, mevProtection), rpcUrl);
     const minLamports = Math.ceil(client.minTipSol() * 1e9);
     if (tipLamports < minLamports) {
       if (logEnabled) {
@@ -11843,13 +12295,10 @@ function filterSwqosConfigsByMinTip(swqosMod, configs, tradeType, gas, mevProtec
   }
   return out;
 }
-function resolveTipRecipientPubkey(swqosMod, configs, mevProtection, rpcUrl) {
+function resolveTipRecipientPubkey(swqosMod, configs, mevProtection, rpcUrl, getClient) {
   const preferred = configs.find((c) => c.type !== "Default" /* Default */) ?? configs[0];
   if (!preferred) return null;
-  const client = swqosMod.ClientFactory.createClient(
-    mapSwqosToClientConfig(preferred, mevProtection),
-    rpcUrl
-  );
+  const client = getClient?.(preferred) ?? swqosMod.ClientFactory.createClient(mapSwqosToClientConfig(preferred, mevProtection), rpcUrl);
   const acc = client.getTipAccount();
   if (!acc) return null;
   try {
@@ -11865,7 +12314,7 @@ function createTradeConfig(rpcUrl, swqosConfigs = [], options) {
   const { commitment, logEnabled, ...rest } = options ?? {};
   return {
     rpcUrl,
-    swqosConfigs,
+    swqosConfigs: normalizeSwqosConfigs(rpcUrl, swqosConfigs),
     ...rest,
     commitment: commitment ?? "confirmed",
     logEnabled: logEnabled ?? true
@@ -11887,7 +12336,6 @@ var init_index = __esm({
     init_wsol_manager();
     init_compute_budget();
     init_confirm_any_signature();
-    init_map_pool();
     init_execution();
     init_sdk_errors();
     init_sdk_errors();
@@ -11983,7 +12431,6 @@ var init_index = __esm({
       _checkMinTip = false;
       _mevProtection = false;
       _useSeedOptimize = true;
-      _usePumpfunV2 = false;
       _swqosCoresFromEnd = true;
       _createWsolAtaOnStartup = false;
       _gasFeeStrategy;
@@ -11997,7 +12444,7 @@ var init_index = __esm({
         return new _TradeConfigBuilder(rpcUrl);
       }
       swqosConfigs(configs) {
-        this._swqosConfigs = configs;
+        this._swqosConfigs = normalizeSwqosConfigs(this._rpcUrl, configs);
         return this;
       }
       commitment(commitment) {
@@ -12026,10 +12473,6 @@ var init_index = __esm({
         this._useSeedOptimize = enabled;
         return this;
       }
-      usePumpfunV2(enabled) {
-        this._usePumpfunV2 = enabled;
-        return this;
-      }
       swqosCoresFromEnd(enabled) {
         this._swqosCoresFromEnd = enabled;
         return this;
@@ -12061,13 +12504,12 @@ var init_index = __esm({
       build() {
         return {
           rpcUrl: this._rpcUrl,
-          swqosConfigs: this._swqosConfigs,
+          swqosConfigs: normalizeSwqosConfigs(this._rpcUrl, this._swqosConfigs),
           commitment: this._commitment,
           logEnabled: this._logEnabled,
           checkMinTip: this._checkMinTip,
           mevProtection: this._mevProtection,
           useSeedOptimize: this._useSeedOptimize,
-          usePumpfunV2: this._usePumpfunV2,
           swqosCoresFromEnd: this._swqosCoresFromEnd,
           createWsolAtaOnStartup: this._createWsolAtaOnStartup,
           gasFeeStrategy: this._gasFeeStrategy,
@@ -12077,7 +12519,7 @@ var init_index = __esm({
         };
       }
     };
-    SWQOS_SUBMIT_TIMEOUT_MS_WHEN_NO_CONFIRM = 2e3;
+    SWQOS_SUBMIT_TIMEOUT_MS_WHEN_NO_CONFIRM = 5e3;
     RUST_PARITY_SIMULATE_CONFIG = {
       sigVerify: false,
       replaceRecentBlockhash: false,
@@ -12090,14 +12532,48 @@ var init_index = __esm({
       _config;
       middlewares = [];
       _logEnabled;
+      _swqosModulePromise;
+      _swqosClientCache = /* @__PURE__ */ new Map();
       constructor(payer, config) {
         this.payer = payer;
-        this._config = config;
+        this._config = {
+          ...config,
+          swqosConfigs: normalizeSwqosConfigs(config.rpcUrl, config.swqosConfigs ?? [])
+        };
         this.connection = new import_web321.Connection(config.rpcUrl, {
           commitment: config.commitment ?? "confirmed"
         });
         this._logEnabled = config.logEnabled ?? true;
       }
+      getSwqosModule() {
+        this._swqosModulePromise ??= Promise.resolve().then(() => (init_clients(), clients_exports));
+        return this._swqosModulePromise;
+      }
+      swqosClientCacheKey(cfg) {
+        return JSON.stringify([
+          this._config.rpcUrl,
+          this._config.mevProtection ?? false,
+          cfg.type,
+          cfg.region ?? null,
+          cfg.customUrl ?? null,
+          cfg.apiKey ?? null,
+          cfg.transport ?? null,
+          cfg.astralaneTransport ?? null,
+          cfg.swqosOnly ?? null,
+          cfg.mevProtection ?? null
+        ]);
+      }
+      getSwqosClient(swqosMod, cfg) {
+        const key = this.swqosClientCacheKey(cfg);
+        const cached = this._swqosClientCache.get(key);
+        if (cached) return cached;
+        const client = swqosMod.ClientFactory.createClient(
+          mapSwqosToClientConfig(cfg, this._config.mevProtection),
+          this._config.rpcUrl
+        );
+        this._swqosClientCache.set(key, client);
+        return client;
+      }
       /** Get the current configuration */
       get config() {
         return this._config;
@@ -12332,9 +12808,10 @@ var init_index = __esm({
               fixedOutputAmount: params.fixedOutputTokenAmount !== void 0 ? BigInt(params.fixedOutputTokenAmount) : void 0,
               createOutputMintAta: params.createMintAta ?? true,
               createInputMintAta: params.createInputTokenAta ?? false,
+              closeInputMintAta: params.closeInputTokenAta ?? false,
               protocolParams: mapPumpFunParams(ext.params),
               useExactSolAmount: params.useExactSolAmount ?? true,
-              usePumpFunV2: this._config.usePumpfunV2 ?? ext.params.useV2Ix ?? false
+              inputMint: this.getInputMint(params.inputTokenType)
             });
           }
           case "PumpSwap" /* PumpSwap */: {
@@ -12433,8 +12910,18 @@ var init_index = __esm({
               pcMint: p.pcMint,
               tokenCoin: p.tokenCoin,
               tokenPc: p.tokenPc,
-              coinReserve: BigInt(p.coinReserve),
-              pcReserve: BigInt(p.pcReserve)
+              ammOpenOrders: p.ammOpenOrders,
+              ammTargetOrders: p.ammTargetOrders,
+              serumProgram: p.serumProgram,
+              serumMarket: p.serumMarket,
+              serumBids: p.serumBids,
+              serumAsks: p.serumAsks,
+              serumEventQueue: p.serumEventQueue,
+              serumCoinVaultAccount: p.serumCoinVaultAccount,
+              serumPcVaultAccount: p.serumPcVaultAccount,
+              serumVaultSigner: p.serumVaultSigner,
+              coinReserve: p.coinReserve,
+              pcReserve: p.pcReserve
             };
             return buildRaydiumAmmV4BuyInstructions({
               payer: this.payer.publicKey,
@@ -12500,7 +12987,7 @@ var init_index = __esm({
               closeInputMintAta: params.closeMintTokenAta ?? false,
               createOutputMintAta: params.createOutputTokenAta ?? false,
               protocolParams: mapPumpFunParams(ext.params),
-              usePumpFunV2: this._config.usePumpfunV2 ?? ext.params.useV2Ix ?? false
+              outputMint: this.getOutputMint(params.outputTokenType)
             });
           }
           case "PumpSwap" /* PumpSwap */: {
@@ -12598,12 +13085,23 @@ var init_index = __esm({
               pcMint: p.pcMint,
               tokenCoin: p.tokenCoin,
               tokenPc: p.tokenPc,
-              coinReserve: BigInt(p.coinReserve),
-              pcReserve: BigInt(p.pcReserve)
+              ammOpenOrders: p.ammOpenOrders,
+              ammTargetOrders: p.ammTargetOrders,
+              serumProgram: p.serumProgram,
+              serumMarket: p.serumMarket,
+              serumBids: p.serumBids,
+              serumAsks: p.serumAsks,
+              serumEventQueue: p.serumEventQueue,
+              serumCoinVaultAccount: p.serumCoinVaultAccount,
+              serumPcVaultAccount: p.serumPcVaultAccount,
+              serumVaultSigner: p.serumVaultSigner,
+              coinReserve: p.coinReserve,
+              pcReserve: p.pcReserve
             };
             return buildRaydiumAmmV4SellInstructions({
               payer: this.payer.publicKey,
               inputMint: params.mint,
+              outputMint: this.getOutputMint(params.outputTokenType),
               inputAmount: inputAmt,
               slippageBasisPoints: slippage,
               fixedOutputAmount: params.fixedOutputTokenAmount !== void 0 ? BigInt(params.fixedOutputTokenAmount) : void 0,
@@ -12679,11 +13177,23 @@ var init_index = __esm({
         return result;
       }
       async executeTransaction(instructions, recentBlockhash, lookupTableAccount, waitConfirmed, simulate, execCtx) {
-        const blockhash = recentBlockhash ?? execCtx?.durableNonce?.nonceHash ?? (await this.connection.getLatestBlockhash(this.rpcCommitment())).blockhash;
+        const blockhash = recentBlockhash ?? execCtx?.durableNonce?.nonceHash;
+        if (!blockhash) {
+          return {
+            success: false,
+            signatures: [],
+            error: new TradeError(
+              105,
+              "recentBlockhash or durableNonce.nonceHash is required; trade execution hot path does not query RPC for blockhash"
+            ),
+            timings: []
+          };
+        }
         const swqosList = this._config.swqosConfigs ?? [];
         const tradeType = execCtx?.tradeType ?? "Buy" /* Buy */;
         const withTip = execCtx?.withTip ?? true;
-        const swqosMod = swqosList.length > 0 ? await Promise.resolve().then(() => (init_clients(), clients_exports)) : null;
+        const swqosMod = swqosList.length > 0 ? await this.getSwqosModule() : null;
+        const swqosClientForConfig = swqosMod ? (cfg) => this.getSwqosClient(swqosMod, cfg) : void 0;
         let effectiveSwqos = swqosList;
         if (swqosMod && !withTip) {
           effectiveSwqos = filterSwqosConfigsForWithTip(swqosList, withTip);
@@ -12715,7 +13225,8 @@ var init_index = __esm({
             gasMerged,
             this._config.mevProtection,
             this._config.rpcUrl,
-            this._logEnabled
+            this._logEnabled,
+            swqosClientForConfig
           );
           if (effectiveSwqos.length === 0) {
             return {
@@ -12749,7 +13260,8 @@ var init_index = __esm({
             swqosMod,
             this._config.mevProtection,
             this._config.rpcUrl,
-            this._logEnabled
+            this._logEnabled,
+            swqosClientForConfig
           );
           if (swqosTasks.length === 0) {
             return {
@@ -12811,7 +13323,8 @@ var init_index = __esm({
                 swqosMod,
                 [t.cfg],
                 this._config.mevProtection,
-                this._config.rpcUrl
+                this._config.rpcUrl,
+                swqosClientForConfig
               ) : null;
               const txSim2 = buildSignedVersionedTransaction(
                 this.payer,
@@ -12866,17 +13379,15 @@ var init_index = __esm({
           if (swqosMod) {
             const timings = [];
             const signatures = [];
-            const submitConcurrency = this._config.maxSwqosSubmitConcurrency ?? swqosTasks.length;
-            const results = await mapWithConcurrencyLimit(
-              swqosTasks,
-              submitConcurrency,
-              async (task) => {
-                const t0 = performance.now();
+            const submitTask = async (task) => {
+              const t0 = performance.now();
+              try {
                 const tipPk = withTip ? resolveTipRecipientPubkey(
                   swqosMod,
                   [task.cfg],
                   this._config.mevProtection,
-                  this._config.rpcUrl
+                  this._config.rpcUrl,
+                  swqosClientForConfig
                 ) : null;
                 const tx = buildSignedVersionedTransaction(
                   this.payer,
@@ -12885,33 +13396,30 @@ var init_index = __esm({
                   lookupTableAccount
                 );
                 const raw = Buffer.from(tx.serialize());
-                const client = swqosMod.ClientFactory.createClient(
-                  mapSwqosToClientConfig(task.cfg, this._config.mevProtection),
-                  this._config.rpcUrl
-                );
-                try {
-                  const pending = client.sendTransaction(tradeType, raw, false);
-                  const sig = await (!waitConfirmed ? Promise.race([
-                    pending,
-                    new Promise(
-                      (_, reject) => setTimeout(
-                        () => reject(
-                          new Error(
-                            `SWQOS submit timed out after ${SWQOS_SUBMIT_TIMEOUT_MS_WHEN_NO_CONFIRM}ms`
-                          )
-                        ),
-                        SWQOS_SUBMIT_TIMEOUT_MS_WHEN_NO_CONFIRM
-                      )
+                const client = swqosClientForConfig(task.cfg);
+                const pending = client.sendTransaction(tradeType, raw, false);
+                const sig = await (!waitConfirmed ? Promise.race([
+                  pending,
+                  new Promise(
+                    (_, reject) => setTimeout(
+                      () => reject(
+                        new Error(
+                          `SWQOS submit timed out after ${SWQOS_SUBMIT_TIMEOUT_MS_WHEN_NO_CONFIRM}ms`
+                        )
+                      ),
+                      SWQOS_SUBMIT_TIMEOUT_MS_WHEN_NO_CONFIRM
                     )
-                  ]) : pending);
-                  const duration = Math.round((performance.now() - t0) * 1e3);
-                  return { ok: true, sig, task, duration };
-                } catch (e) {
-                  const duration = Math.round((performance.now() - t0) * 1e3);
-                  return { ok: false, err: e, task, duration };
-                }
+                  )
+                ]) : pending);
+                const duration = Math.round((performance.now() - t0) * 1e3);
+                return { ok: true, sig, task, duration };
+              } catch (e) {
+                const duration = Math.round((performance.now() - t0) * 1e3);
+                return { ok: false, err: e, task, duration };
               }
-            );
+            };
+            const submitPromises = swqosTasks.map((task) => submitTask(task));
+            const results = waitConfirmed ? await Promise.all(submitPromises) : await collectUntilFirstSuccess(submitPromises, (result) => result.ok);
             for (const v of results) {
               timings.push({
                 swqosType: v.task.cfg.type,
@@ -12919,7 +13427,7 @@ var init_index = __esm({
                 gasFeeStrategyType: v.task.strategyType
               });
               if (v.ok) {
-                signatures.push(v.sig);
+                if (v.sig) signatures.push(v.sig);
               }
             }
             const success = signatures.length > 0;
@@ -13025,12 +13533,15 @@ init_index();
   KNOWN_PROGRAM_IDS,
   KeyNotAvailableError,
   LoggingMiddleware,
+  MARKET_STATE_SIZE,
   MAX_INSTRUCTIONS_WARN,
   METEORA_DAMM_V2_AUTHORITY,
   METEORA_DAMM_V2_EVENT_AUTHORITY_SEED,
   METEORA_DAMM_V2_PROGRAM,
   METEORA_DAMM_V2_PROGRAM_ID,
+  METEORA_DAMM_V2_SWAP2_DISCRIMINATOR,
   METEORA_DAMM_V2_SWAP_DISCRIMINATOR,
+  METEORA_DAMM_V2_SWAP_MODE_PARTIAL_FILL,
   METEORA_POOL_SIZE,
   MeteoraDammV2Executor,
   MeteoraDammV2Params,
@@ -13176,18 +13687,21 @@ init_index();
   createTradeConfig,
   decodeAmmInfo,
   decodeBonkPoolState,
+  decodeMarketState,
   decodeMeteoraPool,
   decodePool,
   decodeRaydiumCPMMpoolState,
   defaultExecuteOptions,
   defaultHotPathConfig,
   defaultTradeExecuteOptions,
+  deriveSerumVaultSigner,
   extractHintsFromLogs,
   fetchAddressLookupTableAccount,
   fetchAmmInfo,
   fetchBondingCurveAccount,
   fetchBonkPoolState,
   fetchDurableNonceInfo,
+  fetchMarketState,
   fetchMeteoraPool,
   fetchPool,
   fetchRaydiumCPMMpoolState,
@@ -13247,6 +13761,8 @@ init_index();
   parseAddressLookupTable,
   perf,
   pumpFunFeeRecipientMeta,
+  pumpFunParamsFromParserTrade,
+  pumpSwapParamsFromParserTrade,
   recommendedSenderThreadCoreIndices,
   retryWithBackoff,
   signWithKeypair,