@0dotxyz/p0-ts-sdk 2.8.3-alpha.0 → 2.8.3

package/dist/index.cjs

@@ -54892,8 +54892,6 @@ var SWAP_ADAPTERS = {
 function getSwapAdapter(provider) {
   return SWAP_ADAPTERS[provider];
 }
-
-// src/services/account/services/swap-engine/swap-engine.service.ts
 function resolveAdapters(req, predicate) {
   const resolved = [];
   for (const entry of req.providers) {
@@ -54937,7 +54935,18 @@ async function runSwapEngine(req) {
       failures.join("; ") || "No swap route available"
     );
   }
-  const candidates = routes.map((route) => annotateFit(route, req));
+  const wsolAta = getAssociatedTokenAddressSync(NATIVE_MINT, req.taker, true);
+  const isProviderSolWrapIx = (ix) => ix.programId.equals(web3_js.SystemProgram.programId) && ix.data.length >= 12 && ix.data.readUInt32LE(0) === 2 && ix.keys[0]?.pubkey.equals(req.taker) && ix.keys[1]?.pubkey.equals(wsolAta) || ix.programId.equals(TOKEN_PROGRAM_ID) && (ix.data[0] === 17 /* SyncNative */ || ix.data[0] === 9 /* CloseAccount */) && ix.keys[0]?.pubkey.equals(wsolAta);
+  const candidates = routes.map(
+    (route) => annotateFit(
+      {
+        ...route,
+        swapInstructions: route.swapInstructions.filter((ix) => !isProviderSolWrapIx(ix)),
+        setupInstructions: route.setupInstructions.filter((ix) => !isProviderSolWrapIx(ix))
+      },
+      req
+    )
+  );
   const fitting = candidates.filter((c) => c.fits && c.outAmountNative.gtn(0));
   if (fitting.length === 0) {
     const closest = candidates.reduce((best, c) => c.fullTxSize < best.fullTxSize ? c : best);
@@ -55032,6 +55041,7 @@ async function makeEndFlashLoanIx3(program, marginfiAccountPk, group, projectedA
     program,
     {
       marginfiAccount: marginfiAccountPk,
+      group,
       authority
     },
     remainingAccounts.map((account) => ({