four-flap-meme-sdk 1.1.83 → 1.1.84

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

@@ -3,7 +3,7 @@ import { MerkleClient } from '../../clients/merkle.js';
 import { NonceManager, getOptimizedGasPrice } from '../../utils/bundle-helpers.js';
 import { ADDRESSES } from '../../utils/constants.js';
 import { FourClient, buildLoginMessage } from '../../clients/four.js';
-import { getErrorMessage, getTxType, getBundleOptions, getGasPriceConfig, shouldExtractProfit, calculateProfit } from './config.js';
+import { getErrorMessage, getTxType, getGasPriceConfig, shouldExtractProfit, calculateProfit } from './config.js';
 // ==================== TokenManager2 ABI（仅需要的方法）====================
 const TM2_ABI = [
     'function createToken(bytes args, bytes signature) payable',
@@ -201,111 +201,30 @@ export async function createTokenWithBundleBuyMerkle(params) {
         });
         signedTxs.push(profitTx);
     }
-    // ✅ 如果配置了 skipSubmit，直接返回签名交易
-    if (config.skipSubmit) {
-        nonceManager.clearTemp();
-        const emptyStatus = {
-            bundleHash: '',
-            txHashes: [],
-            results: [],
-            successCount: 0,
-            totalGasUsed: 0n,
-            targetBlock: 0
-        };
-        return {
-            bundleHash: '',
-            tokenAddress: predictedTokenAddress,
-            status: emptyStatus,
-            createTx: signedCreateTx,
-            buyTxs: [],
-            signedTransactions: signedTxs,
-            metadata: extractProfit ? {
-                totalBuyAmount: ethers.formatEther(totalBuyAmount),
-                profitAmount: ethers.formatEther(totalProfit),
-                profitRecipient: config.profitRecipient,
-                buyerCount: buyers.length
-            } : undefined
-        };
-    }
-    // 5. 提交 Bundle（使用智能配置）
-    const bundleResult = await merkle.sendBundle({
-        transactions: signedTxs,
-        ...getBundleOptions(config, blockOffset)
-    });
-    // 6. 根据配置决定是否等待确认
-    const waitForConfirmation = config.waitForConfirmation ?? false;
-    if (!waitForConfirmation) {
-        const status = {
-            bundleHash: bundleResult.bundleHash,
-            txHashes: bundleResult.txHashes,
-            results: [],
-            successCount: 0,
-            totalGasUsed: 0n,
-            targetBlock: bundleResult.targetBlock
-        };
-        // 清理临时 nonce 缓存
-        nonceManager.clearTemp();
-        return {
-            bundleHash: bundleResult.bundleHash,
-            tokenAddress: undefined,
-            status,
-            createTx: signedCreateTx,
-            buyTxs
-        };
-    }
-    // 7. 等待确认
-    const results = await merkle.waitForBundleConfirmation(bundleResult.txHashes, 1, config.waitTimeoutMs ?? 120000);
-    const successCount = results.filter(r => r.success).length;
-    const totalGasUsed = results.reduce((sum, r) => {
-        if (r.gasUsed) {
-            return sum + BigInt(r.gasUsed);
-        }
-        return sum;
-    }, 0n);
-    const status = {
-        bundleHash: bundleResult.bundleHash,
-        txHashes: bundleResult.txHashes,
-        results,
-        successCount,
-        totalGasUsed,
-        targetBlock: bundleResult.targetBlock
-    };
-    // 8. 解析 TokenCreate 事件
-    let createdTokenAddress;
-    if (results[0]?.success) {
-        try {
-            const createTxHash = bundleResult.txHashes[0];
-            if (createTxHash) {
-                const receipt = await provider.getTransactionReceipt(createTxHash);
-                if (receipt && receipt.logs) {
-                    const tm2Interface = new ethers.Interface(TM2_ABI);
-                    for (const log of receipt.logs) {
-                        try {
-                            const parsed = tm2Interface.parseLog({ topics: log.topics, data: log.data });
-                            if (parsed && parsed.name === 'TokenCreate') {
-                                createdTokenAddress = parsed.args.token;
-                                break;
-                            }
-                        }
-                        catch (e) {
-                            // 忽略
-                        }
-                    }
-                }
-            }
-        }
-        catch (e) {
-            console.warn('Failed to parse token address from receipt:', e);
-        }
-    }
-    // 清理临时 nonce 缓存
+    // ✅ 清理临时 nonce 缓存
     nonceManager.clearTemp();
+    // ✅ 直接返回签名交易（不提交到Merkle）
+    const emptyStatus = {
+        bundleHash: '',
+        txHashes: [],
+        results: [],
+        successCount: 0,
+        totalGasUsed: 0n,
+        targetBlock: 0
+    };
     return {
-        bundleHash: bundleResult.bundleHash,
-        tokenAddress: createdTokenAddress,
-        status,
+        bundleHash: '',
+        tokenAddress: predictedTokenAddress,
+        status: emptyStatus,
         createTx: signedCreateTx,
-        buyTxs
+        buyTxs: [],
+        signedTransactions: signedTxs,
+        metadata: extractProfit ? {
+            totalBuyAmount: ethers.formatEther(totalBuyAmount),
+            profitAmount: ethers.formatEther(totalProfit),
+            profitRecipient: config.profitRecipient,
+            buyerCount: buyers.length
+        } : undefined
     };
 }
 /**
@@ -379,67 +298,29 @@ export async function batchBuyWithBundleMerkle(params) {
         });
         signedTxs.push(profitTx);
     }
-    // ✅ 如果配置了 skipSubmit，直接返回签名交易
-    if (config.skipSubmit) {
-        nonceManager.clearTemp();
-        const emptyStatus = {
-            bundleHash: '',
-            txHashes: [],
-            results: [],
-            successCount: 0,
-            totalGasUsed: 0n,
-            targetBlock: 0
-        };
-        return {
-            bundleHash: '',
-            status: emptyStatus,
-            buyTxs: [],
-            signedTransactions: signedTxs,
-            metadata: extractProfit ? {
-                totalBuyAmount: ethers.formatEther(totalBuyAmount),
-                profitAmount: ethers.formatEther(totalProfit),
-                profitRecipient: config.profitRecipient,
-                buyerCount: buyers.length
-            } : undefined
-        };
-    }
-    const bundleResult = await merkle.sendBundle({
-        transactions: signedTxs,
-        ...getBundleOptions(config, blockOffset)
-    });
-    const waitForConfirmation = config.waitForConfirmation ?? false;
-    if (!waitForConfirmation) {
-        const status = {
-            bundleHash: bundleResult.bundleHash,
-            txHashes: bundleResult.txHashes,
-            results: [],
-            successCount: 0,
-            totalGasUsed: 0n,
-            targetBlock: bundleResult.targetBlock
-        };
-        // 清理临时 nonce 缓存
-        nonceManager.clearTemp();
-        return { bundleHash: bundleResult.bundleHash, status, buyTxs: signedTxs };
-    }
-    const results = await merkle.waitForBundleConfirmation(bundleResult.txHashes, 1, config.waitTimeoutMs ?? 120000);
-    const successCount = results.filter(r => r.success).length;
-    const totalGasUsed = results.reduce((sum, r) => {
-        if (r.gasUsed) {
-            return sum + BigInt(r.gasUsed);
-        }
-        return sum;
-    }, 0n);
-    const status = {
-        bundleHash: bundleResult.bundleHash,
-        txHashes: bundleResult.txHashes,
-        results,
-        successCount,
-        totalGasUsed,
-        targetBlock: bundleResult.targetBlock
-    };
-    // 清理临时 nonce 缓存
+    // ✅ 清理临时 nonce 缓存
     nonceManager.clearTemp();
-    return { bundleHash: bundleResult.bundleHash, status, buyTxs: signedTxs };
+    // ✅ 直接返回签名交易（不提交到Merkle）
+    const emptyStatus = {
+        bundleHash: '',
+        txHashes: [],
+        results: [],
+        successCount: 0,
+        totalGasUsed: 0n,
+        targetBlock: 0
+    };
+    return {
+        bundleHash: '',
+        status: emptyStatus,
+        buyTxs: [],
+        signedTransactions: signedTxs,
+        metadata: extractProfit ? {
+            totalBuyAmount: ethers.formatEther(totalBuyAmount),
+            profitAmount: ethers.formatEther(totalProfit),
+            profitRecipient: config.profitRecipient,
+            buyerCount: buyers.length
+        } : undefined
+    };
 }
 /**
  * four.meme: 批量卖出（Merkle 版本）
@@ -484,40 +365,11 @@ export async function batchSellWithBundleMerkle(params) {
     console.log(`   - 需要授权: ${needApprovalIndexes.length}`);
     console.log(`   - 已有授权: ${sellers.length - needApprovalIndexes.length}\n`);
     // ✅ Step 2: 批量授权（如果需要）
+    // ⚠️ 注意：授权需要单独提交，SDK只返回签名交易
     if (needApprovalIndexes.length > 0) {
-        console.log('🔓 提交授权交易...');
-        const nonceManager = new NonceManager(provider);
-        const approveSignedTxs = [];
-        const needApprovalSellers = needApprovalIndexes.map(i => sellers[i]);
-        const tokenContractsForApprove = needApprovalSellers.map((w) => new ethers.Contract(tokenAddress, ERC20_ABI, w));
-        const approveUnsigned = await Promise.all(tokenContractsForApprove.map((c) => c.approve.populateTransaction(tmAddr, ethers.MaxUint256 // 授权最大额度
-        )));
-        const approveGasLimit = getGasLimit(config, 80000);
-        const approveNonces = await Promise.all(needApprovalSellers.map((w) => nonceManager.getNextNonce(w)));
-        const signedApproves = await Promise.all(approveUnsigned.map((unsigned, i) => needApprovalSellers[i].signTransaction({
-            ...unsigned,
-            from: needApprovalSellers[i].address,
-            nonce: approveNonces[i],
-            gasLimit: approveGasLimit,
-            gasPrice: gasPrice,
-            chainId: 56,
-            type: getTxType(config)
-        })));
-        approveSignedTxs.push(...signedApproves);
-        nonceManager.clearTemp();
-        // 提交授权 Bundle 并等待确认
-        const approveBundleResult = await merkle.sendBundle({
-            transactions: approveSignedTxs,
-            ...getBundleOptions(config, blockOffset)
-        });
-        console.log(`   Bundle Hash: ${approveBundleResult.bundleHash}`);
-        console.log('⏳ 等待授权确认...');
-        const approveResults = await merkle.waitForBundleConfirmation(approveBundleResult.txHashes, 1, config.waitTimeoutMs ?? 120000);
-        const approveSuccessCount = approveResults.filter(r => r.success).length;
-        console.log(`✅ 授权完成: ${approveSuccessCount}/${needApprovalIndexes.length}\n`);
-        if (approveSuccessCount !== needApprovalIndexes.length) {
-            throw new Error(`授权失败: 只有 ${approveSuccessCount}/${needApprovalIndexes.length} 笔授权成功`);
-        }
+        console.log('⚠️ 警告：检测到 ${needApprovalIndexes.length} 个钱包需要授权');
+        console.log('   请先使用这些钱包的私钥调用授权方法，授权完成后再调用卖出方法');
+        throw new Error(`需要授权: ${needApprovalIndexes.length} 个钱包尚未授权。请先完成授权后再卖出。`);
     }
     // ✅ Step 3: 批量卖出
     console.log('💰 提交卖出交易...');
@@ -539,41 +391,21 @@ export async function batchSellWithBundleMerkle(params) {
         type: getTxType(config)
     })));
     signedTxs.push(...signedList);
-    const bundleResult = await merkle.sendBundle({
-        transactions: signedTxs,
-        ...getBundleOptions(config, blockOffset)
-    });
-    const waitForConfirmation = config.waitForConfirmation ?? false;
-    if (!waitForConfirmation) {
-        const status = {
-            bundleHash: bundleResult.bundleHash,
-            txHashes: bundleResult.txHashes,
-            results: [],
-            successCount: 0,
-            totalGasUsed: 0n,
-            targetBlock: bundleResult.targetBlock
-        };
-        // 清理临时 nonce 缓存
-        nonceManager.clearTemp();
-        return { bundleHash: bundleResult.bundleHash, status, sellTxs: signedTxs };
-    }
-    const results = await merkle.waitForBundleConfirmation(bundleResult.txHashes, 1, config.waitTimeoutMs ?? 120000);
-    const successCount = results.filter(r => r.success).length;
-    const totalGasUsed = results.reduce((sum, r) => {
-        if (r.gasUsed) {
-            return sum + BigInt(r.gasUsed);
-        }
-        return sum;
-    }, 0n);
-    const status = {
-        bundleHash: bundleResult.bundleHash,
-        txHashes: bundleResult.txHashes,
-        results,
-        successCount,
-        totalGasUsed,
-        targetBlock: bundleResult.targetBlock
-    };
-    // 清理临时 nonce 缓存
+    // ✅ 清理临时 nonce 缓存
     nonceManager.clearTemp();
-    return { bundleHash: bundleResult.bundleHash, status, sellTxs: signedTxs };
+    // ✅ 直接返回签名交易（不提交到Merkle）
+    const emptyStatus = {
+        bundleHash: '',
+        txHashes: [],
+        results: [],
+        successCount: 0,
+        totalGasUsed: 0n,
+        targetBlock: 0
+    };
+    return {
+        bundleHash: '',
+        status: emptyStatus,
+        sellTxs: [],
+        signedTransactions: signedTxs
+    };
 }

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

@@ -332,32 +332,21 @@ export async function fourPancakeProxyBatchBuyMerkle(params) {
         });
         signedTxs.push(profitTx);
     }
-    // ✅ 如果配置了 skipSubmit，直接返回
-    if (config.skipSubmit) {
-        nonceManager.clearTemp();
-        return {
-            bundleHash: '',
-            status: {
-                bundleHash: '',
-                txHashes: [],
-                results: [],
-                successCount: 0,
-                totalGasUsed: 0n,
-                targetBlock: 0
-            },
-            buyTxs: signedTxs
-        };
-    }
-    const bundleResult = await merkle.sendBundle({
-        transactions: signedTxs,
-        ...getBundleOptions(config, blockOffset)
-    });
+    // ✅ 清理临时 nonce 缓存
     nonceManager.clearTemp();
-    const status = await waitForBundleResult(merkle, bundleResult, config.waitForConfirmation ?? false, config.waitTimeoutMs ?? 120000);
+    // ✅ 直接返回签名交易（不提交到Merkle）
     return {
-        bundleHash: bundleResult.bundleHash,
-        status,
-        buyTxs: []
+        bundleHash: '',
+        status: {
+            bundleHash: '',
+            txHashes: [],
+            results: [],
+            successCount: 0,
+            totalGasUsed: 0n,
+            targetBlock: 0
+        },
+        buyTxs: [],
+        signedTransactions: signedTxs
     };
 }
 /**
@@ -397,40 +386,12 @@ export async function fourPancakeProxyBatchSellMerkle(params) {
     console.log(`   - 总钱包数: ${sellers.length}`);
     console.log(`   - 需要授权: ${needApprovalIndexes.length}`);
     console.log(`   - 已有授权: ${sellers.length - needApprovalIndexes.length}\n`);
-    // ✅ Step 2: 批量授权（如果需要）
+    // ✅ Step 2: 如果需要授权，抛出错误提示
+    // ⚠️ SDK不再处理授权，需要前端先单独授权
     if (needApprovalIndexes.length > 0) {
-        console.log('🔓 提交授权交易...');
-        const nonceManager = new NonceManager(provider);
-        const approveSignedTxs = [];
-        const needApprovalSellers = needApprovalIndexes.map(i => sellers[i]);
-        const tokenContractsForApprove = needApprovalSellers.map((w) => new Contract(tokenAddress, ERC20_ABI, w));
-        const approveUnsigned = await Promise.all(tokenContractsForApprove.map((c) => c.approve.populateTransaction(pancakeProxyAddress, ethers.MaxUint256)));
-        const approveGasLimit = getGasLimit(config, 80000);
-        const approveNonces = await Promise.all(needApprovalSellers.map((w) => nonceManager.getNextNonce(w)));
-        const signedApproves = await Promise.all(approveUnsigned.map((unsigned, i) => needApprovalSellers[i].signTransaction({
-            ...unsigned,
-            from: needApprovalSellers[i].address,
-            nonce: approveNonces[i],
-            gasLimit: approveGasLimit,
-            gasPrice: gasPrice,
-            chainId: 56,
-            type: getTxType(config)
-        })));
-        approveSignedTxs.push(...signedApproves);
-        nonceManager.clearTemp();
-        // 提交授权 Bundle 并等待确认
-        const approveBundleResult = await merkle.sendBundle({
-            transactions: approveSignedTxs,
-            ...getBundleOptions(config, blockOffset)
-        });
-        console.log(`   Bundle Hash: ${approveBundleResult.bundleHash}`);
-        console.log('⏳ 等待授权确认...');
-        const approveResults = await merkle.waitForBundleConfirmation(approveBundleResult.txHashes, 1, config.waitTimeoutMs ?? 120000);
-        const approveSuccessCount = approveResults.filter(r => r.success).length;
-        console.log(`✅ 授权完成: ${approveSuccessCount}/${needApprovalIndexes.length}\n`);
-        if (approveSuccessCount !== needApprovalIndexes.length) {
-            throw new Error(`授权失败: 只有 ${approveSuccessCount}/${needApprovalIndexes.length} 笔授权成功`);
-        }
+        console.log('⚠️ 警告：检测到 ${needApprovalIndexes.length} 个钱包需要授权');
+        console.log('   请先使用这些钱包完成授权后再调用卖出方法');
+        throw new Error(`需要授权: ${needApprovalIndexes.length} 个钱包尚未授权。请先完成授权后再卖出。`);
     }
     // ✅ Step 3: 批量卖出
     console.log('💰 提交卖出交易...');
@@ -565,54 +526,20 @@ export async function fourPancakeProxyBatchSellMerkle(params) {
             }
         }
     }
+    // ✅ 清理临时 nonce 缓存
     nonceManager.clearTemp();
-    // ✅ 如果配置了 skipSubmit，直接返回
-    if (config.skipSubmit) {
-        return {
-            bundleHash: '',
-            status: {
-                bundleHash: '',
-                txHashes: [],
-                results: [],
-                successCount: 0,
-                totalGasUsed: 0n,
-                targetBlock: 0
-            },
-            sellTxs: signedTxs
-        };
-    }
-    console.log('🚀 提交卖出 Bundle...\n');
-    let bundleResult;
-    try {
-        bundleResult = await merkle.sendBundle({
-            transactions: signedTxs,
-            ...getBundleOptions(config, blockOffset)
-        });
-        console.log(`   ✅ Bundle 已提交: ${bundleResult.bundleHash}`);
-    }
-    catch (error) {
-        console.error('❌ 提交 Bundle 失败:', error.message);
-        throw new Error(`卖出 Bundle 提交失败: ${error.message}`);
-    }
-    const status = await waitForBundleResult(merkle, bundleResult, config.waitForConfirmation ?? false, config.waitTimeoutMs ?? 120000);
-    if (status.successCount === sellers.length) {
-        console.log(`✅ 卖出完成: ${status.successCount}/${sellers.length} 全部成功\n`);
-    }
-    else {
-        console.log(`⚠️ 卖出完成: ${status.successCount}/${sellers.length} 成功`);
-        console.log(`   失败数量: ${sellers.length - status.successCount}\n`);
-        // 打印失败详情
-        if (status.results && status.results.length > 0) {
-            status.results.forEach((result, i) => {
-                if (!result.success && result.error) {
-                    console.log(`   交易 ${i + 1} 失败: ${result.error}`);
-                }
-            });
-        }
-    }
+    // ✅ 直接返回签名交易（不提交到Merkle）
     return {
-        bundleHash: bundleResult.bundleHash,
-        status,
-        sellTxs: []
+        bundleHash: '',
+        status: {
+            bundleHash: '',
+            txHashes: [],
+            results: [],
+            successCount: 0,
+            totalGasUsed: 0n,
+            targetBlock: 0
+        },
+        sellTxs: [],
+        signedTransactions: signedTxs
     };
 }