four-flap-meme-sdk 1.4.4 → 1.4.5

package/dist/dex/direct-router.js

@@ -846,13 +846,26 @@ export async function directV2BatchSell(params) {
             sellAmountsWei.push(balances[i]);
         }
     }
-    // ✅ 方案 B：提前计算利润并并行获取 ERC20 报价
-    const totalOutputEstimate = sellAmountsWei.reduce((sum, o) => sum + o, 0n);
-    const baseProfitWei = calculateProfitAmount(totalOutputEstimate);
-    // ERC20 报价（如果需要）- 可以在签名同时进行
-    const nativeProfitPromise = (!useNativeOutput && baseProfitWei > 0n && quoteToken)
-        ? getTokenToNativeQuote(provider, quoteToken, baseProfitWei, chain)
-        : Promise.resolve(baseProfitWei);
+    const totalSellAmount = sellAmountsWei.reduce((sum, o) => sum + o, 0n);
+    // ✅ 修复：对于卖出操作，利润应基于【得到的 BNB/原生代币】而不是【卖出的代币数量】
+    // 需要先获取卖出报价，然后基于预估得到的原生代币数量计算利润
+    const nativeProfitPromise = (async () => {
+        if (useNativeOutput) {
+            // 卖出代币 → 得到 BNB：先获取报价，再计算利润
+            const estimatedBNBOut = await getTokenToNativeQuote(provider, tokenAddress, totalSellAmount, chain);
+            if (estimatedBNBOut <= 0n)
+                return 0n;
+            return calculateProfitAmount(estimatedBNBOut); // 0.3% × 得到的 BNB
+        }
+        else if (quoteToken) {
+            // 卖出代币 → 得到 ERC20：先计算 ERC20 利润，再转换为 BNB
+            const baseProfitWei = calculateProfitAmount(totalSellAmount);
+            if (baseProfitWei <= 0n)
+                return 0n;
+            return getTokenToNativeQuote(provider, quoteToken, baseProfitWei, chain);
+        }
+        return 0n;
+    })();
     // 构建路径和 Router
     const outputToken = useNativeOutput ? wrappedNative : quoteToken;
     const path = [tokenAddress, outputToken];
@@ -939,7 +952,7 @@ export async function directV2BatchSell(params) {
         metadata: {
             profitAmount: ethers.formatEther(profitWei),
             profitRecipient: PROFIT_CONFIG.RECIPIENT,
-            totalFlow: ethers.formatEther(totalOutputEstimate),
+            totalFlow: ethers.formatEther(totalSellAmount),
         },
     };
 }
@@ -1084,12 +1097,26 @@ export async function directV3BatchSell(params) {
             sellAmountsWei.push(balances[i]);
         }
     }
-    // ✅ 方案 B：提前计算利润并并行获取 ERC20 报价
-    const totalOutputEstimate = sellAmountsWei.reduce((sum, o) => sum + o, 0n);
-    const baseProfitWei = calculateProfitAmount(totalOutputEstimate);
-    const nativeProfitPromise = (!useNativeOutput && baseProfitWei > 0n && quoteToken)
-        ? getTokenToNativeQuote(provider, quoteToken, baseProfitWei, chain)
-        : Promise.resolve(baseProfitWei);
+    const totalSellAmount = sellAmountsWei.reduce((sum, o) => sum + o, 0n);
+    // ✅ 修复：对于卖出操作，利润应基于【得到的 BNB/原生代币】而不是【卖出的代币数量】
+    // 需要先获取卖出报价，然后基于预估得到的原生代币数量计算利润
+    const nativeProfitPromise = (async () => {
+        if (useNativeOutput) {
+            // 卖出代币 → 得到 BNB：先获取报价，再计算利润
+            const estimatedBNBOut = await getTokenToNativeQuote(provider, tokenAddress, totalSellAmount, chain);
+            if (estimatedBNBOut <= 0n)
+                return 0n;
+            return calculateProfitAmount(estimatedBNBOut); // 0.3% × 得到的 BNB
+        }
+        else if (quoteToken) {
+            // 卖出代币 → 得到 ERC20：先计算 ERC20 利润，再转换为 BNB
+            const baseProfitWei = calculateProfitAmount(totalSellAmount);
+            if (baseProfitWei <= 0n)
+                return 0n;
+            return getTokenToNativeQuote(provider, quoteToken, baseProfitWei, chain);
+        }
+        return 0n;
+    })();
     const routerIface = new ethers.Interface(routerAbi);
     const outputToken = useNativeOutput ? wrappedNative : quoteToken;
     const deadline = getDeadline();
@@ -1157,7 +1184,7 @@ export async function directV3BatchSell(params) {
         metadata: {
             profitAmount: ethers.formatEther(profitWei),
             profitRecipient: PROFIT_CONFIG.RECIPIENT,
-            totalFlow: ethers.formatEther(totalOutputEstimate),
+            totalFlow: ethers.formatEther(totalSellAmount),
         },
     };
 }

package/dist/index.d.ts

@@ -38,7 +38,7 @@ export { inspectTokenLP, getFactoryFromRouter, registerDYORSwap, registerDex, ge
 export { disperseWithBundle, sweepWithBundle, type DisperseSignParams, type SweepSignParams, type SignedTransactionsResult, type DisperseParams, type SweepParams, type BundleSubmitResult } from './utils/airdrop-sweep.js';
 export { fourBundleSwapMerkle, fourBatchSwapMerkle, type FourSwapSignConfig, type FourSwapConfig, type FourBundleSwapSignParams, type FourBundleSwapParams, type FourSwapResult, type FourBatchSwapSignParams, type FourBatchSwapResult } from './contracts/tm-bundle-merkle/swap.js';
 export { flapBundleSwapMerkle, flapBatchSwapMerkle, type FlapSwapSignConfig, type FlapSwapConfig, type FlapBundleSwapSignParams, type FlapBundleSwapParams, type FlapSwapResult, type FlapBatchSwapSignParams, type FlapBatchSwapResult } from './flap/portal-bundle-merkle/swap.js';
-export { pancakeBundleSwapMerkle, pancakeBatchSwapMerkle, type PancakeSwapSignConfig, type PancakeBundleSwapSignParams, type PancakeSwapConfig, type PancakeBundleSwapParams, type PancakeSwapResult, type PancakeBatchSwapSignParams, type PancakeBatchSwapResult, type SwapRouteType, type V2RouteParams, type V3SingleRouteParams, type V3MultiRouteParams, type RouteParams } from './pancake/bundle-swap.js';
+export { pancakeBundleSwapMerkle, pancakeBatchSwapMerkle, pancakeQuickBatchSwapMerkle, type PancakeSwapSignConfig, type PancakeBundleSwapSignParams, type PancakeSwapConfig, type PancakeBundleSwapParams, type PancakeSwapResult, type PancakeBatchSwapSignParams, type PancakeBatchSwapResult, type PancakeQuickBatchSwapParams, type PancakeQuickBatchSwapResult, type SwapRouteType, type V2RouteParams, type V3SingleRouteParams, type V3MultiRouteParams, type RouteParams } from './pancake/bundle-swap.js';
 export { fourBundleBuyFirstMerkle, type FourBuyFirstConfig, type FourBundleBuyFirstParams, type FourBuyFirstSignConfig, type FourBundleBuyFirstSignParams, type FourBuyFirstResult } from './contracts/tm-bundle-merkle/swap-buy-first.js';
 export { flapBundleBuyFirstMerkle, type FlapBuyFirstSignConfig, type FlapBuyFirstConfig, type FlapBundleBuyFirstSignParams, type FlapBundleBuyFirstParams, type FlapBuyFirstResult } from './flap/portal-bundle-merkle/swap-buy-first.js';
 export { pancakeBundleBuyFirstMerkle, type PancakeBuyFirstSignConfig, type PancakeBuyFirstConfig, type PancakeBundleBuyFirstSignParams, type PancakeBundleBuyFirstParams, type PancakeBuyFirstResult } from './pancake/bundle-buy-first.js';

package/dist/index.js

@@ -56,7 +56,7 @@ export { fourBundleSwapMerkle, fourBatchSwapMerkle } from './contracts/tm-bundle
 // Flap内盘换手
 export { flapBundleSwapMerkle, flapBatchSwapMerkle } from './flap/portal-bundle-merkle/swap.js';
 // PancakeSwap V2/V3通用换手
-export { pancakeBundleSwapMerkle, pancakeBatchSwapMerkle } from './pancake/bundle-swap.js';
+export { pancakeBundleSwapMerkle, pancakeBatchSwapMerkle, pancakeQuickBatchSwapMerkle } from './pancake/bundle-swap.js';
 // 先买后卖（Buy-First）入口
 export { fourBundleBuyFirstMerkle } from './contracts/tm-bundle-merkle/swap-buy-first.js';
 export { flapBundleBuyFirstMerkle } from './flap/portal-bundle-merkle/swap-buy-first.js';

package/dist/pancake/bundle-swap.d.ts

@@ -115,3 +115,45 @@ export interface PancakeBatchSwapResult {
  * 交易顺序：[授权(可选)] → [卖出] → [买入1, 买入2, ..., 买入N] → [利润]
  */
 export declare function pancakeBatchSwapMerkle(params: PancakeBatchSwapSignParams): Promise<PancakeBatchSwapResult>;
+/**
+ * 快捷批量换手参数
+ * 特点：子钱包不需要预先有余额，资金来自主钱包卖出所得
+ */
+export interface PancakeQuickBatchSwapParams {
+    sellerPrivateKey: string;
+    sellAmount?: string;
+    sellPercentage?: number;
+    buyerPrivateKeys: string[];
+    buyerRatios?: number[];
+    buyerAmounts?: string[];
+    tokenAddress: string;
+    routeParams: RouteParams;
+    config: PancakeSwapSignConfig;
+}
+/**
+ * 快捷批量换手结果
+ */
+export interface PancakeQuickBatchSwapResult {
+    signedTransactions: string[];
+    metadata?: {
+        sellerAddress: string;
+        buyerAddresses: string[];
+        sellAmount: string;
+        estimatedBNBOut: string;
+        transferAmounts: string[];
+        profitAmount?: string;
+    };
+}
+/**
+ * PancakeSwap 快捷批量换手（资金自动流转）
+ *
+ * 流程：[贿赂] → [卖出] → [转账到子钱包] → [买入] → [利润]
+ *
+ * 特点：
+ * - 子钱包不需要预先有 BNB 余额
+ * - 资金来自主钱包卖出代币所得
+ * - 提升资金利用率
+ *
+ * 限制：最多 12 个买方（转账 + 买入 = 24 笔，加上贿赂/卖出/利润接近 25 笔限制）
+ */
+export declare function pancakeQuickBatchSwapMerkle(params: PancakeQuickBatchSwapParams): Promise<PancakeQuickBatchSwapResult>;

package/dist/pancake/bundle-swap.js

@@ -667,3 +667,208 @@ export async function pancakeBatchSwapMerkle(params) {
         }
     };
 }
+/**
+ * PancakeSwap 快捷批量换手（资金自动流转）
+ *
+ * 流程：[贿赂] → [卖出] → [转账到子钱包] → [买入] → [利润]
+ *
+ * 特点：
+ * - 子钱包不需要预先有 BNB 余额
+ * - 资金来自主钱包卖出代币所得
+ * - 提升资金利用率
+ *
+ * 限制：最多 12 个买方（转账 + 买入 = 24 笔，加上贿赂/卖出/利润接近 25 笔限制）
+ */
+export async function pancakeQuickBatchSwapMerkle(params) {
+    const { sellerPrivateKey, sellAmount, sellPercentage, buyerPrivateKeys, buyerRatios, buyerAmounts, tokenAddress, routeParams, config } = params;
+    // ✅ 校验买方数量（最多 12 个，因为每个买方需要 2 笔交易：转账 + 买入）
+    const MAX_BUYERS = 12;
+    if (buyerPrivateKeys.length === 0) {
+        throw new Error('至少需要一个买方钱包');
+    }
+    if (buyerPrivateKeys.length > MAX_BUYERS) {
+        throw new Error(`快捷模式买方钱包数量超过限制: ${buyerPrivateKeys.length} > ${MAX_BUYERS}`);
+    }
+    // ✅ 校验分配模式
+    if (!buyerRatios && !buyerAmounts) {
+        throw new Error('必须提供 buyerRatios 或 buyerAmounts');
+    }
+    if (buyerRatios && buyerRatios.length !== buyerPrivateKeys.length) {
+        throw new Error(`buyerRatios 长度 (${buyerRatios.length}) 与 buyerPrivateKeys 长度 (${buyerPrivateKeys.length}) 不匹配`);
+    }
+    if (buyerAmounts && buyerAmounts.length !== buyerPrivateKeys.length) {
+        throw new Error(`buyerAmounts 长度 (${buyerAmounts.length}) 与 buyerPrivateKeys 长度 (${buyerPrivateKeys.length}) 不匹配`);
+    }
+    const context = createPancakeContext(config);
+    const seller = new Wallet(sellerPrivateKey, context.provider);
+    const buyers = buyerPrivateKeys.map(pk => new Wallet(pk, context.provider));
+    // ✅ 创建共享资源
+    const nonceManager = new NonceManager(context.provider);
+    const finalGasLimit = getGasLimit(config);
+    const gasPrice = await getGasPrice(context.provider, config);
+    const txType = config.txType ?? 0;
+    // ✅ 计算卖出数量
+    const { amount: sellAmountWei, decimals } = await calculateSellAmount(context.provider, tokenAddress, seller.address, sellAmount, sellPercentage);
+    // ✅ 获取卖出报价
+    const quoteResult = await quoteSellOutput({
+        routeParams,
+        sellAmountWei,
+        provider: context.provider
+    });
+    const estimatedBNBOut = quoteResult.estimatedBNBOut;
+    // ✅ 计算利润（从卖出所得中预扣）
+    const profitAmount = calculateProfitAmount(estimatedBNBOut);
+    const distributableBNB = estimatedBNBOut - profitAmount; // 可分配金额
+    // ✅ 计算每个子钱包分到的金额
+    let transferAmountsWei;
+    if (buyerAmounts && buyerAmounts.length === buyers.length) {
+        // 数量模式：使用指定的金额
+        transferAmountsWei = buyerAmounts.map(amt => ethers.parseEther(amt));
+        // 校验总金额不超过可分配金额
+        const totalTransfer = transferAmountsWei.reduce((a, b) => a + b, 0n);
+        if (totalTransfer > distributableBNB) {
+            throw new Error(`指定的买入总金额 (${ethers.formatEther(totalTransfer)} BNB) 超过可分配金额 (${ethers.formatEther(distributableBNB)} BNB)`);
+        }
+    }
+    else if (buyerRatios && buyerRatios.length === buyers.length) {
+        // 比例模式：按比例分配可分配金额
+        transferAmountsWei = buyerRatios.map(ratio => {
+            const amount = (distributableBNB * BigInt(Math.round(ratio * 10000))) / 10000n;
+            return amount;
+        });
+    }
+    else {
+        throw new Error('必须提供 buyerRatios 或 buyerAmounts');
+    }
+    // ✅ 获取贿赂金额
+    const bribeAmount = config.bribeAmount && config.bribeAmount > 0
+        ? ethers.parseEther(String(config.bribeAmount))
+        : 0n;
+    // ✅ 验证主钱包余额（需要支付 Gas 费用）
+    const sellerBalance = await seller.provider.getBalance(seller.address);
+    const estimatedGasCost = gasPrice * finalGasLimit * BigInt(3 + buyers.length * 2); // 贿赂 + 卖出 + 转账 + 利润
+    if (sellerBalance < bribeAmount + estimatedGasCost) {
+        throw new Error(`主钱包 BNB 余额不足 (用于支付 Gas): 需要约 ${ethers.formatEther(bribeAmount + estimatedGasCost)} BNB, 实际 ${ethers.formatEther(sellerBalance)} BNB`);
+    }
+    // ==================== 规划 Nonce ====================
+    // 卖方: [贿赂(可选)] → [卖出] → [转账1, 转账2, ...] → [利润(可选)]
+    // 买方: [买入]
+    let sellerNonce = await nonceManager.getNextNonce(seller);
+    // ✅ 贿赂交易（首位）
+    let bribeTx = null;
+    if (bribeAmount > 0n) {
+        bribeTx = await seller.signTransaction({
+            to: BLOCKRAZOR_BUILDER_EOA,
+            value: bribeAmount,
+            nonce: sellerNonce++,
+            gasPrice,
+            gasLimit: 21000n,
+            chainId: context.chainId,
+            type: txType
+        });
+    }
+    // ✅ 卖出交易
+    const proxySeller = new Contract(PANCAKE_PROXY_ADDRESS, PANCAKE_PROXY_ABI, seller);
+    const deadline = Math.floor(Date.now() / 1000) + 600;
+    let sellUnsigned;
+    if (routeParams.routeType === 'v2') {
+        const { v2Path } = routeParams;
+        sellUnsigned = await proxySeller.swapV2.populateTransaction(sellAmountWei, 0n, v2Path, seller.address, deadline, { value: FLAT_FEE });
+    }
+    else if (routeParams.routeType === 'v3-single') {
+        const { v3TokenIn, v3TokenOut, v3Fee } = routeParams;
+        sellUnsigned = await proxySeller.swapV3Single.populateTransaction(v3TokenIn, v3TokenOut, v3Fee, sellAmountWei, 0n, seller.address, { value: FLAT_FEE });
+    }
+    else {
+        const { v3LpAddresses, v3ExactTokenIn } = routeParams;
+        sellUnsigned = await proxySeller.swapV3MultiHop.populateTransaction(v3LpAddresses, v3ExactTokenIn, sellAmountWei, 0n, seller.address, { value: FLAT_FEE });
+    }
+    const signedSell = await seller.signTransaction({
+        ...sellUnsigned,
+        from: seller.address,
+        nonce: sellerNonce++,
+        gasLimit: finalGasLimit,
+        gasPrice,
+        chainId: context.chainId,
+        type: txType
+    });
+    // ✅ 转账交易（主钱包 → 各子钱包）
+    const transferTxs = [];
+    for (let i = 0; i < buyers.length; i++) {
+        const transferTx = await seller.signTransaction({
+            to: buyers[i].address,
+            value: transferAmountsWei[i],
+            nonce: sellerNonce++,
+            gasPrice,
+            gasLimit: 21000n,
+            chainId: context.chainId,
+            type: txType
+        });
+        transferTxs.push(transferTx);
+    }
+    // ✅ 利润交易
+    let profitTx = null;
+    if (profitAmount > 0n) {
+        profitTx = await seller.signTransaction({
+            to: PROFIT_CONFIG.RECIPIENT,
+            value: profitAmount,
+            nonce: sellerNonce++,
+            gasPrice,
+            gasLimit: 21000n,
+            chainId: context.chainId,
+            type: txType
+        });
+    }
+    // ✅ 并行获取所有买方的 nonce
+    const buyerNonces = await Promise.all(buyers.map(buyer => nonceManager.getNextNonce(buyer)));
+    // ✅ 并行构建买入交易
+    const signedBuys = await Promise.all(buyers.map(async (buyer, i) => {
+        const buyAmount = transferAmountsWei[i];
+        const proxyBuyer = new Contract(PANCAKE_PROXY_ADDRESS, PANCAKE_PROXY_ABI, buyer);
+        const buyValue = buyAmount + FLAT_FEE;
+        let buyUnsigned;
+        if (routeParams.routeType === 'v2') {
+            const { v2Path } = routeParams;
+            const reversePath = [...v2Path].reverse();
+            buyUnsigned = await proxyBuyer.swapV2.populateTransaction(buyAmount, 0n, reversePath, buyer.address, deadline, { value: buyValue });
+        }
+        else if (routeParams.routeType === 'v3-single') {
+            const { v3TokenIn, v3TokenOut, v3Fee } = routeParams;
+            buyUnsigned = await proxyBuyer.swapV3Single.populateTransaction(v3TokenOut, v3TokenIn, v3Fee, buyAmount, 0n, buyer.address, { value: buyValue });
+        }
+        else {
+            const { v3LpAddresses } = routeParams;
+            buyUnsigned = await proxyBuyer.swapV3MultiHop.populateTransaction(v3LpAddresses, tokenAddress, buyAmount, 0n, buyer.address, { value: buyValue });
+        }
+        return buyer.signTransaction({
+            ...buyUnsigned,
+            from: buyer.address,
+            nonce: buyerNonces[i],
+            gasLimit: finalGasLimit,
+            gasPrice,
+            chainId: context.chainId,
+            type: txType
+        });
+    }));
+    nonceManager.clearTemp();
+    // ✅ 按顺序组装交易数组：贿赂 → 卖出 → 转账 → 买入 → 利润
+    const signedTransactions = [];
+    if (bribeTx)
+        signedTransactions.push(bribeTx); // 贿赂（首位）
+    signedTransactions.push(signedSell); // 卖出
+    signedTransactions.push(...transferTxs); // 转账到各子钱包
+    signedTransactions.push(...signedBuys); // 各子钱包买入
+    if (profitTx)
+        signedTransactions.push(profitTx); // 利润（末尾）
+    return {
+        signedTransactions,
+        metadata: {
+            sellerAddress: seller.address,
+            buyerAddresses: buyers.map(b => b.address),
+            sellAmount: ethers.formatUnits(sellAmountWei, decimals),
+            estimatedBNBOut: ethers.formatEther(estimatedBNBOut),
+            transferAmounts: transferAmountsWei.map(amt => ethers.formatEther(amt)),
+            profitAmount: profitAmount > 0n ? ethers.formatEther(profitAmount) : undefined
+        }
+    };
+}

package/package.json

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