four-flap-meme-sdk 4.4.3 → 4.5.0

package/README.md

@@ -2,7 +2,7 @@
 
 **four.meme 和 Flap Protocol 统一 SDK - 生产环境 MEV 保护方案**
 
-提供完整的代币发行和交易功能，所有操作均通过 **Merkle.io Bundle** 执行，确保 MEV 保护、原子性和私有性。
+提供完整的代币发行和交易功能，签名后通过 BlockRazor / 48.club / Emit 提交，确保 MEV 保护和原子性。
 
 ## 核心优势
 
@@ -20,9 +20,9 @@ npm i four-flap-meme-sdk ethers
 
 **要求**：Node.js >= 18, ESM, ethers v6
 
-## 获取 Merkle API Key
+## 提交
 
-从 [Merkle.io](https://merkle.io) 获取免费 API Key，用于 Bundle 服务。
+SDK 只负责构建与签名；Merkle 网络客户端和 `submitBundleToMerkle` 已移除，请使用 BlockRazor、48.club 或 Emit 提交。
 
 ## 浏览器环境 CORS 支持
 
@@ -66,7 +66,6 @@ const result = await createTokenWithBundleBuyMerkle({
     label: 'Meme'
   },
   config: {
-    apiKey: 'YOUR_MERKLE_API_KEY',
     rpcUrl: 'https://bsc-dataseed.binance.org'
   }
 });
@@ -84,7 +83,7 @@ await batchBuyWithBundleMerkle({
   privateKeys: ['0x...买家1', '0x...买家2', '0x...买家3'],
   buyAmounts: ['0.3', '0.5', '0.2'],
   tokenAddress: '0x...代币地址',
-  config: { apiKey: 'YOUR_MERKLE_API_KEY' }
+  config: {}
 });
 ```
 
@@ -98,7 +97,7 @@ await batchSellWithBundleMerkle({
   privateKeys: ['0x...卖家1', '0x...卖家2'],
   sellAmounts: ['1000', '2000'],
   tokenAddress: '0x...代币地址',
-  config: { apiKey: 'YOUR_MERKLE_API_KEY' }
+  config: {}
 });
 ```
 
@@ -110,7 +109,7 @@ import { approveFourBatchMerkle } from 'four-flap-meme-sdk';
 await approveFourBatchMerkle({
   privateKeys: ['0x...地址1', '0x...地址2'],
   tokenAddress: '0x...代币地址',
-  config: { apiKey: 'YOUR_MERKLE_API_KEY' }
+  config: {}
 });
 ```
 
@@ -131,7 +130,7 @@ await fourPancakeProxyBatchBuyMerkle({
     ['0x...WBNB', '0x...TOKEN']
   ],
   routeType: 'v2',
-  config: { apiKey: 'YOUR_MERKLE_API_KEY' }
+  config: {}
 });
 
 // V2 批量卖出
@@ -143,7 +142,7 @@ await fourPancakeProxyBatchSellMerkle({
     ['0x...TOKEN', '0x...WBNB']
   ],
   routeType: 'v2',
-  config: { apiKey: 'YOUR_MERKLE_API_KEY' }
+  config: {}
 });
 ```
 
@@ -158,7 +157,7 @@ await fourPancakeProxyBatchBuyMerkle({
   tokenOut: '0x...TOKEN',
   fee: 2500,  // 0.25%
   routeType: 'v3-single',
-  config: { apiKey: 'YOUR_MERKLE_API_KEY' }
+  config: {}
 });
 
 // V3 多跳买入
@@ -168,7 +167,7 @@ await fourPancakeProxyBatchBuyMerkle({
   lpAddresses: ['0x...WBNB_USDT_LP', '0x...USDT_TOKEN_LP'],
   exactTokenIn: '0x...WBNB',
   routeType: 'v3-multi',
-  config: { apiKey: 'YOUR_MERKLE_API_KEY' }
+  config: {}
 });
 ```
 
@@ -196,7 +195,6 @@ const result = await flapCreateTokenWithBundleBuyMerkle({
     meta: 'QmXxx...'  // IPFS CID
   },
   config: {
-    apiKey: 'YOUR_MERKLE_API_KEY',
     rpcUrl: 'https://bsc-dataseed.binance.org'
   },
   dexThresh: 1,
@@ -222,7 +220,7 @@ await flapBatchBuyWithBundleMerkle({
   privateKeys: ['0x...买家1', '0x...买家2'],
   buyAmounts: ['0.5', '1.0'],
   tokenAddress: '0x...代币地址',
-  config: { apiKey: 'YOUR_MERKLE_API_KEY' }
+  config: {}
 });
 
 // 批量卖出
@@ -231,7 +229,7 @@ await flapBatchSellWithBundleMerkle({
   privateKeys: ['0x...卖家1', '0x...卖家2'],
   sellAmounts: ['1000', '2000'],
   tokenAddress: '0x...代币地址',
-  config: { apiKey: 'YOUR_MERKLE_API_KEY' }
+  config: {}
 });
 ```
 
@@ -253,7 +251,7 @@ await flapPancakeProxyBatchBuyMerkle({
     ['0x...WBNB', '0x...TOKEN']
   ],
   routeType: 'v2',
-  config: { apiKey: 'YOUR_MERKLE_API_KEY' }
+  config: {}
 });
 
 // V3 单跳卖出
@@ -265,7 +263,7 @@ await flapPancakeProxyBatchSellMerkle({
   tokenOut: '0x...WBNB',
   fee: 2500,
   routeType: 'v3-single',
-  config: { apiKey: 'YOUR_MERKLE_API_KEY' }
+  config: {}
 });
 ```
 
@@ -275,7 +273,6 @@ await flapPancakeProxyBatchSellMerkle({
 
 ```typescript
 type BundleMerkleConfig = {
-  apiKey: string;                    // Merkle API Key（必填）
   rpcUrl?: string;                   // RPC 节点（可选）
   bundleBlockOffset?: number;        // Bundle 有效期，默认 200 区块
   gasLimitMultiplier?: number;       // Gas limit 倍数，默认 1.2
@@ -331,11 +328,8 @@ type BundleMerkleConfig = {
 
 ## 常见问题
 
-**Q: 为什么只推荐 Merkle Bundle 方法？**  
-A: 生产环境必须使用 MEV 保护，防止抢跑和三明治攻击。Merkle Bundle 是目前最可靠的 MEV 保护方案。
-
-**Q: Merkle API Key 如何获取？**  
-A: 访问 [Merkle.io](https://merkle.io) 注册并获取免费 API Key。
+**Q: 现在如何提交 Bundle？**  
+A: 使用 BlockRazor、48.club 或 Emit service；Merkle 网络客户端已移除。
 
 **Q: Bundle 交易失败怎么办？**  
 A: 检查配置参数（gasLimit、blockOffset、slippage），确保所有地址有足够余额，适当增大超时时间。

package/dist/bundle/four-meme/types/buy-first.d.ts

@@ -6,7 +6,8 @@ export type FourBuyFirstSignConfig = FourSignConfig & {
     userType?: UserType;
 };
 export type FourBuyFirstConfig = CommonBundleConfig & {
-    apiKey: string;
+    /** @deprecated Merkle 提交已移除；字段仅为旧调用兼容，不再读取 */
+    apiKey?: string;
     customRpcUrl?: string;
     bundleBlockOffset?: number;
     reserveGasBNB?: number;

package/dist/bundle/four-meme/types/config.d.ts

@@ -22,7 +22,8 @@ export type FourSignConfig = {
     bribeAmount?: number;
 };
 export type FourBundleMerkleConfig = {
-    apiKey: string;
+    /** @deprecated Merkle 提交已移除；字段仅为旧调用兼容，不再读取 */
+    apiKey?: string;
     customRpcUrl?: string;
     fourApiUrl?: string;
     bundleBlockOffset?: number;

package/dist/bundle/four-meme/types/swap-types.d.ts

@@ -16,7 +16,8 @@ export type FourSwapSignConfig = {
 };
 /** Swap Merkle 配置（保留兼容） */
 export type FourSwapConfig = CommonBundleConfig & {
-    apiKey: string;
+    /** @deprecated Merkle 提交已移除；字段仅为旧调用兼容，不再读取 */
+    apiKey?: string;
     customRpcUrl?: string;
     bundleBlockOffset?: number;
     reserveGasBNB?: number;

package/dist/bundle/four-meme/utils-sweep/erc20-no-hop.js

@@ -113,14 +113,23 @@ export async function sweepErc20NoHop(ctx) {
         }
     }
     // ✅ 第二步：生成归集交易（ERC20 全额归集，费用以原生币单独支付）
+    // 支付者可能既要归集又要发利润，必须先按“主交易 + 利润”预留连续 nonce；
+    // 且支付者不能再从批量 nonce 里取一次，否则 target 同时在 sources 时会拿到 m+1 做主交易、m 做利润。
     let payerProfitNonce;
+    let payerMainNonce;
+    const payerAddressErc20 = extractProfit && nativeProfitAmount > 0n && profitPayerWalletErc20
+        ? profitPayerWalletErc20.address.toLowerCase()
+        : undefined;
     if (extractProfit && nativeProfitAmount > 0n && profitPayerWalletErc20) {
-        const nonces = await nonceManager.getNextNonceBatch(profitPayerWalletErc20, useTargetAsPayerErc20 ? 1 : 2);
-        payerProfitNonce = useTargetAsPayerErc20 ? nonces[0] : nonces[1];
+        const payerIsSourceWithAmount = targetIndexInSources >= 0 && useTargetAsPayerErc20 && sweepAmounts[targetIndexInSources] > 0n;
+        const payerNeedsMain = !useTargetAsPayerErc20 || payerIsSourceWithAmount;
+        const nonces = await nonceManager.getNextNonceBatch(profitPayerWalletErc20, payerNeedsMain ? 2 : 1);
+        if (payerNeedsMain)
+            payerMainNonce = nonces[0];
+        payerProfitNonce = payerNeedsMain ? nonces[1] : nonces[0];
     }
-    // ✅ 优化：批量获取所有钱包的 nonce（JSON-RPC 批量请求）
-    // 过滤出需要归集的钱包（如果用 targetWallet 支付利润，则不排除 maxSweepIndex）
-    const walletsToSweepErc20 = wallets.filter((_, i) => sweepAmounts[i] > 0n && (useTargetAsPayerErc20 || i !== maxSweepIndex));
+    // 支付者已单独预留 nonce，不能再进入批量查询。
+    const walletsToSweepErc20 = wallets.filter((w, i) => sweepAmounts[i] > 0n && (!payerAddressErc20 || w.address.toLowerCase() !== payerAddressErc20));
     const noncesErc20 = walletsToSweepErc20.length > 0 ? await nonceManager.getNextNoncesForWallets(walletsToSweepErc20) : [];
     let nonceIdxErc20 = 0;
     const txPromises = wallets.map(async (w, i) => {
@@ -129,10 +138,9 @@ export async function sweepErc20NoHop(ctx) {
             return null;
         // ✅ ERC20 归集：全部归集，不扣除代币（利润从 BNB 支付）
         const actualToSend = toSend;
-        // ✅ 支付者使用预留的第一个 nonce，其他钱包使用批量获取的 nonce
         let nonce;
-        if (!useTargetAsPayerErc20 && i === maxSweepIndex && payerProfitNonce !== undefined) {
-            nonce = payerProfitNonce - 1; // 使用预留的第一个 nonce
+        if (payerMainNonce !== undefined && w.address.toLowerCase() === payerAddressErc20) {
+            nonce = payerMainNonce;
         }
         else {
             nonce = noncesErc20[nonceIdxErc20++];

package/dist/bundle/four-meme/utils-sweep/main.js

@@ -16,7 +16,7 @@ import { sweepNativeNoHop } from './native-no-hop.js';
 import { sweepErc20NoHop } from './erc20-no-hop.js';
 import { sweepWithHops } from './with-hops.js';
 export async function sweepWithBundleMerkle(params) {
-    const { sourcePrivateKeys, target, targetPrivateKey, ratioPct, ratios, amount, amounts, tokenAddress, tokenDecimals, skipIfInsufficient = true, hopCount = 0, hopPrivateKeys, sources, config, } = params;
+    const { sourcePrivateKeys, target, targetPrivateKey, ratioPct, ratios, amount, amounts, tokenAddress, tokenDecimals, skipIfInsufficient = true, hopCount = 0, hopPrivateKeys, sources, config, startNonce, } = params;
     // 快速返回空结果
     if (!sourcePrivateKeys || sourcePrivateKeys.length === 0) {
         return {
@@ -45,6 +45,17 @@ export async function sweepWithBundleMerkle(params) {
     const hopCountInput = resolveHopCountInput(actualKeys.length, hopCount, sources);
     const preparedHops = providedHops ?? _generateHopWallets(actualKeys.length, hopCountInput);
     const hasHops = preparedHops !== null;
+    if (providedHops) {
+        // 中转交易当前按 nonce 0/1 组装；复用已发过交易的 hop key 会直接冲突。
+        for (const group of providedHops) {
+            for (const key of group) {
+                const address = new Wallet(key).address;
+                if (await provider.getTransactionCount(address, 'latest') > 0) {
+                    throw new Error('hopPrivateKeys 中包含已使用的地址；请换用未发过交易的中转私钥');
+                }
+            }
+        }
+    }
     const maxHopCount = hasHops ? Math.max(...preparedHops.map((h) => h.length)) : 0;
     // 先按配置算上限，再向节点估算。估算成功就用估算值，归集才不会把没用完的 gas 退回钱包。
     let finalGasLimit = _calculateGasLimit(config, isNative, hasHops, maxHopCount);
@@ -74,6 +85,9 @@ export async function sweepWithBundleMerkle(params) {
     const bribeSignedTx = [];
     // ✅ 共享 NonceManager：统一协调 贿赂/利润提取 等 targetWallet 交易的 nonce，避免同一钱包 nonce 冲突
     const nonceManager = new NonceManager(provider);
+    if (startNonce !== undefined && actualKeys[0]) {
+        nonceManager.seedNextNonce(new Wallet(actualKeys[0]).address, startNonce);
+    }
     // ✅ 贿赂交易放在最前面（由 targetWallet 签名）
     if (needBribeTx && targetWallet) {
         const [bribeGasPrice, bribeNonce] = await Promise.all([

package/dist/bundle/four-meme/utils-sweep/native-no-hop.js

@@ -15,6 +15,7 @@ export async function sweepNativeNoHop(ctx) {
     let profitHopWallets;
     const wallets = actualKeys.map((pk) => new Wallet(pk, provider));
     const addresses = wallets.map((w) => w.address);
+    const targetIndexInSources = addresses.findIndex((addr) => addr.toLowerCase() === target.toLowerCase());
     // ✅ 复用主流程共享的 NonceManager（贿赂交易已用它预留 targetWallet 的 nonce，避免利润提取与之冲突）
     const nonceManager = ctx.nonceManager ?? new NonceManager(provider);
     // ✅ 优化：并行获取 gasPrice 和余额
@@ -91,13 +92,20 @@ export async function sweepNativeNoHop(ctx) {
     const profitPayerWallet = useTargetAsPayer ? targetWallet : maxSweepIndex >= 0 ? wallets[maxSweepIndex] : null;
     // ✅ 先为支付者预留 nonce，确保 nonce 连续
     let payerProfitNonce;
+    let payerMainNonce;
+    const payerAddress = extractProfit && totalProfit > 0n && profitPayerWallet
+        ? profitPayerWallet.address.toLowerCase()
+        : undefined;
     if (extractProfit && totalProfit > 0n && profitPayerWallet) {
-        const nonces = await nonceManager.getNextNonceBatch(profitPayerWallet, useTargetAsPayer ? 1 : 2);
-        payerProfitNonce = useTargetAsPayer ? nonces[0] : nonces[1]; // targetWallet 只需要 1 个 nonce
+        const payerIsSourceWithAmount = targetIndexInSources >= 0 && useTargetAsPayer && sweepAmounts[targetIndexInSources] > 0n;
+        const payerNeedsMain = !useTargetAsPayer || payerIsSourceWithAmount;
+        const nonces = await nonceManager.getNextNonceBatch(profitPayerWallet, payerNeedsMain ? 2 : 1);
+        if (payerNeedsMain)
+            payerMainNonce = nonces[0];
+        payerProfitNonce = payerNeedsMain ? nonces[1] : nonces[0];
     }
-    // ✅ 优化：批量获取所有钱包的 nonce（JSON-RPC 批量请求）
-    // 过滤出需要归集的钱包（如果用 targetWallet 支付利润，则不排除 maxSweepIndex）
-    const walletsToSweep = wallets.filter((_, i) => sweepAmounts[i] > 0n && (useTargetAsPayer || i !== maxSweepIndex));
+    // 支付者已单独预留 nonce，不能再进入批量查询。
+    const walletsToSweep = wallets.filter((w, i) => sweepAmounts[i] > 0n && (!payerAddress || w.address.toLowerCase() !== payerAddress));
     const nonces = walletsToSweep.length > 0 ? await nonceManager.getNextNoncesForWallets(walletsToSweep) : [];
     let nonceIdx = 0;
     const txPromises = wallets.map(async (w, i) => {
@@ -108,17 +116,17 @@ export async function sweepNativeNoHop(ctx) {
         if (extractProfit && !useTargetAsPayer) {
             // ✅ 如果由源钱包支付利润，支付者扣除所有利润总和；其他钱包不扣利润，归集干净
             if (i === maxSweepIndex && totalProfit > 0n) {
-                actualToSend = toSend - totalProfit; // 支付者扣除所有利润总和
+                actualToSend = toSend > totalProfit ? toSend - totalProfit : 0n; // 支付者扣除利润，不足则不发
             }
             else {
                 actualToSend = toSend; // 其他钱包不扣利润，归集全部
             }
         }
         // ✅ 如果由 targetWallet 支付利润，所有源钱包都归集全部金额
-        // ✅ 支付者使用预留的第一个 nonce，其他钱包使用批量获取的 nonce
+        // 支付者 actualToSend=0 时仍发 0 值交易，消费预留 nonce，避免利润 nonce 出现空洞。
         let nonce;
-        if (!useTargetAsPayer && i === maxSweepIndex && payerProfitNonce !== undefined) {
-            nonce = payerProfitNonce - 1; // 使用预留的第一个 nonce
+        if (payerMainNonce !== undefined && w.address.toLowerCase() === payerAddress) {
+            nonce = payerMainNonce;
         }
         else {
             nonce = nonces[nonceIdx++];

package/dist/bundle/index.d.ts

@@ -5,4 +5,4 @@ export { getErc20Decimals, getErc20DecimalsMerkle, generateHopWallets, normalize
 export { resolveChainName, createSignProvider, createSignWallet, resolveSignContext, normalizeItemsOrRecipientsAmounts, resolveProvidedHops, resolveHopCountInput, signBribeTransaction, type SignConfigInput, type HopItem, } from './sign-context-helpers.js';
 export { BUNDLE_ERRORS, ERRORS, getBundleErrorMessage, getErrorMessage } from './errors.js';
 export { getTxType, getGasPriceMultiplier, getBundleOptions, getGasPriceConfig, shouldExtractProfit, getProfitRateBps, getProfitRecipient, calculateProfit, calculateBatchProfit, getBribeAmount, type BundleGasConfigInput, type BundleMerkleConfigInput, } from './config-helpers.js';
-export { submitBundleToMerkle, submitMultipleBundles, submitMultipleBundlesParallel, submitBundleToBlockRazor, submitMultipleBundlesToBlockRazor, submitMultipleBundlesToBlockRazorParallel, submitDirectToRpc, submitDirectToRpcSequential, submitDirectToRpcSequentialNoWait, submitDirectToRpcParallel, submitDirectToRpcSmart, type MerkleSubmitConfig, type SubmitBundleResult, type BlockRazorSubmitConfig, type BlockRazorSubmitResult, type DirectSubmitConfig, type DirectSubmitResult, type DirectTxResult, } from './submit.js';
+export { submitBundleToBlockRazor, submitMultipleBundlesToBlockRazor, submitMultipleBundlesToBlockRazorParallel, submitDirectToRpc, submitDirectToRpcSequential, submitDirectToRpcSequentialNoWait, submitDirectToRpcParallel, submitDirectToRpcSmart, type BlockRazorSubmitConfig, type BlockRazorSubmitResult, type DirectSubmitConfig, type DirectSubmitResult, type DirectTxResult, } from './submit.js';

package/dist/bundle/index.js

@@ -5,4 +5,4 @@ export { getErc20Decimals, getErc20DecimalsMerkle, generateHopWallets, normalize
 export { resolveChainName, createSignProvider, createSignWallet, resolveSignContext, normalizeItemsOrRecipientsAmounts, resolveProvidedHops, resolveHopCountInput, signBribeTransaction, } from './sign-context-helpers.js';
 export { BUNDLE_ERRORS, ERRORS, getBundleErrorMessage, getErrorMessage } from './errors.js';
 export { getTxType, getGasPriceMultiplier, getBundleOptions, getGasPriceConfig, shouldExtractProfit, getProfitRateBps, getProfitRecipient, calculateProfit, calculateBatchProfit, getBribeAmount, } from './config-helpers.js';
-export { submitBundleToMerkle, submitMultipleBundles, submitMultipleBundlesParallel, submitBundleToBlockRazor, submitMultipleBundlesToBlockRazor, submitMultipleBundlesToBlockRazorParallel, submitDirectToRpc, submitDirectToRpcSequential, submitDirectToRpcSequentialNoWait, submitDirectToRpcParallel, submitDirectToRpcSmart, } from './submit.js';
+export { submitBundleToBlockRazor, submitMultipleBundlesToBlockRazor, submitMultipleBundlesToBlockRazorParallel, submitDirectToRpc, submitDirectToRpcSequential, submitDirectToRpcSequentialNoWait, submitDirectToRpcParallel, submitDirectToRpcSmart, } from './submit.js';

package/dist/bundle/internal.d.ts

@@ -22,6 +22,8 @@ export declare function estimateSweepLimits(params: {
     tokenAddress?: string;
     nativeFallback: bigint;
     tokenFallback: bigint;
+    /** 估算值安全垫；节点估值通常是刚好够，批量转账/合约收款方需要余量 */
+    bufferPercent?: number;
 }): Promise<{
     nativeGasLimit: bigint;
     tokenGasLimit: bigint;

package/dist/bundle/internal.js

@@ -131,6 +131,10 @@ export async function batchGetTokenAndNativeBalances(provider, addresses, tokenA
 }
 /** 归集/分发：按节点估算这笔转账的 gas。失败返回 null，调用方再用固定上限。 */
 export async function estimateSweepLimits(params) {
+    const withBuffer = (gas) => {
+        const pct = params.bufferPercent ?? 20;
+        return gas + (gas * BigInt(Math.max(0, Math.floor(pct)))) / 100n;
+    };
     try {
         if (!params.tokenAddress) {
             const gas = await params.provider.estimateGas({
@@ -139,7 +143,7 @@ export async function estimateSweepLimits(params) {
                 value: 0n,
             });
             if (gas > 0n)
-                return { nativeGasLimit: gas, tokenGasLimit: gas, estimated: true };
+                return { nativeGasLimit: withBuffer(gas), tokenGasLimit: withBuffer(gas), estimated: true };
         }
         else {
             const iface = new ethers.Interface(['function transfer(address,uint256) returns (bool)']);
@@ -155,8 +159,8 @@ export async function estimateSweepLimits(params) {
             ]);
             if (tokenGas > 0n) {
                 return {
-                    nativeGasLimit: nativeGas > 0n ? nativeGas : params.nativeFallback,
-                    tokenGasLimit: tokenGas,
+                    nativeGasLimit: nativeGas > 0n ? withBuffer(nativeGas) : params.nativeFallback,
+                    tokenGasLimit: withBuffer(tokenGas),
                     estimated: true,
                 };
             }

package/dist/bundle/submit/index.d.ts

@@ -2,13 +2,11 @@
  * Bundle 提交 barrel
  *
  * 原超长文件按提交后端拆分为：
- * - helpers.ts：Merkle / BlockRazor 共用缓存与批量提交辅助
- * - merkle.ts：Merkle 提交后端
+ * - helpers.ts：BlockRazor 共用批量提交辅助
  * - blockrazor.ts：BlockRazor 提交后端
  * - direct.ts：逐笔 RPC 广播后端
  *
  * 对外 export 符号与路径保持不变。
  */
-export { submitBundleToMerkle, submitMultipleBundles, submitMultipleBundlesParallel, type MerkleSubmitConfig, type SubmitBundleResult, } from './merkle.js';
 export { submitBundleToBlockRazor, submitMultipleBundlesToBlockRazor, submitMultipleBundlesToBlockRazorParallel, type BlockRazorSubmitConfig, type BlockRazorSubmitResult, } from './blockrazor.js';
 export { submitDirectToRpc, submitDirectToRpcSequential, submitDirectToRpcSequentialNoWait, submitDirectToRpcParallel, submitDirectToRpcSmart, type DirectSubmitConfig, type DirectTxResult, type DirectSubmitResult, } from './direct.js';

package/dist/bundle/submit/index.js

@@ -2,13 +2,11 @@
  * Bundle 提交 barrel
  *
  * 原超长文件按提交后端拆分为：
- * - helpers.ts：Merkle / BlockRazor 共用缓存与批量提交辅助
- * - merkle.ts：Merkle 提交后端
+ * - helpers.ts：BlockRazor 共用批量提交辅助
  * - blockrazor.ts：BlockRazor 提交后端
  * - direct.ts：逐笔 RPC 广播后端
  *
  * 对外 export 符号与路径保持不变。
  */
-export { submitBundleToMerkle, submitMultipleBundles, submitMultipleBundlesParallel, } from './merkle.js';
 export { submitBundleToBlockRazor, submitMultipleBundlesToBlockRazor, submitMultipleBundlesToBlockRazorParallel, } from './blockrazor.js';
 export { submitDirectToRpc, submitDirectToRpcSequential, submitDirectToRpcSequentialNoWait, submitDirectToRpcParallel, submitDirectToRpcSmart, } from './direct.js';

package/dist/chains/bsc/index.d.ts

@@ -5,6 +5,6 @@
  */
 export * from './constants.js';
 export * as platforms from './platforms/index.js';
-export { disperseWithBundleMerkle, sweepWithBundleMerkle, pairwiseTransferWithBundleMerkle, fourBundleSwapMerkle, fourBatchSwapMerkle, fourQuickBatchSwapMerkle, fourBundleBuyFirstMerkle, createTokenWithBundleBuyMerkle as fourCreateTokenWithBundleBuyMerkle, batchSellWithBundleMerkle as fourBatchSellWithBundleMerkle, fourBatchPrivateBuyMerkle, submitBundleToMerkle, submitBundleToBlockRazor, submitDirectToRpc, submitDirectToRpcSmart, approveFourTokenManagerBatch, } from './platforms/four/index.js';
+export { disperseWithBundleMerkle, sweepWithBundleMerkle, pairwiseTransferWithBundleMerkle, fourBundleSwapMerkle, fourBatchSwapMerkle, fourQuickBatchSwapMerkle, fourBundleBuyFirstMerkle, createTokenWithBundleBuyMerkle as fourCreateTokenWithBundleBuyMerkle, batchSellWithBundleMerkle as fourBatchSellWithBundleMerkle, fourBatchPrivateBuyMerkle, submitBundleToBlockRazor, submitDirectToRpc, submitDirectToRpcSmart, approveFourTokenManagerBatch, } from './platforms/four/index.js';
 export { pancakeBundleSwapMerkle, pancakeBatchSwapMerkle, pancakeQuickBatchSwapMerkle, pancakeCrossSwapMerkle, pancakeBundleBuyFirstMerkle, } from './platforms/pancake/index.js';
 export { IroFactoryQuery, createProject as iroCreateProject, encodeCreateProjectCall as iroEncodeCreateProjectCall, parseCreateProjectEvent as iroParseCreateProjectEvent, IroTokenQuery, subscribe as iroSubscribe, pledge as iroPledge, batchSubscribe as iroBatchSubscribe, batchSubscribeForSubmit as iroBatchSubscribeForSubmit, IroPoolQuery, poolRemovePledge as iroPoolRemovePledge, poolExtract as iroPoolExtract, poolTransferAwards as iroPoolTransferAwards, batchExtract as iroBatchExtract, IRO_FACTORY_ADDRESS, IRO_FACTORY_ABI, IRO_TOKEN_ABI, IRO_POOL_ABI, CREATE_PROJECT_GAS_LIMIT as BSC_CREATE_PROJECT_GAS_LIMIT, IRO_PLATFORM_URL, IRO_TESTNET_PLATFORM_URL, setIroApiBase, setIroTestApiBase, iroApiCreateProject, iroApiUploadImage, } from './platforms/iro/index.js';

package/dist/chains/bsc/index.js

@@ -20,7 +20,7 @@ fourBundleBuyFirstMerkle,
 // 发币 / 批量卖 / 私有买入（消费者白名单别名）
 createTokenWithBundleBuyMerkle as fourCreateTokenWithBundleBuyMerkle, batchSellWithBundleMerkle as fourBatchSellWithBundleMerkle, fourBatchPrivateBuyMerkle, 
 // 提交
-submitBundleToMerkle, submitBundleToBlockRazor, submitDirectToRpc, submitDirectToRpcSmart, 
+submitBundleToBlockRazor, submitDirectToRpc, submitDirectToRpcSmart, 
 // 授权
 approveFourTokenManagerBatch, } from './platforms/four/index.js';
 // ============================================================================

package/dist/chains/bsc/pancake/bundle-buy-first-types.d.ts

@@ -48,7 +48,8 @@ export interface V3MultiRouteParams {
 }
 export type RouteParams = V2RouteParams | V3SingleRouteParams | V3MultiRouteParams;
 export interface PancakeBuyFirstConfig extends CommonBundleConfig {
-    apiKey: string;
+    /** @deprecated Merkle 提交已移除；字段仅为旧调用兼容，不再读取 */
+    apiKey?: string;
     customRpcUrl?: string;
     bundleBlockOffset?: number;
     reserveGasBNB?: number;

package/dist/chains/bsc/pancake/bundle-swap-types.d.ts

@@ -103,7 +103,8 @@ export interface PancakeSwapSignConfig {
     v2RouterAddress?: string;
 }
 export interface PancakeSwapConfig extends CommonBundleConfig {
-    apiKey: string;
+    /** @deprecated Merkle 提交已移除；字段仅为旧调用兼容，不再读取 */
+    apiKey?: string;
     customRpcUrl?: string;
     bundleBlockOffset?: number;
     reserveGasBNB?: number;

package/dist/chains/bsc/platforms/four/index.d.ts

@@ -19,6 +19,6 @@ export { sweepWithBundleMerkle } from '../../../../bundle/four-meme/utils-sweep.
 export { pairwiseTransferWithBundleMerkle } from '../../../../bundle/four-meme/utils-pairwise.js';
 export { fourPancakeProxyBatchBuyMerkle, fourPancakeProxyBatchSellMerkle, approveFourPancakeProxy, approveFourPancakeProxyBatch, } from '../../../../bundle/four-meme/pancake-proxy.js';
 export { approveFourTokenManagerBatch } from '../../../../bundle/four-meme/approve-tokenmanager.js';
-export { submitBundleToMerkle, submitMultipleBundles, submitMultipleBundlesParallel, submitBundleToBlockRazor, submitMultipleBundlesToBlockRazor, submitMultipleBundlesToBlockRazorParallel, submitDirectToRpc, submitDirectToRpcSequential, submitDirectToRpcSequentialNoWait, submitDirectToRpcParallel, submitDirectToRpcSmart, type MerkleSubmitConfig, type SubmitBundleResult, type BlockRazorSubmitConfig, type BlockRazorSubmitResult, type DirectSubmitConfig, type DirectSubmitResult, type DirectTxResult, } from '../../../../bundle/submit.js';
+export { submitBundleToBlockRazor, submitMultipleBundlesToBlockRazor, submitMultipleBundlesToBlockRazorParallel, submitDirectToRpc, submitDirectToRpcSequential, submitDirectToRpcSequentialNoWait, submitDirectToRpcParallel, submitDirectToRpcSmart, type BlockRazorSubmitConfig, type BlockRazorSubmitResult, type DirectSubmitConfig, type DirectSubmitResult, type DirectTxResult, } from '../../../../bundle/submit.js';
 export { fourBundleBuyFirstMerkle } from '../../../../bundle/four-meme/swap-buy-first.js';
 export { fourBundleSwapMerkle, fourBatchSwapMerkle, fourQuickBatchSwapMerkle, } from '../../../../bundle/four-meme/swap.js';

package/dist/chains/bsc/platforms/four/index.js

@@ -24,7 +24,7 @@ export { fourPancakeProxyBatchBuyMerkle, fourPancakeProxyBatchSellMerkle, approv
 // TokenManager 授权方法
 export { approveFourTokenManagerBatch } from '../../../../bundle/four-meme/approve-tokenmanager.js';
 // Bundle 提交方法（服务器端使用）
-export { submitBundleToMerkle, submitMultipleBundles, submitMultipleBundlesParallel, submitBundleToBlockRazor, submitMultipleBundlesToBlockRazor, submitMultipleBundlesToBlockRazorParallel, submitDirectToRpc, submitDirectToRpcSequential, submitDirectToRpcSequentialNoWait, submitDirectToRpcParallel, submitDirectToRpcSmart, } from '../../../../bundle/submit.js';
+export { submitBundleToBlockRazor, submitMultipleBundlesToBlockRazor, submitMultipleBundlesToBlockRazorParallel, submitDirectToRpc, submitDirectToRpcSequential, submitDirectToRpcSequentialNoWait, submitDirectToRpcParallel, submitDirectToRpcSmart, } from '../../../../bundle/submit.js';
 // 先买后卖换手方法
 export { fourBundleBuyFirstMerkle } from '../../../../bundle/four-meme/swap-buy-first.js';
 // 换手方法

package/dist/core/clients/blockrazor.js

@@ -146,16 +146,18 @@ export class BlockRazorClient {
         }
         // 验证 Gas Price（最低 0.05 Gwei）
         for (const rawTx of params.txs) {
+            let tx;
             try {
-                const tx = Transaction.from(rawTx);
-                const gasPrice = tx.gasPrice || 0n;
-                const minGasPrice = ethers.parseUnits(String(MIN_GAS_PRICE_GWEI), 'gwei');
-                if (gasPrice < minGasPrice) {
-                    throw new Error(`Transaction gas price (${ethers.formatUnits(gasPrice, 'gwei')} gwei) is below minimum (${MIN_GAS_PRICE_GWEI} gwei)`);
-                }
+                tx = Transaction.from(rawTx);
             }
             catch {
                 // 解析失败，跳过检查
+                continue;
+            }
+            const gasPrice = tx.gasPrice && tx.gasPrice > 0n ? tx.gasPrice : tx.maxFeePerGas ?? 0n;
+            const minGasPrice = ethers.parseUnits(String(MIN_GAS_PRICE_GWEI), 'gwei');
+            if (gasPrice < minGasPrice) {
+                throw new Error(`Transaction gas price (${ethers.formatUnits(gasPrice, 'gwei')} gwei) is below minimum (${MIN_GAS_PRICE_GWEI} gwei)`);
             }
         }
         // 构建请求参数

package/dist/core/clients/blockrazor.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/core/clients/blockrazor.test.js

@@ -0,0 +1,23 @@
+import { Wallet } from 'ethers';
+import { describe, expect, it } from 'vitest';
+import { BlockRazorClient } from './blockrazor.js';
+describe('BlockRazor gas price validation', () => {
+    it('低于 0.05 Gwei 的签名交易被拒绝', async () => {
+        const client = new BlockRazorClient({
+            apiKey: 'test',
+            chainId: 56,
+            customRpcUrl: 'http://127.0.0.1:1',
+        });
+        const wallet = Wallet.createRandom();
+        const raw = await wallet.signTransaction({
+            to: Wallet.createRandom().address,
+            value: 0n,
+            nonce: 0,
+            gasLimit: 21000n,
+            gasPrice: 1n,
+            chainId: 56,
+            type: 0,
+        });
+        await expect(client.sendBundleRaw({ txs: [raw] })).rejects.toThrow(/below minimum/);
+    });
+});

package/dist/core/clients/index.d.ts

@@ -3,6 +3,5 @@
  */
 export { FourClient, buildLoginMessage, buildCreateTokenReq, type FourConfig, type GenerateNonceReq, type LoginReq, type CreateTokenReq, type CreateTokenResp, type FourTokenTaxInfo, type FourRaisedToken, type FourTokenLabel, } from './four.js';
 export { Club48Client, sendBatchPrivateTransactions, sendBackrunBundle, type BundleParams, type BundleStatus, type Club48Config, } from './club48.js';
-export { MerkleClient, createMerkleClient, type MerkleConfig, type BundleParams as MerkleBundleParams, type SendBundleOptions, type BundleResult, type TransactionResult, } from './merkle.js';
 export { BlockRazorClient, createBlockRazorClient, BLOCKRAZOR_BUILDER_EOA, type BlockRazorConfig, type BlockRazorBundleParams, type SendBundleOptions as BlockRazorSendBundleOptions, type BundleResult as BlockRazorBundleResult, type TransactionResult as BlockRazorTransactionResult, type IncentiveTransactionParams, } from './blockrazor.js';
 export { EmitServiceClient, submitToEmitServiceBlockRazor, type EmitServiceClientConfig, type EmitServiceSubmitRequest, type EmitServiceSubmitResponse, type EmitServiceSubmitResponseData, type EmitServiceRouteConfigResponse, } from './emitservice.js';

package/dist/core/clients/index.js

@@ -3,6 +3,5 @@
  */
 export { FourClient, buildLoginMessage, buildCreateTokenReq, } from './four.js';
 export { Club48Client, sendBatchPrivateTransactions, sendBackrunBundle, } from './club48.js';
-export { MerkleClient, createMerkleClient, } from './merkle.js';
 export { BlockRazorClient, createBlockRazorClient, BLOCKRAZOR_BUILDER_EOA, } from './blockrazor.js';
 export { EmitServiceClient, submitToEmitServiceBlockRazor, } from './emitservice.js';

package/dist/core/clients/merkle.js

@@ -38,12 +38,15 @@ export class MerkleClient {
     constructor(config) {
         this.chainId = config.chainId;
         this.chainName = config.chainId === CHAINS.BSC.chainId ? 'bsc' : 'ethereum';
-        // ✅ 修复：移除弃用的 mempool.merkle.io RPC，使用公共 RPC 作为默认值
-        // 优先使用用户自定义 RPC，否则使用官方公共 RPC
-        const defaultRpc = config.chainId === CHAINS.BSC.chainId
-            ? CHAINS.BSC.rpcUrls.backup // bsc-dataseed1
-            : CHAINS.ETHEREUM.rpcUrls.default;
-        const rpcUrl = config.customRpcUrl || defaultRpc;
+        // Blink/Merkle 的 bundle RPC 是带 API key 的节点 endpoint；公共 BSC 节点
+        // 不支持 eth_sendBundle。customRpcUrl 可显式覆盖（需自带 key）。
+        const bundleBase = config.chainId === CHAINS.BSC.chainId
+            ? CHAINS.BSC.bundleRpcUrl
+            : CHAINS.ETHEREUM.bundleRpcUrl;
+        const rpcUrl = config.customRpcUrl || (bundleBase ? `${bundleBase}/v1/${config.apiKey}` : '');
+        if (!rpcUrl) {
+            throw new Error('Merkle bundle RPC endpoint is not configured');
+        }
         this.provider = createProvider(rpcUrl, this.chainId, this.chainName);
     }
     /**
@@ -366,10 +369,12 @@ export class MerkleClient {
      */
     getProviderInfo() {
         const rpcConnection = this.provider._getConnection?.();
+        const rawUrl = rpcConnection?.url ?? 'unknown';
         return {
             chainId: this.chainId,
             chainName: this.chainName,
-            rpcUrl: rpcConnection?.url ?? 'unknown',
+            // API key 在路径中，调试输出只保留脱敏后的 endpoint。
+            rpcUrl: rawUrl.replace(/\/v1\/[^/?#]+/, '/v1/***'),
         };
     }
 }

package/dist/core/clients/merkle.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/core/clients/merkle.test.js

@@ -0,0 +1,8 @@
+import { describe, expect, it } from 'vitest';
+import { MerkleClient } from './merkle.js';
+describe('MerkleClient endpoint', () => {
+    it('默认使用带 apiKey 的 Blink BSC bundle RPC', () => {
+        const client = new MerkleClient({ apiKey: 'test-key', chainId: 56 });
+        expect(client.getProviderInfo().rpcUrl).toContain('https://bsc.blinklabs.xyz/v1/***');
+    });
+});

package/dist/core/nonce/nonce-manager.d.ts

@@ -14,6 +14,8 @@ export declare class NonceManager {
     private readOnchainNonce;
     getNextNonce(wallet: Wallet | string): Promise<number>;
     getNextNonceBatch(wallet: Wallet | string, count: number): Promise<number[]>;
+    /** 预填某个地址的下一个 nonce（用于调用方显式 startNonce 的并行场景）。 */
+    seedNextNonce(wallet: Wallet | string, nextNonce: number): void;
     clearTemp(): void;
     getTempCachedNonce(address: string): number | undefined;
     getNextNoncesForWallets(wallets: (Wallet | string)[]): Promise<number[]>;

package/dist/core/nonce/nonce-manager.js

@@ -157,6 +157,14 @@ export class NonceManager {
             return Array.from({ length: count }, (_, i) => startNonce + i);
         });
     }
+    /** 预填某个地址的下一个 nonce（用于调用方显式 startNonce 的并行场景）。 */
+    seedNextNonce(wallet, nextNonce) {
+        if (!Number.isInteger(nextNonce) || nextNonce < 0)
+            return;
+        const address = typeof wallet === 'string' ? wallet : wallet.address;
+        const key = address.toLowerCase();
+        this.tempNonceCache.set(key, nextNonce);
+    }
     clearTemp() {
         this.tempNonceCache.clear();
     }
@@ -210,10 +218,22 @@ export class NonceManager {
                 const rawResults = await asBatchSendProvider(this.provider)._send(batchRequests);
                 const byId = new Map();
                 for (const row of rawResults) {
+                    if (row.error || row.result == null) {
+                        throw new Error(`batch eth_getTransactionCount failed: ${row.error?.message || 'missing result'}`);
+                    }
                     const id = Number(row.id);
+                    if (!Number.isInteger(id))
+                        throw new Error('batch eth_getTransactionCount returned invalid id');
                     byId.set(id, parseRpcQuantity(row.result));
                 }
-                queryResults = uniqueQueries.map((_, idx) => Math.max(byId.get(idx * 2 + 1) || 0, byId.get(idx * 2 + 2) || 0));
+                queryResults = uniqueQueries.map((_, idx) => {
+                    const latest = byId.get(idx * 2 + 1);
+                    const pending = byId.get(idx * 2 + 2);
+                    if (latest === undefined || pending === undefined) {
+                        throw new Error('batch eth_getTransactionCount returned incomplete result');
+                    }
+                    return Math.max(latest, pending);
+                });
             }
             catch {
                 queryResults = await Promise.all(uniqueQueries.map(({ address }) => this.readOnchainNonce(address)));

package/dist/core/tx/wallet-sign-patch.js

@@ -46,18 +46,29 @@ Wallet.prototype.signTransaction = async function (tx) {
                 /* 节点没给出 gas 价格时保留交易上已有的出价 */
             }
         }
-        try {
-            const estimated = await provider.estimateGas({
-                from: signable.from ?? this.address,
-                to: signable.to,
-                data: signable.data,
-                value: signable.value,
-            });
-            if (estimated > 0n)
-                signable = { ...signable, gasLimit: estimated };
+        let hasGasLimit = false;
+        if (signable.gasLimit != null) {
+            try {
+                hasGasLimit = BigInt(signable.gasLimit) > 0n;
+            }
+            catch {
+                hasGasLimit = false;
+            }
         }
-        catch {
-            /* 节点没给出 gas 上限时保留原来的上限，避免发不出去 */
+        if (!hasGasLimit) {
+            try {
+                const estimated = await provider.estimateGas({
+                    from: signable.from ?? this.address,
+                    to: signable.to,
+                    data: signable.data,
+                    value: signable.value,
+                });
+                if (estimated > 0n)
+                    signable = { ...signable, gasLimit: estimated };
+            }
+            catch {
+                /* 节点没给出 gas 上限时保留原来的上限，避免发不出去 */
+            }
         }
     }
     return _origWalletSign.call(this, signable);

package/dist/core/tx/wallet-sign-patch.test.d.ts

@@ -0,0 +1 @@
+import './wallet-sign-patch.js';

package/dist/core/tx/wallet-sign-patch.test.js

@@ -0,0 +1,21 @@
+import { Transaction, Wallet } from 'ethers';
+import { describe, expect, it, vi } from 'vitest';
+import './wallet-sign-patch.js';
+describe('wallet sign patch gasLimit', () => {
+    it('保留调用方显式 gasLimit，不被 estimateGas 覆盖', async () => {
+        const estimateGas = vi.fn(async () => 21000n);
+        const provider = { estimateGas };
+        const wallet = new Wallet(Wallet.createRandom().privateKey, provider);
+        const raw = await wallet.signTransaction({
+            to: Wallet.createRandom().address,
+            value: 0n,
+            nonce: 0,
+            gasLimit: 500000n,
+            gasPrice: 1000000000n,
+            chainId: 56,
+            type: 0,
+        });
+        expect(Transaction.from(raw).gasLimit).toBe(500000n);
+        expect(estimateGas).not.toHaveBeenCalled();
+    });
+});

package/dist/domains/dex/direct-router-v2-buy.js

@@ -71,6 +71,19 @@ export async function directV2BatchBuy(params) {
         activeNonces = activeIndices.map((i) => nonces[i]);
         activeBuyAllowances = activeIndices.map((i) => buyAllowances[i]);
     }
+    // 0 金额钱包不参与 swap；否则 amountIn=0 会让整包 revert，拖死正常钱包。
+    const positiveIndices = activeFlowAmounts
+        .map((amount, index) => (amount > 0n ? index : -1))
+        .filter((index) => index >= 0);
+    if (positiveIndices.length === 0) {
+        throw new Error('所有买方金额为 0，无法执行');
+    }
+    if (positiveIndices.length !== activeWallets.length) {
+        activeWallets = positiveIndices.map((i) => activeWallets[i]);
+        activeFlowAmounts = positiveIndices.map((i) => activeFlowAmounts[i]);
+        activeNonces = positiveIndices.map((i) => activeNonces[i]);
+        activeBuyAllowances = positiveIndices.map((i) => activeBuyAllowances[i]);
+    }
     const activeTotalFlowWei = activeFlowAmounts.reduce((sum, amt) => sum + amt, 0n);
     const activeBaseProfitWei = calculateProfitAmount(activeTotalFlowWei);
     let activeProfitWei = activeBaseProfitWei > 0n ? activeBaseProfitWei : 0n;

package/dist/domains/flap/portal-bundle-merkle/private/buy.js

@@ -4,13 +4,13 @@ import { FLAP_PORTAL_ADDRESSES } from '../../constants.js';
 import { ZERO_ADDRESS } from '../../../../core/constants/index.js';
 import { GAS_LIMITS } from '../../../../core/constants/index.js';
 import { PORTAL_ABI, getTxType, getGasPriceConfig, shouldExtractProfit, calculateBatchProfit, getProfitRecipient, getBribeAmount, BLOCKRAZOR_BUILDER_EOA, } from '../config.js';
-import { createMerkleContext, splitBuyAmount, parseMinOutput, resolveGasLimit, resolveBatchMinOutputs, findMaxIndex, signBatchTransactions, } from './helpers.js';
+import { createPrivateContext, splitBuyAmount, parseMinOutput, resolveGasLimit, resolveBatchMinOutputs, findMaxIndex, signBatchTransactions, } from './helpers.js';
 /**
  * 私有购买（单笔）（Merkle 版本）
  */
 export async function flapPrivateBuyMerkle(params) {
     const { chain, privateKey, tokenAddress, amountIn, minOutputAmount, config } = params;
-    const { chainId, provider } = createMerkleContext(chain, config);
+    const { chainId, provider } = createPrivateContext(chain, config);
     const wallet = new Wallet(privateKey, provider);
     const portalAddr = FLAP_PORTAL_ADDRESSES[chain];
     const originalAmountWei = ethers.parseEther(amountIn);
@@ -97,7 +97,7 @@ export async function flapBatchPrivateBuyMerkle(params) {
     if (privateKeys.length !== amountsIn.length) {
         throw new Error('privateKeys and amountsIn length mismatch');
     }
-    const { chainId, provider } = createMerkleContext(chain, config);
+    const { chainId, provider } = createPrivateContext(chain, config);
     const portalAddr = FLAP_PORTAL_ADDRESSES[chain];
     const wallets = privateKeys.map((k) => new Wallet(k, provider));
     const originalAmountsWei = amountsIn.map((a) => ethers.parseEther(a));

package/dist/domains/flap/portal-bundle-merkle/private/helpers.d.ts

@@ -2,7 +2,7 @@ import { ethers, Wallet } from 'ethers';
 import type { FlapPrivateBuyMerkleParams } from '../types.js';
 type FlapChain = FlapPrivateBuyMerkleParams['chain'];
 type FlapConfig = FlapPrivateBuyMerkleParams['config'];
-export declare function createMerkleContext(chain: FlapChain, config: FlapConfig): {
+export declare function createPrivateContext(chain: FlapChain, config: FlapConfig): {
     chainId: number;
     provider: ethers.JsonRpcProvider;
 };

package/dist/domains/flap/portal-bundle-merkle/private/helpers.js

@@ -1,10 +1,9 @@
 import { ethers } from 'ethers';
-import { MerkleClient } from '../../../../core/clients/merkle.js';
 import { createProvider } from '../../../../utils/provider-factory.js';
 import { ZERO_ADDRESS, CHAINS, applySlippageBps } from '../../../../core/constants/index.js';
 import { CHAIN_ID_MAP, getTxType, calculateProfit, } from '../config.js';
 const DEFAULT_GAS_LIMIT = 800000;
-export function createMerkleContext(chain, config) {
+export function createPrivateContext(chain, config) {
     const chainId = CHAIN_ID_MAP[chain];
     // ✅ 检查是否为 Merkle 支持的链（BSC, ETH）
     // Monad 不支持 Merkle 捆绑服务，使用普通 RPC
@@ -19,14 +18,11 @@ export function createMerkleContext(chain, config) {
             provider: createProvider(config.customRpcUrl, chainId, chain.toLowerCase()),
         };
     }
-    const merkle = new MerkleClient({
-        apiKey: config.apiKey,
-        chainId: chainId, // 类型断言为 Merkle 支持的 chainId
-        customRpcUrl: config.customRpcUrl,
-    });
+    const rpcUrl = config.customRpcUrl
+        || (chainId === CHAINS.BSC.chainId ? CHAINS.BSC.rpcUrls.default : CHAINS.ETHEREUM.rpcUrls.default);
     return {
         chainId,
-        provider: merkle.getProvider(),
+        provider: createProvider(rpcUrl, chainId, chain.toLowerCase()),
     };
 }
 export function splitBuyAmount(amount, extractProfit) {

package/dist/domains/flap/portal-bundle-merkle/private/sell.js

@@ -4,13 +4,13 @@ import { FLAP_PORTAL_ADDRESSES } from '../../constants.js';
 import { ZERO_ADDRESS, applySlippageBps } from '../../../../core/constants/index.js';
 import { GAS_LIMITS } from '../../../../core/constants/index.js';
 import { PORTAL_ABI, getTxType, getGasPriceConfig, shouldExtractProfit, calculateProfit, getProfitRecipient, getBribeAmount, BLOCKRAZOR_BUILDER_EOA, } from '../config.js';
-import { createMerkleContext, resolveGasLimit, resolveSingleSellOutputs, signBatchTransactions, summarizeSellProfits, } from './helpers.js';
+import { createPrivateContext, resolveGasLimit, resolveSingleSellOutputs, signBatchTransactions, summarizeSellProfits, } from './helpers.js';
 /**
  * 私有卖出（单笔）（Merkle 版本）
  */
 export async function flapPrivateSellMerkle(params) {
     const { chain, privateKey, tokenAddress, amount, minOutputAmount, config } = params;
-    const { chainId, provider } = createMerkleContext(chain, config);
+    const { chainId, provider } = createPrivateContext(chain, config);
     const wallet = new Wallet(privateKey, provider);
     const portalAddr = FLAP_PORTAL_ADDRESSES[chain];
     const amountWei = ethers.parseUnits(amount, 18);
@@ -95,7 +95,7 @@ export async function flapBatchPrivateSellMerkle(params) {
     if (privateKeys.length !== amounts.length) {
         throw new Error('privateKeys and amounts length mismatch');
     }
-    const { chainId, provider } = createMerkleContext(chain, config);
+    const { chainId, provider } = createPrivateContext(chain, config);
     const portalAddr = FLAP_PORTAL_ADDRESSES[chain];
     const wallets = privateKeys.map((k) => new Wallet(k, provider));
     const amountsWei = amounts.map((a) => ethers.parseUnits(a, 18));

package/dist/domains/flap/portal-bundle-merkle/swap-buy-first-types.d.ts

@@ -13,7 +13,8 @@ export interface FlapBuyFirstSignConfig extends FlapSignConfig {
     userType?: UserType;
 }
 export interface FlapBuyFirstConfig extends CommonBundleConfig {
-    apiKey: string;
+    /** @deprecated Merkle 提交已移除；字段仅为旧调用兼容 */
+    apiKey?: string;
     customRpcUrl?: string;
     bundleBlockOffset?: number;
     reserveGasETH?: number;

package/dist/domains/flap/portal-bundle-merkle/swap-helpers.d.ts

@@ -49,7 +49,8 @@ export declare const MONAD_WMON: "0x3bd359c1119da7da1d913d1c4d2b7c461115433a";
 export declare function getTokenToNativeQuote(provider: ethers.JsonRpcProvider, tokenAddress: string, tokenAmount: bigint, chainId: number): Promise<bigint>;
 export type FlapChain = 'bsc' | 'xlayer' | 'base';
 export interface FlapSwapConfig extends CommonBundleConfig {
-    apiKey: string;
+    /** @deprecated Merkle 提交已移除；字段仅为旧调用兼容 */
+    apiKey?: string;
     customRpcUrl?: string;
     bundleBlockOffset?: number;
     reserveGasETH?: number;

package/dist/domains/flap/portal-bundle-merkle/swap-planning.js

@@ -100,6 +100,9 @@ export async function calculateBuyerNeed({ buyer, quotedNative, reserveGasEth, n
         buyerBalance = await erc20.balanceOf(buyer.address);
     }
     const estimatedBuyerNeed = quotedNative;
+    if (estimatedBuyerNeed <= 0n) {
+        throw new Error('卖出报价为 0，拒绝用买方全部余额买入；请稍后重试或检查池子流动性');
+    }
     const buyerNeedTotal = useNativeToken ? estimatedBuyerNeed + reserveGas : estimatedBuyerNeed;
     if (buyerBalance < buyerNeedTotal) {
         if (useNativeToken) {
@@ -113,7 +116,7 @@ export async function calculateBuyerNeed({ buyer, quotedNative, reserveGasEth, n
                 `  - 实际: ${ethers.formatUnits(buyerBalance, quoteTokenDecimals)}`);
         }
     }
-    const maxBuyerValue = estimatedBuyerNeed > 0n ? estimatedBuyerNeed : useNativeToken ? buyerBalance - reserveGas : buyerBalance;
+    const maxBuyerValue = estimatedBuyerNeed;
     return { reserveGas, buyerBalance, buyerNeedTotal, maxBuyerValue };
 }
 export async function validateBalances({ buyerAddress, portalGasCost, provider, chainContext, seller, useNativeToken, }) {
@@ -168,7 +171,7 @@ export async function planNonces({ seller, buyer, approvalExists, extractProfit,
     return { sellerNonce: nonces[0], buyerNonce: nonces[1] };
 }
 export async function buildProfitTransaction({ provider, seller, profitAmount, profitNonce, gasPrice, chainId, txType, }) {
-    if (!profitNonce || profitAmount === 0n) {
+    if (profitNonce === undefined || profitAmount === 0n) {
         return null;
     }
     const profitHopResult = await buildProfitHopTransactions({

package/dist/domains/flap/portal-bundle-merkle/swap-planning.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/domains/flap/portal-bundle-merkle/swap-planning.test.js

@@ -0,0 +1,16 @@
+import { ethers, Wallet } from 'ethers';
+import { describe, expect, it, vi } from 'vitest';
+import { calculateBuyerNeed } from './swap-planning.js';
+describe('calculateBuyerNeed quote guard', () => {
+    it('报价为 0 时拒绝用买方全部余额买入', async () => {
+        const provider = {
+            getBalance: vi.fn(async () => ethers.parseEther('1')),
+        };
+        const buyer = new Wallet(Wallet.createRandom().privateKey, provider);
+        await expect(calculateBuyerNeed({
+            buyer,
+            quotedNative: 0n,
+            nativeToken: 'BNB',
+        })).rejects.toThrow(/卖出报价为 0/);
+    });
+});

package/dist/domains/flap/portal-bundle-merkle/types-config.d.ts

@@ -62,7 +62,8 @@ export type FlapSignConfig = {
     extractProfitOnLaunch?: boolean;
 };
 export type FlapBundleMerkleConfig = {
-    apiKey: string;
+    /** @deprecated Merkle 提交已移除；字段仅为旧调用兼容，不再读取 */
+    apiKey?: string;
     customRpcUrl?: string;
     bundleBlockOffset?: number;
     minBlockOffset?: number;

package/dist/domains/merkle/index.d.ts

@@ -8,5 +8,5 @@ export { sweepWithBundleMerkle } from '../../bundle/four-meme/utils-sweep.js';
 export { pairwiseTransferWithBundleMerkle } from '../../bundle/four-meme/utils-pairwise.js';
 export { fourBundleSwapMerkle, fourBatchSwapMerkle, fourQuickBatchSwapMerkle } from '../../bundle/four-meme/swap.js';
 export { fourBundleBuyFirstMerkle } from '../../bundle/four-meme/swap-buy-first.js';
-export { submitBundleToMerkle, submitBundleToBlockRazor, submitDirectToRpc, submitDirectToRpcSmart, type MerkleSubmitConfig, type SubmitBundleResult, type BlockRazorSubmitConfig, type DirectSubmitConfig, } from '../../bundle/submit.js';
+export { submitBundleToBlockRazor, submitDirectToRpc, submitDirectToRpcSmart, type BlockRazorSubmitConfig, type DirectSubmitConfig, } from '../../bundle/submit.js';
 export type { DisperseSignParams, DisperseMerkleResult, SweepSignParams, SweepMerkleResult, FourBundleSwapSignParams, FourSwapResult, FourBatchSwapSignParams, FourBatchSwapResult, FourQuickBatchSwapSignParams, FourQuickBatchSwapResult, PairwiseTransferSignParams, PairwiseTransferMerkleResult, } from '../../bundle/four-meme/types/index.js';

package/dist/domains/merkle/index.js

@@ -8,4 +8,4 @@ export { sweepWithBundleMerkle } from '../../bundle/four-meme/utils-sweep.js';
 export { pairwiseTransferWithBundleMerkle } from '../../bundle/four-meme/utils-pairwise.js';
 export { fourBundleSwapMerkle, fourBatchSwapMerkle, fourQuickBatchSwapMerkle } from '../../bundle/four-meme/swap.js';
 export { fourBundleBuyFirstMerkle } from '../../bundle/four-meme/swap-buy-first.js';
-export { submitBundleToMerkle, submitBundleToBlockRazor, submitDirectToRpc, submitDirectToRpcSmart, } from '../../bundle/submit.js';
+export { submitBundleToBlockRazor, submitDirectToRpc, submitDirectToRpcSmart, } from '../../bundle/submit.js';

package/dist/exports/root-bundle-and-tooling.d.ts

@@ -20,7 +20,7 @@ export { sweepWithBundleMerkle } from '../bundle/four-meme/utils-sweep.js';
 export { pairwiseTransferWithBundleMerkle } from '../bundle/four-meme/utils-pairwise.js';
 export { fourPancakeProxyBatchBuyMerkle, fourPancakeProxyBatchSellMerkle, approveFourPancakeProxy, approveFourPancakeProxyBatch, } from '../bundle/four-meme/pancake-proxy.js';
 export { approveFourTokenManagerBatch } from '../bundle/four-meme/approve-tokenmanager.js';
-export { submitBundleToMerkle, submitMultipleBundles, submitMultipleBundlesParallel, submitBundleToBlockRazor, submitMultipleBundlesToBlockRazor, submitMultipleBundlesToBlockRazorParallel, type MerkleSubmitConfig, type SubmitBundleResult, type BlockRazorSubmitConfig, type BlockRazorSubmitResult, } from '../bundle/submit.js';
+export { submitBundleToBlockRazor, submitMultipleBundlesToBlockRazor, submitMultipleBundlesToBlockRazorParallel, type BlockRazorSubmitConfig, type BlockRazorSubmitResult, } from '../bundle/submit.js';
 export type { FourBundleMerkleConfig, FourSignConfig, FourCreateWithBundleBuySignParams, FourBatchBuySignParams, FourBatchSellSignParams, FourPrivateBuySignParams, FourPrivateSellSignParams, FourBatchPrivateBuySignParams, FourBatchPrivateSellSignParams, FourPancakeProxyBatchBuySignParams, FourPancakeProxyBatchSellSignParams, DisperseSignParams as FourDisperseSignParams, SweepSignParams as FourSweepSignParams, FourCreateWithBundleBuyMerkleParams, FourCreateWithBundleBuyMerkleResult, FourBatchBuyMerkleParams, FourBatchBuyMerkleResult, FourBatchSellMerkleParams, FourBatchSellMerkleResult, FourPrivateBuyMerkleParams, FourPrivateSellMerkleParams, FourBatchPrivateBuyMerkleParams, FourBatchPrivateSellMerkleParams, FourBatchPrivateMerkleResult, FourPrivateTransactionResult, DisperseMerkleParams, DisperseMerkleResult, SweepMerkleParams, SweepMerkleResult, FourPancakeProxyBatchBuyParams, FourPancakeProxyBatchBuyResult, FourPancakeProxyBatchSellParams, FourPancakeProxyBatchSellResult, FourPancakeProxyApprovalParams, FourPancakeProxyApprovalBatchParams, FourPancakeProxyApprovalBatchResult, ApproveFourTokenManagerBatchParams, ApproveFourTokenManagerBatchResult, } from '../bundle/four-meme/types/index.js';
 export type { OpenFourCreateSignParams } from '../bundle/four-meme/core.js';
 export type { OpenFourBatchBuySignParams } from '../bundle/four-meme/private.js';

package/dist/exports/root-bundle-and-tooling.js

@@ -20,7 +20,7 @@ export { sweepWithBundleMerkle } from '../bundle/four-meme/utils-sweep.js';
 export { pairwiseTransferWithBundleMerkle } from '../bundle/four-meme/utils-pairwise.js';
 export { fourPancakeProxyBatchBuyMerkle, fourPancakeProxyBatchSellMerkle, approveFourPancakeProxy, approveFourPancakeProxyBatch, } from '../bundle/four-meme/pancake-proxy.js';
 export { approveFourTokenManagerBatch } from '../bundle/four-meme/approve-tokenmanager.js';
-export { submitBundleToMerkle, submitMultipleBundles, submitMultipleBundlesParallel, submitBundleToBlockRazor, submitMultipleBundlesToBlockRazor, submitMultipleBundlesToBlockRazorParallel, } from '../bundle/submit.js';
+export { submitBundleToBlockRazor, submitMultipleBundlesToBlockRazor, submitMultipleBundlesToBlockRazorParallel, } from '../bundle/submit.js';
 // ✅ Four.meme TaxToken 工具（税币识别/查询/领取奖励）
 export { isTaxToken as fourIsTaxToken, isAntiSniperFeeMode as fourIsAntiSniperFeeMode, getCreatorType as fourGetCreatorType, getTaxTokenInfo as fourGetTaxTokenInfo, getClaimableFee as fourGetClaimableFee, getClaimedFee as fourGetClaimedFee, getUserRewardInfo as fourGetUserRewardInfo, buildClaimFeeTx as fourBuildClaimFeeTx, buildBatchClaimFeeTxs as fourBuildBatchClaimFeeTxs, validateFourTokenTaxInfo, TAX_TOKEN_ABI, TransferMode as FourTransferMode, } from '../domains/four/index.js';
 export { PinataClient } from '../domains/flap/pinata.js';

package/dist/exports/root-foundations.d.ts

@@ -31,7 +31,6 @@ export { parseFlapError, getFlapErrorMessage, getFlapErrorMessageEn, type FlapEr
 export { getFlapMetaByAddress, getFlapMetasByAddresses } from '../domains/flap/meta.js';
 export { createTokenFlow, type CreateTokenFlowInput, type CreateTokenFlowOutput } from '../domains/flows/create.js';
 export { Club48Client, sendBatchPrivateTransactions, sendBackrunBundle, type BundleParams, type BundleStatus, type Club48Config, } from '../core/clients/club48.js';
-export { MerkleClient, createMerkleClient, type MerkleConfig, type BundleParams as MerkleBundleParams, type SendBundleOptions, type BundleResult, type TransactionResult, } from '../core/clients/merkle.js';
 export { BlockRazorClient, createBlockRazorClient, BLOCKRAZOR_BUILDER_EOA, type BlockRazorConfig, type BlockRazorBundleParams, type SendBundleOptions as BlockRazorSendBundleOptions, type BundleResult as BlockRazorBundleResult, type TransactionResult as BlockRazorTransactionResult, type IncentiveTransactionParams, } from '../core/clients/blockrazor.js';
 export { EmitServiceClient, submitToEmitServiceBlockRazor, type EmitServiceClientConfig, type EmitServiceSubmitRequest, type EmitServiceSubmitResponse, type EmitServiceSubmitResponseData, type EmitServiceRouteConfigResponse, } from '../core/clients/emitservice.js';
 export { NonceManager, getOptimizedGasPrice, estimateGasWithSafety, estimateGasBatch, buildTransaction, signTransactionsBatch, signTransactionsBatchMultiWallet, validateSignedTransactions, getDeadline, encodeV3Path, decodeV3Path, getGasLimit, getGasPriceConfig, getTxType, getChainId, type GasPriceConfig, type GasEstimateConfig, type BuildTransactionOptions, type CommonBundleConfig, } from '../utils/bundle-helpers.js';

package/dist/exports/root-foundations.js

@@ -66,7 +66,6 @@ export { parseFlapError, getFlapErrorMessage, getFlapErrorMessageEn, } from '../
 export { getFlapMetaByAddress, getFlapMetasByAddresses } from '../domains/flap/meta.js';
 export { createTokenFlow } from '../domains/flows/create.js';
 export { Club48Client, sendBatchPrivateTransactions, sendBackrunBundle, } from '../core/clients/club48.js';
-export { MerkleClient, createMerkleClient, } from '../core/clients/merkle.js';
 export { BlockRazorClient, createBlockRazorClient, BLOCKRAZOR_BUILDER_EOA, } from '../core/clients/blockrazor.js';
 export { EmitServiceClient, submitToEmitServiceBlockRazor, } from '../core/clients/emitservice.js';
 export { NonceManager, getOptimizedGasPrice, estimateGasWithSafety, estimateGasBatch, buildTransaction, signTransactionsBatch, signTransactionsBatchMultiWallet, validateSignedTransactions, getDeadline, encodeV3Path, decodeV3Path, getGasLimit, getGasPriceConfig, getTxType, getChainId, } from '../utils/bundle-helpers.js';

package/dist/utils/swap-helpers.d.ts

@@ -1,21 +1,7 @@
 /**
  * 换手交易通用工具函数
  */
-import { Wallet, JsonRpcProvider } from 'ethers';
-import type { MerkleClient } from '../core/clients/merkle.js';
-/**
- * 检查并执行代币授权（如果需要）
- * ✅ 与 pancake-proxy.ts 的授权逻辑一致
- */
-export declare function ensureTokenApproval(provider: JsonRpcProvider, merkle: MerkleClient, wallet: Wallet, tokenAddress: string, spenderAddress: string, config: {
-    gasLimit?: number;
-    gasLimitMultiplier?: number;
-    minGasPriceGwei?: number;
-    maxGasPriceGwei?: number;
-    txType?: 0 | 2;
-    bundleBlockOffset?: number;
-    waitTimeoutMs?: number;
-}): Promise<void>;
+import { JsonRpcProvider } from 'ethers';
 /**
  * 获取代币余额
  */

package/dist/utils/swap-helpers.js

@@ -2,88 +2,8 @@
  * 换手交易通用工具函数
  */
 import { ethers, Contract, Interface } from 'ethers';
-import { batchCheckAllowances } from '../core/erc20/index.js';
 import { ERC20_ABI, MULTICALL3_ABI } from '../abis/common.js';
 import { getMulticall3Address } from '../core/constants/index.js';
-import { NonceManager, getOptimizedGasPrice } from './bundle-helpers.js';
-const APPROVAL_THRESHOLD = ethers.MaxUint256 / 2n;
-/**
- * 获取 Gas Limit（授权专用）
- * 优先使用 config.gasLimit，否则使用默认值 * multiplier
- *
- * ✅ ethers v6 最佳实践：直接使用 bigint 类型
- */
-function getApprovalGasLimit(config, defaultGas = 80000) {
-    // 优先使用前端传入的 gasLimit
-    if (config.gasLimit !== undefined) {
-        // 如果已经是 bigint，直接返回；否则转换
-        return typeof config.gasLimit === 'bigint' ? config.gasLimit : BigInt(config.gasLimit);
-    }
-    // 使用默认值 * multiplier
-    const multiplier = config.gasLimitMultiplier ?? 1.0;
-    const calculatedGas = Math.ceil(defaultGas * multiplier);
-    // JavaScript 原生 BigInt 转换（ethers v6 兼容）
-    return BigInt(calculatedGas);
-}
-/**
- * 检查并执行代币授权（如果需要）
- * ✅ 与 pancake-proxy.ts 的授权逻辑一致
- */
-export async function ensureTokenApproval(provider, merkle, wallet, tokenAddress, spenderAddress, config) {
-    // 使用Multicall3批量检查（虽然只有一个地址，但保持接口一致）
-    const allowances = await batchCheckAllowances(provider, tokenAddress, [wallet.address], spenderAddress);
-    const currentAllowance = allowances[0];
-    if (currentAllowance >= APPROVAL_THRESHOLD) {
-        return;
-    }
-    // ✅ 使用 NonceManager（与 pancake-proxy.ts 一致）
-    const nonceManager = new NonceManager(provider);
-    // 构建授权交易
-    const tokenContract = new Contract(tokenAddress, ERC20_ABI, wallet);
-    const approveUnsigned = await tokenContract.approve.populateTransaction(spenderAddress, ethers.MaxUint256);
-    // ✅ 使用 getApprovalGasLimit 函数处理 Gas Limit（与 pancake-proxy.ts 一致）
-    const approveGasLimit = getApprovalGasLimit(config, 80000);
-    // ✅ 使用 getOptimizedGasPrice 处理 Gas Price（与 pancake-proxy.ts 一致）
-    const gasPriceConfig = {};
-    if (config.minGasPriceGwei !== undefined) {
-        gasPriceConfig.baseGasPrice = ethers.parseUnits(String(config.minGasPriceGwei), 'gwei');
-        gasPriceConfig.multiplierPercent = 0;
-    }
-    if (config.maxGasPriceGwei !== undefined) {
-        gasPriceConfig.maxGasPrice = ethers.parseUnits(String(config.maxGasPriceGwei), 'gwei');
-    }
-    const gasPrice = await getOptimizedGasPrice(provider, gasPriceConfig);
-    // ✅ 使用 NonceManager 获取 nonce
-    const nonce = await nonceManager.getNextNonce(wallet);
-    // ✅ 获取 chainId（不硬编码）
-    const network = await provider.getNetwork();
-    const chainId = Number(network.chainId);
-    // 签名
-    const signedTx = await wallet.signTransaction({
-        ...approveUnsigned,
-        from: wallet.address,
-        nonce,
-        gasLimit: approveGasLimit,
-        gasPrice,
-        chainId,
-        type: config.txType ?? 0,
-    });
-    // 清理临时 nonce 缓存
-    nonceManager.clearTemp();
-    // ✅ 提交 Bundle（使用 blockOffset）
-    const blockOffset = config.bundleBlockOffset ?? 5;
-    const bundleResult = await merkle.sendBundle({
-        transactions: [signedTx],
-        blockOffset,
-        minTimestamp: 0,
-        maxTimestamp: 0,
-    });
-    // 等待确认
-    const results = await merkle.waitForBundleConfirmation(bundleResult.txHashes, 1, config.waitTimeoutMs ?? 120000);
-    if (!results[0]?.success) {
-        throw new Error(`授权失败: ${results[0]?.error || '未知错误'}`);
-    }
-}
 async function readDecimalsAndBalance(provider, tokenAddress, walletAddress) {
     try {
         const chainId = Number((await provider.getNetwork()).chainId);

package/package.json

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