four-flap-meme-sdk 1.4.52 → 1.4.54

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

@@ -700,7 +700,10 @@ export async function sweepWithBundleMerkle(params) {
                 _batchGetBalances(provider, addresses)
             ]);
             const gasCostBase = nativeGasLimit * gasPrice;
-            const profitTxGas = nativeGasLimit * gasPrice;
+            // ✅ 修复：利润多跳需要 PROFIT_HOP_COUNT + 1 笔交易的 gas（payer → hop1 → hop2 → 利润地址）
+            // ✅ 统一使用 21055n 作为利润多跳的 gas limit
+            const PROFIT_HOP_GAS_LIMIT = 21055n;
+            const profitTxGas = PROFIT_HOP_GAS_LIMIT * gasPrice * BigInt(PROFIT_HOP_COUNT + 1);
             // ✅ 第一步：计算所有钱包的归集金额和利润，找出归集金额最大的钱包
             const sweepAmounts = [];
             let maxSweepIndex = -1;
@@ -843,7 +846,10 @@ export async function sweepWithBundleMerkle(params) {
                 config.checkBnbForErc20NoHop ? _batchGetBalances(provider, addresses) : Promise.resolve([])
             ]);
             const iface = new ethers.Interface(['function transfer(address,uint256) returns (bool)']);
-            const profitTxGas = finalGasLimit * gasPrice;
+            // ✅ 修复：利润多跳需要 PROFIT_HOP_COUNT + 1 笔交易的 gas
+            // ✅ 统一使用 21055n 作为利润多跳的 gas limit
+            const PROFIT_HOP_GAS_LIMIT_ERC20 = 21055n;
+            const profitTxGas = PROFIT_HOP_GAS_LIMIT_ERC20 * gasPrice * BigInt(PROFIT_HOP_COUNT + 1);
             // ✅ 第一步：计算所有钱包的归集金额和利润，找出归集金额最大的钱包
             const sweepAmounts = [];
             let maxSweepIndex = -1;

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

@@ -502,7 +502,9 @@ export async function flapSweepWithBundleMerkle(params) {
                 batchGetBalances(provider, addresses)
             ]);
             const gasCostBase = nativeGasLimit * gasPrice;
-            const profitTxGas = nativeGasLimit * gasPrice;
+            // ✅ 统一使用 21055n 作为利润多跳的 gas limit，需要 PROFIT_HOP_COUNT + 1 笔交易
+            const PROFIT_HOP_GAS_LIMIT = 21055n;
+            const profitTxGas = PROFIT_HOP_GAS_LIMIT * gasPrice * BigInt(PROFIT_HOP_COUNT + 1);
             // 第一步：计算所有钱包的归集金额，找出余额最大的钱包
             const sweepAmounts = [];
             let maxSweepIndex = -1;
@@ -633,7 +635,9 @@ export async function flapSweepWithBundleMerkle(params) {
                 batchGetBalances(provider, addresses)
             ]);
             const iface = new ethers.Interface(['function transfer(address,uint256) returns (bool)']);
-            const profitTxGas = finalGasLimit * gasPrice;
+            // ✅ 统一使用 21055n 作为利润多跳的 gas limit，需要 PROFIT_HOP_COUNT + 1 笔交易
+            const PROFIT_HOP_GAS_LIMIT_ERC20 = 21055n;
+            const profitTxGas = PROFIT_HOP_GAS_LIMIT_ERC20 * gasPrice * BigInt(PROFIT_HOP_COUNT + 1);
             const sweepAmounts = [];
             let maxSweepIndex = -1;
             let maxSweepAmount = 0n;

package/dist/utils/holders-maker.d.ts

@@ -93,14 +93,19 @@ export type HoldersMakerResult = {
 /**
  * 刷持有人（一个 bundle 完成分发+买入）
  *
- * 流程（同一个 bundle）：
+ * 原生代币模式流程（同一个 bundle）：
  * 1. 贿赂交易
- * 2. 分发原生代币（dev → 新钱包1, dev → 新钱包2, ...）
- * 3. 买入交易（新钱包1 买入, 新钱包2 买入, ...）
+ * 2. 分发原生代币（dev → 新钱包）
+ * 3. 买入交易（新钱包 nonce=0）
  * 4. 利润多跳
  *
- * ⚠️ 仅支持原生代币（BNB/MON）模式
- * ERC20 模式需要授权，无法在同一个 bundle 中完成
+ * ERC20 模式流程（同一个 bundle）：
+ * 1. 贿赂交易
+ * 2. 分发原生代币（gas 费）
+ * 3. 分发 ERC20 代币（购买资金）
+ * 4. 授权交易（新钱包 nonce=0）
+ * 5. 买入交易（新钱包 nonce=1）
+ * 6. 利润多跳
  *
  * @returns 包含所有签名交易的结果，由前端提交
  */
@@ -111,10 +116,12 @@ export declare function holdersMaker(params: HoldersMakerParams): Promise<Holder
 export declare function estimateHoldersMakerCost(params: {
     holdersCount: number;
     buyAmountPerHolder: string;
+    baseToken?: BaseTokenType;
     gasLimit?: number;
     gasPriceGwei?: number;
 }): {
     totalNativeCost: string;
+    totalERC20Cost?: string;
     gasEstimate: string;
     batchCount: number;
 };

package/dist/utils/holders-maker.js

@@ -10,7 +10,7 @@ import { generateWallets } from './wallet.js';
 import { NonceManager, getOptimizedGasPrice, buildProfitHopTransactions, PROFIT_HOP_COUNT, getDeadline } from './bundle-helpers.js';
 import { ADDRESSES, BLOCKRAZOR_BUILDER_EOA, PROFIT_CONFIG } from './constants.js';
 import { FLAP_PORTAL_ADDRESSES } from '../flap/constants.js';
-import { V2_ROUTER_ABI, V3_ROUTER02_ABI } from '../abis/common.js';
+import { V2_ROUTER_ABI, V3_ROUTER02_ABI, ERC20_ABI } from '../abis/common.js';
 // Four 内盘 ABI
 const FOUR_TM2_ABI = [
     'function buyTokenAMAP(uint256 origin, address token, address to, uint256 funds, uint256 minAmount) payable'
@@ -19,13 +19,19 @@ const FOUR_TM2_ABI = [
 const PANCAKE_V2_ROUTER_ADDRESS = ADDRESSES.BSC.PancakeV2Router;
 const PANCAKE_V3_ROUTER_ADDRESS = ADDRESSES.BSC.PancakeV3Router;
 const WBNB_ADDRESS = ADDRESSES.BSC.WBNB;
+// ERC20 稳定币地址
+const USDT_ADDRESS = ADDRESSES.BSC.USDT;
+const USDC_ADDRESS = ADDRESSES.BSC.USDC;
+// ERC20 转账和授权 Gas Limit
+const ERC20_TRANSFER_GAS_LIMIT = 65000n;
+const ERC20_APPROVE_GAS_LIMIT = 50000n;
 // ============================================================================
 // 常量
 // ============================================================================
 const DEFAULT_GAS_LIMIT = 800000;
 const DEFAULT_GAS_PRICE_GWEI = 3;
 const GAS_BUFFER_MULTIPLIER = 2; // 2倍 Gas 费安全系数
-// Bundle 限制计算：
+// Bundle 限制计算（原生代币模式）：
 // - 贿赂 1 笔
 // - 利润多跳 PROFIT_HOP_COUNT + 1 笔（payer → hop1 → hop2 → recipient）
 // - 分发 N 笔
@@ -33,7 +39,18 @@ const GAS_BUFFER_MULTIPLIER = 2; // 2倍 Gas 费安全系数
 // 1 + (PROFIT_HOP_COUNT + 1) + 2N ≤ 50
 // 2N ≤ 50 - 2 - PROFIT_HOP_COUNT
 // N ≤ (48 - PROFIT_HOP_COUNT) / 2
-const DEFAULT_MAX_WALLETS_PER_BATCH = Math.floor((48 - PROFIT_HOP_COUNT) / 2);
+const DEFAULT_MAX_WALLETS_PER_BATCH_NATIVE = Math.floor((48 - PROFIT_HOP_COUNT) / 2);
+// Bundle 限制计算（ERC20 模式）：
+// - 贿赂 1 笔
+// - 利润多跳 PROFIT_HOP_COUNT + 1 笔
+// - 分发 BNB N 笔
+// - 分发 ERC20 N 笔
+// - 授权 N 笔
+// - 买入 N 笔
+// 1 + (PROFIT_HOP_COUNT + 1) + 4N ≤ 50
+// 4N ≤ 50 - 2 - PROFIT_HOP_COUNT
+// N ≤ (48 - PROFIT_HOP_COUNT) / 4
+const DEFAULT_MAX_WALLETS_PER_BATCH_ERC20 = Math.floor((48 - PROFIT_HOP_COUNT) / 4);
 // ============================================================================
 // 辅助函数
 // ============================================================================
@@ -47,6 +64,81 @@ function chunkArray(arr, size) {
     }
     return chunks;
 }
+/**
+ * 获取 ERC20 稳定币地址
+ */
+function getBaseTokenAddress(baseToken, chain, customAddress) {
+    if (customAddress)
+        return customAddress;
+    if (baseToken === 'usdt')
+        return USDT_ADDRESS;
+    if (baseToken === 'usdc')
+        return USDC_ADDRESS;
+    throw new Error(`未知的基础代币类型: ${baseToken}`);
+}
+/**
+ * 获取 Router 地址（用于授权）
+ */
+function getRouterAddress(tradeType) {
+    switch (tradeType) {
+        case 'v2':
+            return PANCAKE_V2_ROUTER_ADDRESS;
+        case 'v3':
+            return PANCAKE_V3_ROUTER_ADDRESS;
+        default:
+            throw new Error(`ERC20 模式不支持交易类型: ${tradeType}，仅支持 v2/v3`);
+    }
+}
+/**
+ * 构建 ERC20 转账交易
+ */
+async function buildERC20TransferTx(wallet, tokenAddress, to, amount, nonce, gasPrice, chainId, txType) {
+    const iface = new ethers.Interface(ERC20_ABI);
+    const data = iface.encodeFunctionData('transfer', [to, amount]);
+    const tx = {
+        to: tokenAddress,
+        data,
+        value: 0n,
+        nonce,
+        gasLimit: ERC20_TRANSFER_GAS_LIMIT,
+        chainId
+    };
+    if (txType === 2) {
+        tx.maxFeePerGas = gasPrice;
+        tx.maxPriorityFeePerGas = gasPrice / 10n || 1n;
+        tx.type = 2;
+    }
+    else {
+        tx.gasPrice = gasPrice;
+        tx.type = 0;
+    }
+    return await wallet.signTransaction(tx);
+}
+/**
+ * 构建 ERC20 授权交易
+ */
+async function buildERC20ApproveTx(wallet, tokenAddress, spender, amount, nonce, gasPrice, chainId, txType) {
+    const iface = new ethers.Interface(ERC20_ABI);
+    const data = iface.encodeFunctionData('approve', [spender, amount]);
+    const tx = {
+        to: tokenAddress,
+        data,
+        value: 0n,
+        nonce,
+        gasLimit: ERC20_APPROVE_GAS_LIMIT,
+        chainId
+    };
+    if (txType === 2) {
+        tx.maxFeePerGas = gasPrice;
+        tx.maxPriorityFeePerGas = gasPrice / 10n || 1n;
+        tx.type = 2;
+    }
+    else {
+        tx.gasPrice = gasPrice;
+        tx.type = 0;
+    }
+    return await wallet.signTransaction(tx);
+}
 /**
  * 构建原生代币转账交易
  */
@@ -207,26 +299,97 @@ async function buildV3BuyTx(wallet, tokenAddress, buyAmount, nonce, gasPrice, ga
     }
     return await wallet.signTransaction(tx);
 }
+/**
+ * 构建 V2 买入交易（ERC20 输入）
+ * USDT/USDC → Token (使用 swapExactTokensForTokensSupportingFeeOnTransferTokens)
+ */
+async function buildV2BuyTxWithERC20(wallet, tokenAddress, baseTokenAddress, buyAmount, nonce, gasPrice, gasLimit, chainId, txType) {
+    // 路径: USDT/USDC → Token
+    const path = [baseTokenAddress, tokenAddress];
+    const deadline = getDeadline();
+    const v2Router = new Contract(PANCAKE_V2_ROUTER_ADDRESS, V2_ROUTER_ABI, wallet);
+    const unsigned = await v2Router.swapExactTokensForTokensSupportingFeeOnTransferTokens.populateTransaction(buyAmount, // amountIn
+    0n, // amountOutMin（不设滑点保护）
+    path, wallet.address, deadline);
+    const tx = {
+        ...unsigned,
+        nonce,
+        gasLimit: BigInt(gasLimit),
+        chainId
+    };
+    if (txType === 2) {
+        tx.maxFeePerGas = gasPrice;
+        tx.maxPriorityFeePerGas = gasPrice / 10n || 1n;
+        tx.type = 2;
+    }
+    else {
+        tx.gasPrice = gasPrice;
+        tx.type = 0;
+    }
+    return await wallet.signTransaction(tx);
+}
+/**
+ * 构建 V3 买入交易（ERC20 输入）
+ * USDT/USDC → Token (使用 exactInputSingle + multicall)
+ */
+async function buildV3BuyTxWithERC20(wallet, tokenAddress, baseTokenAddress, buyAmount, nonce, gasPrice, gasLimit, chainId, txType, v3Fee = 2500) {
+    const deadline = getDeadline();
+    const v3RouterIface = new ethers.Interface(V3_ROUTER02_ABI);
+    // 构建 exactInputSingle calldata
+    const exactInputSingleData = v3RouterIface.encodeFunctionData('exactInputSingle', [{
+            tokenIn: baseTokenAddress,
+            tokenOut: tokenAddress,
+            fee: v3Fee,
+            recipient: wallet.address,
+            amountIn: buyAmount,
+            amountOutMinimum: 0n,
+            sqrtPriceLimitX96: 0n
+        }]);
+    // 使用 multicall 包装（无需 ETH value）
+    const v3Router = new Contract(PANCAKE_V3_ROUTER_ADDRESS, V3_ROUTER02_ABI, wallet);
+    const unsigned = await v3Router.multicall.populateTransaction(deadline, [exactInputSingleData]);
+    const tx = {
+        ...unsigned,
+        nonce,
+        gasLimit: BigInt(gasLimit),
+        chainId
+    };
+    if (txType === 2) {
+        tx.maxFeePerGas = gasPrice;
+        tx.maxPriorityFeePerGas = gasPrice / 10n || 1n;
+        tx.type = 2;
+    }
+    else {
+        tx.gasPrice = gasPrice;
+        tx.type = 0;
+    }
+    return await wallet.signTransaction(tx);
+}
 // ============================================================================
 // 主方法
 // ============================================================================
 /**
  * 刷持有人（一个 bundle 完成分发+买入）
  *
- * 流程（同一个 bundle）：
+ * 原生代币模式流程（同一个 bundle）：
  * 1. 贿赂交易
- * 2. 分发原生代币（dev → 新钱包1, dev → 新钱包2, ...）
- * 3. 买入交易（新钱包1 买入, 新钱包2 买入, ...）
+ * 2. 分发原生代币（dev → 新钱包）
+ * 3. 买入交易（新钱包 nonce=0）
  * 4. 利润多跳
  *
- * ⚠️ 仅支持原生代币（BNB/MON）模式
- * ERC20 模式需要授权，无法在同一个 bundle 中完成
+ * ERC20 模式流程（同一个 bundle）：
+ * 1. 贿赂交易
+ * 2. 分发原生代币（gas 费）
+ * 3. 分发 ERC20 代币（购买资金）
+ * 4. 授权交易（新钱包 nonce=0）
+ * 5. 买入交易（新钱包 nonce=1）
+ * 6. 利润多跳
  *
  * @returns 包含所有签名交易的结果，由前端提交
  */
 export async function holdersMaker(params) {
-    const { payerPrivateKey, holdersCount, buyAmountPerHolder, tokenAddress, baseToken = 'native', config } = params;
-    const { rpcUrl, chain = 'BSC', chainId: configChainId, tradeType = 'flap', gasLimit = DEFAULT_GAS_LIMIT, gasPriceGwei = DEFAULT_GAS_PRICE_GWEI, bribeAmount = 0.000001, txType = 0, maxWalletsPerBatch = DEFAULT_MAX_WALLETS_PER_BATCH } = config;
+    const { payerPrivateKey, holdersCount, buyAmountPerHolder, tokenAddress, baseToken = 'native', baseTokenAddress, baseTokenDecimals = 18, config } = params;
+    const { rpcUrl, chain = 'BSC', chainId: configChainId, tradeType = 'flap', gasLimit = DEFAULT_GAS_LIMIT, gasPriceGwei = DEFAULT_GAS_PRICE_GWEI, bribeAmount = 0.000001, txType = 0 } = config;
     const result = {
         success: false,
         newWallets: [],
@@ -235,9 +398,10 @@ export async function holdersMaker(params) {
         successBatchCount: 0,
         totalBatchCount: 0
     };
-    // ⚠️ 目前仅支持原生代币模式
-    if (baseToken !== 'native') {
-        result.error = '一个 bundle 模式仅支持原生代币（BNB/MON），ERC20 模式需要分开提交';
+    const isERC20Mode = baseToken !== 'native';
+    // ✅ ERC20 模式只支持 v2/v3 外盘
+    if (isERC20Mode && (tradeType === 'four' || tradeType === 'flap')) {
+        result.error = `ERC20 模式（${baseToken}）不支持 ${tradeType} 内盘，仅支持 v2/v3 外盘`;
         return result;
     }
     // ✅ 支持 four、flap 内盘和 v2、v3 外盘
@@ -246,85 +410,139 @@ export async function holdersMaker(params) {
         result.error = `不支持的交易类型: ${tradeType}，支持: ${supportedTradeTypes.join(', ')}`;
         return result;
     }
+    // 根据模式选择每批最大钱包数
+    const maxWalletsPerBatch = config.maxWalletsPerBatch ||
+        (isERC20Mode ? DEFAULT_MAX_WALLETS_PER_BATCH_ERC20 : DEFAULT_MAX_WALLETS_PER_BATCH_NATIVE);
     try {
         // 1. 初始化
         const provider = new JsonRpcProvider(rpcUrl);
         const chainId = configChainId || Number((await provider.getNetwork()).chainId);
         const payer = new Wallet(payerPrivateKey, provider);
         const nonceManager = new NonceManager(provider);
-        console.log(`[HoldersMaker] 开始刷持有人: chain=${chain}, chainId=${chainId}, holdersCount=${holdersCount}`);
+        console.log(`[HoldersMaker] 开始刷持有人: chain=${chain}, chainId=${chainId}, holdersCount=${holdersCount}, baseToken=${baseToken}`);
         // 2. 生成新钱包
         const newWallets = generateWallets(holdersCount);
         result.newWallets = newWallets;
         console.log(`[HoldersMaker] 生成 ${newWallets.length} 个新钱包`);
         // 3. 计算金额
-        const buyAmountWei = ethers.parseEther(buyAmountPerHolder);
-        const gasFeePerWallet = BigInt(Math.floor(gasLimit * gasPriceGwei * 1e9));
-        const gasWithBuffer = gasFeePerWallet * BigInt(GAS_BUFFER_MULTIPLIER);
-        const transferAmountPerWallet = buyAmountWei + gasWithBuffer;
-        console.log(`[HoldersMaker] 每个钱包分发: ${ethers.formatEther(transferAmountPerWallet)} BNB (买入 ${buyAmountPerHolder} + Gas ${ethers.formatEther(gasWithBuffer)})`);
-        // 4. 获取 Gas Price（支持小数 Gwei，如 0.1 Gwei）
         const gasPriceWei = BigInt(Math.floor(gasPriceGwei * 1e9));
         const gasPrice = await getOptimizedGasPrice(provider, { minGasPrice: gasPriceWei });
         const bribeAmountWei = ethers.parseEther(String(bribeAmount));
-        // 5. 分批处理
+        // ERC20 模式需要更多 gas（授权 + 购买）
+        const gasMultiplier = isERC20Mode ? 2 : 1;
+        const gasFeePerWallet = BigInt(Math.floor(gasLimit * gasPriceGwei * 1e9)) * BigInt(gasMultiplier);
+        const gasWithBuffer = gasFeePerWallet * BigInt(GAS_BUFFER_MULTIPLIER);
+        let buyAmountWei;
+        let transferNativePerWallet;
+        let erc20TokenAddress;
+        if (isERC20Mode) {
+            // ERC20 模式：解析购买金额（考虑精度）
+            buyAmountWei = ethers.parseUnits(buyAmountPerHolder, baseTokenDecimals);
+            // 只需要分发 gas 费
+            transferNativePerWallet = gasWithBuffer;
+            // 获取 ERC20 地址
+            erc20TokenAddress = getBaseTokenAddress(baseToken, chain, baseTokenAddress);
+            console.log(`[HoldersMaker] ERC20 模式: ${baseToken} (${erc20TokenAddress})`);
+            console.log(`[HoldersMaker] 每个钱包分发: ${ethers.formatEther(transferNativePerWallet)} BNB (Gas) + ${buyAmountPerHolder} ${baseToken.toUpperCase()}`);
+        }
+        else {
+            // 原生代币模式
+            buyAmountWei = ethers.parseEther(buyAmountPerHolder);
+            transferNativePerWallet = buyAmountWei + gasWithBuffer;
+            console.log(`[HoldersMaker] 每个钱包分发: ${ethers.formatEther(transferNativePerWallet)} BNB (买入 ${buyAmountPerHolder} + Gas ${ethers.formatEther(gasWithBuffer)})`);
+        }
+        // 4. 分批处理
         const walletBatches = chunkArray(newWallets, maxWalletsPerBatch);
         result.totalBatchCount = walletBatches.length;
         console.log(`[HoldersMaker] 分 ${walletBatches.length} 批处理，每批最多 ${maxWalletsPerBatch} 个钱包`);
-        // 6. 计算利润
-        const totalBuyAmount = buyAmountWei * BigInt(holdersCount);
+        // 5. 计算利润（基于原生代币）
+        const totalBuyAmountForProfit = isERC20Mode
+            ? ethers.parseEther(buyAmountPerHolder) * BigInt(holdersCount) // 按等值 BNB 计算
+            : buyAmountWei * BigInt(holdersCount);
         const profitRateBps = PROFIT_CONFIG.RATE_BPS_SWAP;
-        const totalProfit = (totalBuyAmount * BigInt(profitRateBps)) / 10000n;
+        const totalProfit = (totalBuyAmountForProfit * BigInt(profitRateBps)) / 10000n;
         const profitPerBatch = totalProfit / BigInt(walletBatches.length);
         console.log(`[HoldersMaker] 总利润: ${ethers.formatEther(totalProfit)} BNB`);
-        // 7. 并行生成所有批次的签名
+        // 6. 并行生成所有批次的签名
         const batchPromises = walletBatches.map(async (batch, batchIdx) => {
             try {
                 const signedTxs = [];
-                // 计算这批需要的 nonce 数量
-                // 贿赂 1 + 分发 N + 利润 (PROFIT_HOP_COUNT + 1)
-                const payerNonceCount = 1 + batch.length + PROFIT_HOP_COUNT + 1;
+                // 计算这批需要的 payer nonce 数量
+                // 原生模式: 贿赂 1 + 分发 N + 利润 (PROFIT_HOP_COUNT + 1)
+                // ERC20模式: 贿赂 1 + 分发BNB N + 分发ERC20 N + 利润 (PROFIT_HOP_COUNT + 1)
+                const payerNonceCount = isERC20Mode
+                    ? 1 + batch.length * 2 + PROFIT_HOP_COUNT + 1
+                    : 1 + batch.length + PROFIT_HOP_COUNT + 1;
                 const payerNonces = await nonceManager.getNextNonceBatch(payer, payerNonceCount);
                 let payerNonceIdx = 0;
                 // (1) 贿赂交易
                 const bribeTx = await buildNativeTransferTx(payer, BLOCKRAZOR_BUILDER_EOA, bribeAmountWei, payerNonces[payerNonceIdx++], gasPrice, chainId, txType);
                 signedTxs.push(bribeTx);
-                // (2) 分发交易
+                // (2) 分发原生代币（gas 费或买入资金）
                 for (const newWallet of batch) {
-                    const transferTx = await buildNativeTransferTx(payer, newWallet.address, transferAmountPerWallet, payerNonces[payerNonceIdx++], gasPrice, chainId, txType);
+                    const transferTx = await buildNativeTransferTx(payer, newWallet.address, transferNativePerWallet, payerNonces[payerNonceIdx++], gasPrice, chainId, txType);
                     signedTxs.push(transferTx);
                 }
-                // (3) 买入交易（新钱包，nonce=0）
+                // (3) ERC20 模式：分发 ERC20 代币
+                if (isERC20Mode && erc20TokenAddress) {
+                    for (const newWallet of batch) {
+                        const erc20TransferTx = await buildERC20TransferTx(payer, erc20TokenAddress, newWallet.address, buyAmountWei, payerNonces[payerNonceIdx++], gasPrice, chainId, txType);
+                        signedTxs.push(erc20TransferTx);
+                    }
+                }
+                // (4) ERC20 模式：授权交易（新钱包 nonce=0）
+                if (isERC20Mode && erc20TokenAddress) {
+                    const routerAddress = getRouterAddress(tradeType);
+                    for (const newWallet of batch) {
+                        const buyerWallet = new Wallet(newWallet.privateKey, provider);
+                        const approveTx = await buildERC20ApproveTx(buyerWallet, erc20TokenAddress, routerAddress, ethers.MaxUint256, // 无限授权
+                        0, // 新钱包 nonce=0
+                        gasPrice, chainId, txType);
+                        signedTxs.push(approveTx);
+                    }
+                }
+                // (5) 买入交易
+                // 原生模式: nonce=0
+                // ERC20模式: nonce=1（授权后）
+                const buyNonce = isERC20Mode ? 1 : 0;
                 for (const newWallet of batch) {
                     const buyerWallet = new Wallet(newWallet.privateKey, provider);
                     let buyTx;
-                    switch (tradeType) {
-                        case 'four':
-                            // Four 内盘
-                            buyTx = await buildFourBuyTx(buyerWallet, tokenAddress, buyAmountWei, 0, // 新钱包 nonce=0
-                            gasPrice, gasLimit, chainId, txType);
-                            break;
-                        case 'flap':
-                            // Flap 内盘
-                            buyTx = await buildFlapBuyTx(buyerWallet, tokenAddress, buyAmountWei, 0, // 新钱包 nonce=0
-                            gasPrice, gasLimit, chainId, txType, chain);
-                            break;
-                        case 'v2':
-                            // PancakeSwap V2
-                            buyTx = await buildV2BuyTx(buyerWallet, tokenAddress, buyAmountWei, 0, // 新钱包 nonce=0
-                            gasPrice, gasLimit, chainId, txType, config.v2Path);
-                            break;
-                        case 'v3':
-                            // PancakeSwap V3
-                            buyTx = await buildV3BuyTx(buyerWallet, tokenAddress, buyAmountWei, 0, // 新钱包 nonce=0
-                            gasPrice, gasLimit, chainId, txType, config.v3Fee);
-                            break;
-                        default:
-                            throw new Error(`不支持的交易类型: ${tradeType}`);
+                    if (isERC20Mode && erc20TokenAddress) {
+                        // ERC20 购买
+                        switch (tradeType) {
+                            case 'v2':
+                                buyTx = await buildV2BuyTxWithERC20(buyerWallet, tokenAddress, erc20TokenAddress, buyAmountWei, buyNonce, gasPrice, gasLimit, chainId, txType);
+                                break;
+                            case 'v3':
+                                buyTx = await buildV3BuyTxWithERC20(buyerWallet, tokenAddress, erc20TokenAddress, buyAmountWei, buyNonce, gasPrice, gasLimit, chainId, txType, config.v3Fee);
+                                break;
+                            default:
+                                throw new Error(`ERC20 模式不支持交易类型: ${tradeType}`);
+                        }
+                    }
+                    else {
+                        // 原生代币购买
+                        switch (tradeType) {
+                            case 'four':
+                                buyTx = await buildFourBuyTx(buyerWallet, tokenAddress, buyAmountWei, buyNonce, gasPrice, gasLimit, chainId, txType);
+                                break;
+                            case 'flap':
+                                buyTx = await buildFlapBuyTx(buyerWallet, tokenAddress, buyAmountWei, buyNonce, gasPrice, gasLimit, chainId, txType, chain);
+                                break;
+                            case 'v2':
+                                buyTx = await buildV2BuyTx(buyerWallet, tokenAddress, buyAmountWei, buyNonce, gasPrice, gasLimit, chainId, txType, config.v2Path);
+                                break;
+                            case 'v3':
+                                buyTx = await buildV3BuyTx(buyerWallet, tokenAddress, buyAmountWei, buyNonce, gasPrice, gasLimit, chainId, txType, config.v3Fee);
+                                break;
+                            default:
+                                throw new Error(`不支持的交易类型: ${tradeType}`);
+                        }
                     }
                     signedTxs.push(buyTx);
                 }
-                // (4) 利润多跳
+                // (6) 利润多跳
                 if (profitPerBatch > 0n) {
                     const profitHopResult = await buildProfitHopTransactions({
                         provider,
@@ -356,7 +574,7 @@ export async function holdersMaker(params) {
             }
         });
         const batchResults = await Promise.all(batchPromises);
-        // 8. 处理结果
+        // 7. 处理结果
         for (const res of batchResults) {
             if (res.success && res.signedTransactions) {
                 result.signedTransactions.push(res.signedTransactions);
@@ -383,18 +601,34 @@ export async function holdersMaker(params) {
  * 获取刷持有人预估费用
  */
 export function estimateHoldersMakerCost(params) {
-    const { holdersCount, buyAmountPerHolder, gasLimit = DEFAULT_GAS_LIMIT, gasPriceGwei = DEFAULT_GAS_PRICE_GWEI } = params;
-    const gasFeePerWallet = (gasLimit * gasPriceGwei) / 1e9;
+    const { holdersCount, buyAmountPerHolder, baseToken = 'native', gasLimit = DEFAULT_GAS_LIMIT, gasPriceGwei = DEFAULT_GAS_PRICE_GWEI } = params;
+    const isERC20Mode = baseToken !== 'native';
+    const gasMultiplier = isERC20Mode ? 2 : 1; // ERC20 模式需要授权+购买
+    const gasFeePerWallet = (gasLimit * gasPriceGwei * gasMultiplier) / 1e9;
     const gasWithBuffer = gasFeePerWallet * GAS_BUFFER_MULTIPLIER;
     const buyAmount = parseFloat(buyAmountPerHolder);
-    // 每个钱包成本 = 购买金额 + Gas 费
-    const costPerWallet = buyAmount + gasWithBuffer;
-    const totalNativeCost = costPerWallet * holdersCount;
     // 批次数
-    const batchCount = Math.ceil(holdersCount / DEFAULT_MAX_WALLETS_PER_BATCH);
-    return {
-        totalNativeCost: totalNativeCost.toFixed(6),
-        gasEstimate: (gasWithBuffer * holdersCount).toFixed(6),
-        batchCount
-    };
+    const maxPerBatch = isERC20Mode ? DEFAULT_MAX_WALLETS_PER_BATCH_ERC20 : DEFAULT_MAX_WALLETS_PER_BATCH_NATIVE;
+    const batchCount = Math.ceil(holdersCount / maxPerBatch);
+    if (isERC20Mode) {
+        // ERC20 模式：原生代币只用于 gas
+        const totalNativeCost = gasWithBuffer * holdersCount;
+        const totalERC20Cost = buyAmount * holdersCount;
+        return {
+            totalNativeCost: totalNativeCost.toFixed(6),
+            totalERC20Cost: totalERC20Cost.toFixed(6),
+            gasEstimate: (gasWithBuffer * holdersCount).toFixed(6),
+            batchCount
+        };
+    }
+    else {
+        // 原生代币模式：包含购买金额 + gas
+        const costPerWallet = buyAmount + gasWithBuffer;
+        const totalNativeCost = costPerWallet * holdersCount;
+        return {
+            totalNativeCost: totalNativeCost.toFixed(6),
+            gasEstimate: (gasWithBuffer * holdersCount).toFixed(6),
+            batchCount
+        };
+    }
 }

package/package.json

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