four-flap-meme-sdk 1.2.74 → 1.2.76

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

@@ -2,11 +2,9 @@ import { ethers, Wallet } from 'ethers';
 import { NonceManager, getOptimizedGasPrice } from '../../utils/bundle-helpers.js';
 import { ADDRESSES } from '../../utils/constants.js';
 import { FourClient, buildLoginMessage } from '../../clients/four.js';
-import axios from 'axios';
 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',
@@ -141,27 +139,21 @@ export async function createTokenWithBundleBuyMerkle(params) {
     }
     nonceManager.clearTemp();
     console.log(`✅ 总共生成了 ${signedTxs.length} 个交易签名 (1创建 + ${buyerKeys.length}买入 + 利润)`);
-    // ✅ 使用 48.club 的 eth_sendRawTransaction 捆绑提交
-    console.log('📡 开始通过 48.club 捆绑提交交易...');
-    const club48Endpoint = config.club48Endpoint || 'https://puissant-bsc.48.club';
+    // ✅ 使用公共 BSC RPC 提交交易（无 CORS 问题）
+    console.log('📡 开始通过公共 RPC 提交交易...');
     const txHashes = [];
-    // ✅ 使用 eth_sendRawTransaction 逐个提交（48.club 会自动捆绑连续的交易）
+    // ✅ 使用 provider.broadcastTransaction 逐个提交
     for (let i = 0; i < signedTxs.length; i++) {
         try {
             const tx = signedTxs[i];
             console.log(`📤 提交第 ${i + 1}/${signedTxs.length} 个交易...`);
-            const response = await axios.post(club48Endpoint, {
-                jsonrpc: "2.0",
-                id: i + 1,
-                method: "eth_sendRawTransaction",
-                params: [tx]
-            });
-            if (response.data.error) {
-                throw new Error(`交易 ${i + 1} 提交失败: ${response.data.error.message}`);
+            const txResponse = await provider.broadcastTransaction(tx);
+            txHashes.push(txResponse.hash);
+            console.log(`✅ 交易 ${i + 1} 提交成功: ${txResponse.hash}`);
+            // 短暂延迟，避免 nonce 冲突
+            if (i < signedTxs.length - 1) {
+                await new Promise(resolve => setTimeout(resolve, 200));
             }
-            const txHash = response.data.result;
-            txHashes.push(txHash);
-            console.log(`✅ 交易 ${i + 1} 提交成功: ${txHash}`);
         }
         catch (error) {
             console.error(`❌ 交易 ${i + 1} 提交失败:`, error.message);
@@ -195,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) {
@@ -220,69 +219,24 @@ 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);
+    const txType = getTxType(config);
+    // ✅ 优化：并行执行 gasPrice 获取和 nonce 预加载
+    const [gasPrice, nonceManager] = await Promise.all([
+        getOptimizedGasPrice(provider, getGasPriceConfig(config)),
+        (async () => {
+            const nm = new NonceManager(provider);
+            // 预加载所有钱包的 nonce（批量查询）
+            await Promise.all(buyers.map(w => nm.getNextNonce(w)));
+            return nm;
+        })()
+    ]);
     const buyFlow = await executeBuyFlow({
         wallets: buyers,
         buyAmounts,
@@ -307,10 +261,18 @@ export async function batchSellWithBundleMerkle(params) {
         throw new Error(getErrorMessage('SELL_KEY_AMOUNT_MISMATCH'));
     }
     const { provider, chainId } = createChainContext(config.rpcUrl);
-    const gasPrice = await getOptimizedGasPrice(provider, getGasPriceConfig(config));
-    const nonceManager = new NonceManager(provider);
     const sellers = createWallets(privateKeys, provider);
     const txType = getTxType(config);
+    // ✅ 优化：并行执行 gasPrice 获取和 nonce 预加载
+    const [gasPrice, nonceManager] = await Promise.all([
+        getOptimizedGasPrice(provider, getGasPriceConfig(config)),
+        (async () => {
+            const nm = new NonceManager(provider);
+            // 预加载所有钱包的 nonce（批量查询）
+            await Promise.all(sellers.map(w => nm.getNextNonce(w)));
+            return nm;
+        })()
+    ]);
     const sellFlow = await executeSellFlow({
         wallets: sellers,
         sellAmounts,

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

@@ -128,15 +128,23 @@ 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);
+    const signedTxs = [];
+    // ✅ 优化：并行执行所有 RPC 调用（gasPrice + nonces + populateTransaction）
+    const [gasPrice, nonceManager, unsignedBuys] = await Promise.all([
+        resolveGasPrice(provider, config),
+        (async () => {
+            const nm = new NonceManager(provider);
+            // 预加载所有钱包的 nonce（批量查询）
+            await Promise.all(buyers.map(w => nm.getNextNonce(w)));
+            return nm;
+        })(),
+        populateBuyTransactions(buyers, FLAP_PORTAL_ADDRESSES[chain], tokenAddress, fundsList)
+    ]);
     const buyerNonces = await allocateBuyerNonces(buyers, extractProfit, maxFundsIndex, totalProfit, nonceManager);
     const signedBuys = await signBuyTransactions({
         unsignedBuys,
@@ -176,25 +184,35 @@ export async function batchSellWithBundleMerkle(params) {
         throw new Error(getErrorMessage('SELL_KEY_AMOUNT_MISMATCH'));
     }
     const { provider, chainId } = createChainContext(chain, config.rpcUrl);
-    const gasPrice = await resolveGasPrice(provider, config);
-    const nonceManager = new NonceManager(provider);
-    const signedTxs = [];
     const wallets = createWallets(privateKeys, provider);
     const amountsWei = sellAmounts.map(a => ethers.parseUnits(a, 18));
     const portalAddr = FLAP_PORTAL_ADDRESSES[chain];
     const readOnlyPortal = new ethers.Contract(portalAddr, PORTAL_ABI, provider);
-    const quotedOutputs = await quoteSellOutputs(readOnlyPortal, tokenAddress, amountsWei);
+    const gasLimits = buildGasLimitList(wallets.length, config);
+    const signedTxs = [];
+    // ✅ 优化：并行执行所有 RPC 调用（gasPrice + nonces + quotes）
+    const [gasPrice, nonceManager, quotedOutputs] = await Promise.all([
+        resolveGasPrice(provider, config),
+        (async () => {
+            const nm = new NonceManager(provider);
+            // 预加载所有钱包的 nonce（批量查询）
+            await Promise.all(wallets.map(w => nm.getNextNonce(w)));
+            return nm;
+        })(),
+        quoteSellOutputs(readOnlyPortal, tokenAddress, amountsWei)
+    ]);
     const minOuts = resolveMinOutputs(minOutputAmounts, wallets.length, quotedOutputs);
-    const portals = wallets.map(w => new ethers.Contract(portalAddr, PORTAL_ABI, w));
-    const unsignedList = await Promise.all(portals.map((portal, i) => portal.swapExactInput.populateTransaction({
+    // ✅ 优化：使用单个 portal 实例生成所有 populateTransaction（避免重复创建合约实例）
+    const unsignedList = await Promise.all(wallets.map((_, i) => readOnlyPortal.swapExactInput.populateTransaction({
         inputToken: tokenAddress,
         outputToken: ZERO_ADDRESS,
         inputAmount: amountsWei[i],
         minOutputAmount: minOuts[i],
         permitData: '0x'
     })));
-    const gasLimits = buildGasLimitList(wallets.length, config);
+    // ✅ 优化：批量获取 nonces（已预加载，直接从缓存读取）
     const nonces = await Promise.all(wallets.map(w => nonceManager.getNextNonce(w)));
+    // ✅ 优化：批量签名交易
     const signedList = await Promise.all(unsignedList.map((unsigned, i) => wallets[i].signTransaction({
         ...unsigned,
         from: wallets[i].address,
@@ -270,14 +288,15 @@ function findMaxIndex(values) {
     return maxIndex;
 }
 async function populateBuyTransactions(buyers, portalAddr, tokenAddress, fundsList) {
-    const portals = buyers.map(wallet => new ethers.Contract(portalAddr, PORTAL_ABI, wallet));
-    return await Promise.all(portals.map((portal, i) => portal.swapExactInput.populateTransaction({
+    // ✅ 优化：使用单个合约实例（避免重复创建）
+    const portal = new ethers.Contract(portalAddr, PORTAL_ABI, buyers[0]);
+    return await Promise.all(fundsList.map((funds) => portal.swapExactInput.populateTransaction({
         inputToken: ZERO_ADDRESS,
         outputToken: tokenAddress,
-        inputAmount: fundsList[i],
+        inputAmount: funds,
         minOutputAmount: 0n,
         permitData: '0x'
-    }, { value: fundsList[i] })));
+    }, { value: funds })));
 }
 function buildGasLimitList(length, config) {
     const gasLimit = getGasLimit(config);

package/package.json

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