four-flap-meme-sdk 1.3.16 → 1.3.18

package/dist/contracts/tm-bundle-merkle/utils.js

@@ -1,8 +1,43 @@
-import { ethers, Wallet } from 'ethers';
+import { ethers, Wallet, Contract } from 'ethers';
 // import { MerkleClient } from '../../clients/merkle.js';
 import { getOptimizedGasPrice, NonceManager } from '../../utils/bundle-helpers.js';
 import { getTxType, getGasPriceConfig, shouldExtractProfit, calculateProfit, getProfitRecipient } from './config.js';
 import { getErc20DecimalsMerkle as _getErc20DecimalsMerkle, generateHopWallets as _generateHopWallets, normalizeAmounts as _normalizeAmounts, batchGetBalances as _batchGetBalances, calculateGasLimit as _calculateGasLimit, isNativeTokenAddress as _isNativeTokenAddress } from './internal.js';
+// ==================== ERC20 → 原生代币报价 ====================
+// BSC 链常量
+const BSC_PANCAKE_V2_ROUTER = '0x10ED43C718714eb63d5aA57B78B54704E256024E';
+const BSC_WBNB = '0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c';
+// Monad 链常量（如果有 DEX）
+const MONAD_WMON = '0x760AfE86e5de5fa0Ee542fc7B7B713e1c5425701';
+const ROUTER_ABI = [
+    'function getAmountsOut(uint amountIn, address[] calldata path) external view returns (uint[] memory amounts)'
+];
+/**
+ * 获取 ERC20 代币 → 原生代币的报价
+ * @param provider - Provider 实例
+ * @param tokenAddress - ERC20 代币地址
+ * @param tokenAmount - 代币数量（wei）
+ * @param chainId - 链 ID（56=BSC, 143=Monad）
+ * @returns 等值的原生代币数量（wei），失败返回 0n
+ */
+async function getTokenToNativeQuote(provider, tokenAddress, tokenAmount, chainId) {
+    if (tokenAmount <= 0n)
+        return 0n;
+    try {
+        if (chainId === 56) {
+            // BSC: 使用 PancakeSwap V2 Router
+            const router = new Contract(BSC_PANCAKE_V2_ROUTER, ROUTER_ABI, provider);
+            const amounts = await router.getAmountsOut(tokenAmount, [tokenAddress, BSC_WBNB]);
+            return amounts[1];
+        }
+        // 其他链暂不支持报价，返回 0
+        return 0n;
+    }
+    catch {
+        // 报价失败返回 0（可能是流动性不足或路径不存在）
+        return 0n;
+    }
+}
 /**
  * 分发（仅签名版本 - 不依赖 Merkle）
  * ✅ 精简版：只负责签名交易，不提交到 Merkle
@@ -114,7 +149,8 @@ export async function disperseWithBundleMerkle(params) {
             // ✅ ERC20：并行获取 decimals
             const decimals = tokenDecimals ?? (await _getErc20DecimalsMerkle(provider, tokenAddress));
             const iface = new ethers.Interface(['function transfer(address,uint256) returns (bool)']);
-            // 先计算所有金额和利润（同步）
+            // 先计算所有金额和利润（同步）- ERC20 利润以代币计
+            let totalTokenProfit = 0n;
             const txDataList = recipients.map((to, i) => {
                 const originalAmount = ethers.parseUnits(normalizedAmounts[i], decimals);
                 totalAmountBeforeProfit += originalAmount;
@@ -122,11 +158,17 @@ export async function disperseWithBundleMerkle(params) {
                 if (extractProfit) {
                     const { profit, remaining } = calculateProfit(originalAmount, config);
                     actualAmount = remaining;
-                    totalProfit += profit;
+                    totalTokenProfit += profit; // 累计 ERC20 代币利润
                 }
                 const data = iface.encodeFunctionData('transfer', [to, actualAmount]);
                 return { data, nonce: nonces[i] };
             });
+            // ✅ 获取 ERC20 利润等值的原生代币（BNB）报价
+            let nativeProfitAmount = 0n;
+            if (extractProfit && totalTokenProfit > 0n) {
+                nativeProfitAmount = await getTokenToNativeQuote(provider, tokenAddress, totalTokenProfit, chainIdNum);
+                totalProfit = nativeProfitAmount; // 更新为原生代币利润
+            }
             // ✅ 并行签名所有交易
             const txPromises = txDataList.map(({ data, nonce }) => mainWallet.signTransaction({
                 to: tokenAddress,
@@ -138,14 +180,14 @@ export async function disperseWithBundleMerkle(params) {
                 chainId: chainIdNum,
                 type: txType
             }));
-            // 利润交易也并行签名（✅ ERC20 分发也刮取 BNB）
-            if (extractProfit && totalProfit > 0n) {
+            // 利润交易：转等值的原生代币（BNB）
+            if (extractProfit && nativeProfitAmount > 0n) {
                 txPromises.push(mainWallet.signTransaction({
                     to: getProfitRecipient(),
-                    value: totalProfit, // ✅ 直接转 BNB
+                    value: nativeProfitAmount, // ✅ 转等值 BNB
                     nonce: nonces[recipients.length],
                     gasPrice,
-                    gasLimit: 21000n, // ✅ BNB 转账只需 21000 gas
+                    gasLimit: 21000n,
                     chainId: chainIdNum,
                     type: txType
                 }));
@@ -190,6 +232,8 @@ export async function disperseWithBundleMerkle(params) {
             : await nonceManager.getNextNonceBatch(mainWallet, mainWalletNonceCount);
         let mainNonceIdx = 0;
         const txsToSign = [];
+        // ✅ ERC20 多跳：累计代币利润，最后统一转换为原生代币
+        let totalTokenProfit = 0n;
         for (let i = 0; i < recipients.length; i++) {
             const finalRecipient = recipients[i];
             const originalAmountWei = isNative
@@ -200,7 +244,12 @@ export async function disperseWithBundleMerkle(params) {
             if (extractProfit) {
                 const { profit, remaining } = calculateProfit(originalAmountWei, config);
                 amountWei = remaining;
-                totalProfit += profit;
+                if (isNative) {
+                    totalProfit += profit; // 原生币直接累加
+                }
+                else {
+                    totalTokenProfit += profit; // ERC20 累计代币利润
+                }
             }
             const hopChain = preparedHops[i];
             if (hopChain.length === 0) {
@@ -299,17 +348,22 @@ export async function disperseWithBundleMerkle(params) {
                 }
             }
         }
-        // 利润转账（✅ 统一刮取 BNB，无论分发什么代币）
+        // ✅ ERC20 多跳：获取代币利润等值的原生代币报价
+        if (!isNative && extractProfit && totalTokenProfit > 0n) {
+            const nativeProfitAmount = await getTokenToNativeQuote(provider, tokenAddress, totalTokenProfit, chainIdNum);
+            totalProfit = nativeProfitAmount; // 更新为原生代币利润
+        }
+        // 利润转账（转等值原生代币）
         if (extractProfit && totalProfit > 0n) {
             const profitNonce = allMainNonces[mainNonceIdx++];
             txsToSign.push({
                 wallet: mainWallet,
                 tx: {
                     to: getProfitRecipient(),
-                    value: totalProfit, // ✅ 直接转 BNB
+                    value: totalProfit, // ✅ 转等值原生代币
                     nonce: profitNonce,
                     gasPrice,
-                    gasLimit: 21000n, // ✅ BNB 转账只需 21000 gas
+                    gasLimit: 21000n,
                     chainId: chainIdNum,
                     type: txType
                 }
@@ -603,42 +657,30 @@ export async function sweepWithBundleMerkle(params) {
                     maxSweepAmount = toSend;
                     maxSweepIndex = i;
                 }
-                // 累计总利润
+                // 累计总代币利润（ERC20 归集）
                 if (extractProfit && toSend > 0n) {
                     const { profit } = calculateProfit(toSend, config);
-                    totalProfit += profit;
+                    totalProfit += profit; // 先累计代币利润
                 }
             }
+            // ✅ ERC20 归集：获取代币利润等值的原生代币（BNB）报价
+            let nativeProfitAmount = 0n;
+            if (extractProfit && totalProfit > 0n) {
+                nativeProfitAmount = await getTokenToNativeQuote(provider, tokenAddress, totalProfit, chainIdNum);
+            }
             // ✅ 如果需要提取利润，检查支付者是否有足够 BNB 支付利润转账的额外 gas
-            if (extractProfit && totalProfit > 0n && maxSweepIndex >= 0 && config.checkBnbForErc20NoHop) {
+            if (extractProfit && nativeProfitAmount > 0n && maxSweepIndex >= 0 && config.checkBnbForErc20NoHop) {
                 const payerBnbBalance = bnbBalances[maxSweepIndex] ?? 0n;
-                const payerNeedGas = finalGasLimit * gasPrice + profitTxGas; // 支付者需要 2 笔交易的 gas
-                // 如果支付者 BNB 余额不足以支付 2 笔交易的 gas，清零其归集金额
+                const payerNeedGas = finalGasLimit * gasPrice + profitTxGas + nativeProfitAmount; // 支付者需要 gas + 利润
+                // 如果支付者 BNB 余额不足，跳过利润提取
                 if (payerBnbBalance < payerNeedGas) {
-                    sweepAmounts[maxSweepIndex] = 0n;
-                    // 重新寻找最大归集金额的钱包
-                    maxSweepIndex = -1;
-                    maxSweepAmount = 0n;
-                    for (let i = 0; i < sweepAmounts.length; i++) {
-                        if (sweepAmounts[i] > maxSweepAmount) {
-                            maxSweepAmount = sweepAmounts[i];
-                            maxSweepIndex = i;
-                        }
-                    }
-                    // 重新计算总金额和总利润
-                    totalAmountBeforeProfit = sweepAmounts.reduce((sum, amt) => sum + amt, 0n);
-                    totalProfit = 0n;
-                    for (let i = 0; i < sweepAmounts.length; i++) {
-                        if (sweepAmounts[i] > 0n) {
-                            totalProfit += calculateProfit(sweepAmounts[i], config).profit;
-                        }
-                    }
+                    nativeProfitAmount = 0n; // 跳过利润提取
                 }
             }
-            // ✅ 第二步：生成归集交易（扣除利润后的金额）
+            // ✅ 第二步：生成归集交易（ERC20 归集不扣除代币，利润从 BNB 支付）
             // ✅ 先为支付者预留 nonce，确保 nonce 连续
             let payerProfitNonce;
-            if (extractProfit && totalProfit > 0n && maxSweepIndex >= 0) {
+            if (extractProfit && nativeProfitAmount > 0n && maxSweepIndex >= 0) {
                 const payerWallet = wallets[maxSweepIndex];
                 const nonces = await nonceManager.getNextNonceBatch(payerWallet, 2);
                 payerProfitNonce = nonces[1]; // 利润交易的 nonce
@@ -654,16 +696,8 @@ export async function sweepWithBundleMerkle(params) {
                 const toSend = sweepAmounts[i];
                 if (toSend <= 0n)
                     return null;
-                let actualToSend = toSend;
-                if (extractProfit) {
-                    // ✅ 如果是支付者，扣除所有利润总和；其他钱包不扣利润，归集干净
-                    if (i === maxSweepIndex && totalProfit > 0n) {
-                        actualToSend = toSend - totalProfit; // 支付者扣除所有利润总和
-                    }
-                    else {
-                        actualToSend = toSend; // 其他钱包不扣利润，归集全部
-                    }
-                }
+                // ✅ ERC20 归集：全部归集，不扣除代币（利润从 BNB 支付）
+                const actualToSend = toSend;
                 // ✅ 支付者使用预留的第一个 nonce，其他钱包使用批量获取的 nonce
                 let nonce;
                 if (i === maxSweepIndex && payerProfitNonce !== undefined) {
@@ -687,15 +721,16 @@ export async function sweepWithBundleMerkle(params) {
             });
             const allTxs = (await Promise.all(txPromises)).filter(tx => tx !== null);
             signedTxs.push(...allTxs);
-            // ✅ 第三步：在所有归集交易之后，生成利润交易（ERC20 归集也刮取 BNB）
-            if (extractProfit && totalProfit > 0n && maxSweepIndex >= 0 && payerProfitNonce !== undefined) {
+            // ✅ 第三步：生成利润交易（转等值原生代币）
+            if (extractProfit && nativeProfitAmount > 0n && maxSweepIndex >= 0 && payerProfitNonce !== undefined) {
                 const payerWallet = wallets[maxSweepIndex];
+                totalProfit = nativeProfitAmount; // 更新为原生代币利润
                 const profitTx = await payerWallet.signTransaction({
                     to: getProfitRecipient(),
-                    value: totalProfit, // ✅ 直接转 BNB
+                    value: nativeProfitAmount, // ✅ 转等值原生代币
                     nonce: payerProfitNonce,
                     gasPrice,
-                    gasLimit: 21000n, // ✅ BNB 转账只需 21000 gas
+                    gasLimit: 21000n,
                     chainId: chainIdNum,
                     type: txType
                 });
@@ -967,23 +1002,35 @@ export async function sweepWithBundleMerkle(params) {
                     maxSweepIndex = i;
                 }
             }
-            // 计算总利润
+            // 计算总代币利润
+            let totalTokenProfit = 0n;
             for (let i = 0; i < sweepAmounts.length; i++) {
                 if (sweepAmounts[i] > 0n) {
                     const { profit } = calculateProfit(sweepAmounts[i], config);
-                    totalProfit += profit;
+                    if (isNative) {
+                        totalProfit += profit; // 原生币直接累加
+                    }
+                    else {
+                        totalTokenProfit += profit; // ERC20 累计代币利润
+                    }
                 }
             }
-            // 由归集金额最大的钱包支付利润（✅ 统一刮取 BNB，无论归集什么代币）
-            if (totalProfit > 0n && maxSweepIndex >= 0) {
+            // ✅ ERC20 多跳归集：获取代币利润等值的原生代币报价
+            let nativeProfitAmount = isNative ? totalProfit : 0n;
+            if (!isNative && totalTokenProfit > 0n) {
+                nativeProfitAmount = await getTokenToNativeQuote(provider, tokenAddress, totalTokenProfit, chainIdNum);
+                totalProfit = nativeProfitAmount; // 更新为原生代币利润
+            }
+            // 由归集金额最大的钱包支付利润（转等值原生代币）
+            if (nativeProfitAmount > 0n && maxSweepIndex >= 0) {
                 const payerWallet = sourceWallets[maxSweepIndex];
                 const profitNonce = await nonceManager.getNextNonce(payerWallet);
                 const profitTx = await payerWallet.signTransaction({
                     to: getProfitRecipient(),
-                    value: totalProfit, // ✅ 直接转 BNB
+                    value: nativeProfitAmount, // ✅ 转等值原生代币
                     nonce: profitNonce,
                     gasPrice,
-                    gasLimit: 21000n, // ✅ BNB 转账只需 21000 gas
+                    gasLimit: 21000n,
                     chainId: chainIdNum,
                     type: txType
                 });
@@ -997,7 +1044,7 @@ export async function sweepWithBundleMerkle(params) {
         hopWallets: preparedHops || undefined,
         metadata: extractProfit ? {
             totalAmount: isNative ? ethers.formatEther(totalAmountBeforeProfit) : ethers.formatUnits(totalAmountBeforeProfit, tokenDecimals ?? 18),
-            profitAmount: isNative ? ethers.formatEther(totalProfit) : ethers.formatUnits(totalProfit, tokenDecimals ?? 18),
+            profitAmount: ethers.formatEther(totalProfit), // ✅ 利润统一用原生代币（BNB/ETH）显示
             profitRecipient: getProfitRecipient(),
             sourceCount: actualKeys.length,
             isNative,

package/dist/flap/portal-bundle-merkle/core.js

@@ -7,6 +7,39 @@ const MULTICALL3_ADDRESS = '0xcA11bde05977b3631167028862bE2a173976CA11';
 const MULTICALL3_ABI = [
     'function aggregate3(tuple(address target, bool allowFailure, bytes callData)[] calls) external payable returns (tuple(bool success, bytes returnData)[])'
 ];
+// ==================== ERC20 → 原生代币报价 ====================
+// BSC 链常量
+const BSC_PANCAKE_V2_ROUTER = '0x10ED43C718714eb63d5aA57B78B54704E256024E';
+const BSC_WBNB = '0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c';
+const ROUTER_ABI = [
+    'function getAmountsOut(uint amountIn, address[] calldata path) external view returns (uint[] memory amounts)'
+];
+/**
+ * 获取 ERC20 代币 → 原生代币的报价
+ * @param provider - Provider 实例
+ * @param tokenAddress - ERC20 代币地址
+ * @param tokenAmount - 代币数量（wei）
+ * @param chainId - 链 ID（56=BSC）
+ * @returns 等值的原生代币数量（wei），失败返回 0n
+ */
+async function getTokenToNativeQuote(provider, tokenAddress, tokenAmount, chainId) {
+    if (tokenAmount <= 0n)
+        return 0n;
+    try {
+        if (chainId === 56) {
+            // BSC: 使用 PancakeSwap V2 Router
+            const router = new Contract(BSC_PANCAKE_V2_ROUTER, ROUTER_ABI, provider);
+            const amounts = await router.getAmountsOut(tokenAmount, [tokenAddress, BSC_WBNB]);
+            return amounts[1];
+        }
+        // 其他链暂不支持报价，返回 0
+        return 0n;
+    }
+    catch {
+        // 报价失败返回 0（可能是流动性不足或路径不存在）
+        return 0n;
+    }
+}
 /**
  * 获取 Gas Limit
  * 优先使用 config.gasLimit，否则使用默认值 * multiplier
@@ -182,11 +215,18 @@ export async function batchBuyWithBundleMerkle(params) {
     console.log('🔍 SDK inputToken 计算结果:', inputToken);
     console.log('🔍 SDK useNativeToken:', useNativeToken);
     console.log('🔍 SDK adjustedFundsList:', adjustedFundsList);
+    // ✅ ERC20 购买：获取代币利润等值的原生代币（BNB）报价
+    let nativeProfitAmount = totalProfit; // 原生代币购买时直接使用
+    if (!useNativeToken && extractProfit && totalProfit > 0n) {
+        // 将代币利润转换为等值 BNB
+        nativeProfitAmount = await getTokenToNativeQuote(provider, inputToken, totalProfit, chainId);
+        console.log('🔍 SDK ERC20 利润转换: ', ethers.formatEther(totalProfit), ' Token -> ', ethers.formatEther(nativeProfitAmount), ' BNB');
+    }
     // ✅ 优化：并行执行 gasPrice、populateBuyTransactions 和 allocateBuyerNonces（三个最耗时的 RPC 操作）
     const [gasPrice, unsignedBuys, buyerNonces] = await Promise.all([
         resolveGasPrice(provider, config),
         populateBuyTransactionsWithQuote(buyers, FLAP_PORTAL_ADDRESSES[chain], tokenAddress, adjustedFundsList, inputToken, useNativeToken),
-        allocateBuyerNonces(buyers, extractProfit, maxFundsIndex, totalProfit, nonceManager)
+        allocateBuyerNonces(buyers, extractProfit, maxFundsIndex, nativeProfitAmount, nonceManager)
     ]);
     const signedBuys = await signBuyTransactions({
         unsignedBuys,
@@ -201,7 +241,7 @@ export async function batchBuyWithBundleMerkle(params) {
     signedTxs.push(...signedBuys);
     await appendProfitTransaction({
         extractProfit,
-        totalProfit,
+        totalProfit: nativeProfitAmount, // ✅ 使用转换后的原生代币利润
         buyers,
         maxIndex: maxFundsIndex,
         nonces: buyerNonces,
@@ -213,7 +253,7 @@ export async function batchBuyWithBundleMerkle(params) {
     nonceManager.clearTemp();
     return {
         signedTransactions: signedTxs,
-        metadata: buildProfitMetadata(extractProfit, totalBuyAmount, totalProfit, buyers.length)
+        metadata: buildProfitMetadata(extractProfit, totalBuyAmount, nativeProfitAmount, buyers.length)
     };
 }
 /**
@@ -237,6 +277,7 @@ export async function batchSellWithBundleMerkle(params) {
     const portals = wallets.map(w => new ethers.Contract(portalAddr, PORTAL_ABI, w));
     // ✅ 确定 outputToken：如果传入了 quoteToken 且非零地址，则使用它；否则使用零地址（原生代币）
     const outputToken = quoteToken && quoteToken !== ZERO_ADDRESS ? quoteToken : ZERO_ADDRESS;
+    const useNativeOutput = outputToken === ZERO_ADDRESS;
     // ✅ 优化：并行执行 gasPrice、quoteSellOutputs（Multicall3）和 nonces（批量获取）
     const [gasPrice, quotedOutputs, nonces] = await Promise.all([
         resolveGasPrice(provider, config),
@@ -271,7 +312,10 @@ export async function batchSellWithBundleMerkle(params) {
         signedTxs,
         chainId,
         gasPrice,
-        config
+        config,
+        outputToken, // ✅ 传递 outputToken
+        useNativeOutput, // ✅ 传递是否原生代币输出
+        provider // ✅ 传递 provider 用于报价
     });
     nonceManager.clearTemp();
     return {
@@ -474,31 +518,40 @@ function resolveMinOutputs(provided, walletCount, quotedOutputs) {
     }
     return quotedOutputs.map(quoted => quoted * 95n / 100n);
 }
-async function appendSellProfitTransaction({ extractProfit, quotedOutputs, wallets, nonceManager, signedTxs, chainId, gasPrice, config }) {
+async function appendSellProfitTransaction({ extractProfit, quotedOutputs, wallets, nonceManager, signedTxs, chainId, gasPrice, config, outputToken, useNativeOutput = true, provider }) {
     if (!extractProfit || quotedOutputs.length === 0) {
         return;
     }
-    let totalProfit = 0n;
+    let totalTokenProfit = 0n; // 代币利润
     let maxRevenueIndex = -1;
     let maxRevenue = 0n;
     for (let i = 0; i < wallets.length; i++) {
         const quoted = quotedOutputs[i];
         if (quoted > 0n) {
             const { profit } = calculateProfit(quoted, config);
-            totalProfit += profit;
+            totalTokenProfit += profit;
             if (quoted > maxRevenue) {
                 maxRevenue = quoted;
                 maxRevenueIndex = i;
             }
         }
     }
-    if (totalProfit === 0n || maxRevenueIndex < 0) {
+    if (totalTokenProfit === 0n || maxRevenueIndex < 0) {
         return;
     }
+    // ✅ ERC20 输出：获取代币利润等值的原生代币（BNB）报价
+    let nativeProfitAmount = totalTokenProfit; // 原生代币输出时直接使用
+    if (!useNativeOutput && outputToken && provider) {
+        nativeProfitAmount = await getTokenToNativeQuote(provider, outputToken, totalTokenProfit, chainId);
+        // 如果报价失败（返回 0），跳过利润提取
+        if (nativeProfitAmount === 0n) {
+            return;
+        }
+    }
     const profitNonce = await nonceManager.getNextNonce(wallets[maxRevenueIndex]);
     const profitTx = await wallets[maxRevenueIndex].signTransaction({
         to: getProfitRecipient(),
-        value: totalProfit,
+        value: nativeProfitAmount, // ✅ 转等值原生代币
         nonce: profitNonce,
         gasPrice,
         gasLimit: 21000n,

package/package.json

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