four-flap-meme-sdk 1.2.73 → 1.2.75

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

@@ -2,7 +2,6 @@ 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';
@@ -141,42 +140,77 @@ export async function createTokenWithBundleBuyMerkle(params) {
     }
     nonceManager.clearTemp();
     console.log(`✅ 总共生成了 ${signedTxs.length} 个交易签名 (1创建 + ${buyerKeys.length}买入 + 利润)`);
-    // ✅ 内部提交到 48.club Bundle
-    console.log('📡 开始提交到 48.club Bundle...');
-    let bundleUuid;
-    if (config.customSubmitFn) {
-        // ✅ 方式 1：使用自定义提交函数（通过服务器代理）
-        bundleUuid = await config.customSubmitFn(signedTxs);
-        console.log(`✅ Bundle 提交成功！UUID: ${bundleUuid}`);
+    // ✅ 使用公共 BSC RPC 提交交易（无 CORS 问题）
+    console.log('📡 开始通过公共 RPC 提交交易...');
+    const txHashes = [];
+    // ✅ 使用 provider.broadcastTransaction 逐个提交
+    for (let i = 0; i < signedTxs.length; i++) {
+        try {
+            const tx = signedTxs[i];
+            console.log(`📤 提交第 ${i + 1}/${signedTxs.length} 个交易...`);
+            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));
+            }
+        }
+        catch (error) {
+            console.error(`❌ 交易 ${i + 1} 提交失败:`, error.message);
+            throw new Error(`交易 ${i + 1} 提交失败: ${error.message}`);
+        }
     }
-    else {
-        // ✅ 方式 2：使用免费的 eth_sendBundle（不需要 48SP 签名）
-        console.log('📡 使用免费 Bundle 提交...');
-        const endpoint = config.club48Endpoint || 'https://puissant-bsc.48.club';
-        const bundleParams = {
-            txs: signedTxs,
-            maxTimestamp: Math.floor(Date.now() / 1000) + 300, // 5 分钟有效期
-            revertingTxHashes: []
-        };
-        const response = await axios.post(endpoint, {
-            jsonrpc: "2.0",
-            id: 1,
-            method: "eth_sendBundle",
-            params: [bundleParams]
-        });
-        if (response.data.error) {
-            throw new Error(`48.club bundle 提交失败: ${response.data.error.message}`);
+    console.log(`✅ 所有交易提交成功！共 ${txHashes.length} 笔`);
+    // 等待创建交易确认并解析代币地址
+    console.log('⏳ 等待创建交易确认并解析代币地址...');
+    const createTxHash = txHashes[0];
+    // 使用公共 RPC 查询交易收据（避免 CORS）
+    let receipt = null;
+    let retries = 0;
+    const maxRetries = 60; // 最多等待 60 秒
+    while (!receipt && retries < maxRetries) {
+        try {
+            receipt = await provider.getTransactionReceipt(createTxHash);
+            if (receipt)
+                break;
+        }
+        catch (e) {
+            // 忽略查询错误
         }
-        bundleUuid = response.data.result;
-        console.log(`✅ 免费 Bundle 提交成功！UUID: ${bundleUuid}`);
+        await new Promise(resolve => setTimeout(resolve, 1000));
+        retries++;
+        if (retries % 5 === 0) {
+            console.log(`⏳ 等待交易确认... (${retries}/${maxRetries})`);
+        }
+    }
+    if (!receipt) {
+        throw new Error('等待交易确认超时');
+    }
+    console.log(`✅ 创建交易已确认，区块: ${receipt.blockNumber}`);
+    // 解析 TokenCreated 事件
+    let tokenAddress;
+    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));
+                break;
+            }
+        }
+        catch (e) {
+            // 忽略解析错误
+        }
+    }
+    if (!tokenAddress) {
+        throw new Error('无法从交易收据中解析代币地址');
     }
-    // 等待交易上链并解析代币地址
-    const tokenAddress = await waitAndParseTokenAddress(provider, signedTxs[0], bundleUuid);
+    console.log(`✅ 代币地址: ${tokenAddress}`);
     return {
         signedTransactions: signedTxs,
         tokenAddress,
         metadata,
-        bundleUuid
+        txHashes
     };
 }
 /**

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

@@ -70,8 +70,8 @@ export type MerkleSignedResult = {
     metadata?: {
         [key: string]: any;
     };
-    /** Bundle UUID（内部提交时返回） */
-    bundleUuid?: string;
+    /** 交易哈希数组（内部提交时返回） */
+    txHashes?: string[];
 };
 /** ✅ 创建代币 + 购买参数（Merkle 版本 - 完整） */
 export type FourCreateWithBundleBuyMerkleParams = {

package/package.json

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