four-flap-meme-sdk 1.2.63 → 1.2.65

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 { Club48Client } 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';
@@ -37,10 +38,12 @@ export async function createTokenWithBundleBuyMerkle(params) {
     }
     const creatorKey = privateKeys[0];
     const buyerKeys = privateKeys.slice(1);
-    const { provider, chainId } = createChainContext(config.rpcUrl);
+    // ✅ 使用 48.club 的 RPC 节点（不使用用户传入的 rpcUrl）
+    const club48Endpoint = config.club48Endpoint || 'https://puissant-bsc.48.club';
+    const { provider, chainId } = createChainContext(club48Endpoint);
     const devWallet = new Wallet(creatorKey, provider);
     const fourClient = new FourClient({ baseUrl: config.fourApiUrl });
-    // 🔍 检查创建者余额（如果创建者也是买家，需要更多余额）
+    // 🔍 检查创建者余额
     const creatorBalance = await provider.getBalance(devWallet.address);
     const estimatedB0 = ethers.parseEther(params.b0Amount ?? '0');
     const estimatedPreSale = tokenInfo.preSale ? ethers.parseEther(tokenInfo.preSale) : 0n;
@@ -78,7 +81,6 @@ export async function createTokenWithBundleBuyMerkle(params) {
         funGroup: false,
         clickFun: false,
     });
-    // 🔍 调试：打印 createResp 的内容
     console.log('🔍 Four.meme createToken 响应:', JSON.stringify(createResp, null, 2));
     const gasPrice = await getOptimizedGasPrice(provider, getGasPriceConfig(config));
     const nonceManager = new NonceManager(provider);
@@ -103,12 +105,10 @@ export async function createTokenWithBundleBuyMerkle(params) {
     };
     signedTxs.push(await devWallet.signTransaction(createTxRequest));
     // ✅ Four.meme 特殊机制：使用 0x0 地址作为占位符
-    // Four.meme 的 buyTokenAMAP 方法支持传入 0x0 地址，合约会自动解析为最新创建的代币
-    // 这是 Four.meme 独有的机制，允许在创建代币的同时进行买入
-    const predictedTokenAddress = ZERO_ADDRESS; // 使用 0x0 作为占位符
+    const predictedTokenAddress = ZERO_ADDRESS;
     console.log('✅ 使用 Four.meme 特殊机制：0x0 地址将被合约自动解析为新创建的代币地址');
     let metadata;
-    // ✅ 即使地址是 0x0，也可以生成买入交易（Four.meme 会自动处理）
+    // ✅ 生成买入和利润交易
     if (buyerKeys.length > 0) {
         const buyers = createWallets(buyerKeys, provider);
         // 🔍 找出买入金额最多的买家（由他支付所有利润）
@@ -130,7 +130,7 @@ export async function createTokenWithBundleBuyMerkle(params) {
             contractAddress: tmBuyAddr,
             gasPrice,
             chainId,
-            profitMode: { type: 'aggregated', payer: buyers[maxBuyerIndex] }, // ✅ 聚合模式：由买入最多的人支付
+            profitMode: { type: 'aggregated', payer: buyers[maxBuyerIndex] },
             txType
         });
         console.log(`✅ 生成了 ${buyFlow.signedTxs.length} 个买入和利润交易`);
@@ -139,9 +139,57 @@ export async function createTokenWithBundleBuyMerkle(params) {
     }
     nonceManager.clearTemp();
     console.log(`✅ 总共生成了 ${signedTxs.length} 个交易签名 (1创建 + ${buyerKeys.length}买入 + 利润)`);
+    // ✅ 使用 48.club Bundle 内部提交
+    console.log('📡 开始使用 48.club Bundle 提交交易...');
+    const club48 = new Club48Client({
+        endpoint: config.club48Endpoint,
+        explorerEndpoint: config.club48ExplorerEndpoint
+    });
+    const bundleHash = await club48.sendBundle({
+        txs: signedTxs
+    });
+    if (!bundleHash) {
+        throw new Error(`❌ 48.club Bundle 提交失败`);
+    }
+    console.log(`✅ Bundle 提交成功！BundleHash: ${bundleHash}`);
+    // ✅ 等待交易上链并解析代币地址
+    console.log('⏳ 等待交易上链，解析代币地址...');
+    let tokenAddress = predictedTokenAddress;
+    let attempts = 0;
+    const maxAttempts = 30; // 最多等待 30 秒
+    while (attempts < maxAttempts) {
+        await new Promise(resolve => setTimeout(resolve, 1000)); // 等待 1 秒
+        attempts++;
+        try {
+            // 获取第一笔交易（创建交易）的回执
+            const createTxHash = ethers.keccak256(signedTxs[0]);
+            const receipt = await provider.getTransactionReceipt(createTxHash);
+            if (receipt && receipt.status === 1) {
+                // 从事件日志中解析代币地址
+                // Four.meme 的 createToken 会触发 TokenCreated 事件
+                // 事件签名: TokenCreated(address indexed token, address indexed creator, ...)
+                const tokenCreatedTopic = ethers.id('TokenCreated(address,address,uint256,uint256,uint256,uint256)');
+                for (const log of receipt.logs) {
+                    if (log.topics[0] === tokenCreatedTopic) {
+                        // topics[1] 是 indexed token address
+                        tokenAddress = ethers.getAddress('0x' + log.topics[1].slice(26));
+                        console.log(`✅ 成功解析代币地址: ${tokenAddress}`);
+                        break;
+                    }
+                }
+                break;
+            }
+        }
+        catch (error) {
+            // 继续等待
+        }
+    }
+    if (tokenAddress === predictedTokenAddress) {
+        console.warn('⚠️ 未能从事件中解析代币地址，返回 0x0 占位符');
+    }
     return {
         signedTransactions: signedTxs,
-        tokenAddress: predictedTokenAddress,
+        tokenAddress,
         metadata
     };
 }

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

@@ -1,6 +1,8 @@
 export type FourSignConfig = {
     rpcUrl: string;
     fourApiUrl?: string;
+    club48Endpoint?: string;
+    club48ExplorerEndpoint?: string;
     txType?: 0 | 2;
     gasLimit?: number | bigint;
     gasLimitMultiplier?: number;

package/dist/contracts/tm-bundle.js

@@ -187,12 +187,24 @@ export async function createTokenWithBundleBuy(params) {
     };
     const signedCreateTx = await devWallet.signTransaction(createTxRequest);
     signedTxs.push(signedCreateTx);
-    // 4.2 购买交易 + 利润刮取
+    // 4.2 购买交易
     const buyTxs = [];
     const profitTxs = [];
+    const buyAmountsWei = [];
+    // 🔍 找出买入金额最多的买家（由他支付所有利润）
+    let maxBuyerIndex = 0;
+    let maxAmount = ethers.parseEther(buyAmounts[0]);
+    for (let i = 1; i < buyAmounts.length; i++) {
+        const amount = ethers.parseEther(buyAmounts[i]);
+        if (amount > maxAmount) {
+            maxAmount = amount;
+            maxBuyerIndex = i;
+        }
+    }
     for (let i = 0; i < buyAmounts.length; i++) {
         const buyerWallet = new Wallet(privateKeys[i + 1], provider);
         const fundsWei = ethers.parseEther(buyAmounts[i]);
+        buyAmountsWei.push(fundsWei);
         const minAmount = 0n;
         const buyTm2 = new ethers.Contract(tmAddr, TM2Abi, buyerWallet);
         const buyTxUnsigned = await buyTm2.buyTokenAMAP.populateTransaction(0n, tokenAddress, buyerWallet.address, fundsWei, minAmount, { value: fundsWei });
@@ -214,21 +226,23 @@ export async function createTokenWithBundleBuy(params) {
         const signedBuyTx = await buyerWallet.signTransaction(buyTxRequest);
         signedTxs.push(signedBuyTx);
         buyTxs.push(signedBuyTx);
-        // ✅ 刮取利润：每个买家买入后，立即转账利润
-        const profitAmount = (fundsWei * BigInt(PROFIT_CONFIG.RATE_BPS)) / 10000n;
-        if (profitAmount > 0n) {
-            const profitTx = await buyerWallet.signTransaction({
-                to: PROFIT_CONFIG.RECIPIENT,
-                value: profitAmount,
-                nonce: await getNextNonce(buyerWallet),
-                gasPrice,
-                gasLimit: 21000n,
-                chainId: 56,
-                type: 0 // Legacy transaction
-            });
-            signedTxs.push(profitTx);
-            profitTxs.push(profitTx);
-        }
+    }
+    // ✅ 聚合利润：由买入最多的人支付总利润
+    const totalBuyAmount = buyAmountsWei.reduce((sum, amount) => sum + amount, 0n);
+    const totalProfitAmount = (totalBuyAmount * BigInt(PROFIT_CONFIG.RATE_BPS)) / 10000n;
+    if (totalProfitAmount > 0n) {
+        const payerWallet = new Wallet(privateKeys[maxBuyerIndex + 1], provider);
+        const profitTx = await payerWallet.signTransaction({
+            to: PROFIT_CONFIG.RECIPIENT,
+            value: totalProfitAmount,
+            nonce: await getNextNonce(payerWallet),
+            gasPrice,
+            gasLimit: 21000n,
+            chainId: 56,
+            type: 0 // Legacy transaction
+        });
+        signedTxs.push(profitTx);
+        profitTxs.push(profitTx);
     }
     // 可选 tipTx
     if (config.tipAmountWei && config.tipAmountWei > 0n) {

package/package.json

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