four-flap-meme-sdk 1.1.86 → 1.1.87

package/dist/contracts/tm-bundle-merkle/pancake-proxy.js

@@ -494,12 +494,12 @@ export async function fourPancakeProxyBatchSellMerkle(params) {
         type: getTxType(config),
         value: unsigned.value // ✅ 显式保留 value（手续费）
     })));
-    // ✅ 基于 minFunds 为每个钱包添加利润转账（如果设置且 > 0）
+    // ✅ 基于 minFunds 为每个钱包添加利润转账
     const extractProfit = shouldExtractProfit(config);
     if (extractProfit && minOuts.length > 0) {
-        // 为每个有 minOut > 0 的钱包添加利润转账
+        // 为每个钱包添加利润转账（如果 minOut > 0）
         for (let i = 0; i < sellers.length; i++) {
-            if (minOuts[i] > 0n) {
+            if (minOuts[i] > 0n) { // ⚠️ 保留这个判断：只对设置了 minOut 的钱包提取利润
                 const { profit } = calculateProfit(minOuts[i], config);
                 if (profit > 0n) {
                     const profitNonce = await nonceManager.getNextNonce(sellers[i]);

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

@@ -128,9 +128,9 @@ export async function fourPrivateSellMerkle(params) {
     };
     const signedSell = await wallet.signTransaction(sellReq);
     signedTxs.push(signedSell);
-    // ✅ 基于 minFunds 计算利润（如果设置且 > 0）
+    // ✅ 基于 minFunds 计算利润
     const extractProfit = shouldExtractProfit(config);
-    if (extractProfit && minOut > 0n) {
+    if (extractProfit) {
         const { profit } = calculateProfit(minOut, config);
         if (profit > 0n) {
             const profitNonce = await nonceManager.getNextNonce(wallet);
@@ -280,9 +280,9 @@ export async function fourBatchPrivateSellMerkle(params) {
         type: getTxType(config)
     })));
     signedTxs.push(...signedSells);
-    // ✅ 基于 minFunds 为每个钱包添加利润转账（如果设置且 > 0）
+    // ✅ 基于 minFunds 为每个钱包添加利润转账
     const extractProfit = shouldExtractProfit(config);
-    if (extractProfit && minOut > 0n) {
+    if (extractProfit) {
         const { profit } = calculateProfit(minOut, config);
         if (profit > 0n) {
             // 为每个钱包添加利润转账

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

@@ -2,7 +2,7 @@ import { ethers, Wallet } from 'ethers';
 import { MerkleClient } from '../../clients/merkle.js';
 import { NonceManager, getOptimizedGasPrice } from '../../utils/bundle-helpers.js';
 import { FLAP_PORTAL_ADDRESSES, FLAP_ORIGINAL_PORTAL_ADDRESSES } from '../constants.js';
-import { CHAIN_ID_MAP, PORTAL_ABI, getErrorMessage, getTxType, getGasPriceConfig } from './config.js';
+import { CHAIN_ID_MAP, PORTAL_ABI, getErrorMessage, getTxType, getGasPriceConfig, shouldExtractProfit, calculateProfit } from './config.js';
 /**
  * 获取 Gas Limit
  * 优先使用 config.gasLimit，否则使用默认值 * multiplier
@@ -100,16 +100,31 @@ export async function createTokenWithBundleBuyMerkle(params) {
     // 购买交易
     const buyTxs = [];
     const buyers = privateKeys.slice(1).map(k => new Wallet(k, provider));
-    const amountsWei = buyAmounts.map(a => ethers.parseEther(a));
+    // ✅ 利润提取配置
+    const extractProfit = shouldExtractProfit(config);
+    let totalProfit = 0n;
+    let totalBuyAmount = 0n;
+    // 计算每个买家的实际购买金额（扣除利润）
+    const fundsList = buyAmounts.map((v) => {
+        const originalAmount = ethers.parseEther(v);
+        totalBuyAmount += originalAmount;
+        if (extractProfit) {
+            const { remaining, profit } = calculateProfit(originalAmount, config);
+            totalProfit += profit;
+            return remaining; // ✅ 扣除利润后的金额用于购买
+        }
+        return originalAmount;
+    });
     const minOuts = new Array(buyers.length).fill(0n);
     const buyPortals = buyers.map(w => new ethers.Contract(portalAddr, PORTAL_ABI, w));
     const unsignedBuys = await Promise.all(buyPortals.map((portal, i) => portal.swapExactInput.populateTransaction({
         inputToken: '0x0000000000000000000000000000000000000000',
         outputToken: tokenAddress,
-        inputAmount: amountsWei[i],
+        inputAmount: fundsList[i], // ✅ 使用扣除利润后的金额
         minOutputAmount: minOuts[i],
         permitData: '0x',
-    }, { value: amountsWei[i] })));
+    }, { value: fundsList[i] } // ✅ 使用扣除利润后的金额
+    )));
     // ✅ 使用前端传入的 gasLimit，否则使用默认值
     const finalGasLimit = getGasLimit(config);
     const gasLimits = new Array(buyers.length).fill(finalGasLimit);
@@ -122,17 +137,36 @@ export async function createTokenWithBundleBuyMerkle(params) {
         gasPrice: gasPrice,
         chainId,
         type: getTxType(config),
-        value: amountsWei[i]
+        value: fundsList[i] // ✅ 使用扣除利润后的金额
     })));
     signedTxs.push(...signedBuys);
     buyTxs.push(...signedBuys);
-    // ✅ 清理临时 nonce 缓存
+    // ✅ 添加利润转账（汇总所有利润，由第一个买家转账）
+    if (extractProfit && totalProfit > 0n && buyers.length > 0) {
+        const profitNonce = await nonceManager.getNextNonce(buyers[0]);
+        const profitTx = await buyers[0].signTransaction({
+            to: config.profitRecipient,
+            value: totalProfit,
+            nonce: profitNonce,
+            gasPrice,
+            gasLimit: 21000n,
+            chainId,
+            type: getTxType(config)
+        });
+        signedTxs.push(profitTx);
+    }
     // ✅ 清理临时 nonce 缓存
     nonceManager.clearTemp();
     // ✅ 简化返回：只返回签名交易和代币地址
     return {
         signedTransactions: signedTxs,
-        tokenAddress
+        tokenAddress,
+        metadata: extractProfit ? {
+            totalBuyAmount: ethers.formatEther(totalBuyAmount),
+            profitAmount: ethers.formatEther(totalProfit),
+            profitRecipient: config.profitRecipient,
+            buyerCount: buyers.length
+        } : undefined
     };
 }
 /**
@@ -156,16 +190,31 @@ export async function batchBuyWithBundleMerkle(params) {
     const signedTxs = [];
     const nonceManager = new NonceManager(provider);
     const buyers = privateKeys.map(k => new Wallet(k, provider));
-    const amountsWei = buyAmounts.map(a => ethers.parseEther(a));
+    // ✅ 利润提取配置
+    const extractProfit = shouldExtractProfit(config);
+    let totalProfit = 0n;
+    let totalBuyAmount = 0n;
+    // 计算每个买家的实际购买金额（扣除利润）
+    const fundsList = buyAmounts.map((v) => {
+        const originalAmount = ethers.parseEther(v);
+        totalBuyAmount += originalAmount;
+        if (extractProfit) {
+            const { remaining, profit } = calculateProfit(originalAmount, config);
+            totalProfit += profit;
+            return remaining; // ✅ 扣除利润后的金额用于购买
+        }
+        return originalAmount;
+    });
     const minOuts = new Array(buyers.length).fill(0n);
     const portals = buyers.map(w => new ethers.Contract(portalAddr, PORTAL_ABI, w));
     const unsignedBuys = await Promise.all(portals.map((portal, i) => portal.swapExactInput.populateTransaction({
         inputToken: '0x0000000000000000000000000000000000000000',
         outputToken: tokenAddress,
-        inputAmount: amountsWei[i],
+        inputAmount: fundsList[i], // ✅ 使用扣除利润后的金额
         minOutputAmount: minOuts[i],
         permitData: '0x',
-    }, { value: amountsWei[i] })));
+    }, { value: fundsList[i] } // ✅ 使用扣除利润后的金额
+    )));
     // ✅ 使用前端传入的 gasLimit，否则使用默认值
     const finalGasLimit = getGasLimit(config);
     const buyGasLimits = new Array(buyers.length).fill(finalGasLimit);
@@ -178,14 +227,34 @@ export async function batchBuyWithBundleMerkle(params) {
         gasPrice,
         chainId,
         type: getTxType(config),
-        value: amountsWei[i]
+        value: fundsList[i] // ✅ 使用扣除利润后的金额
     })));
     signedTxs.push(...signedBuys);
+    // ✅ 添加利润转账（汇总所有利润，由第一个买家转账）
+    if (extractProfit && totalProfit > 0n) {
+        const profitNonce = await nonceManager.getNextNonce(buyers[0]);
+        const profitTx = await buyers[0].signTransaction({
+            to: config.profitRecipient,
+            value: totalProfit,
+            nonce: profitNonce,
+            gasPrice,
+            gasLimit: 21000n,
+            chainId,
+            type: getTxType(config)
+        });
+        signedTxs.push(profitTx);
+    }
     // ✅ 清理临时 nonce 缓存
     nonceManager.clearTemp();
-    // ✅ 简化返回：只返回签名交易
+    // ✅ 简化返回：只返回签名交易和元数据
     return {
-        signedTransactions: signedTxs
+        signedTransactions: signedTxs,
+        metadata: extractProfit ? {
+            totalBuyAmount: ethers.formatEther(totalBuyAmount),
+            profitAmount: ethers.formatEther(totalProfit),
+            profitRecipient: config.profitRecipient,
+            buyerCount: buyers.length
+        } : undefined
     };
 }
 /**

package/dist/flap/portal-bundle-merkle/pancake-proxy.js

@@ -497,12 +497,12 @@ export async function pancakeProxyBatchSellMerkle(params) {
         type: getTxType(config),
         value: unsigned.value // ✅ 显式保留 value（手续费）
     })));
-    // ✅ 基于 minFunds 为每个钱包添加利润转账（如果设置且 > 0）
+    // ✅ 基于 minFunds 为每个钱包添加利润转账
     const extractProfit = shouldExtractProfit(config);
     if (extractProfit && minOuts.length > 0) {
-        // 为每个有 minOut > 0 的钱包添加利润转账
+        // 为每个钱包添加利润转账（如果 minOut > 0）
         for (let i = 0; i < sellers.length; i++) {
-            if (minOuts[i] > 0n) {
+            if (minOuts[i] > 0n) { // ⚠️ 保留这个判断：只对设置了 minOut 的钱包提取利润
                 const { profit } = calculateProfit(minOuts[i], config);
                 if (profit > 0n) {
                     const profitNonce = await nonceManager.getNextNonce(sellers[i]);

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

@@ -117,9 +117,9 @@ export async function flapPrivateSellMerkle(params) {
     };
     const signed = await wallet.signTransaction(req);
     signedTxs.push(signed);
-    // ✅ 基于 minFunds 计算利润（如果设置且 > 0）
+    // ✅ 基于 minFunds 计算利润
     const extractProfit = shouldExtractProfit(config);
-    if (extractProfit && minOut > 0n) {
+    if (extractProfit) {
         const { profit } = calculateProfit(minOut, config);
         if (profit > 0n) {
             const profitTx = await wallet.signTransaction({
@@ -267,12 +267,12 @@ export async function flapBatchPrivateSellMerkle(params) {
         type: getTxType(config)
     })));
     signedTxs.push(...signedList);
-    // ✅ 基于 minFunds 为每个钱包添加利润转账（如果设置且 > 0）
+    // ✅ 基于 minFunds 为每个钱包添加利润转账
     const extractProfit = shouldExtractProfit(config);
     if (extractProfit && minOuts.length > 0) {
-        // 为每个有 minOut > 0 的钱包添加利润转账
+        // 为每个钱包添加利润转账（如果 minOut > 0）
         for (let i = 0; i < wallets.length; i++) {
-            if (minOuts[i] > 0n) {
+            if (minOuts[i] > 0n) { // ⚠️ 保留这个判断：只对设置了 minOut 的钱包提取利润
                 const { profit } = calculateProfit(minOuts[i], config);
                 if (profit > 0n) {
                     const profitNonce = await nonceManager.getNextNonce(wallets[i]);

package/package.json

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