four-flap-meme-sdk 1.2.1 → 1.2.2

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

@@ -5,6 +5,7 @@ import { ADDRESSES } from '../../utils/constants.js';
 import { FourClient, buildLoginMessage } from '../../clients/four.js';
 import { getErrorMessage, getTxType, getGasPriceConfig, shouldExtractProfit, calculateProfit } from './config.js';
 import { batchCheckAllowances } from '../../utils/erc20.js';
+import { trySell } from '../tm.js';
 // ==================== TokenManager2 ABI（仅需要的方法）====================
 const TM2_ABI = [
     'function createToken(bytes args, bytes signature) payable',
@@ -322,24 +323,34 @@ 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));
-    // ⚠️ Four.meme 内盘代币通过 TokenManager bonding curve 定价，不在 PancakeSwap 上
+    // ⚠️ Four.meme 内盘代币通过 TokenManager bonding curve 定价
+    // ✅ 优先使用用户提供的 minOutputAmounts，否则自动调用 trySell 获取
     let minOuts;
     let quotedOutputs = [];
     if (minOutputAmounts && minOutputAmounts.length === sellers.length) {
         // 用户提供了 minOutputAmounts，用于滑点保护和利润计算
         minOuts = minOutputAmounts.map(m => typeof m === 'string' ? ethers.parseEther(m) : m);
-        // 反推实际收益（假设 minOut 是 95% 的收益）
         quotedOutputs = minOuts.map(m => m * 100n / 95n);
     }
     else {
-        // 默认 minOutputAmount = 0（不限制最小输出，不提取利润）
-        minOuts = new Array(sellers.length).fill(0n);
-        quotedOutputs = new Array(sellers.length).fill(0n);
-        // ⚠️ 友好提示
-        if (shouldExtractProfit(config)) {
-            console.log('\n⚠️  提示：未传入 minOutputAmounts，将无法提取利润');
-            console.log('   请在 four.meme 网站查看预期收益，然后传入 minOutputAmounts 参数\n');
-        }
+        // ✅ 自动调用 trySell 获取每个钱包的预期收益
+        console.log('💰 自动获取卖出报价...');
+        const rpcUrl = config.customRpcUrl;
+        quotedOutputs = await Promise.all(amountsWei.map(async (amount, i) => {
+            try {
+                const result = await trySell('BSC', rpcUrl, tokenAddress, amount);
+                const quoted = result.funds; // 预期收益
+                console.log(`   钱包 ${i}: 卖出 ${ethers.formatUnits(amount, 18)} 代币 → 预期收益 ${ethers.formatEther(quoted)} BNB`);
+                return quoted;
+            }
+            catch (error) {
+                console.log(`   ⚠️ 钱包 ${i}: 报价失败，使用 minOut = 0`);
+                return 0n;
+            }
+        }));
+        // minOuts 设为预期收益的 95%（作为滑点保护）
+        minOuts = quotedOutputs.map(q => q * 95n / 100n);
+        console.log('');
     }
     // ✅ Step 1: 检查代币余额和授权状态
     const ERC20_ABI = [

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

@@ -4,6 +4,7 @@ import { NonceManager, getOptimizedGasPrice } from '../../utils/bundle-helpers.j
 import { ADDRESSES } from '../../utils/constants.js';
 import { getTxType, getGasPriceConfig, shouldExtractProfit, calculateProfit, calculateBatchProfit } from './config.js';
 import { batchCheckAllowances } from '../../utils/erc20.js';
+import { trySell } from '../tm.js';
 // ==================== TokenManager2 ABI（仅需要的方法）====================
 const TM2_ABI = [
     'function buyTokenAMAP(uint256 origin, address token, address to, uint256 funds, uint256 minAmount) payable',
@@ -229,16 +230,6 @@ export async function fourBatchPrivateSellMerkle(params) {
     if (privateKeys.length !== amounts.length) {
         throw new Error('privateKeys and amounts length mismatch');
     }
-    // ⚠️ 友好提示：利润提取需要 minFundsEach
-    if (!minFundsEach && shouldExtractProfit(config)) {
-        console.log('\n⚠️  重要提示：未传入 minFundsEach 参数，将无法提取利润！');
-        console.log('   Four.meme 内盘代币无法自动报价，需要手动估算预期收益');
-        console.log('   建议步骤：');
-        console.log('   1. 在 four.meme 网站查看卖出预期收益');
-        console.log('   2. 传入 minFundsEach 参数');
-        console.log('   示例: minFundsEach: 0.1 (预计每个钱包收到 0.1 BNB)');
-        console.log('   如果只是测试卖出，可以忽略此提示\n');
-    }
     const merkle = new MerkleClient({
         apiKey: config.apiKey,
         chainId: 56,
@@ -248,12 +239,40 @@ export async function fourBatchPrivateSellMerkle(params) {
     const tmAddr = ADDRESSES.BSC.TokenManagerOriginal;
     const gasPrice = await getOptimizedGasPrice(provider, getGasPriceConfig(config));
     const gasMultiplier = config.gasLimitMultiplier ?? 1.0;
-    const minOut = minFundsEach ?? 0n;
     const sellGasLimit = BigInt(Math.ceil(800000 * gasMultiplier));
     const signedTxs = [];
     const nonceManager = new NonceManager(provider);
     const wallets = privateKeys.map((k) => new Wallet(k, provider));
     const amountsWei = amounts.map((a) => ethers.parseUnits(a, 18));
+    // ✅ 自动获取每个钱包的预期收益（用于利润计算和滑点保护）
+    let quotedOutputs;
+    let minOuts;
+    if (minFundsEach !== undefined) {
+        // 用户提供了 minFundsEach，所有钱包使用相同的 minOut
+        const minOutWei = typeof minFundsEach === 'string' ? ethers.parseEther(minFundsEach) : minFundsEach;
+        minOuts = new Array(wallets.length).fill(minOutWei);
+        quotedOutputs = minOuts.map(m => m * 100n / 95n);
+    }
+    else {
+        // ✅ 自动调用 trySell 获取每个钱包的预期收益
+        console.log('💰 自动获取卖出报价...');
+        const rpcUrl = config.customRpcUrl;
+        quotedOutputs = await Promise.all(amountsWei.map(async (amount, i) => {
+            try {
+                const result = await trySell('BSC', rpcUrl, tokenAddress, amount);
+                const quoted = result.funds;
+                console.log(`   钱包 ${i}: 卖出 ${ethers.formatUnits(amount, 18)} 代币 → 预期收益 ${ethers.formatEther(quoted)} BNB`);
+                return quoted;
+            }
+            catch (error) {
+                console.log(`   ⚠️ 钱包 ${i}: 报价失败，使用 minOut = 0`);
+                return 0n;
+            }
+        }));
+        // minOuts 设为预期收益的 95%（作为滑点保护）
+        minOuts = quotedOutputs.map(q => q * 95n / 100n);
+        console.log('');
+    }
     // ✅ Step 0: 检查代币余额
     const tokenContract = new ethers.Contract(tokenAddress, ERC20_ABI, provider);
     const balances = await Promise.all(wallets.map(w => tokenContract.balanceOf(w.address)));
@@ -288,7 +307,7 @@ export async function fourBatchPrivateSellMerkle(params) {
     }
     // ✅ Step 3: 构建卖出交易
     const tm2Contracts = wallets.map((w) => new ethers.Contract(tmAddr, TM2_ABI, w));
-    const sellUnsigned = await Promise.all(tm2Contracts.map((c, i) => c.sellToken.populateTransaction(0n, tokenAddress, amountsWei[i], minOut)));
+    const sellUnsigned = await Promise.all(tm2Contracts.map((c, i) => c.sellToken.populateTransaction(0n, tokenAddress, amountsWei[i], minOuts[i])));
     const sellGasLimits = new Array(wallets.length).fill(sellGasLimit);
     const sellNonces = await Promise.all(wallets.map((w) => nonceManager.getNextNonce(w)));
     const signedSells = await Promise.all(sellUnsigned.map((unsigned, i) => wallets[i].signTransaction({
@@ -301,22 +320,26 @@ export async function fourBatchPrivateSellMerkle(params) {
         type: getTxType(config)
     })));
     signedTxs.push(...signedSells);
-    // ✅ 提取利润
+    // ✅ 提取利润（基于每个钱包的预期收益）
     const extractProfit = shouldExtractProfit(config);
-    if (extractProfit && minOut > 0n) {
-        const { profit } = calculateProfit(minOut, config);
-        if (profit > 0n) {
-            const profitNonces = await Promise.all(wallets.map(w => nonceManager.getNextNonce(w)));
-            const profitTxs = await Promise.all(wallets.map((wallet, i) => wallet.signTransaction({
-                to: config.profitRecipient,
-                value: profit,
-                nonce: profitNonces[i],
-                gasPrice,
-                gasLimit: 21000n,
-                chainId: 56,
-                type: getTxType(config)
-            })));
-            signedTxs.push(...profitTxs);
+    if (extractProfit) {
+        for (let i = 0; i < wallets.length; i++) {
+            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({
+                        to: config.profitRecipient,
+                        value: profit,
+                        nonce: profitNonce,
+                        gasPrice,
+                        gasLimit: 21000n,
+                        chainId: 56,
+                        type: getTxType(config)
+                    });
+                    signedTxs.push(profitTx);
+                }
+            }
         }
     }
     nonceManager.clearTemp();

package/package.json

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