four-flap-meme-sdk 1.2.70 → 1.2.72

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

@@ -2,6 +2,7 @@ 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 { sendBatchPrivateTransactions } from '../../clients/club48.js';
 import { getErrorMessage, getTxType, getGasPriceConfig, shouldExtractProfit, calculateProfit, getProfitRecipient } from './config.js';
 import { batchCheckAllowances } from '../../utils/erc20.js';
 import { trySell } from '../tm.js';
@@ -142,23 +143,34 @@ export async function createTokenWithBundleBuyMerkle(params) {
     console.log(`✅ 总共生成了 ${signedTxs.length} 个交易签名 (1创建 + ${buyerKeys.length}买入 + 利润)`);
     // ✅ 内部提交到 48.club Bundle
     console.log('📡 开始提交到 48.club Bundle...');
-    // 检查是否有自定义提交函数
+    let bundleUuid;
     if (config.customSubmitFn) {
-        // 使用自定义提交函数（通过服务器代理）
-        const bundleUuid = await config.customSubmitFn(signedTxs);
+        // ✅ 方式 1：使用自定义提交函数（通过服务器代理）
+        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 if (config.spPrivateKey) {
+        // ✅ 方式 2：使用 48SP 批量提交（支持浏览器直接调用）
+        console.log('📡 使用 48SP 批量提交...');
+        await sendBatchPrivateTransactions(signedTxs, config.spPrivateKey, config.club48Endpoint || 'https://puissant-bsc.48.club', {
+            spMode: config.spMode,
+            spVMode: config.spVMode
+        });
+        // 批量提交不返回 bundleUuid，使用第一笔交易的 hash 作为标识
+        bundleUuid = ethers.keccak256(signedTxs[0]);
+        console.log(`✅ 48SP 批量提交成功！`);
     }
     else {
-        throw new Error('❌ 浏览器环境必须提供 customSubmitFn 来通过服务器代理提交 Bundle（避免 CORS 限制）');
+        throw new Error('❌ 浏览器环境必须提供 customSubmitFn 或 spPrivateKey 来提交 Bundle（避免 CORS 限制）');
     }
+    // 等待交易上链并解析代币地址
+    const tokenAddress = await waitAndParseTokenAddress(provider, signedTxs[0], bundleUuid);
+    return {
+        signedTransactions: signedTxs,
+        tokenAddress,
+        metadata,
+        bundleUuid
+    };
 }
 /**
  * 等待交易上链并解析代币地址

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

@@ -12,6 +12,9 @@ export type FourSignConfig = {
     prefer21000ForNative?: boolean;
     checkBnbForErc20NoHop?: boolean;
     customSubmitFn?: (signedTxs: string[]) => Promise<string>;
+    spPrivateKey?: string;
+    spMode?: 'none' | 'timestampPersonalSign' | 'concatTxHash' | 'rawTimestamp';
+    spVMode?: '27_28' | '0_1';
 };
 export type FourBundleMerkleConfig = {
     apiKey: string;

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) => {
@@ -263,8 +304,21 @@ export async function createTokenWithBundleBuy(params) {
         // ✅ 使用自定义提交函数（通过服务器代理）
         bundleUuid = await config.customSubmitFn(signedTxs);
     }
+    else if (config.spPrivateKey) {
+        // ✅ 使用 48SP 批量提交（支持浏览器直接调用）
+        console.log('📡 使用 48SP 批量提交...');
+        await sendBatchPrivateTransactions(signedTxs, config.spPrivateKey, config.club48Endpoint || 'https://puissant-bsc.48.club', {
+            spMode: config.spMode ?? 'timestampPersonalSign',
+            spVMode: config.spVMode
+        });
+        // 批量提交不返回 bundleUuid，使用第一笔交易的 hash 作为标识
+        bundleUuid = ethers.keccak256(signedTxs[0]);
+    }
     else {
-        // ✅ 直接提交到 48.club（仅服务器端可用）
+        // ✅ 直接提交到 48.club Bundle（仅服务器端可用）
+        if (!club48) {
+            throw new Error('❌ 浏览器环境必须提供 customSubmitFn 或 spPrivateKey 来提交 Bundle（避免 CORS 限制）');
+        }
         bundleUuid = await club48.sendBundle({
             txs: signedTxs,
             maxBlockNumber: (await provider.getBlockNumber()) + (config.bundleBlockOffset ?? 100),
@@ -276,7 +330,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.72",
   "description": "SDK for Flap bonding curve and four.meme TokenManager",
   "type": "module",
   "main": "dist/index.js",