four-flap-meme-sdk 1.2.3 → 1.2.5

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

@@ -15,6 +15,16 @@ const PANCAKE_PROXY_ABI = [
     'function swapV3Single(address tokenIn, address tokenOut, uint24 fee, uint256 amountIn, uint256 amountOutMin, address to) external payable returns (uint256 amountOut)',
     'function swapV3MultiHop(address[] calldata lpAddresses, address exactTokenIn, uint256 amountIn, uint256 amountOutMin, address to) external payable returns (uint256 amountOut)'
 ];
+// PancakeSwap V2 Router ABI（用于报价）
+const PANCAKE_V2_ROUTER_ABI = [
+    'function getAmountsOut(uint amountIn, address[] calldata path) external view returns (uint[] memory amounts)'
+];
+// PancakeSwap V3 QuoterV2 ABI（用于报价）
+const PANCAKE_V3_QUOTER_ABI = [
+    'function quoteExactInputSingle((address tokenIn, address tokenOut, uint256 amountIn, uint24 fee, uint160 sqrtPriceLimitX96)) external returns (uint256 amountOut, uint160 sqrtPriceX96After, uint32 initializedTicksCrossed, uint256 gasEstimate)'
+];
+const PANCAKE_V2_ROUTER_ADDRESS = '0x10ED43C718714eb63d5aA57B78B54704E256024E';
+const PANCAKE_V3_QUOTER_ADDRESS = '0xB048Bbc1Ee6b733FFfCFb9e9CeF7375518e25997';
 // ERC20 ABI
 const ERC20_ABI = [
     'function approve(address spender, uint256 amount) external returns (bool)',
@@ -398,7 +408,6 @@ export async function fourPancakeProxyBatchSellMerkle(params) {
     const tokenDecimals = await getTokenDecimals(tokenAddress, provider);
     const amountsWei = sellAmounts.map(a => ethers.parseUnits(a, tokenDecimals));
     // ✅ Step 1: 使用 Multicall3 批量检查授权状态
-    console.log('🔍 使用 Multicall3 批量检查授权状态...');
     const allowances = await batchCheckAllowances(provider, tokenAddress, sellers.map(w => w.address), pancakeProxyAddress);
     // 找出需要授权的钱包索引
     const needApprovalIndexes = [];
@@ -408,75 +417,58 @@ export async function fourPancakeProxyBatchSellMerkle(params) {
             needApprovalIndexes.push(i);
         }
     }
-    console.log(`   - 总钱包数: ${sellers.length}`);
-    console.log(`   - 需要授权: ${needApprovalIndexes.length}`);
-    console.log(`   - 已有授权: ${sellers.length - needApprovalIndexes.length}\n`);
     // ✅ Step 2: 如果需要授权，抛出错误提示
     // ⚠️ SDK不再处理授权，需要前端先单独授权
     if (needApprovalIndexes.length > 0) {
-        console.log(`⚠️ 警告：检测到 ${needApprovalIndexes.length} 个钱包需要授权`);
-        console.log('   请先使用这些钱包完成授权后再调用卖出方法');
         throw new Error(`需要授权: ${needApprovalIndexes.length} 个钱包尚未授权。请先完成授权后再卖出。`);
     }
-    // ✅ Step 3: 批量卖出
-    console.log('💰 提交卖出交易...');
-    // 🔍 调试信息 - 详细参数
-    console.log('📊 卖出详情:');
-    console.log(`   [基本信息]`);
-    console.log(`   - 链: BSC`);
-    console.log(`   - 代币地址: ${tokenAddress}`);
-    console.log(`   - PancakeProxy: ${pancakeProxyAddress}`);
-    console.log(`   - 卖家数量: ${sellers.length}`);
-    console.log(`   - 路由类型: ${routeType}`);
-    console.log(`\n   [卖家信息]`);
-    sellers.forEach((seller, i) => {
-        console.log(`   - 钱包 ${i + 1}: ${seller.address}`);
-    });
-    console.log(`\n   [卖出金额]`);
-    sellAmounts.forEach((amount, i) => {
-        console.log(`   - 钱包 ${i + 1}: ${amount} TOKEN (${amountsWei[i].toString()} Wei)`);
-    });
-    // 计算 minOutputAmounts（通常是 BNB/WBNB，18 位）
+    // ✅ 自动获取报价或使用用户提供的 minOutputAmounts
     let minOuts;
+    let quotedOutputs;
     if (params.minOutputAmounts && params.minOutputAmounts.length === sellers.length) {
+        // 用户提供了 minOutputAmounts
         minOuts = params.minOutputAmounts.map(m => typeof m === 'string' ? ethers.parseEther(m) : m);
-        console.log(`\n   [最小输出]`);
-        params.minOutputAmounts.forEach((min, i) => {
-            console.log(`   - 钱包 ${i + 1}: ${min} BNB`);
-        });
+        quotedOutputs = minOuts.map(m => m * 100n / 95n); // 反推预期收益
     }
     else {
-        minOuts = new Array(sellers.length).fill(0n);
-        console.log(`\n   [最小输出] 未设置（默认 0，无滑点保护）`);
-    }
-    console.log(`\n   [路由信息]`);
-    if (routeType === 'v2' && params.v2Path) {
-        console.log(`   - V2 路径: ${params.v2Path.join(' → ')}`);
-    }
-    else if (routeType === 'v3-single') {
-        console.log(`   - V3 单跳: ${tokenAddress} → ${params.v3TokenOut}`);
-        console.log(`   - 费率: ${params.v3Fee}`);
-    }
-    else if (routeType === 'v3-multi') {
-        console.log(`   - V3 多跳 LP 数量: ${params.v3LpAddresses?.length}`);
-        console.log(`   - 起始代币: ${params.v3ExactTokenIn}`);
+        // ✅ 自动调用 PancakeSwap 获取报价
+        quotedOutputs = await Promise.all(amountsWei.map(async (amount) => {
+            try {
+                if (routeType === 'v2') {
+                    const v2Router = new Contract(PANCAKE_V2_ROUTER_ADDRESS, PANCAKE_V2_ROUTER_ABI, provider);
+                    const amounts = await v2Router.getAmountsOut(amount, params.v2Path);
+                    return amounts[amounts.length - 1];
+                }
+                else if (routeType === 'v3-single') {
+                    const quoter = new Contract(PANCAKE_V3_QUOTER_ADDRESS, PANCAKE_V3_QUOTER_ABI, provider);
+                    const result = await quoter.quoteExactInputSingle.staticCall({
+                        tokenIn: tokenAddress,
+                        tokenOut: params.v3TokenOut,
+                        amountIn: amount,
+                        fee: params.v3Fee,
+                        sqrtPriceLimitX96: 0
+                    });
+                    return result[0];
+                }
+                else {
+                    // v3-multi 使用 v2 备选
+                    if (params.v2Path && params.v2Path.length >= 2) {
+                        const v2Router = new Contract(PANCAKE_V2_ROUTER_ADDRESS, PANCAKE_V2_ROUTER_ABI, provider);
+                        const amounts = await v2Router.getAmountsOut(amount, params.v2Path);
+                        return amounts[amounts.length - 1];
+                    }
+                    return 0n;
+                }
+            }
+            catch (error) {
+                return 0n;
+            }
+        }));
+        // minOuts 设为预期收益的 95%（滑点保护）
+        minOuts = quotedOutputs.map(q => q * 95n / 100n);
     }
     // 卖出不需要发送 BNB，只需要 flatFee
     const needBNB = false;
-    console.log(`\n   [交易费用]`);
-    console.log(`   - 需要发送 BNB: ${needBNB ? '是' : '否'}`);
-    console.log(`   - 每笔手续费: 0.0001 BNB`);
-    console.log(`   - 总手续费: ${ethers.formatEther(BigInt(sellers.length) * ethers.parseEther('0.0001'))} BNB`);
-    console.log(`\n   [Gas 配置]`);
-    console.log(`   - Gas Price: ${ethers.formatUnits(gasPrice, 'gwei')} Gwei`);
-    console.log(`   - Gas Limit: ${config.gasLimit || 'Auto (800000 * multiplier)'}`);
-    if (config.gasLimitMultiplier) {
-        console.log(`   - Gas Multiplier: ${config.gasLimitMultiplier}x`);
-    }
-    console.log(`\n   [Bundle 配置]`);
-    console.log(`   - Block Offset: ${blockOffset}`);
-    console.log(`   - Wait Confirmation: ${config.waitForConfirmation ?? false}`);
-    console.log(`   - Timeout: ${(config.waitTimeoutMs ?? 120000) / 1000}s\n`);
     // 构建交易
     const proxies = sellers.map(w => new Contract(pancakeProxyAddress, PANCAKE_PROXY_ABI, w));
     let unsignedSells;
@@ -502,20 +494,15 @@ export async function fourPancakeProxyBatchSellMerkle(params) {
         throw new Error(`Unsupported routeType: ${routeType}`);
     }
     // ✅ Step 4: 验证钱包余额（确保有足够 BNB 支付手续费）
-    console.log('🔍 验证钱包余额...');
     const balances = await Promise.all(sellers.map(w => provider.getBalance(w.address)));
     const minRequiredBNB = ethers.parseEther('0.001'); // 至少需要 0.001 BNB（包括 gas 和手续费）
     const insufficientBalances = balances.filter(b => b < minRequiredBNB);
     if (insufficientBalances.length > 0) {
-        console.warn(`⚠️ 警告: ${insufficientBalances.length} 个钱包 BNB 余额不足 0.001 BNB`);
-        balances.forEach((b, i) => {
-            console.log(`   钱包 ${i + 1}: ${ethers.formatEther(b)} BNB`);
-        });
+        throw new Error(`${insufficientBalances.length} 个钱包 BNB 余额不足 0.001 BNB`);
     }
     // ✅ 使用前端传入的 gasLimit，否则使用默认值
     const finalGasLimit = getGasLimit(config);
     // ✅ 直接签名和提交（内联处理以支持利润转账）
-    console.log('🚀 签名卖出交易...\n');
     const nonceManager = new NonceManager(provider);
     const nonces = await Promise.all(sellers.map(w => nonceManager.getNextNonce(w)));
     const signedTxs = await Promise.all(unsignedSells.map((unsigned, i) => sellers[i].signTransaction({
@@ -528,13 +515,12 @@ export async function fourPancakeProxyBatchSellMerkle(params) {
         type: getTxType(config),
         value: unsigned.value // ✅ 显式保留 value（手续费）
     })));
-    // ✅ 基于 minFunds 为每个钱包添加利润转账
+    // ✅ 基于预期收益为每个钱包添加利润转账
     const extractProfit = shouldExtractProfit(config);
-    if (extractProfit && minOuts.length > 0) {
-        // 为每个钱包添加利润转账（如果 minOut > 0）
+    if (extractProfit && quotedOutputs.length > 0) {
         for (let i = 0; i < sellers.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(sellers[i]);
                     const profitTx = await sellers[i].signTransaction({

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

@@ -106,15 +106,11 @@ export async function fourPrivateSellMerkle(params) {
     // ✅ Step 2: 如果需要授权，抛出错误提示
     // ⚠️ SDK不再处理授权，需要前端先单独授权
     if (currentAllowance < APPROVAL_THRESHOLD) {
-        console.log('⚠️ 警告：检测到钱包需要授权');
-        console.log('   请先完成授权后再调用卖出方法');
         throw new Error(`需要授权：钱包 ${wallet.address} 尚未授权。请先完成授权后再卖出。`);
     }
     else {
-        console.log('✅ 已有足够授权额度，跳过授权\n');
     }
     // ✅ Step 3: 卖出交易
-    console.log('💰 提交卖出交易...');
     const nonceManager = new NonceManager(provider);
     const signedTxs = [];
     const tm2 = new ethers.Contract(tmAddr, TM2_ABI, wallet);

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

@@ -104,16 +104,22 @@ export async function createTokenWithBundleBuyMerkle(params) {
     const extractProfit = shouldExtractProfit(config);
     let totalProfit = 0n;
     let totalBuyAmount = 0n;
-    // 计算每个买家的实际购买金额（扣除利润）
-    const fundsList = buyAmounts.map((v) => {
+    // 计算每个买家的实际购买金额和利润
+    const fundsList = [];
+    const profitList = [];
+    buyAmounts.forEach((v) => {
         const originalAmount = ethers.parseEther(v);
         totalBuyAmount += originalAmount;
         if (extractProfit) {
             const { remaining, profit } = calculateProfit(originalAmount, config);
             totalProfit += profit;
-            return remaining; // ✅ 扣除利润后的金额用于购买
+            fundsList.push(remaining); // ✅ 扣除利润后的金额用于购买
+            profitList.push(profit); // ✅ 记录每个买家的利润
+        }
+        else {
+            fundsList.push(originalAmount);
+            profitList.push(0n);
         }
-        return originalAmount;
     });
     const minOuts = new Array(buyers.length).fill(0n);
     const buyPortals = buyers.map(w => new ethers.Contract(portalAddr, PORTAL_ABI, w));
@@ -141,19 +147,23 @@ export async function createTokenWithBundleBuyMerkle(params) {
     })));
     signedTxs.push(...signedBuys);
     buyTxs.push(...signedBuys);
-    // ✅ 添加利润转账（汇总所有利润，由第一个买家转账）
+    // ✅ 添加利润转账（每个买家单独转自己的利润）
     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);
+        for (let i = 0; i < buyers.length; i++) {
+            if (profitList[i] > 0n) {
+                const profitNonce = await nonceManager.getNextNonce(buyers[i]);
+                const profitTx = await buyers[i].signTransaction({
+                    to: config.profitRecipient,
+                    value: profitList[i], // ✅ 每个买家转自己的利润
+                    nonce: profitNonce,
+                    gasPrice,
+                    gasLimit: 21000n,
+                    chainId,
+                    type: getTxType(config)
+                });
+                signedTxs.push(profitTx);
+            }
+        }
     }
     // ✅ 清理临时 nonce 缓存
     nonceManager.clearTemp();

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

@@ -227,12 +227,7 @@ export async function approvePancakeProxyBatch(params) {
     // 只授权不足的
     const needApproval = wallets.filter((_, i) => allowances[i] < amountsBigInt[i]);
     const needApprovalAmounts = amountsBigInt.filter((amount, i) => allowances[i] < amount);
-    console.log(`🔍 PancakeProxy 授权检查:`);
-    console.log(`   - 总钱包数: ${wallets.length}`);
-    console.log(`   - 需要授权: ${needApproval.length}`);
-    console.log(`   - 已有授权: ${wallets.length - needApproval.length}`);
     if (needApproval.length === 0) {
-        console.log('✅ 所有钱包已授权，无需再次授权。');
         return {
             success: true,
             approvedCount: 0,
@@ -257,22 +252,17 @@ export async function approvePancakeProxyBatch(params) {
         type: getTxType(config)
     })));
     nonceManager.clearTemp();
-    console.log(`✅ 已生成 ${signedTxs.length} 个授权交易签名`);
     // ✅ 内部提交到 Merkle
     const currentBlock = await provider.getBlockNumber();
     const targetBlock = currentBlock + blockOffset;
-    console.log(`📤 正在提交授权交易到 Merkle...`);
     const bundleResult = await merkle.sendBundle({
         transactions: signedTxs,
         targetBlock: targetBlock
     });
-    console.log(`✅ 授权交易已提交，bundleHash: ${bundleResult.bundleHash}`);
     // ✅ 等待授权确认
-    console.log(`⏳ 等待授权交易确认（约5-10秒）...`);
     const confirmResults = await merkle.waitForBundleConfirmation(bundleResult.txHashes, 1, 60000);
     const successCount = confirmResults.filter(r => r.success).length;
     if (successCount > 0) {
-        console.log(`✅ 授权已确认，共 ${successCount} 笔交易成功`);
         return {
             success: true,
             approvedCount: successCount,
@@ -281,7 +271,6 @@ export async function approvePancakeProxyBatch(params) {
         };
     }
     else {
-        console.log(`⚠️ 授权交易未确认`);
         return {
             success: false,
             approvedCount: 0,

package/package.json

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