four-flap-meme-sdk 1.2.69 → 1.2.71

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

@@ -5,6 +5,7 @@ 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',
@@ -139,13 +140,78 @@ export async function createTokenWithBundleBuyMerkle(params) {
     }
     nonceManager.clearTemp();
     console.log(`✅ 总共生成了 ${signedTxs.length} 个交易签名 (1创建 + ${buyerKeys.length}买入 + 利润)`);
-    // ✅ 返回签名交易，由服务器端提交到 48.club Bundle
-    // 注意：浏览器无法直接调用 48.club Bundle API（CORS 限制）
-    return {
-        signedTransactions: signedTxs,
-        tokenAddress: predictedTokenAddress, // 返回 0x0，服务器提交后需要从事件中解析真实地址
-        metadata
-    };
+    // ✅ 内部提交到 48.club Bundle
+    console.log('📡 开始提交到 48.club Bundle...');
+    // 检查是否有自定义提交函数
+    if (config.customSubmitFn) {
+        // 使用自定义提交函数（通过服务器代理）
+        const bundleUuid = await config.customSubmitFn(signedTxs);
+        console.log(`✅ Bundle 提交成功！UUID: ${bundleUuid}`);
+        // 等待交易上链并解析代币地址
+        const tokenAddress = await waitAndParseTokenAddress(provider, signedTxs[0], bundleUuid);
+        return {
+            signedTransactions: signedTxs,
+            tokenAddress,
+            metadata,
+            bundleUuid
+        };
+    }
+    else {
+        throw new Error('❌ 浏览器环境必须提供 customSubmitFn 来通过服务器代理提交 Bundle（避免 CORS 限制）');
+    }
+}
+/**
+ * 等待交易上链并解析代币地址
+ */
+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;

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

@@ -11,6 +11,7 @@ export type FourSignConfig = {
     chainId?: number;
     prefer21000ForNative?: boolean;
     checkBnbForErc20NoHop?: boolean;
+    customSubmitFn?: (signedTxs: string[]) => Promise<string>;
 };
 export type FourBundleMerkleConfig = {
     apiKey: string;
@@ -66,6 +67,8 @@ export type MerkleSignedResult = {
     metadata?: {
         [key: string]: any;
     };
+    /** Bundle UUID（内部提交时返回） */
+    bundleUuid?: string;
 };
 /** ✅ 创建代币 + 购买参数（Merkle 版本 - 完整） */
 export type FourCreateWithBundleBuyMerkleParams = {

package/dist/contracts/tm-bundle.js

@@ -38,6 +38,34 @@ function getErrorMessage(key, ...args) {
     return typeof message === 'function' ? message(...args) : message;
 }
 // ========================================
+// 辅助函数
+// ========================================
+/**
+ * 等待交易上链（不使用 club48 客户端）
+ */
+async function waitForBundleWithProvider(provider, firstTxSigned, bundleUuid) {
+    const maxAttempts = 60; // 最多等待 60 秒
+    for (let i = 0; i < maxAttempts; i++) {
+        await new Promise(resolve => setTimeout(resolve, 1000));
+        try {
+            const txHash = ethers.keccak256(firstTxSigned);
+            const receipt = await provider.getTransactionReceipt(txHash);
+            if (receipt) {
+                if (receipt.status === 1) {
+                    return { status: 'INCLUDED', includedBlock: receipt.blockNumber };
+                }
+                else {
+                    return { status: 'FAILED' };
+                }
+            }
+        }
+        catch (error) {
+            // 继续等待
+        }
+    }
+    return { status: 'PENDING' };
+}
+// ========================================
 // 辅助函数：估算 gas 并应用配置
 // ========================================
 /**
@@ -87,10 +115,14 @@ export async function createTokenWithBundleBuy(params) {
     }
     const provider = new JsonRpcProvider(config.rpcUrl);
     const devWallet = new Wallet(privateKeys[0], provider);
-    const club48 = new Club48Client({
-        endpoint: 'https://puissant-bsc.48.club',
-        explorerEndpoint: config.club48ExplorerEndpoint
-    });
+    // ✅ 只在没有 customSubmitFn 时创建 club48 客户端
+    let club48 = null;
+    if (!config.customSubmitFn) {
+        club48 = new Club48Client({
+            endpoint: 'https://puissant-bsc.48.club',
+            explorerEndpoint: config.club48ExplorerEndpoint
+        });
+    }
     const fourClient = new FourClient({ baseUrl: config.fourApiUrl });
     // 1. 登录 four.meme
     const nonce = await fourClient.generateNonce({
@@ -144,7 +176,16 @@ export async function createTokenWithBundleBuy(params) {
     });
     // 4. 构建交易
     const tmAddr = ADDRESSES.BSC.TokenManagerV2Proxy;
-    const gasPrice = await club48.getMinGasPrice();
+    // ✅ 获取 gas price
+    let gasPrice;
+    if (club48) {
+        gasPrice = await club48.getMinGasPrice();
+    }
+    else {
+        // 使用 provider 获取 gas price 并增加 20%
+        const currentGasPrice = (await provider.getFeeData()).gasPrice || 3000000000n;
+        gasPrice = (currentGasPrice * 120n) / 100n;
+    }
     const signedTxs = [];
     const nextNonceMap = new Map();
     const getNextNonce = async (w) => {
@@ -265,6 +306,9 @@ export async function createTokenWithBundleBuy(params) {
     }
     else {
         // ✅ 直接提交到 48.club（仅服务器端可用）
+        if (!club48) {
+            throw new Error('❌ club48 客户端未初始化');
+        }
         bundleUuid = await club48.sendBundle({
             txs: signedTxs,
             maxBlockNumber: (await provider.getBlockNumber()) + (config.bundleBlockOffset ?? 100),
@@ -276,7 +320,14 @@ export async function createTokenWithBundleBuy(params) {
         });
     }
     // 6. 等待完成
-    const status = await club48.waitForBundle(bundleUuid);
+    let status;
+    if (club48) {
+        status = await club48.waitForBundle(bundleUuid);
+    }
+    else {
+        // 使用 provider 等待交易上链
+        status = await waitForBundleWithProvider(provider, signedTxs[0], bundleUuid);
+    }
     // 7. 解析 TokenCreate 事件获取创建的代币地址
     let createdTokenAddress;
     if (status.status === 'INCLUDED' || status.status === 'PENDING') {

package/package.json

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