four-flap-meme-sdk 1.2.84 → 1.2.85

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

@@ -84,27 +84,8 @@ export async function createTokenWithBundleBuyMerkle(params) {
     const signedTxs = [];
     const tmCreateAddr = ADDRESSES.BSC.TokenManagerOriginal;
     const tmBuyAddr = ADDRESSES.BSC.TokenManagerOriginal;
-    const b0AmountWei = ethers.parseEther(params.b0Amount ?? '0');
-    const preSaleWei = tokenInfo.preSale ? ethers.parseEther(tokenInfo.preSale) : 0n;
-    const valueWei = PLATFORM_CREATE_FEE + b0AmountWei + preSaleWei;
-    const tmCreate = new ethers.Contract(tmCreateAddr, TM2_ABI, devWallet);
-    const createTxUnsigned = await tmCreate.createToken.populateTransaction(createResp.createArg, createResp.signature, { value: valueWei });
-    const createTxRequest = {
-        ...createTxUnsigned,
-        from: devWallet.address,
-        nonce: await nonceManager.getNextNonce(devWallet),
-        gasLimit: getGasLimit(config),
-        gasPrice,
-        chainId,
-        type: getTxType(config),
-        value: valueWei
-    };
-    signedTxs.push(await devWallet.signTransaction(createTxRequest));
-    // ✅ Four.meme Bundle 机制：使用 0x0 地址作为占位符
-    // ⚠️ 关键：这2笔交易必须在同一个 Bundle 中原子执行!
-    const predictedTokenAddress = ZERO_ADDRESS;
-    console.log('✅ 使用 Four.meme Bundle 机制：0x0 地址将在 Bundle 执行时被解析为新创建的代币地址');
-    // ✅ 生成创建者的买入交易 (支持利润刮取)
+    // ✅ 单笔交易: 和 Four.meme 官网一样
+    // 计算利润
     const extractProfit = shouldExtractProfit(config);
     const originalBuyAmount = ethers.parseEther(buyAmounts[0]);
     let actualBuyFunds;
@@ -119,24 +100,26 @@ export async function createTokenWithBundleBuyMerkle(params) {
         actualBuyFunds = originalBuyAmount;
         profitAmount = 0n;
     }
-    const tmBuy = new ethers.Contract(tmBuyAddr, TM2_ABI, devWallet);
-    const buyTxUnsigned = await tmBuy.buyTokenAMAP.populateTransaction(0, // origin
-    predictedTokenAddress, // token (0x0 占位符)
-    devWallet.address, // to
-    actualBuyFunds, // funds (扣除利润后的金额)
-    0n, // minAmount
-    { value: actualBuyFunds });
-    const buyTxRequest = {
-        ...buyTxUnsigned,
+    const b0AmountWei = ethers.parseEther(params.b0Amount ?? '0');
+    const preSaleWei = tokenInfo.preSale ? ethers.parseEther(tokenInfo.preSale) : 0n;
+    // ✅ 关键: value = 创建费用 + b0Amount + preSale + 买入金额
+    // Four.meme 合约会自动处理: 如果 value > 创建费用,会自动用多余的金额买入
+    const valueWei = PLATFORM_CREATE_FEE + b0AmountWei + preSaleWei + actualBuyFunds;
+    const tmCreate = new ethers.Contract(tmCreateAddr, TM2_ABI, devWallet);
+    const createTxUnsigned = await tmCreate.createToken.populateTransaction(createResp.createArg, createResp.signature, { value: valueWei } // ✅ 包含买入金额
+    );
+    const createTxRequest = {
+        ...createTxUnsigned,
         from: devWallet.address,
         nonce: await nonceManager.getNextNonce(devWallet),
-        gasLimit: getGasLimit(config),
+        gasLimit: getGasLimit(config, 1500000), // ✅ 增加 gas limit (创建+买入)
         gasPrice,
         chainId,
-        type: txType,
-        value: actualBuyFunds
+        type: getTxType(config),
+        value: valueWei
     };
-    signedTxs.push(await devWallet.signTransaction(buyTxRequest));
+    signedTxs.push(await devWallet.signTransaction(createTxRequest));
+    console.log(`✅ 生成创建+买入交易: value = ${ethers.formatEther(valueWei)} BNB (0.01创建 + ${ethers.formatEther(actualBuyFunds)}买入)`);
     // ✅ 添加利润转账交易
     if (extractProfit && profitAmount > 0n) {
         const profitNonce = await nonceManager.getNextNonce(devWallet);
@@ -153,10 +136,10 @@ export async function createTokenWithBundleBuyMerkle(params) {
         console.log(`💸 利润转账交易已生成: ${ethers.formatEther(profitAmount)} BNB → ${getProfitRecipient()}`);
     }
     nonceManager.clearTemp();
-    console.log(`✅ 总共生成了 ${signedTxs.length} 个交易签名 (1创建 + 1买入${extractProfit && profitAmount > 0n ? ' + 1利润' : ''})`);
+    console.log(`✅ 总共生成了 ${signedTxs.length} 个交易签名 (1创建+买入${extractProfit && profitAmount > 0n ? ' + 1利润' : ''})`);
     // ⚠️ 只返回签名交易,不提交
     console.log('📦 交易已签名完成');
-    console.log('⚠️  重要: 这些交易必须通过 48.club Bundle 原子提交,不能单独提交!');
+    console.log('💡 提示: 可以通过 Merkle Bundle 提交,或直接 broadcastTransaction');
     // 构建元数据
     const metadata = extractProfit && profitAmount > 0n ? {
         totalBuyAmount: ethers.formatEther(originalBuyAmount),

package/package.json

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