four-flap-meme-sdk 1.6.66 → 1.6.67

package/dist/xlayer/dex-bundle-swap.js

@@ -203,10 +203,9 @@ export class AADexSwapExecutor {
         initIfNeeded(buyerSender, !!buyerAi?.deployed, buyerOwner.address);
         const decimals = await this.bundleExecutor['getErc20Decimals'](tokenAddress);
         const sellerTokenBal = await this.aaManager.getErc20Balance(tokenAddress, sellerSender);
-        // ✅ 当 sellPercent = 100 时直接使用完整余额，避免精度损失
         const sellAmountWei = sellAmount
             ? ethers.parseUnits(String(sellAmount), decimals)
-            : (sellPercent >= 100 ? sellerTokenBal : (sellerTokenBal * BigInt(sellPercent)) / 100n);
+            : (sellerTokenBal * BigInt(sellPercent)) / 100n;
         if (sellAmountWei <= 0n)
             throw new Error('卖出数量无效');
         // 授权检查
@@ -472,10 +471,9 @@ export class AADexSwapExecutor {
         }
         const decimals = await this.bundleExecutor['getErc20Decimals'](tokenAddress);
         const sellerTokenBal = await this.aaManager.getErc20Balance(tokenAddress, sellerAi.sender);
-        // ✅ 当 sellPercent = 100 时直接使用完整余额，避免精度损失
         const sellAmountWei = sellAmount
             ? ethers.parseUnits(String(sellAmount), decimals)
-            : (sellPercent >= 100 ? sellerTokenBal : (sellerTokenBal * BigInt(sellPercent)) / 100n);
+            : (sellerTokenBal * BigInt(sellPercent)) / 100n;
         let needApprove = false;
         if (!skipApprovalCheck) {
             const allowance = await this.aaManager.getErc20Allowance(tokenAddress, sellerAi.sender, effectiveRouter);
@@ -586,32 +584,19 @@ export class AADexSwapExecutor {
         const totalBuyerPrefundWithBuffer = (useNativeToken && capitalMode)
             ? buyerAis.reduce((sum, ai) => sum + estimateBuyerPrefundWithBuffer(ai.deployed), 0n)
             : 0n;
-        // ✅ 计算利润（不再压缩到"卖出-买入-prefund"上限，按配置直接刮取）
-        let profitWei = extractProfit ? calculateProfitWei(quotedSellOutWei, profitBps) : 0n;
-        // ✅ 关键修复：如果分发总额 > 预估卖出所得，按比例缩减分发金额
-        // 这样可以避免 seller 需要用自己的 OKB 补贴分发
+        // ✅ 计算利润（不再压缩到“卖出-买入-prefund”上限，按配置直接刮取）
+        const profitWei = extractProfit ? calculateProfitWei(quotedSellOutWei, profitBps) : 0n;
+        // 资金充足性提示：不再阻断，记录警告后继续分发
         const totalDistributeNeeded = totalBuyWei + totalBuyerPrefundWithBuffer + profitWei;
-        let adjustedBuyAmountsWei = buyAmountsWei;
-        let adjustedProfitWei = profitWei;
         if (quotedSellOutWei > 0n && totalDistributeNeeded > quotedSellOutWei) {
-            // 计算缩减比例，留 5% 安全边际给 seller 的 prefund
-            const safeQuoted = (quotedSellOutWei * 95n) / 100n; // 留 5% 给 seller prefund
-            const scaleRatio = safeQuoted > 0n ? (safeQuoted * 10000n) / totalDistributeNeeded : 0n;
-            // 按比例缩减 buyAmounts
-            adjustedBuyAmountsWei = buyAmountsWei.map(w => (w * scaleRatio) / 10000n);
-            const adjustedTotalBuyWei = adjustedBuyAmountsWei.reduce((a, b) => a + b, 0n);
-            // 按比例缩减 profit
-            adjustedProfitWei = (profitWei * scaleRatio) / 10000n;
-            console.warn('[AA DEX 批量换手] ⚠️ 分发金额超过预估卖出，已按比例缩减:', {
+            console.warn('[AA DEX 批量换手] ⚠️ 预估卖出金额不足，仍继续分发:', {
                 quotedSellOutWei: ethers.formatEther(quotedSellOutWei),
-                originalTotalBuyWei: ethers.formatEther(totalBuyWei),
-                adjustedTotalBuyWei: ethers.formatEther(adjustedTotalBuyWei),
-                originalProfitWei: ethers.formatEther(profitWei),
-                adjustedProfitWei: ethers.formatEther(adjustedProfitWei),
-                scaleRatio: `${Number(scaleRatio) / 100}%`,
+                totalBuyWei: ethers.formatEther(totalBuyWei),
+                totalBuyerPrefund: ethers.formatEther(totalBuyerPrefundWithBuffer),
+                profitWei: ethers.formatEther(profitWei),
+                totalNeeded: ethers.formatEther(totalDistributeNeeded),
+                shortfall: ethers.formatEther(totalDistributeNeeded - quotedSellOutWei),
             });
-            // 更新变量
-            profitWei = adjustedProfitWei;
         }
         // ✅ 利润在分发阶段通过 AA 内部刮取
         // ✅ 资金分发逻辑（仅 capitalMode=true 时执行，对应 BSC flapQuickBatchSwapMerkle）
@@ -698,7 +683,7 @@ export class AADexSwapExecutor {
                 // - 原生代币模式：分发金额 = 买入金额 + 买方 prefund
                 // - ERC20 模式：只分发 ERC20 代币，prefund 需要 buyer 自己有 OKB
                 const items = buyerSenders.map((to, i) => {
-                    const buyAmount = adjustedBuyAmountsWei[i] ?? 0n;
+                    const buyAmount = buyAmountsWei[i] ?? 0n;
                     const prefund = buyerPrefunds[i] ?? 0n;
                     return {
                         to,
@@ -870,7 +855,7 @@ export class AADexSwapExecutor {
                     const chainHops = allGeneratedHopWallets[buyerIdx];
                     const buyerSender = buyerSenders[buyerIdx];
                     const buyerAi = buyerAis[buyerIdx];
-                    const buyAmount = adjustedBuyAmountsWei[buyerIdx] ?? 0n;
+                    const buyAmount = buyAmountsWei[buyerIdx] ?? 0n;
                     if (buyAmount <= 0n)
                         continue;
                     // ✅ 计算 buyer 的 prefund（用于买入，使用常量）
@@ -1016,7 +1001,7 @@ export class AADexSwapExecutor {
         // 不使用 exactOutput，因为卖出后价格下跌，可能导致 OKB 不够买回目标数量
         for (let i = 0; i < buyerOwners.length; i++) {
             const ai = buyerAis[i];
-            const buyWei = adjustedBuyAmountsWei[i]; // 分发给买家的 OKB 金额（已按比例调整）
+            const buyWei = buyAmountsWei[i]; // 分发给买家的 OKB 金额
             let buyCallData;
             if (useNativeToken) {
                 // ✅ 原生代币模式：OKB → Token

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "four-flap-meme-sdk",
-  "version": "1.6.66",
+  "version": "1.6.67",
   "description": "SDK for Flap bonding curve and four.meme TokenManager",
   "type": "module",
   "main": "dist/index.js",