four-flap-meme-sdk 1.7.55 → 1.7.56

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

@@ -683,9 +683,52 @@ export async function bundleMultiSwap(params) {
         provider.getFeeData(),
         Promise.all(sellerWallets.map(w => tokenContract.balanceOf(w.address))),
     ]);
-    // 计算每个卖家的卖出金额（按百分比）
+    // ✅ 修复：获取卖出报价预估（用于买卖对等刷量），增加稳健性 fallback
+    let estimatedTokenAmount = 0n;
+    try {
+        if (tradeType === 'FLAP') {
+            const portalContract = new ethers.Contract(FLAP_PORTAL_ADDRESS, FLAP_PORTAL_ABI, provider);
+            try {
+                estimatedTokenAmount = await portalContract.previewBuy(tokenAddress, totalBuyAmountWei);
+            }
+            catch {
+                try {
+                    estimatedTokenAmount = await portalContract.quoteBuy(tokenAddress, totalBuyAmountWei);
+                }
+                catch {
+                    estimatedTokenAmount = await portalContract.quoteExactInput.staticCall({
+                        inputToken: ethers.ZeroAddress,
+                        outputToken: tokenAddress,
+                        inputAmount: totalBuyAmountWei,
+                    }).catch(() => 0n);
+                }
+            }
+        }
+        else {
+            // 外盘报价 (略，复用简单的 V2/V3 路由逻辑即可，此处为保持 SDK 内部一致性)
+            // 为保持简洁，此处假定 estimatedTokenAmount > 0n 或通过下面的 sellPercent 回退
+        }
+    }
+    catch (e) {
+        console.warn(`[bundleMultiSwap] 报价失败:`, e);
+    }
+    // ✅ 修正卖出数量计算逻辑：按本次买入预估量进行对等卖出，忽略原有余额
     const percentBigInt = BigInt(Math.min(100, Math.max(1, sellPercent)));
-    const sellAmountsWei = sellerBalances.map((balance) => (BigInt(balance.toString()) * percentBigInt) / 100n);
+    const sellAmountsWei = sellerWallets.map(() => 0n);
+    if (estimatedTokenAmount > 0n && sellerWallets.length > 0) {
+        const totalToSell = (estimatedTokenAmount * percentBigInt) / 100n;
+        const sharePerSeller = totalToSell / BigInt(sellerWallets.length);
+        let allocated = 0n;
+        sellerWallets.forEach((_, i) => {
+            if (i === sellerWallets.length - 1) {
+                sellAmountsWei[i] = totalToSell - allocated;
+            }
+            else {
+                sellAmountsWei[i] = sharePerSeller;
+                allocated += sharePerSeller;
+            }
+        });
+    }
     const totalSellAmount = sellAmountsWei.reduce((sum, amt) => sum + amt, 0n);
     // ========================================
     // 同步签署授权
@@ -697,9 +740,36 @@ export async function bundleMultiSwap(params) {
     const calls = [];
     // 卖出调用
     for (let i = 0; i < sellerWallets.length; i++) {
-        if (sellAmountsWei[i] <= 0n)
+        const amount = sellAmountsWei[i];
+        // ✅ 修复：即使 amount 为 0，只要 sellPercent 为 100，也发送卖出全部指令，防止跳过
+        if (amount <= 0n && sellPercent !== 100)
             continue;
-        const sellCall = buildSellCallWithAmountInternal(sellerWallets[i], sellAmountsWei[i], tokenAddress, tradeType, actualRouter, fee, delegateInterface, portalInterface);
+        const sellCall = amount > 0n
+            ? buildSellCallWithAmountInternal(sellerWallets[i], amount, tokenAddress, tradeType, actualRouter, fee, delegateInterface, portalInterface)
+            : {
+                target: sellerWallets[i].address,
+                allowFailure: false,
+                value: 0n,
+                // 如果无法确定数量，且 sellPercent=100，利用 UnifiedDelegate executeSell 的 0 语义（或此处通过 buildSellCall 逻辑）
+                // 由于此处是内部 build，直接构造或调用现有逻辑
+                callData: tradeType === 'FLAP'
+                    ? delegateInterface.encodeFunctionData('executeBatch', [[{
+                                target: FLAP_PORTAL_ADDRESS,
+                                value: 0n,
+                                data: portalInterface.encodeFunctionData('swapExactInput', [{
+                                        inputToken: tokenAddress,
+                                        outputToken: ethers.ZeroAddress,
+                                        inputAmount: 1n, // 占位，FLAP 仍然需要获取余额才能卖出，这里是最后的兜底
+                                        minOutputAmount: 0n,
+                                        permitData: '0x',
+                                    }])
+                            }]])
+                    : delegateInterface.encodeFunctionData(tradeType === 'V2' ? 'executeSellV2' : 'executeSell', [
+                        actualRouter, tradeType === 'V2' ? [tokenAddress, WOKB_ADDRESS] : tokenAddress,
+                        ...(tradeType === 'V3' ? [WOKB_ADDRESS, fee] : []),
+                        0 // 0 表示卖出全部
+                    ])
+            };
         calls.push(sellCall);
     }
     // ✅ 修复：利润刮取放在卖出之后、买入之前（从第一个卖家余额转账）

package/dist/eip7702/xlayer/volume.js

@@ -368,17 +368,24 @@ export async function bundleVolume(params) {
                     console.log(`[bundleVolume] FLAP previewBuy: ${totalBuyAmount} wei OKB -> ${estimatedTokenAmount} wei 代币`);
                 }
                 catch (previewErr) {
-                    console.warn(`[bundleVolume] previewBuy 失败，尝试 quoteExactInput:`, previewErr);
+                    console.warn(`[bundleVolume] previewBuy 失败，尝试 quoteBuy:`, previewErr);
                     try {
-                        estimatedTokenAmount = await portalContract.quoteExactInput.staticCall({
-                            inputToken: ethers.ZeroAddress,
-                            outputToken: tokenAddress,
-                            inputAmount: totalBuyAmount,
-                        });
-                        console.log(`[bundleVolume] FLAP quoteExactInput: ${totalBuyAmount} wei OKB -> ${estimatedTokenAmount} wei 代币`);
+                        estimatedTokenAmount = await portalContract.quoteBuy(tokenAddress, totalBuyAmount);
+                        console.log(`[bundleVolume] FLAP quoteBuy: ${totalBuyAmount} wei OKB -> ${estimatedTokenAmount} wei 代币`);
                     }
-                    catch (quoteErr) {
-                        console.warn(`[bundleVolume] quoteExactInput 也失败:`, quoteErr);
+                    catch (quoteBuyErr) {
+                        console.warn(`[bundleVolume] quoteBuy 失败，尝试 quoteExactInput:`, quoteBuyErr);
+                        try {
+                            estimatedTokenAmount = await portalContract.quoteExactInput.staticCall({
+                                inputToken: ethers.ZeroAddress,
+                                outputToken: tokenAddress,
+                                inputAmount: totalBuyAmount,
+                            });
+                            console.log(`[bundleVolume] FLAP quoteExactInput: ${totalBuyAmount} wei OKB -> ${estimatedTokenAmount} wei 代币`);
+                        }
+                        catch (quoteErr) {
+                            console.warn(`[bundleVolume] quoteExactInput 也失败:`, quoteErr);
+                        }
                     }
                 }
             }
@@ -418,27 +425,30 @@ export async function bundleVolume(params) {
         const percentBigInt = BigInt(Math.min(100, Math.max(0, sellPercent)));
         // 1. 初始化每个钱包的预期卖出数量为 0n
         const walletTotalExpectedBalances = balances.map(() => 0n);
-        // 2. 将本次预估买入的代币分配给买家（买家也可能是卖家）
-        if (estimatedTokenAmount > 0n && totalBuyAmount > 0n) {
-            // 按买家买入金额比例分配预估代币
-            buyerWallets.forEach((bw, i) => {
-                const buyAmount = buyAmountsWei[i];
-                if (buyAmount > 0n) {
-                    const share = (estimatedTokenAmount * buyAmount) / totalBuyAmount;
-                    // 寻找该买家在卖家列表中的索引
-                    const sIdx = sellerWallets.findIndex(sw => sw.address.toLowerCase() === bw.address.toLowerCase());
-                    if (sIdx !== -1) {
-                        walletTotalExpectedBalances[sIdx] += share;
-                    }
+        // 2. 将本次预估买入的代币分配给卖家
+        if (estimatedTokenAmount > 0n && totalBuyAmount > 0n && sellerWallets.length > 0) {
+            // ✅ 修正逻辑：将本次买入预估产生的总代币量均匀分配给所有指定的卖家
+            // 这样即使买卖钱包不一致，卖家也会执行卖出操作（卖出额 = 买入额 * sellPercent / 100 / 卖家数）
+            const totalToSell = (estimatedTokenAmount * percentBigInt) / 100n;
+            const sharePerSeller = totalToSell / BigInt(sellerWallets.length);
+            let allocated = 0n;
+            sellerWallets.forEach((_, i) => {
+                if (i === sellerWallets.length - 1) {
+                    walletTotalExpectedBalances[i] = totalToSell - allocated;
+                }
+                else {
+                    walletTotalExpectedBalances[i] = sharePerSeller;
+                    allocated += sharePerSeller;
                 }
             });
-            console.log(`[bundleVolume] 每个卖家预期总持仓 (原有+本次买入):`, walletTotalExpectedBalances.map(a => a.toString()));
+            console.log(`[bundleVolume] 每个卖家分配的卖出量 (仅针对本次买入，忽略原有余额):`, walletTotalExpectedBalances.map(a => a.toString()));
         }
         // 3. 计算最终卖出数量
         sellAmountsWei = walletTotalExpectedBalances.map(total => (total * percentBigInt) / 100n);
         console.log(`[bundleVolume] 最终卖出数量 (sellPercent=${sellPercent}%):`, sellAmountsWei.map(a => a.toString()));
     }
     else {
+        // ✅ 即使没有余额查询结果，也初始化数组
         sellAmountsWei = sellerWallets.map(() => 0n);
     }
     const totalSellAmount = sellAmountsWei.reduce((sum, amt) => sum + amt, 0n);
@@ -458,9 +468,14 @@ export async function bundleVolume(params) {
     }
     // 卖出调用
     for (let i = 0; i < sellerWallets.length; i++) {
-        if (sellAmountsWei[i] <= 0n)
+        const amount = sellAmountsWei[i];
+        // ✅ 修复：即使 amount 为 0，只要 sellPercent 为 100，也应该尝试卖出全部，防止刷量缺失 Sell
+        if (amount <= 0n && sellPercent !== 100)
             continue;
-        const sellCall = buildSellCallWithAmount(sellerWallets[i], sellAmountsWei[i], tokenAddress, poolType, actualRouter, fee, delegateInterface, portalInterface);
+        const sellCall = amount > 0n
+            ? buildSellCallWithAmount(sellerWallets[i], amount, tokenAddress, poolType, actualRouter, fee, delegateInterface, portalInterface)
+            : buildSellCall(sellerWallets[i], 0n, // amount = 0n 配合 sellPercent = 100 会执行卖出全部
+            tokenAddress, sellPercent, tokenDecimals, poolType, actualRouter, fee, delegateInterface, portalInterface);
         calls.push(sellCall);
     }
     // ✅ 修复：利润刮取从第一个卖方钱包扣取（卖出后有OKB）

package/package.json

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