four-flap-meme-sdk 1.2.70 → 1.2.71

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.70",
+  "version": "1.2.71",
   "description": "SDK for Flap bonding curve and four.meme TokenManager",
   "type": "module",
   "main": "dist/index.js",