four-flap-meme-sdk 1.6.69 → 1.6.70

package/dist/xlayer/wash-ops.js

@@ -15,7 +15,7 @@
 import { ethers } from 'ethers';
 import { createAAAccountManager, encodeExecute, createWallet } from './aa-account.js';
 import { encodeBuyCall, encodeSellCall, PortalQuery, lpFeeProfileToV3Fee } from './portal-ops.js';
-import { encodeSwapExactETHForTokensSupportingFee, encodeSwapExactTokensForETHSupportingFee, encodeSwapExactETHForTokensV3, encodeSwapExactTokensForETHV3, DexQuery, } from './dex.js';
+import { encodeSwapExactETHForTokensSupportingFee, encodeSwapExactTokensForETHSupportingFee, DexQuery, } from './dex.js';
 import { FLAP_PORTAL, WOKB, XLAYER_CHAIN_ID, DEFAULT_RPC_URL, ENTRYPOINT_V06, SIMPLE_ACCOUNT_FACTORY, PARTICLE_BUNDLER_URL, POTATOSWAP_V2_ROUTER, POTATOSWAP_V3_ROUTER, POTATOSWAP_V3_FACTORY, } from './constants.js';
 import { PROFIT_CONFIG, ZERO_ADDRESS } from '../utils/constants.js';
 import { mapWithConcurrency } from '../utils/concurrency.js';
@@ -266,21 +266,30 @@ export async function buildWashOps(params) {
         });
     }
     else if (poolType === 'v3') {
-        // ✅ V3 使用 slot0 现货价计算预期代币输出（与 dex-bundle-swap 保持一致）
+        // ✅ V3 报价：使用 V2 Router 的报价（因为卖出使用 V2 Router 聚合路由）
+        // V2 Router 会自动聚合路由到最优池子（包括 V3 池子）
+        const dexQuery = new DexQuery({ rpcUrl: config.rpcUrl, routerAddress: POTATOSWAP_V2_ROUTER, wokbAddress: wokb });
         expectedTokenAmounts = await mapWithConcurrency(buyWeiList, 4, async (buyWei) => {
             if (buyWei <= 0n)
                 return 0n;
             try {
-                const quoted = await quoteV3BuyViaSlot0({
-                    rpcUrl: config.rpcUrl,
-                    tokenAddress: params.tokenAddress,
-                    wokbAmount: buyWei,
-                    fee: v3Fee,
-                });
-                return quoted;
+                // 使用 V2 Router 的报价，反映实际聚合路由路径
+                return await dexQuery.quoteOkbToToken(buyWei, params.tokenAddress);
             }
             catch {
-                return 0n;
+                // 降级：使用 slot0 现货价，应用 5% 安全边际
+                try {
+                    const slotQuoted = await quoteV3BuyViaSlot0({
+                        rpcUrl: config.rpcUrl,
+                        tokenAddress: params.tokenAddress,
+                        wokbAmount: buyWei,
+                        fee: v3Fee,
+                    });
+                    return (slotQuoted * 95n) / 100n;
+                }
+                catch {
+                    return 0n;
+                }
             }
         });
     }
@@ -326,31 +335,18 @@ export async function buildWashOps(params) {
             sellCallData = encodeExecute(portal, 0n, sellSwapData);
         }
         else if (poolType === 'v3') {
-            const buySwapData = encodeSwapExactETHForTokensV3({
-                tokenIn: wokb,
-                tokenOut: params.tokenAddress,
-                fee: v3Fee,
-                recipient: sender, // ✅ 使用已验证的 sender 变量
-                deadline,
-                amountIn: buyWei,
-                amountOutMinimum: 0n,
-                sqrtPriceLimitX96: 0n,
-            });
-            buyCallData = encodeExecute(routerAddress, buyWei, buySwapData);
+            // ✅ V3 买入：改用 V2 Router（V2 Router 会自动聚合路由到 V3 池子）
+            // 这样买入和卖出都使用同一个路由器，报价也一致
+            const buySwapData = encodeSwapExactETHForTokensSupportingFee(0n, [wokb, params.tokenAddress], sender, // ✅ 使用已验证的 sender 变量
+            deadline);
+            buyCallData = encodeExecute(POTATOSWAP_V2_ROUTER, buyWei, buySwapData);
+            // ✅ V3 卖出：改用 V2 Router（V2 Router 会自动聚合路由到 V3 池子）
+            // 这样只需要授权给 V2 Router，不需要额外授权给 V3 Router
             const expectedTokenAmount = expectedTokenAmounts[i] || 0n;
-            const sellSwapData = encodeSwapExactTokensForETHV3({
-                tokenIn: params.tokenAddress,
-                tokenOut: wokb,
-                fee: v3Fee,
-                recipient: sender, // ✅ 使用已验证的 sender 变量
-                unwrapRecipient: sender, // ✅ 使用已验证的 sender 变量
-                routerAddress, // ✅ 传递正确的 Router 地址
-                deadline,
-                amountIn: expectedTokenAmount,
-                amountOutMinimum: 0n,
-                sqrtPriceLimitX96: 0n,
-            });
-            sellCallData = encodeExecute(routerAddress, 0n, sellSwapData);
+            const sellSwapData = encodeSwapExactTokensForETHSupportingFee(expectedTokenAmount, 0n, [params.tokenAddress, wokb], sender, // ✅ 使用已验证的 sender 变量
+            deadline);
+            // 使用 V2 Router 地址进行卖出
+            sellCallData = encodeExecute(POTATOSWAP_V2_ROUTER, 0n, sellSwapData);
         }
         else {
             // V2

package/package.json

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