four-flap-meme-sdk 4.4.3 → 4.5.1

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-approvals.d.ts

@@ -0,0 +1,28 @@
+/**
+ * V2/V3 直连 Router 卖出/买入前的自动授权。
+ *
+ * 与 V2 路径保持一致：钱包对 Router 的 allowance 不足时，在该钱包的起始 nonce 上
+ * 插入一笔 `approve(spender, MaxUint256)`，并按顺序把后续交易 nonce 顺延。
+ *
+ * 背景：BlockRazor 的 bundle 要求包内交易都不能回滚。漏掉授权时，卖出的
+ * `TransferHelper.safeTransferFrom` 会直接 STF 回滚，整包被拒（表现为
+ * `non-reverting tx in bundle failed`），而且不会指出是哪一笔。
+ */
+import { type JsonRpcProvider, type Wallet } from 'ethers';
+export interface SignMissingAllowanceApprovalsParams {
+    provider: JsonRpcProvider;
+    wallets: Wallet[];
+    /** 会被原地修改：插入 approve 的钱包 nonce +1，后续交易自动顺延 */
+    nonces: number[];
+    tokenAddress: string;
+    spender: string;
+    /** 与 wallets 等长；<= 0 表示该钱包本轮没有交易，不授权 */
+    amounts: bigint[];
+    /** 与 wallets 等长；RPC 失败时传 MaxUint256 可跳过授权 */
+    allowances: bigint[];
+    txType: number;
+    gasPrice: bigint;
+    chainId: number;
+}
+/** 返回按钱包顺序排好的 approve 原始交易（未授权的钱包不产生交易） */
+export declare function signMissingAllowanceApprovals(params: SignMissingAllowanceApprovalsParams): Promise<string[]>;

package/dist/domains/dex/direct-router-approvals.js

@@ -0,0 +1,45 @@
+/**
+ * V2/V3 直连 Router 卖出/买入前的自动授权。
+ *
+ * 与 V2 路径保持一致：钱包对 Router 的 allowance 不足时，在该钱包的起始 nonce 上
+ * 插入一笔 `approve(spender, MaxUint256)`，并按顺序把后续交易 nonce 顺延。
+ *
+ * 背景：BlockRazor 的 bundle 要求包内交易都不能回滚。漏掉授权时，卖出的
+ * `TransferHelper.safeTransferFrom` 会直接 STF 回滚，整包被拒（表现为
+ * `non-reverting tx in bundle failed`），而且不会指出是哪一笔。
+ */
+import { MaxUint256, ethers } from 'ethers';
+import { estimateApproveGasLimit } from '../../core/gas/bundle-gas.js';
+import { ERC20_ABI } from '../../abis/common.js';
+import { buildGasFields } from '../../core/gas/bundle-gas.js';
+/** 返回按钱包顺序排好的 approve 原始交易（未授权的钱包不产生交易） */
+export async function signMissingAllowanceApprovals(params) {
+    const { provider, wallets, nonces, tokenAddress, spender, amounts, allowances, txType, gasPrice, chainId } = params;
+    if (!ethers.isAddress(tokenAddress) || !ethers.isAddress(spender))
+        return [];
+    const tokenIface = new ethers.Interface(ERC20_ABI);
+    const approveData = tokenIface.encodeFunctionData('approve', [spender, MaxUint256]);
+    const txs = [];
+    for (let i = 0; i < wallets.length; i++) {
+        const amount = amounts[i] ?? 0n;
+        if (amount <= 0n)
+            continue;
+        const allowance = allowances[i];
+        if (allowance === undefined || allowance >= amount)
+            continue;
+        const wallet = wallets[i];
+        const gasLimit = await estimateApproveGasLimit(provider, wallet.address, tokenAddress, approveData);
+        const tx = await wallet.signTransaction({
+            to: tokenAddress,
+            data: approveData,
+            value: 0n,
+            nonce: nonces[i],
+            gasLimit,
+            ...buildGasFields(txType, gasPrice),
+            chainId,
+        });
+        txs.push(tx);
+        nonces[i] += 1;
+    }
+    return txs;
+}

package/dist/domains/dex/direct-router-helpers.d.ts

@@ -15,3 +15,4 @@ export * from './quote.js';
 export * from './profit.js';
 export * from './router.js';
 export * from './dyo-encode.js';
+export * from './direct-router-approvals.js';

package/dist/domains/dex/direct-router-helpers.js

@@ -15,3 +15,4 @@ export * from './quote.js';
 export * from './profit.js';
 export * from './router.js';
 export * from './dyo-encode.js';
+export * from './direct-router-approvals.js';

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/dex/direct-router-v3.js

@@ -7,6 +7,8 @@ import { NonceManager, buildProfitHopTransactions, PROFIT_HOP_COUNT, buildGasFie
 import { getProfitRecipient, CHAINS, GAS_LIMITS } from '../../core/constants/index.js';
 import { getErrorMessageFromUnknown } from '../../core/index.js';
 import { batchGetBalances } from '../../bundle/internal.js';
+import { batchCheckAllowances } from '../../core/erc20/allowances.js';
+import { signMissingAllowanceApprovals } from './direct-router-approvals.js';
 import { getTokenToNativeQuote } from '../../core/quote/quote-helpers.js';
 import { CHAIN_IDS, V3_ROUTER02_ABI, V3_ROUTER_LEGACY_ABI, buildBribeTransaction, buildProfitTransactionWithHops, calculateProfitAmount, findMaxFlowIndex, getBribeAmount, getCachedProvider, getDeadline, getGasPrice, getWrappedNative, isLegacySwapRouter, isNativeToken, quoteXLayerV3TokenToNativeBySlot0, } from './direct-router-helpers.js';
 // ============================================================================
@@ -37,7 +39,8 @@ export async function directV3BatchBuy(params) {
     const totalFlowWei = flowAmounts.reduce((sum, amt) => sum + amt, 0n);
     const baseProfitWei = calculateProfitAmount(totalFlowWei);
     // ✅ 方案 B：并行获取 nonces、gasPrice 和 ERC20 报价
-    const [nonces, gasPrice, nativeProfitWei] = await Promise.all([
+    const quoteToApprove = useNative ? '' : String(quoteToken || '');
+    const [nonces, gasPrice, nativeProfitWei, allowances] = await Promise.all([
         startNonces && startNonces.length === wallets.length
             ? Promise.resolve(startNonces)
             : new NonceManager(provider).getNextNoncesForWallets(wallets),
@@ -48,6 +51,10 @@ export async function directV3BatchBuy(params) {
                 ? quoteXLayerV3TokenToNativeBySlot0({ provider, tokenIn: quoteToken, amountIn: baseProfitWei, fee })
                 : getTokenToNativeQuote(provider, quoteToken, baseProfitWei, chain, 'v3', fee)
             : Promise.resolve(baseProfitWei),
+        // ERC-20 计价币买入要先把计价币授权给 Router，ERC-20 结算不会自动带 approve
+        quoteToApprove && ethers.isAddress(quoteToApprove) && ethers.isAddress(String(routerAddress || ''))
+            ? batchCheckAllowances(provider, quoteToApprove, wallets.map((w) => w.address), routerAddress).catch(() => wallets.map(() => ethers.MaxUint256))
+            : Promise.resolve(wallets.map(() => ethers.MaxUint256)),
     ]);
     let profitWei = nativeProfitWei > 0n ? nativeProfitWei : 0n;
     if (profitWei > 0n && chain.toUpperCase() === 'ENI') {
@@ -55,6 +62,21 @@ export async function directV3BatchBuy(params) {
     }
     const gasLimit = getGasLimit(config, 300000);
     const txType = config.txType ?? 0;
+    // 计价币 allowance 不足时同包补 approve；nonces[i] 会被顺延
+    const approveTxs = quoteToApprove
+        ? await signMissingAllowanceApprovals({
+            provider,
+            wallets,
+            nonces,
+            tokenAddress: quoteToApprove,
+            spender: String(routerAddress || ''),
+            amounts: flowAmounts,
+            allowances,
+            txType,
+            gasPrice,
+            chainId,
+        })
+        : [];
     const routerIface = new ethers.Interface(routerAbi);
     const inputToken = useNative ? wrappedNative : quoteToken;
     const deadline = getDeadline();
@@ -184,7 +206,7 @@ export async function directV3BatchBuy(params) {
             profitHopWallets = profitResult.hopWallets;
         }
     }
-    const signedTxs = [...bribeTxs, ...swapTxs, ...profitTxs];
+    const signedTxs = [...approveTxs, ...bribeTxs, ...swapTxs, ...profitTxs];
     return {
         signedTransactions: signedTxs,
         profitHopWallets,
@@ -214,12 +236,16 @@ export async function directV3BatchSell(params) {
     const routerAbi = useLegacyRouter ? V3_ROUTER_LEGACY_ABI : V3_ROUTER02_ABI;
     const wallets = privateKeys.map((pk) => new Wallet(pk, provider));
     // ✅ 并行获取所有 RPC 数据
-    const [balances, nonces, gasPrice] = await Promise.all([
+    const [balances, nonces, gasPrice, allowances] = await Promise.all([
         batchGetBalances(provider, wallets.map((w) => w.address), tokenAddress, chainId),
         startNonces && startNonces.length === wallets.length
             ? Promise.resolve(startNonces)
             : new NonceManager(provider).getNextNoncesForWallets(wallets),
         getGasPrice(provider, config),
+        // 卖出要先把代币授权给 Router，否则 TransferHelper 直接 STF 回滚、整包被拒
+        ethers.isAddress(String(tokenAddress || '')) && ethers.isAddress(String(routerAddress || ''))
+            ? batchCheckAllowances(provider, tokenAddress, wallets.map((w) => w.address), routerAddress).catch(() => wallets.map(() => ethers.MaxUint256))
+            : Promise.resolve(wallets.map(() => ethers.MaxUint256)),
     ]);
     const gasLimit = getGasLimit(config, 350000);
     const txType = config.txType ?? 0;
@@ -238,6 +264,19 @@ export async function directV3BatchSell(params) {
         }
     }
     const totalSellAmount = sellAmountsWei.reduce((sum, o) => sum + o, 0n);
+    // 代币 allowance 不足时同包补 approve；nonces[i] 会被顺延
+    const approveTxs = await signMissingAllowanceApprovals({
+        provider,
+        wallets,
+        nonces,
+        tokenAddress: String(tokenAddress || ''),
+        spender: String(routerAddress || ''),
+        amounts: sellAmountsWei,
+        allowances,
+        txType,
+        gasPrice,
+        chainId,
+    });
     // ✅ 修复：对于卖出操作，利润应基于【得到的 BNB/原生代币】而不是【卖出的代币数量】
     // 使用 V2 Router 获取卖出报价，然后基于预估得到的原生代币数量计算利润
     const nativeProfitPromise = (async () => {
@@ -417,7 +456,7 @@ export async function directV3BatchSell(params) {
         .filter((r) => r.type === 'swap')
         .sort((a, b) => a.index - b.index)
         .map((r) => r.tx);
-    const signedTxs = [...bribeTxs, ...swapTxs, ...profitTxs];
+    const signedTxs = [...approveTxs, ...bribeTxs, ...swapTxs, ...profitTxs];
     return {
         signedTransactions: signedTxs,
         profitHopWallets,

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';
 /**
  * 获取代币余额
  */