four-flap-meme-sdk 1.6.84 → 1.6.85

package/dist/xlayer/wash-ops.js

@@ -331,47 +331,101 @@ export async function buildWashOps(params) {
     // 批量预测买入后获得的代币数量（用于卖出，避免 maxUint256 问题）
     let expectedTokenAmounts = [];
     if (poolType === 'flap') {
+        // ✅ Flap 报价：使用【总金额报价 + 按比例分配】（和 BSC 一样）
         const portalQuery = new PortalQuery({ rpcUrl: config.rpcUrl, chainId: config.chainId });
-        expectedTokenAmounts = await mapWithConcurrency(buyWeiList, 4, async (buyWei) => {
-            if (buyWei <= 0n)
-                return 0n;
+        const totalBuyWei = buyWeiList.reduce((a, b) => a + b, 0n);
+        console.log(`[buildWashOps] Flap 总金额报价: ${buyWeiList.length} 个钱包, 总金额=${totalBuyWei}`);
+        // 1. 用总金额获取总代币数量
+        let totalTokenAmount = 0n;
+        try {
+            totalTokenAmount = await portalQuery.previewBuy(params.tokenAddress, totalBuyWei);
+        }
+        catch {
             try {
-                return await portalQuery.previewBuy(params.tokenAddress, buyWei);
+                totalTokenAmount = await portalQuery.quoteExactInput('0x0000000000000000000000000000000000000000', params.tokenAddress, totalBuyWei);
             }
             catch {
-                try {
-                    return await portalQuery.quoteExactInput('0x0000000000000000000000000000000000000000', params.tokenAddress, buyWei);
-                }
-                catch {
-                    return 0n;
-                }
+                totalTokenAmount = 0n;
             }
-        });
+        }
+        // 2. 按每个钱包的买入金额比例分配代币数量
+        if (totalBuyWei > 0n && totalTokenAmount > 0n) {
+            let allocated = 0n;
+            expectedTokenAmounts = buyWeiList.map((buyWei, i) => {
+                if (i === buyWeiList.length - 1) {
+                    return totalTokenAmount - allocated;
+                }
+                const share = (totalTokenAmount * buyWei) / totalBuyWei;
+                allocated += share;
+                return share;
+            });
+        }
+        else {
+            expectedTokenAmounts = buyWeiList.map(() => 0n);
+        }
+        console.log(`[buildWashOps] Flap 总代币=${totalTokenAmount}, 分配:`, expectedTokenAmounts.map(a => a.toString()));
     }
     else if (poolType === 'v2') {
+        // ✅ V2 报价：使用【总金额报价 + 按比例分配】（和 BSC 一样）
         const dexQuery = new DexQuery({ rpcUrl: config.rpcUrl, routerAddress, wokbAddress: wokb });
-        expectedTokenAmounts = await mapWithConcurrency(buyWeiList, 4, async (buyWei) => {
-            if (buyWei <= 0n)
-                return 0n;
-            try {
-                return await dexQuery.quoteOkbToToken(buyWei, params.tokenAddress);
-            }
-            catch {
-                return 0n;
-            }
-        });
+        const totalBuyWei = buyWeiList.reduce((a, b) => a + b, 0n);
+        console.log(`[buildWashOps] V2 总金额报价: ${buyWeiList.length} 个钱包, 总金额=${totalBuyWei}`);
+        // 1. 用总金额获取总代币数量
+        let totalTokenAmount = 0n;
+        try {
+            totalTokenAmount = await dexQuery.quoteOkbToToken(totalBuyWei, params.tokenAddress);
+        }
+        catch {
+            totalTokenAmount = 0n;
+        }
+        // 2. 按每个钱包的买入金额比例分配代币数量
+        if (totalBuyWei > 0n && totalTokenAmount > 0n) {
+            let allocated = 0n;
+            expectedTokenAmounts = buyWeiList.map((buyWei, i) => {
+                if (i === buyWeiList.length - 1) {
+                    return totalTokenAmount - allocated;
+                }
+                const share = (totalTokenAmount * buyWei) / totalBuyWei;
+                allocated += share;
+                return share;
+            });
+        }
+        else {
+            expectedTokenAmounts = buyWeiList.map(() => 0n);
+        }
+        console.log(`[buildWashOps] V2 总代币=${totalTokenAmount}, 分配:`, expectedTokenAmounts.map(a => a.toString()));
     }
     else if (poolType === 'v3') {
-        // ✅ V3 报价：使用 Multicall3 批量查询（单次 RPC 请求获取所有钱包的报价）
-        // PotatoSwap V3 QuoterV2: 0x5A6f3723346aF54a4D0693bfC1718D64d4915C3e
-        console.log(`[buildWashOps] V3 批量报价: ${buyWeiList.length} 个钱包, fee=${v3Fee}`);
-        expectedTokenAmounts = await batchQuoteV3WithMulticall({
+        // ✅ V3 报价：使用【总金额报价 + 按比例分配】（和 BSC 一样）
+        // 这样可以正确考虑多钱包累积价格影响，确保卖干净
+        const totalBuyWei = buyWeiList.reduce((a, b) => a + b, 0n);
+        console.log(`[buildWashOps] V3 总金额报价: ${buyWeiList.length} 个钱包, 总金额=${totalBuyWei}, fee=${v3Fee}`);
+        // 1. 用总金额获取总代币数量
+        const totalQuoteResult = await batchQuoteV3WithMulticall({
             rpcUrl: config.rpcUrl,
             tokenIn: wokb,
             tokenOut: params.tokenAddress,
-            amountsIn: buyWeiList,
+            amountsIn: [totalBuyWei],
             fee: v3Fee,
         });
+        const totalTokenAmount = totalQuoteResult[0] || 0n;
+        // 2. 按每个钱包的买入金额比例分配代币数量
+        if (totalBuyWei > 0n && totalTokenAmount > 0n) {
+            let allocated = 0n;
+            expectedTokenAmounts = buyWeiList.map((buyWei, i) => {
+                if (i === buyWeiList.length - 1) {
+                    // 最后一个钱包分配剩余的全部（避免精度损失）
+                    return totalTokenAmount - allocated;
+                }
+                const share = (totalTokenAmount * buyWei) / totalBuyWei;
+                allocated += share;
+                return share;
+            });
+        }
+        else {
+            expectedTokenAmounts = buyWeiList.map(() => 0n);
+        }
+        console.log(`[buildWashOps] V3 总代币=${totalTokenAmount}, 分配:`, expectedTokenAmounts.map(a => a.toString()));
     }
     console.log(`[buildWashOps] 预测买入代币数量 (${poolType}):`, expectedTokenAmounts.map(a => a.toString()));
     // 构建所有 UserOps 的骨架

package/package.json

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