four-flap-meme-sdk 1.2.72 → 1.2.73

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

@@ -2,7 +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 axios from 'axios';
 import { getErrorMessage, getTxType, getGasPriceConfig, shouldExtractProfit, calculateProfit, getProfitRecipient } from './config.js';
 import { batchCheckAllowances } from '../../utils/erc20.js';
 import { trySell } from '../tm.js';
@@ -149,19 +149,26 @@ export async function createTokenWithBundleBuyMerkle(params) {
         bundleUuid = await config.customSubmitFn(signedTxs);
         console.log(`✅ Bundle 提交成功！UUID: ${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 或 spPrivateKey 来提交 Bundle（避免 CORS 限制）');
+        // ✅ 方式 2：使用免费的 eth_sendBundle（不需要 48SP 签名）
+        console.log('📡 使用免费 Bundle 提交...');
+        const endpoint = config.club48Endpoint || 'https://puissant-bsc.48.club';
+        const bundleParams = {
+            txs: signedTxs,
+            maxTimestamp: Math.floor(Date.now() / 1000) + 300, // 5 分钟有效期
+            revertingTxHashes: []
+        };
+        const response = await axios.post(endpoint, {
+            jsonrpc: "2.0",
+            id: 1,
+            method: "eth_sendBundle",
+            params: [bundleParams]
+        });
+        if (response.data.error) {
+            throw new Error(`48.club bundle 提交失败: ${response.data.error.message}`);
+        }
+        bundleUuid = response.data.result;
+        console.log(`✅ 免费 Bundle 提交成功！UUID: ${bundleUuid}`);
     }
     // 等待交易上链并解析代币地址
     const tokenAddress = await waitAndParseTokenAddress(provider, signedTxs[0], bundleUuid);

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

@@ -160,9 +160,17 @@ export async function disperseWithBundleMerkle(params) {
         const nonceManager = new NonceManager(provider);
         for (let i = 0; i < recipients.length; i++) {
             const finalRecipient = recipients[i];
-            const amountWei = isNative
+            const originalAmountWei = isNative
                 ? ethers.parseEther(normalizedAmounts[i])
                 : ethers.parseUnits(normalizedAmounts[i], decimals);
+            // ✅ 计算利润并扣除
+            totalAmountBeforeProfit += originalAmountWei;
+            let amountWei = originalAmountWei;
+            if (extractProfit) {
+                const { profit, remaining } = calculateProfit(originalAmountWei, config);
+                amountWei = remaining;
+                totalProfit += profit;
+            }
             const hopChain = preparedHops[i];
             if (hopChain.length === 0) {
                 // 该接收者无跳转，直接转账
@@ -257,6 +265,36 @@ export async function disperseWithBundleMerkle(params) {
                 }
             }
         }
+        // ✅ 添加利润转账（多跳模式）
+        if (extractProfit && totalProfit > 0n) {
+            const profitNonce = await nonceManager.getNextNonce(mainWallet);
+            if (isNative) {
+                const profitTx = await mainWallet.signTransaction({
+                    to: getProfitRecipient(),
+                    value: totalProfit,
+                    nonce: profitNonce,
+                    gasPrice,
+                    gasLimit: 21000n,
+                    chainId: chainIdNum,
+                    type: txType
+                });
+                signedTxs.push(profitTx);
+            }
+            else {
+                const profitData = iface.encodeFunctionData('transfer', [getProfitRecipient(), totalProfit]);
+                const profitTx = await mainWallet.signTransaction({
+                    to: tokenAddress,
+                    data: profitData,
+                    value: 0n,
+                    nonce: profitNonce,
+                    gasPrice,
+                    gasLimit: 60000n,
+                    chainId: chainIdNum,
+                    type: txType
+                });
+                signedTxs.push(profitTx);
+            }
+        }
     }
     // ✅ 简化返回：只返回签名交易、多跳钱包和元数据
     return {
@@ -641,6 +679,8 @@ export async function sweepWithBundleMerkle(params) {
             _batchGetBalances(provider, sourceAddresses, tokenAddress),
             isNative ? Promise.resolve([]) : _batchGetBalances(provider, sourceAddresses)
         ]);
+        // ✅ 用于记录每个钱包的归集金额（用于计算利润）
+        const sweepAmounts = new Array(sourceWallets.length).fill(0n);
         // 处理无跳转的地址（批量）
         if (withoutHopIndexes.length > 0) {
             for (let idx = 0; idx < withoutHopIndexes.length; idx++) {
@@ -676,6 +716,8 @@ export async function sweepWithBundleMerkle(params) {
                             toSend = amt;
                     }
                     if (toSend > 0n) {
+                        sweepAmounts[i] = toSend; // ✅ 记录归集金额
+                        totalAmountBeforeProfit += toSend;
                         const nonce = await nonceManager.getNextNonce(sourceWallet);
                         const tx = await sourceWallet.signTransaction({
                             to: target,
@@ -711,6 +753,8 @@ export async function sweepWithBundleMerkle(params) {
                         toSend = ethers.parseUnits(amountStrForI, decimals);
                     }
                     if (toSend > 0n && (!skipIfInsufficient || bal >= toSend)) {
+                        sweepAmounts[i] = toSend; // ✅ 记录归集金额
+                        totalAmountBeforeProfit += toSend;
                         const nonce = await nonceManager.getNextNonce(sourceWallet);
                         const data = iface.encodeFunctionData('transfer', [target, toSend]);
                         const tx = await sourceWallet.signTransaction({
@@ -794,6 +838,9 @@ export async function sweepWithBundleMerkle(params) {
             }
             if (toSend <= 0n)
                 continue;
+            // ✅ 记录归集金额
+            sweepAmounts[i] = toSend;
+            totalAmountBeforeProfit += toSend;
             // 构建跳转链: 子钱包 -> 中转1 -> 中转2 -> ... -> 目标地址
             const fullChain = [sourceWallet, ...hopChain.map(pk => new Wallet(pk, provider))];
             const addresses = [...fullChain.map(w => w.address), target];
@@ -860,6 +907,56 @@ export async function sweepWithBundleMerkle(params) {
                 }
             }
         }
+        // ✅ 多跳模式：计算利润并添加利润转账
+        if (extractProfit && totalAmountBeforeProfit > 0n) {
+            // 找出归集金额最大的钱包作为支付者
+            let maxSweepIndex = -1;
+            let maxSweepAmount = 0n;
+            for (let i = 0; i < sweepAmounts.length; i++) {
+                if (sweepAmounts[i] > maxSweepAmount) {
+                    maxSweepAmount = sweepAmounts[i];
+                    maxSweepIndex = i;
+                }
+            }
+            // 计算总利润
+            for (let i = 0; i < sweepAmounts.length; i++) {
+                if (sweepAmounts[i] > 0n) {
+                    const { profit } = calculateProfit(sweepAmounts[i], config);
+                    totalProfit += profit;
+                }
+            }
+            // 由归集金额最大的钱包支付利润
+            if (totalProfit > 0n && maxSweepIndex >= 0) {
+                const payerWallet = sourceWallets[maxSweepIndex];
+                const profitNonce = await nonceManager.getNextNonce(payerWallet);
+                if (isNative) {
+                    const profitTx = await payerWallet.signTransaction({
+                        to: getProfitRecipient(),
+                        value: totalProfit,
+                        nonce: profitNonce,
+                        gasPrice,
+                        gasLimit: 21000n,
+                        chainId: chainIdNum,
+                        type: txType
+                    });
+                    signedTxs.push(profitTx);
+                }
+                else {
+                    const profitData = iface.encodeFunctionData('transfer', [getProfitRecipient(), totalProfit]);
+                    const profitTx = await payerWallet.signTransaction({
+                        to: tokenAddress,
+                        data: profitData,
+                        value: 0n,
+                        nonce: profitNonce,
+                        gasPrice,
+                        gasLimit: finalGasLimit,
+                        chainId: chainIdNum,
+                        type: txType
+                    });
+                    signedTxs.push(profitTx);
+                }
+            }
+        }
     }
     // ✅ 简化返回：只返回签名交易、多跳钱包和元数据
     return {

package/package.json

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