four-flap-meme-sdk 4.4.2 → 4.5.0

package/dist/chains/robinhood/sign.js

@@ -17,6 +17,20 @@ export async function signRobinhoodTx(params) {
     if (maxFeePerGas < floor)
         maxFeePerGas = floor;
     const maxPriorityFeePerGas = priority > maxFeePerGas ? maxFeePerGas : priority;
+    let gasLimit = params.gasLimit;
+    try {
+        const estimated = await provider.estimateGas({
+            from: wallet.address,
+            to: params.to,
+            data: params.data,
+            value: params.value ?? 0n,
+        });
+        if (estimated > 0n)
+            gasLimit = estimated;
+    }
+    catch {
+        /* 节点没给出上限时用服务端配置 */
+    }
     const signedTx = await wallet.signTransaction({
         to: params.to,
         value: params.value ?? 0n,
@@ -26,7 +40,7 @@ export async function signRobinhoodTx(params) {
         type: 2,
         maxFeePerGas,
         maxPriorityFeePerGas,
-        gasLimit: params.gasLimit,
+        gasLimit,
     });
     const tx = Transaction.from(signedTx);
     return {

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/gas/bundle-gas.d.ts

@@ -52,3 +52,11 @@ export type Eip1559GasFields = {
 };
 export type TxGasFields = LegacyGasFields | Eip1559GasFields;
 export declare function buildGasFields(txType: number, gasPrice: bigint): TxGasFields;
+/** 向节点 eth_estimateGas 要这笔 approve 的 gas 上限。节点没返回时才用 fallback。 */
+export declare function estimateApproveGasLimit(provider: {
+    estimateGas: (tx: {
+        from?: string;
+        to?: string;
+        data?: string;
+    }) => Promise<bigint>;
+}, from: string, to: string, data: string, fallback?: bigint): Promise<bigint>;

package/dist/core/gas/bundle-gas.js

@@ -23,7 +23,7 @@ export async function getOptimizedGasPrice(provider, config) {
     return gasPrice;
 }
 export async function estimateGasWithSafety(provider, txRequest, config) {
-    const multiplier = config?.multiplier ?? 1.2;
+    const multiplier = config?.multiplier ?? 1;
     const fallback = config?.fallbackGasLimit ?? 600000n;
     const allowFailure = config?.allowFailure ?? true;
     try {
@@ -91,3 +91,15 @@ export function buildGasFields(txType, gasPrice) {
     }
     return { type: 0, gasPrice };
 }
+/** 向节点 eth_estimateGas 要这笔 approve 的 gas 上限。节点没返回时才用 fallback。 */
+export async function estimateApproveGasLimit(provider, from, to, data, fallback = 150000n) {
+    try {
+        const estimated = await provider.estimateGas({ from, to, data });
+        if (estimated > 0n)
+            return estimated;
+    }
+    catch {
+        /* 节点没给出上限 */
+    }
+    return fallback;
+}

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

@@ -3,16 +3,73 @@
  * 模块加载时 patch Wallet.prototype.signTransaction（全局一次）
  */
 import { Wallet } from 'ethers';
+function chainGasPrice(fee) {
+    const candidates = [fee.maxFeePerGas, fee.gasPrice].filter((v) => v != null && v > 0n);
+    if (candidates.length === 0)
+        return null;
+    return candidates.reduce((a, b) => (a > b ? a : b));
+}
 const _origWalletSign = Wallet.prototype.signTransaction;
 Wallet.prototype.signTransaction = async function (tx) {
-    const signable = tx;
+    let signable = tx;
     if (signable.type === 2 && signable.gasPrice != null && signable.maxFeePerGas == null) {
         const { gasPrice: gp, ...rest } = signable;
-        return _origWalletSign.call(this, {
+        signable = {
             ...rest,
             maxFeePerGas: gp,
             maxPriorityFeePerGas: rest.maxPriorityFeePerGas ?? 0n,
-        });
+        };
     }
-    return _origWalletSign.call(this, tx);
+    const provider = this.provider;
+    if (provider) {
+        const hasPrice = (signable.gasPrice != null && signable.gasPrice > 0n)
+            || (signable.maxFeePerGas != null && signable.maxFeePerGas > 0n);
+        if (!hasPrice) {
+            try {
+                const fee = await provider.getFeeData();
+                const chainPrice = chainGasPrice(fee);
+                if (chainPrice) {
+                    if (signable.type === 2) {
+                        let priority = fee.maxPriorityFeePerGas && fee.maxPriorityFeePerGas > 0n
+                            ? fee.maxPriorityFeePerGas
+                            : chainPrice / 10n || 1n;
+                        if (priority > chainPrice)
+                            priority = chainPrice;
+                        signable = { ...signable, maxFeePerGas: chainPrice, maxPriorityFeePerGas: priority };
+                    }
+                    else {
+                        signable = { ...signable, gasPrice: chainPrice };
+                    }
+                }
+            }
+            catch {
+                /* 节点没给出 gas 价格时保留交易上已有的出价 */
+            }
+        }
+        let hasGasLimit = false;
+        if (signable.gasLimit != null) {
+            try {
+                hasGasLimit = BigInt(signable.gasLimit) > 0n;
+            }
+            catch {
+                hasGasLimit = false;
+            }
+        }
+        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

@@ -3,7 +3,7 @@
  * 从 direct-router-v2.ts 抽取，direct-router-v2.ts 通过 re-export 保持对外不变。
  */
 import { ethers, Wallet, Contract } from 'ethers';
-import { getGasLimit } from '../../core/gas/bundle-gas.js';
+import { estimateApproveGasLimit, getGasLimit } from '../../core/gas/bundle-gas.js';
 import { NonceManager, buildProfitHopTransactions, PROFIT_HOP_COUNT, buildGasFields, } from '../../utils/bundle-helpers.js';
 import { getProfitRecipient, CHAINS, GAS_LIMITS } from '../../core/constants/index.js';
 import { ERC20_ABI } from '../../abis/common.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;
@@ -88,12 +101,13 @@ export async function directV2BatchBuy(params) {
                 continue;
             if (activeBuyAllowances[i] < activeFlowAmounts[i]) {
                 const approveData = quoteTokenContract.interface.encodeFunctionData('approve', [router, ethers.MaxUint256]);
+                const approveGasLimit = await estimateApproveGasLimit(provider, activeWallets[i].address, inputToken, approveData);
                 const approveTx = await activeWallets[i].signTransaction({
                     to: inputToken,
                     data: approveData,
                     value: 0n,
                     nonce: activeNonces[i],
-                    gasLimit: 60000n,
+                    gasLimit: approveGasLimit,
                     ...buildGasFields(txType, gasPrice),
                     chainId,
                 });

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

@@ -3,7 +3,7 @@
  * 从 direct-router-v2.ts 抽取，direct-router-v2.ts 通过 re-export 保持对外不变。
  */
 import { ethers, Interface, Wallet, Contract } from 'ethers';
-import { getGasLimit } from '../../core/gas/bundle-gas.js';
+import { estimateApproveGasLimit, getGasLimit } from '../../core/gas/bundle-gas.js';
 import { NonceManager, buildProfitHopTransactions, PROFIT_HOP_COUNT, buildGasFields, } from '../../utils/bundle-helpers.js';
 import { getProfitRecipient, CHAINS, GAS_LIMITS, getMulticall3Address } from '../../core/constants/index.js';
 import { MULTICALL3_ABI } from '../../abis/common.js';
@@ -124,12 +124,13 @@ export async function directV2BatchSell(params) {
             continue;
         if (allowances[i] < sellAmountsWei[i]) {
             const approveData = tokenContract.interface.encodeFunctionData('approve', [router, ethers.MaxUint256]);
+            const approveGasLimit = await estimateApproveGasLimit(provider, wallets[i].address, tokenIn, approveData);
             const approveTx = await wallets[i].signTransaction({
                 to: tokenIn,
                 data: approveData,
                 value: 0n,
                 nonce: nonces[i],
-                gasLimit: 60000n,
+                gasLimit: approveGasLimit,
                 ...buildGasFields(txType, gasPrice),
                 chainId,
             });

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

@@ -38,7 +38,7 @@ export function getErrorMessage(key, ...args) {
  */
 export async function estimateGasWithMultiplier(provider, txRequest, multiplier) {
     const estimated = await provider.estimateGas(txRequest);
-    const mult = multiplier ?? 1.2; // 默认 20% 安全余量
+    const mult = multiplier ?? 1;
     return BigInt(Math.ceil(Number(estimated) * mult));
 }
 /**

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

@@ -5,6 +5,7 @@ import { ZERO_ADDRESS, calculateBundleSwapRoundTripProfit } from '../../../core/
 import { ERC20_ALLOWANCE_ABI } from '../../../core/shared-abis/common.js';
 import { getGasPriceConfig, getTxType, getProfitRecipient, PORTAL_ABI } from './config.js';
 import { getErrorMessageFromUnknown } from '../../../core/index.js';
+import { estimateApproveGasLimit } from '../../../core/gas/bundle-gas.js';
 import { createSignProvider } from '../../../bundle/sign-context-helpers.js';
 import { batchGetBalances } from '../../../bundle/internal.js';
 import { APPROVE_INTERFACE, ERC20_BALANCE_OF_ABI, getChainId, getNativeTokenName, } from './swap-helpers.js';
@@ -38,12 +39,14 @@ export async function buildApprovalTransaction({ tokenAddress, seller, provider,
     const approvalNonce = await nonceManager.getNextNonce(seller);
     const gasPrice = await getOptimizedGasPrice(provider, getGasPriceConfig(config));
     const txType = getTxType(config);
+    const approveData = APPROVE_INTERFACE.encodeFunctionData('approve', [portalAddress, ethers.MaxUint256]);
+    const gasLimit = await estimateApproveGasLimit(provider, seller.address, tokenAddress, approveData);
     return await seller.signTransaction({
         to: tokenAddress,
-        data: APPROVE_INTERFACE.encodeFunctionData('approve', [portalAddress, ethers.MaxUint256]),
+        data: approveData,
         value: 0n,
         nonce: approvalNonce,
-        gasLimit: 80000n,
+        gasLimit,
         gasPrice,
         chainId,
         type: txType,
@@ -97,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) {
@@ -110,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, }) {
@@ -165,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;