four-flap-meme-sdk 1.7.34 → 1.7.36

package/dist/eip7702/xlayer/volume.js

@@ -12,7 +12,7 @@
  *
  * 只生成签名，由调用方决定如何提交
  */
-import { ethers } from 'ethers';
+import { ethers, Contract } from 'ethers';
 import { getCachedProvider, createWallet, signAuthorizationsWithNonces, batchGetNonces, buildEIP7702TransactionSync, calculateProfitAmountByTxCount, getProfitRecipient, } from './utils.js';
 import { UNIFIED_DELEGATE_ADDRESS, UNIFIED_DELEGATE_ABI, FLAP_PORTAL_ABI, FLAP_PORTAL_ADDRESS, POTATOSWAP_V2_ROUTER, POTATOSWAP_V3_ROUTER, WOKB_ADDRESS, V3_FEE_TIERS, ERC20_ABI, } from './constants.js';
 import { bundleBuy } from './bundle-buy.js';
@@ -94,6 +94,18 @@ export async function washVolume(params) {
     // 并行获取数据
     // ========================================
     const allAddresses = allWallets.map(w => w.address);
+    // ✅ 对 FLAP 模式，预估买入会得到多少代币（用于卖出调用）
+    let estimatedTokenAmount = 0n;
+    if (poolType === 'FLAP') {
+        try {
+            const portalContract = new Contract(FLAP_PORTAL_ADDRESS, FLAP_PORTAL_ABI, provider);
+            estimatedTokenAmount = await portalContract.quoteBuy(tokenAddress, buyAmountWei);
+            console.log(`[washVolume] FLAP quoteBuy 预估: ${buyAmountWei} wei OKB -> ${estimatedTokenAmount} wei 代币`);
+        }
+        catch (e) {
+            console.warn(`[washVolume] quoteBuy 失败，使用 0 作为卖出金额:`, e);
+        }
+    }
     const [nonces, feeData] = await Promise.all([
         batchGetNonces(allAddresses, provider),
         provider.getFeeData(),
@@ -107,25 +119,29 @@ export async function washVolume(params) {
     // 构建调用
     // ========================================
     const calls = [];
-    // 利润刮取（从主钱包）
-    if (profitAmount > 0n) {
-        calls.push({
-            target: mainWallet.address,
-            allowFailure: false,
-            value: profitAmount,
-            callData: delegateInterface.encodeFunctionData('transferTo', [profitRecipient]),
-        });
-    }
+    // ✅ 修复：先执行买卖，最后执行利润转账（与 bundleBuy 调用顺序一致）
     // 每个钱包执行买入 + 卖出
     for (let i = 0; i < wallets.length; i++) {
         const wallet = wallets[i];
         // 买入调用
         const buyCall = buildBuyCall(wallet, buyAmountWei, tokenAddress, poolType, actualRouter, fee, delegateInterface, portalInterface);
         calls.push(buyCall);
-        // 卖出调用（使用 sellPercent）
-        const sellCall = buildSellCall(wallet, tokenAddress, sellPercent, tokenDecimals, poolType, actualRouter, fee, delegateInterface, portalInterface);
+        // 卖出调用（使用预估的代币数量或 sellPercent）
+        // ✅ FLAP 模式使用 buildSellCallWithAmount，其他模式使用 buildSellCall
+        const sellCall = poolType === 'FLAP' && estimatedTokenAmount > 0n
+            ? buildSellCallWithAmount(wallet, estimatedTokenAmount, tokenAddress, poolType, actualRouter, fee, delegateInterface, portalInterface)
+            : buildSellCall(wallet, tokenAddress, sellPercent, tokenDecimals, poolType, actualRouter, fee, delegateInterface, portalInterface);
         calls.push(sellCall);
     }
+    // 利润刮取（放在最后，与 bundleBuy 一致）
+    if (profitAmount > 0n) {
+        calls.push({
+            target: mainWallet.address,
+            allowFailure: false,
+            value: profitAmount,
+            callData: delegateInterface.encodeFunctionData('transferTo', [profitRecipient]),
+        });
+    }
     // ========================================
     // 构建交易
     // ========================================
@@ -263,15 +279,7 @@ export async function bundleVolume(params) {
     // 构建调用
     // ========================================
     const calls = [];
-    // 利润刮取
-    if (profitAmount > 0n) {
-        calls.push({
-            target: mainWallet.address,
-            allowFailure: false,
-            value: profitAmount,
-            callData: delegateInterface.encodeFunctionData('transferTo', [profitRecipient]),
-        });
-    }
+    // ✅ 修复：先执行买卖，最后执行利润转账（与 bundleBuy 调用顺序一致）
     // 买入调用
     for (let i = 0; i < buyerWallets.length; i++) {
         const buyCall = buildBuyCall(buyerWallets[i], buyAmountsWei[i], tokenAddress, poolType, actualRouter, fee, delegateInterface, portalInterface);
@@ -284,6 +292,15 @@ export async function bundleVolume(params) {
         const sellCall = buildSellCallWithAmount(sellerWallets[i], sellAmountsWei[i], tokenAddress, poolType, actualRouter, fee, delegateInterface, portalInterface);
         calls.push(sellCall);
     }
+    // 利润刮取（放在最后，与 bundleBuy 一致）
+    if (profitAmount > 0n) {
+        calls.push({
+            target: mainWallet.address,
+            allowFailure: false,
+            value: profitAmount,
+            callData: delegateInterface.encodeFunctionData('transferTo', [profitRecipient]),
+        });
+    }
     // ========================================
     // 构建交易
     // ========================================

package/package.json

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