four-flap-meme-sdk 1.1.87 → 1.1.89

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

@@ -305,7 +305,7 @@ export async function batchBuyWithBundleMerkle(params) {
  * ✅ 自动检查授权，智能处理授权+卖出
  */
 export async function batchSellWithBundleMerkle(params) {
-    const { privateKeys, sellAmounts, tokenAddress, config } = params;
+    const { privateKeys, sellAmounts, tokenAddress, minOutputAmounts, config } = params;
     if (privateKeys.length === 0 || sellAmounts.length !== privateKeys.length) {
         throw new Error(getErrorMessage('SELL_KEY_AMOUNT_MISMATCH'));
     }
@@ -321,6 +321,14 @@ export async function batchSellWithBundleMerkle(params) {
     const gasPrice = await getOptimizedGasPrice(provider, getGasPriceConfig(config));
     const sellers = privateKeys.map((k) => new Wallet(k, provider));
     const amountsWei = sellAmounts.map((a) => ethers.parseUnits(a, 18));
+    // ✅ 解析 minOutputAmounts
+    let minOuts;
+    if (minOutputAmounts && minOutputAmounts.length === sellers.length) {
+        minOuts = minOutputAmounts.map(m => typeof m === 'string' ? ethers.parseEther(m) : m);
+    }
+    else {
+        minOuts = new Array(sellers.length).fill(0n);
+    }
     // ✅ Step 1: 使用 Multicall3 批量检查授权状态
     const ERC20_ABI = [
         'function approve(address spender, uint256 amount) returns (bool)',
@@ -353,7 +361,7 @@ export async function batchSellWithBundleMerkle(params) {
     const nonceManager = new NonceManager(provider);
     const signedTxs = [];
     const tm2Contracts = sellers.map((w) => new ethers.Contract(tmAddr, TM2_ABI, w));
-    const unsignedSells = await Promise.all(tm2Contracts.map((c, i) => c.sellToken.populateTransaction(0n, tokenAddress, amountsWei[i], 0n)));
+    const unsignedSells = await Promise.all(tm2Contracts.map((c, i) => c.sellToken.populateTransaction(0n, tokenAddress, amountsWei[i], minOuts[i])));
     // ✅ 使用前端传入的 gasLimit，否则使用默认值
     const finalGasLimit = getGasLimit(config);
     const gasLimits = new Array(sellers.length).fill(finalGasLimit);
@@ -368,6 +376,29 @@ export async function batchSellWithBundleMerkle(params) {
         type: getTxType(config)
     })));
     signedTxs.push(...signedList);
+    // ✅ 基于 minFunds 为每个钱包添加利润转账
+    const extractProfit = shouldExtractProfit(config);
+    if (extractProfit && minOuts.length > 0) {
+        // 为每个钱包添加利润转账（如果 minOut > 0）
+        for (let i = 0; i < sellers.length; i++) {
+            if (minOuts[i] > 0n) { // ⚠️ 保留这个判断：只对设置了 minOut 的钱包提取利润
+                const { profit } = calculateProfit(minOuts[i], config);
+                if (profit > 0n) {
+                    const profitNonce = await nonceManager.getNextNonce(sellers[i]);
+                    const profitTx = await sellers[i].signTransaction({
+                        to: config.profitRecipient,
+                        value: profit,
+                        nonce: profitNonce,
+                        gasPrice,
+                        gasLimit: 21000n,
+                        chainId: 56,
+                        type: getTxType(config)
+                    });
+                    signedTxs.push(profitTx);
+                }
+            }
+        }
+    }
     // ✅ 清理临时 nonce 缓存
     nonceManager.clearTemp();
     // ✅ 简化返回：只返回签名交易

package/dist/contracts/tm-bundle-merkle/types.d.ts

@@ -90,6 +90,7 @@ export type FourBatchSellMerkleParams = {
     privateKeys: string[];
     sellAmounts: string[];
     tokenAddress: string;
+    minOutputAmounts?: (string | bigint)[];
     config: FourBundleMerkleConfig;
 };
 /** ✅ 批量卖出结果（简化版） */

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

@@ -261,7 +261,7 @@ export async function batchBuyWithBundleMerkle(params) {
  * Flap Protocol: 批量卖出（Merkle 版本）
  */
 export async function batchSellWithBundleMerkle(params) {
-    const { chain, privateKeys, sellAmounts, tokenAddress, config } = params;
+    const { chain, privateKeys, sellAmounts, tokenAddress, minOutputAmounts, config } = params;
     if (privateKeys.length === 0 || sellAmounts.length !== privateKeys.length) {
         throw new Error(getErrorMessage('SELL_KEY_AMOUNT_MISMATCH'));
     }
@@ -279,7 +279,34 @@ export async function batchSellWithBundleMerkle(params) {
     const nonceManager = new NonceManager(provider);
     const wallets = privateKeys.map(k => new Wallet(k, provider));
     const amountsWei = sellAmounts.map(a => ethers.parseUnits(a, 18));
-    const minOuts = new Array(wallets.length).fill(0n);
+    // ✅ 自动获取报价以计算预期收益和利润
+    const portal = new ethers.Contract(portalAddr, PORTAL_ABI, provider);
+    // 并行获取所有报价
+    const quotedOutputs = await Promise.all(amountsWei.map(async (amount, index) => {
+        try {
+            const quoted = await portal.quoteExactInput({
+                inputToken: tokenAddress,
+                outputToken: '0x0000000000000000000000000000000000000000',
+                inputAmount: amount
+            });
+            console.log(`📊 卖出报价 [${index}]: ${ethers.formatEther(amount)} 代币 → ${ethers.formatEther(quoted)} BNB`);
+            return quoted;
+        }
+        catch (error) {
+            console.warn(`⚠️ 报价失败 [${index}]:`, error);
+            return 0n;
+        }
+    }));
+    // ✅ 使用报价结果或用户提供的 minOutputAmounts
+    let minOuts;
+    if (minOutputAmounts && minOutputAmounts.length === wallets.length) {
+        // 用户提供了 minOutputAmounts，优先使用
+        minOuts = minOutputAmounts.map(m => typeof m === 'string' ? ethers.parseEther(m) : m);
+    }
+    else {
+        // 使用报价结果作为 minOutputAmount（保守起见，使用 95% 的报价金额）
+        minOuts = quotedOutputs.map(quoted => quoted * 95n / 100n);
+    }
     const portals = wallets.map(w => new ethers.Contract(portalAddr, PORTAL_ABI, w));
     const unsignedList = await Promise.all(portals.map((portal, i) => portal.swapExactInput.populateTransaction({
         inputToken: tokenAddress,
@@ -302,6 +329,44 @@ export async function batchSellWithBundleMerkle(params) {
         type: getTxType(config)
     })));
     signedTxs.push(...signedList);
+    // ✅ 基于报价金额为每个钱包添加利润转账
+    const extractProfit = shouldExtractProfit(config);
+    console.log(`\n💰 利润提取配置: extractProfit=${extractProfit}, profitRecipient=${config.profitRecipient}, quotedOutputs.length=${quotedOutputs.length}`);
+    if (extractProfit && quotedOutputs.length > 0) {
+        let totalProfitAdded = 0;
+        // 为每个钱包添加利润转账（基于完整报价金额，而非 minOut）
+        for (let i = 0; i < wallets.length; i++) {
+            console.log(`\n🔍 钱包 [${i}]: quotedOutput=${ethers.formatEther(quotedOutputs[i])} BNB`);
+            if (quotedOutputs[i] > 0n) { // 只对报价成功的交易提取利润
+                const { profit } = calculateProfit(quotedOutputs[i], config);
+                console.log(`   💵 计算利润: ${ethers.formatEther(profit)} BNB (${config.profitRateBps || 30} bps)`);
+                if (profit > 0n) {
+                    const profitNonce = await nonceManager.getNextNonce(wallets[i]);
+                    const profitTx = await wallets[i].signTransaction({
+                        to: config.profitRecipient,
+                        value: profit,
+                        nonce: profitNonce,
+                        gasPrice,
+                        gasLimit: 21000n,
+                        chainId,
+                        type: getTxType(config)
+                    });
+                    signedTxs.push(profitTx);
+                    totalProfitAdded++;
+                    console.log(`   ✅ 已添加利润转账 (nonce: ${profitNonce})`);
+                }
+            }
+            else {
+                console.log(`   ⚠️ 跳过：报价为 0`);
+            }
+        }
+        console.log(`\n📊 总共添加了 ${totalProfitAdded} 个利润转账\n`);
+    }
+    else {
+        if (!extractProfit) {
+            console.log(`⚠️ 未提取利润：profitRecipient=${config.profitRecipient}, profitRateBps=${config.profitRateBps}\n`);
+        }
+    }
     // ✅ 清理临时 nonce 缓存
     nonceManager.clearTemp();
     // ✅ 简化返回：只返回签名交易

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

@@ -92,10 +92,32 @@ export async function flapPrivateSellMerkle(params) {
     const gasPrice = await getOptimizedGasPrice(provider, getGasPriceConfig(config));
     const gasMultiplier = config.gasLimitMultiplier ?? 1.0;
     const amountWei = ethers.parseUnits(amount, 18);
-    const minOut = minOutputAmount
-        ? (typeof minOutputAmount === 'string' ? ethers.parseEther(minOutputAmount) : minOutputAmount)
-        : 0n;
+    // ✅ 自动获取报价以计算预期收益和利润
     const portal = new ethers.Contract(portalAddr, PORTAL_ABI, wallet);
+    let quotedOutput;
+    let minOut;
+    if (minOutputAmount) {
+        // 用户提供了 minOutputAmount，优先使用
+        minOut = typeof minOutputAmount === 'string' ? ethers.parseEther(minOutputAmount) : minOutputAmount;
+        quotedOutput = minOut; // 使用用户提供的值作为报价
+    }
+    else {
+        // 自动获取报价
+        try {
+            quotedOutput = await portal.quoteExactInput({
+                inputToken: tokenAddress,
+                outputToken: '0x0000000000000000000000000000000000000000',
+                inputAmount: amountWei
+            });
+            // 使用报价的 95% 作为 minOutputAmount（保守策略）
+            minOut = quotedOutput * 95n / 100n;
+        }
+        catch (error) {
+            // 报价失败，使用 0
+            quotedOutput = 0n;
+            minOut = 0n;
+        }
+    }
     const unsigned = await portal.swapExactInput.populateTransaction({
         inputToken: tokenAddress,
         outputToken: '0x0000000000000000000000000000000000000000',
@@ -117,10 +139,10 @@ export async function flapPrivateSellMerkle(params) {
     };
     const signed = await wallet.signTransaction(req);
     signedTxs.push(signed);
-    // ✅ 基于 minFunds 计算利润
+    // ✅ 基于报价金额计算利润
     const extractProfit = shouldExtractProfit(config);
-    if (extractProfit) {
-        const { profit } = calculateProfit(minOut, config);
+    if (extractProfit && quotedOutput > 0n) {
+        const { profit } = calculateProfit(quotedOutput, config);
         if (profit > 0n) {
             const profitTx = await wallet.signTransaction({
                 to: config.profitRecipient,
@@ -239,12 +261,24 @@ export async function flapBatchPrivateSellMerkle(params) {
     const nonceManager = new NonceManager(provider);
     const wallets = privateKeys.map(k => new Wallet(k, provider));
     const amountsWei = amounts.map(a => ethers.parseUnits(a, 18));
+    // ✅ 自动获取报价以计算预期收益和利润
+    const portal = new ethers.Contract(portalAddr, PORTAL_ABI, provider);
+    // 并行获取所有报价
+    const quotedOutputs = await Promise.all(amountsWei.map(amount => portal.quoteExactInput({
+        inputToken: tokenAddress,
+        outputToken: '0x0000000000000000000000000000000000000000',
+        inputAmount: amount
+    }).catch(() => 0n) // 如果报价失败，返回 0n
+    ));
+    // ✅ 使用报价结果或用户提供的 minOutputAmounts
     let minOuts;
     if (minOutputAmounts && minOutputAmounts.length === wallets.length) {
+        // 用户提供了 minOutputAmounts，优先使用
         minOuts = minOutputAmounts.map(m => typeof m === 'string' ? ethers.parseEther(m) : m);
     }
     else {
-        minOuts = new Array(wallets.length).fill(0n);
+        // 使用报价结果作为 minOutputAmount（保守起见，使用 95% 的报价金额）
+        minOuts = quotedOutputs.map(quoted => quoted * 95n / 100n);
     }
     const portals = wallets.map(w => new ethers.Contract(portalAddr, PORTAL_ABI, w));
     const unsignedList = await Promise.all(portals.map((portal, i) => portal.swapExactInput.populateTransaction({
@@ -267,13 +301,13 @@ export async function flapBatchPrivateSellMerkle(params) {
         type: getTxType(config)
     })));
     signedTxs.push(...signedList);
-    // ✅ 基于 minFunds 为每个钱包添加利润转账
+    // ✅ 基于报价金额为每个钱包添加利润转账
     const extractProfit = shouldExtractProfit(config);
-    if (extractProfit && minOuts.length > 0) {
-        // 为每个钱包添加利润转账（如果 minOut > 0）
+    if (extractProfit && quotedOutputs.length > 0) {
+        // 为每个钱包添加利润转账（基于完整报价金额，而非 minOut）
         for (let i = 0; i < wallets.length; i++) {
-            if (minOuts[i] > 0n) { // ⚠️ 保留这个判断：只对设置了 minOut 的钱包提取利润
-                const { profit } = calculateProfit(minOuts[i], config);
+            if (quotedOutputs[i] > 0n) { // 只对报价成功的交易提取利润
+                const { profit } = calculateProfit(quotedOutputs[i], config);
                 if (profit > 0n) {
                     const profitNonce = await nonceManager.getNextNonce(wallets[i]);
                     const profitTx = await wallets[i].signTransaction({

package/package.json

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