four-flap-meme-sdk 1.2.75 → 1.2.77

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

@@ -5,7 +5,6 @@ import { FourClient, buildLoginMessage } from '../../clients/four.js';
 import { getErrorMessage, getTxType, getGasPriceConfig, shouldExtractProfit, calculateProfit, getProfitRecipient } from './config.js';
 import { batchCheckAllowances } from '../../utils/erc20.js';
 import { trySell } from '../tm.js';
-import TM2Abi from '../../abis/TokenManager2.json' with { type: 'json' };
 const TM2_ABI = [
     'function createToken(bytes args, bytes signature) payable',
     'function buyTokenAMAP(uint256 origin, address token, address to, uint256 funds, uint256 minAmount) payable',
@@ -188,18 +187,25 @@ export async function createTokenWithBundleBuyMerkle(params) {
         throw new Error('等待交易确认超时');
     }
     console.log(`✅ 创建交易已确认，区块: ${receipt.blockNumber}`);
-    // 解析 TokenCreated 事件
+    // ✅ 解析 TokenCreate 事件（Four.meme 使用的事件名，注意没有 'd'）
     let tokenAddress;
+    // 使用 TM2 ABI 解析事件
+    const tm2Interface = new ethers.Interface(TM2_ABI);
     for (const log of receipt.logs) {
         try {
-            // TokenCreated(address indexed token, ...)
-            if (log.topics[0] === ethers.id('TokenCreated(address,address,string,string,uint256,uint256,uint256)')) {
-                tokenAddress = ethers.getAddress('0x' + log.topics[1].slice(26));
+            const parsed = tm2Interface.parseLog({
+                topics: log.topics,
+                data: log.data
+            });
+            // Four.meme 的事件是 TokenCreate（不是 TokenCreated）
+            if (parsed && parsed.name === 'TokenCreate') {
+                tokenAddress = parsed.args.token;
+                console.log(`✅ 从 TokenCreate 事件解析代币地址: ${tokenAddress}`);
                 break;
             }
         }
         catch (e) {
-            // 忽略解析错误
+            // 忽略无法解析的日志
         }
     }
     if (!tokenAddress) {
@@ -213,69 +219,19 @@ export async function createTokenWithBundleBuyMerkle(params) {
         txHashes
     };
 }
-/**
- * 等待交易上链并解析代币地址
- */
-async function waitAndParseTokenAddress(provider, createTxSigned, bundleUuid) {
-    console.log('⏳ 等待交易上链，解析代币地址...');
-    let tokenAddress = ZERO_ADDRESS;
-    const maxAttempts = 30; // 最多等待 30 秒
-    for (let i = 0; i < maxAttempts; i++) {
-        await new Promise(resolve => setTimeout(resolve, 1000)); // 等待 1 秒
-        try {
-            // 获取创建交易的回执
-            const createTxHash = ethers.keccak256(createTxSigned);
-            const receipt = await provider.getTransactionReceipt(createTxHash);
-            if (receipt && receipt.status === 1) {
-                // 从事件日志中解析代币地址
-                const tm2Interface = new ethers.Interface(TM2Abi);
-                for (const log of receipt.logs) {
-                    try {
-                        const parsed = tm2Interface.parseLog({
-                            topics: log.topics,
-                            data: log.data
-                        });
-                        if (parsed && parsed.name === 'TokenCreate') {
-                            tokenAddress = parsed.args.token;
-                            console.log(`✅ 成功解析代币地址: ${tokenAddress}`);
-                            return tokenAddress;
-                        }
-                    }
-                    catch (e) {
-                        // 忽略无法解析的日志
-                    }
-                }
-                // 如果没有找到 TokenCreate 事件，尝试 TokenCreated
-                const tokenCreatedTopic = ethers.id('TokenCreated(address,address,uint256,uint256,uint256,uint256)');
-                for (const log of receipt.logs) {
-                    if (log.topics[0] === tokenCreatedTopic) {
-                        tokenAddress = ethers.getAddress('0x' + log.topics[1].slice(26));
-                        console.log(`✅ 成功解析代币地址: ${tokenAddress}`);
-                        return tokenAddress;
-                    }
-                }
-                break;
-            }
-        }
-        catch (error) {
-            // 继续等待
-        }
-    }
-    if (tokenAddress === ZERO_ADDRESS) {
-        console.warn('⚠️ 未能从事件中解析代币地址，返回 0x0');
-    }
-    return tokenAddress;
-}
 export async function batchBuyWithBundleMerkle(params) {
     const { privateKeys, buyAmounts, tokenAddress, config } = params;
     if (privateKeys.length === 0 || buyAmounts.length !== privateKeys.length) {
         throw new Error(getErrorMessage('KEY_AMOUNT_MISMATCH'));
     }
     const { provider, chainId } = createChainContext(config.rpcUrl);
-    const gasPrice = await getOptimizedGasPrice(provider, getGasPriceConfig(config));
-    const nonceManager = new NonceManager(provider);
     const txType = getTxType(config);
     const buyers = createWallets(privateKeys, provider);
+    // ✅ 优化：并行初始化 nonceManager 和获取 gasPrice
+    const [nonceManager, gasPrice] = await Promise.all([
+        Promise.resolve(new NonceManager(provider)),
+        getOptimizedGasPrice(provider, getGasPriceConfig(config))
+    ]);
     const buyFlow = await executeBuyFlow({
         wallets: buyers,
         buyAmounts,

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

@@ -128,15 +128,18 @@ export async function batchBuyWithBundleMerkle(params) {
         throw new Error(getErrorMessage('KEY_AMOUNT_MISMATCH'));
     }
     const { provider, chainId } = createChainContext(chain, config.rpcUrl);
-    const gasPrice = await resolveGasPrice(provider, config);
     const nonceManager = new NonceManager(provider);
     const signedTxs = [];
     const buyers = createWallets(privateKeys, provider);
     const extractProfit = shouldExtractProfit(config);
     const { fundsList, originalAmounts, totalBuyAmount, totalProfit } = analyzeBuyFunds(buyAmounts, config, extractProfit);
     const maxFundsIndex = findMaxIndex(originalAmounts);
-    const unsignedBuys = await populateBuyTransactions(buyers, FLAP_PORTAL_ADDRESSES[chain], tokenAddress, fundsList);
     const gasLimits = buildGasLimitList(buyers.length, config);
+    // ✅ 优化：并行执行 gasPrice 和 populateBuyTransactions（最耗时的两个操作）
+    const [gasPrice, unsignedBuys] = await Promise.all([
+        resolveGasPrice(provider, config),
+        populateBuyTransactions(buyers, FLAP_PORTAL_ADDRESSES[chain], tokenAddress, fundsList)
+    ]);
     const buyerNonces = await allocateBuyerNonces(buyers, extractProfit, maxFundsIndex, totalProfit, nonceManager);
     const signedBuys = await signBuyTransactions({
         unsignedBuys,

package/package.json

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