four-flap-meme-sdk 1.1.93 → 1.1.95

package/dist/contracts/tm-bundle-merkle/approve-tokenmanager.d.ts

@@ -5,13 +5,20 @@ export type ApproveFourTokenManagerBatchParams = {
     config: {
         apiKey: string;
         customRpcUrl?: string;
+        chainId?: number;
+        bundleBlockOffset?: number;
         gasLimit?: number | bigint;
         gasLimitMultiplier?: number;
+        gasPriceMultiplierPercent?: number;
+        minGasPriceGwei?: number;
         txType?: 0 | 2;
     };
 };
 export type ApproveFourTokenManagerBatchResult = {
-    signedTransactions: string[];
+    success: boolean;
+    approvedCount: number;
+    bundleHash?: string;
+    message: string;
 };
 /**
  * 批量授权代币给 TokenManager（用于 Private Buy/Sell）

package/dist/contracts/tm-bundle-merkle/approve-tokenmanager.js

@@ -21,9 +21,10 @@ export async function approveFourTokenManagerBatch(params) {
         throw new Error('Private key count and amount count must match');
     }
     const tmAddr = ADDRESSES.BSC.TokenManagerOriginal;
+    const chainId = config.chainId ?? 56;
     const merkle = new MerkleClient({
         apiKey: config.apiKey,
-        chainId: 56,
+        chainId: chainId,
         customRpcUrl: config.customRpcUrl
     });
     const provider = merkle.getProvider();
@@ -44,19 +45,26 @@ export async function approveFourTokenManagerBatch(params) {
     console.log(`   - 需要授权: ${needApproval.length}`);
     console.log(`   - 已有授权: ${wallets.length - needApproval.length}`);
     if (needApproval.length === 0) {
-        // 全部已授权，直接返回
-        console.log(`✅ 所有钱包已授权给 TokenManager`);
+        console.log('✅ 所有钱包已授权，无需再次授权。');
         return {
-            signedTransactions: []
+            success: true,
+            approvedCount: 0,
+            message: '所有钱包已授权'
         };
     }
     // 构建授权交易
     const needApprovalTokens = needApproval.map(w => new ethers.Contract(tokenAddress, ERC20_ABI, w));
     const unsignedApprovals = await Promise.all(needApprovalTokens.map((token, i) => token.approve.populateTransaction(tmAddr, needApprovalAmounts[i])));
-    // ✅ 使用前端传入的 gasLimit，否则使用默认值
-    const gasMultiplier = config.gasLimitMultiplier ?? 1.0;
-    const finalGasLimit = config.gasLimit ?? BigInt(Math.ceil(50000 * gasMultiplier));
-    // ✅ 直接签名交易（不提交到Merkle）
+    // 使用前端传入的 gasLimit，否则使用默认值
+    const getGasLimit = (cfg) => {
+        if (cfg.gasLimit)
+            return BigInt(cfg.gasLimit);
+        if (cfg.gasLimitMultiplier)
+            return BigInt(Math.ceil(21000 * cfg.gasLimitMultiplier));
+        return 21000n; // 默认授权 gas limit
+    };
+    const finalGasLimit = getGasLimit(config);
+    // 签名授权交易
     const nonceManager = new NonceManager(provider);
     const nonces = await Promise.all(needApproval.map(w => nonceManager.getNextNonce(w)));
     const signedTxs = await Promise.all(unsignedApprovals.map((unsigned, i) => needApproval[i].signTransaction({
@@ -65,13 +73,40 @@ export async function approveFourTokenManagerBatch(params) {
         nonce: nonces[i],
         gasLimit: finalGasLimit,
         gasPrice,
-        chainId: 56,
+        chainId,
         type: getTxType(config)
     })));
     nonceManager.clearTemp();
     console.log(`✅ 已生成 ${signedTxs.length} 个授权交易签名`);
-    // ✅ 简化返回：只返回签名交易
-    return {
-        signedTransactions: signedTxs
-    };
+    // ✅ 内部提交到 Merkle
+    const currentBlock = await provider.getBlockNumber();
+    const targetBlock = currentBlock + (config.bundleBlockOffset ?? 2);
+    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,
+            bundleHash: bundleResult.bundleHash,
+            message: `授权成功，共 ${successCount} 个钱包`
+        };
+    }
+    else {
+        console.log(`⚠️ 授权交易未确认`);
+        return {
+            success: false,
+            approvedCount: 0,
+            bundleHash: bundleResult.bundleHash,
+            message: '授权交易未确认'
+        };
+    }
 }

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

@@ -322,28 +322,73 @@ 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
+    // ✅ 自动获取报价以计算预期收益和利润（使用 PancakeSwap Router）
+    const PANCAKE_ROUTER = '0x10ED43C718714eb63d5aA57B78B54704E256024E';
+    const ROUTER_ABI = [
+        'function getAmountsOut(uint amountIn, address[] memory path) view returns (uint[] memory amounts)'
+    ];
+    const WBNB = '0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c';
+    const router = new ethers.Contract(PANCAKE_ROUTER, ROUTER_ABI, provider);
+    // 并行获取所有报价
+    console.log(`📊 开始获取 ${amountsWei.length} 个卖单的报价...`);
+    const quotedOutputs = await Promise.all(amountsWei.map(async (amount, index) => {
+        try {
+            const path = [tokenAddress, WBNB];
+            const amounts = await router.getAmountsOut(amount, path);
+            const bnbAmount = amounts[1];
+            console.log(`   ✅ 钱包 ${index}: 卖出 ${ethers.formatUnits(amount, 18)} 代币 → 预计获得 ${ethers.formatEther(bnbAmount)} BNB`);
+            return bnbAmount; // 返回 BNB 数量
+        }
+        catch (error) {
+            console.log(`   ❌ 钱包 ${index}: 报价失败 - ${error}`);
+            return 0n;
+        }
+    }));
+    // ✅ 使用报价结果或用户提供的 minOutputAmounts
     let minOuts;
     if (minOutputAmounts && minOutputAmounts.length === sellers.length) {
+        // 用户提供了 minOutputAmounts，优先使用
         minOuts = minOutputAmounts.map(m => typeof m === 'string' ? ethers.parseEther(m) : m);
+        console.log(`📝 使用用户提供的 minOutputAmounts`);
     }
     else {
-        minOuts = new Array(sellers.length).fill(0n);
+        // 使用报价结果作为 minOutputAmount（保守起见，使用 95% 的报价金额）
+        minOuts = quotedOutputs.map(quoted => quoted * 95n / 100n);
+        console.log(`📝 使用自动报价的 95% 作为 minOutputAmount（5%滑点保护）`);
     }
-    // ✅ Step 1: 使用 Multicall3 批量检查授权状态
+    console.log(`💰 最终 minOutputAmounts:`);
+    minOuts.forEach((minOut, i) => {
+        console.log(`   钱包 ${i}: ${ethers.formatEther(minOut)} BNB`);
+    });
+    console.log('');
+    // ✅ Step 1: 检查代币余额和授权状态
     const ERC20_ABI = [
         'function approve(address spender, uint256 amount) returns (bool)',
-        'function allowance(address owner, address spender) view returns (uint256)'
+        'function allowance(address owner, address spender) view returns (uint256)',
+        'function balanceOf(address owner) view returns (uint256)'
     ];
-    console.log('🔍 使用 Multicall3 批量检查授权状态...');
+    // 检查代币余额
+    console.log('🔍 检查代币余额...');
+    const tokenContract = new ethers.Contract(tokenAddress, ERC20_ABI, provider);
+    const balances = await Promise.all(sellers.map(w => tokenContract.balanceOf(w.address)));
+    for (let i = 0; i < sellers.length; i++) {
+        const balance = balances[i];
+        const sellAmount = amountsWei[i];
+        console.log(`   钱包 ${i}: 余额 ${ethers.formatUnits(balance, 18)}, 卖出 ${ethers.formatUnits(sellAmount, 18)}`);
+        if (balance < sellAmount) {
+            throw new Error(`钱包 ${i} (${sellers[i].address.slice(0, 8)}...) 代币余额不足：需要 ${ethers.formatUnits(sellAmount, 18)}，实际 ${ethers.formatUnits(balance, 18)}`);
+        }
+    }
+    console.log('\n🔍 使用 Multicall3 批量检查授权状态...');
     const allowances = await batchCheckAllowances(provider, tokenAddress, sellers.map(w => w.address), tmAddr);
     // 找出需要授权的钱包索引
-    // 使用 MaxUint256 的一半作为阈值，确保能处理超大供应量代币
+    // ✅ 检查授权额度是否足够卖出
     const needApprovalIndexes = [];
-    const APPROVAL_THRESHOLD = ethers.MaxUint256 / 2n;
     for (let i = 0; i < sellers.length; i++) {
-        if (allowances[i] < APPROVAL_THRESHOLD) {
+        // ✅ 检查授权额度是否 >= 卖出数量
+        if (allowances[i] < amountsWei[i]) {
             needApprovalIndexes.push(i);
+            console.log(`   ⚠️ 钱包 ${i}: 授权不足 (${ethers.formatUnits(allowances[i], 18)} < ${ethers.formatUnits(amountsWei[i], 18)})`);
         }
     }
     console.log(`   - 总钱包数: ${sellers.length}`);
@@ -352,7 +397,7 @@ export async function batchSellWithBundleMerkle(params) {
     // ✅ Step 2: 批量授权（如果需要）
     // ⚠️ 注意：授权需要单独提交，SDK只返回签名交易
     if (needApprovalIndexes.length > 0) {
-        console.log('⚠️ 警告：检测到 ${needApprovalIndexes.length} 个钱包需要授权');
+        console.log(`⚠️ 警告：检测到 ${needApprovalIndexes.length} 个钱包需要授权`);
         console.log('   请先使用这些钱包的私钥调用授权方法，授权完成后再调用卖出方法');
         throw new Error(`需要授权: ${needApprovalIndexes.length} 个钱包尚未授权。请先完成授权后再卖出。`);
     }
@@ -376,14 +421,17 @@ export async function batchSellWithBundleMerkle(params) {
         type: getTxType(config)
     })));
     signedTxs.push(...signedList);
-    // ✅ 基于 minFunds 为每个钱包添加利润转账
+    // ✅ 基于报价金额为每个钱包添加利润转账
     const extractProfit = shouldExtractProfit(config);
-    if (extractProfit && minOuts.length > 0) {
-        // 为每个钱包添加利润转账（如果 minOut > 0）
+    if (extractProfit && quotedOutputs.length > 0) {
+        console.log(`💰 提取利润交易...`);
+        let totalProfitExtracted = 0n;
+        // 为每个钱包添加利润转账（基于完整报价金额，而非 minOut）
         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) {
+                    console.log(`   ✅ 钱包 ${i}: 从 ${ethers.formatEther(quotedOutputs[i])} BNB 中提取 ${ethers.formatEther(profit)} BNB (${config.profitRateBps / 100}%)`);
                     const profitNonce = await nonceManager.getNextNonce(sellers[i]);
                     const profitTx = await sellers[i].signTransaction({
                         to: config.profitRecipient,
@@ -395,9 +443,11 @@ export async function batchSellWithBundleMerkle(params) {
                         type: getTxType(config)
                     });
                     signedTxs.push(profitTx);
+                    totalProfitExtracted += profit;
                 }
             }
         }
+        console.log(`   💵 总利润: ${ethers.formatEther(totalProfitExtracted)} BNB → ${config.profitRecipient}\n`);
     }
     // ✅ 清理临时 nonce 缓存
     nonceManager.clearTemp();

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

@@ -216,18 +216,24 @@ export async function approveFourPancakeProxyBatch(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 {
-            signedTransactions: []
+            success: true,
+            approvedCount: 0,
+            message: '所有钱包已授权'
         };
     }
     // 构建授权交易
     const needApprovalTokens = needApproval.map(w => new Contract(tokenAddress, ERC20_ABI, w));
     const unsignedApprovals = await Promise.all(needApprovalTokens.map((token, i) => token.approve.populateTransaction(pancakeProxyAddress, needApprovalAmounts[i])));
-    // ✅ 使用前端传入的 gasLimit，否则使用默认值
+    // 使用前端传入的 gasLimit，否则使用默认值
     const finalGasLimit = getGasLimit(config);
-    // ✅ 直接签名交易（不提交到Merkle）
+    // 签名授权交易
     const nonceManager = new NonceManager(provider);
     const nonces = await Promise.all(needApproval.map(w => nonceManager.getNextNonce(w)));
     const signedTxs = await Promise.all(unsignedApprovals.map((unsigned, i) => needApproval[i].signTransaction({
@@ -240,10 +246,38 @@ export async function approveFourPancakeProxyBatch(params) {
         type: getTxType(config)
     })));
     nonceManager.clearTemp();
-    // ✅ 简化返回：只返回签名交易
-    return {
-        signedTransactions: signedTxs
-    };
+    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,
+            bundleHash: bundleResult.bundleHash,
+            message: `授权成功，共 ${successCount} 个钱包`
+        };
+    }
+    else {
+        console.log(`⚠️ 授权交易未确认`);
+        return {
+            success: false,
+            approvedCount: 0,
+            bundleHash: bundleResult.bundleHash,
+            message: '授权交易未确认'
+        };
+    }
 }
 /**
  * 使用 PancakeSwapProxy 批量购买代币（Merkle 版本）
@@ -380,7 +414,7 @@ export async function fourPancakeProxyBatchSellMerkle(params) {
     // ✅ Step 2: 如果需要授权，抛出错误提示
     // ⚠️ SDK不再处理授权，需要前端先单独授权
     if (needApprovalIndexes.length > 0) {
-        console.log('⚠️ 警告：检测到 ${needApprovalIndexes.length} 个钱包需要授权');
+        console.log(`⚠️ 警告：检测到 ${needApprovalIndexes.length} 个钱包需要授权`);
         console.log('   请先使用这些钱包完成授权后再调用卖出方法');
         throw new Error(`需要授权: ${needApprovalIndexes.length} 个钱包尚未授权。请先完成授权后再卖出。`);
     }

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

@@ -261,7 +261,7 @@ export async function fourBatchPrivateSellMerkle(params) {
     // ✅ Step 2: 如果需要授权，抛出错误提示
     // ⚠️ SDK不再处理授权，需要前端先单独授权
     if (needApprovalIndexes.length > 0) {
-        console.log('⚠️ 警告：检测到 ${needApprovalIndexes.length} 个钱包需要授权');
+        console.log(`⚠️ 警告：检测到 ${needApprovalIndexes.length} 个钱包需要授权`);
         console.log('   请先使用这些钱包完成授权后再调用卖出方法');
         throw new Error(`需要授权: ${needApprovalIndexes.length} 个钱包尚未授权。请先完成授权后再卖出。`);
     }

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

@@ -215,5 +215,10 @@ export type FourPancakeProxyApprovalBatchParams = {
     amounts: (string | 'max')[];
     config: FourBundleMerkleConfig;
 };
-/** ✅ PancakeProxy 批量授权结果（简化版） */
-export type FourPancakeProxyApprovalBatchResult = MerkleSignedResult;
+/** ✅ PancakeProxy 批量授权结果 */
+export type FourPancakeProxyApprovalBatchResult = {
+    success: boolean;
+    approvedCount: number;
+    bundleHash?: string;
+    message: string;
+};

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

@@ -217,18 +217,24 @@ 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 {
-            signedTransactions: []
+            success: true,
+            approvedCount: 0,
+            message: '所有钱包已授权'
         };
     }
     // 构建授权交易
     const needApprovalTokens = needApproval.map(w => new Contract(tokenAddress, ERC20_ABI, w));
     const unsignedApprovals = await Promise.all(needApprovalTokens.map((token, i) => token.approve.populateTransaction(pancakeProxyAddress, needApprovalAmounts[i])));
-    // ✅ 使用前端传入的 gasLimit，否则使用默认值
+    // 使用前端传入的 gasLimit，否则使用默认值
     const finalGasLimit = getGasLimit(config);
-    // ✅ 直接签名交易（不提交到Merkle）
+    // 签名授权交易
     const nonceManager = new NonceManager(provider);
     const nonces = await Promise.all(needApproval.map(w => nonceManager.getNextNonce(w)));
     const signedTxs = await Promise.all(unsignedApprovals.map((unsigned, i) => needApproval[i].signTransaction({
@@ -241,10 +247,38 @@ export async function approvePancakeProxyBatch(params) {
         type: getTxType(config)
     })));
     nonceManager.clearTemp();
-    // ✅ 简化返回：只返回签名交易
-    return {
-        signedTransactions: signedTxs
-    };
+    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,
+            bundleHash: bundleResult.bundleHash,
+            message: `授权成功，共 ${successCount} 个钱包`
+        };
+    }
+    else {
+        console.log(`⚠️ 授权交易未确认`);
+        return {
+            success: false,
+            approvedCount: 0,
+            bundleHash: bundleResult.bundleHash,
+            message: '授权交易未确认'
+        };
+    }
 }
 /**
  * 使用 PancakeSwapProxy 批量购买代币（Merkle 版本）
@@ -383,7 +417,7 @@ export async function pancakeProxyBatchSellMerkle(params) {
     // ✅ Step 2: 如果需要授权，抛出错误提示
     // ⚠️ SDK不再处理授权，需要前端先单独授权
     if (needApprovalIndexes.length > 0) {
-        console.log('⚠️ 警告：检测到 ${needApprovalIndexes.length} 个钱包需要授权');
+        console.log(`⚠️ 警告：检测到 ${needApprovalIndexes.length} 个钱包需要授权`);
         console.log('   请先使用这些钱包完成授权后再调用卖出方法');
         throw new Error(`需要授权: ${needApprovalIndexes.length} 个钱包尚未授权。请先完成授权后再卖出。`);
     }

package/dist/flap/portal-bundle-merkle/types.d.ts

@@ -187,5 +187,10 @@ export type PancakeProxyApprovalBatchParams = {
     amounts: (string | 'max')[];
     config: FlapBundleMerkleConfig;
 };
-/** ✅ PancakeProxy 批量授权结果（简化版） */
-export type PancakeProxyApprovalBatchResult = MerkleSignedResult;
+/** ✅ PancakeProxy 批量授权结果 */
+export type PancakeProxyApprovalBatchResult = {
+    success: boolean;
+    approvedCount: number;
+    bundleHash?: string;
+    message: string;
+};

package/package.json

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