four-flap-meme-sdk 2.2.7 → 2.2.10

package/dist/contracts/tm-bundle.js

@@ -1,16 +1,112 @@
-/**
- * tm-bundle - 主函数
- */
 import { ethers, Wallet, JsonRpcProvider } from 'ethers';
-import { Club48Client, sendBatchPrivateTransactions, BUILDER_CONTROL_EOA, } from '../shared/clients/club48.js';
-import { ADDRESSES } from '../shared/constants/index.js';
-import { GAS_LIMITS, getProfitRateBps, getProfitRecipient } from '../shared/constants/index.js';
+import { Club48Client, sendBatchPrivateTransactions, BUILDER_CONTROL_EOA } from '../shared/clients/club48.js';
+import { ADDRESSES, PROFIT_CONFIG } from '../utils/constants.js';
+import { GAS_LIMITS } from '../shared/constants/index.js';
 import { buildProfitHopTransactions, PROFIT_HOP_COUNT } from '../utils/bundle-helpers.js';
-import TM2Abi from '../abis/contracts/TokenManager2.json' with { type: 'json' };
+import TM2Abi from '../shared/abis/TokenManager2.json' with { type: 'json' };
 import { FourClient, buildLoginMessage } from '../shared/clients/four.js';
 import { trySell } from './tm.js';
-import { getErrorMessage, waitForBundleWithProvider, } from './tm-bundle-helpers.js';
-const TM2_ABI = TM2Abi;
+/**
+ * four.meme Bundle 交易方法
+ * 使用 48.club Bundle 服务实现原子化交易
+ */
+// 错误信息国际化
+const ERRORS = {
+    NO_PRIVATE_KEY: {
+        en: 'At least 1 private key (creator) is required',
+        zh: '至少需要 1 个私钥（创建者）'
+    },
+    AMOUNT_MISMATCH: {
+        en: (buyCount, buyerCount) => `Buy amount count (${buyCount}) must equal buyer count (${buyerCount})`,
+        zh: (buyCount, buyerCount) => `购买金额数量(${buyCount})必须等于买家数量(${buyerCount})`
+    },
+    IMAGE_REQUIRED: {
+        en: 'Either imageUrl or imageFile must be provided',
+        zh: '必须提供 imageUrl 或 imageFile'
+    },
+    KEY_AMOUNT_MISMATCH: {
+        en: 'Private key count and amount count must match',
+        zh: '私钥和购买金额数量必须一致'
+    },
+    SELL_KEY_AMOUNT_MISMATCH: {
+        en: 'Private key count and sell amount count must match',
+        zh: '私钥和卖出数量必须一致'
+    }
+};
+// 获取错误信息（根据环境语言）
+function getErrorMessage(key, ...args) {
+    const lang = (process.env.LANG || process.env.LANGUAGE || 'en').toLowerCase().includes('zh') ? 'zh' : 'en';
+    const message = ERRORS[key][lang];
+    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 并应用配置
+// ========================================
+/**
+ * 估算 gas 并应用用户配置的倍数
+ */
+async function estimateGasWithMultiplier(provider, txRequest, multiplier) {
+    const estimated = await provider.estimateGas(txRequest);
+    const mult = multiplier ?? 1.2; // 默认 20% 安全余量
+    return BigInt(Math.ceil(Number(estimated) * mult));
+}
+/**
+ * 获取交易类型（用户可配置）
+ */
+function getTxType(config) {
+    return config.txType ?? 0; // 默认 Legacy (type 0)，适用于 48.club/BSC
+}
+/**
+ * 构建完整的交易请求（包含 gas 估算和交易类型）
+ */
+async function buildTxRequest(provider, unsigned, from, nonce, gasPrice, config, value) {
+    const gasLimit = await estimateGasWithMultiplier(provider, { ...unsigned, from, value }, config.gasLimitMultiplier);
+    return {
+        ...unsigned,
+        from,
+        nonce,
+        gasLimit,
+        gasPrice,
+        chainId: 56,
+        type: getTxType(config)
+    };
+}
+/**
+ * four.meme: 创建代币 + 捆绑购买
+ *
+ * 用户只需传入：
+ * - dev 私钥 + N 个买家私钥
+ * - 对应的购买金额
+ * - 代币基本信息
+ */
 export async function createTokenWithBundleBuy(params) {
     const { privateKeys, buyAmounts, tokenInfo, config } = params;
     if (privateKeys.length === 0) {
@@ -26,7 +122,7 @@ export async function createTokenWithBundleBuy(params) {
     if (!config.customSubmitFn) {
         club48 = new Club48Client({
             endpoint: 'https://puissant-bsc.48.club',
-            explorerEndpoint: config.club48ExplorerEndpoint,
+            explorerEndpoint: config.club48ExplorerEndpoint
         });
     }
     const fourClient = new FourClient({ baseUrl: config.fourApiUrl });
@@ -34,7 +130,7 @@ export async function createTokenWithBundleBuy(params) {
     const nonce = await fourClient.generateNonce({
         accountAddress: devWallet.address,
         verifyType: 'LOGIN',
-        networkCode: 'BSC',
+        networkCode: 'BSC'
     });
     const loginSignature = await devWallet.signMessage(buildLoginMessage(nonce));
     const accessToken = await fourClient.loginDex({
@@ -44,9 +140,9 @@ export async function createTokenWithBundleBuy(params) {
             address: devWallet.address,
             networkCode: 'BSC',
             signature: loginSignature,
-            verifyType: 'LOGIN',
+            verifyType: 'LOGIN'
         },
-        walletName: 'MetaMask',
+        walletName: 'MetaMask'
     });
     // 2. 上传图片（如果需要）
     let imgUrl = tokenInfo.imageUrl || '';
@@ -114,15 +210,13 @@ export async function createTokenWithBundleBuy(params) {
     const b0AmountWei = ethers.parseEther(b0AmountStr);
     const preSaleWei = tokenInfo.preSale ? ethers.parseEther(tokenInfo.preSale) : 0n;
     const valueWei = b0AmountWei + preSaleWei;
-    const tm2 = new ethers.Contract(tmAddr, TM2_ABI, devWallet);
-    const createTxUnsigned = await tm2.createToken.populateTransaction(createResp.createArg, createResp.signature, {
-        value: valueWei,
-    });
+    const tm2 = new ethers.Contract(tmAddr, TM2Abi, devWallet);
+    const createTxUnsigned = await tm2.createToken.populateTransaction(createResp.createArg, createResp.signature, { value: valueWei });
     // 估算 gas 并添加 20% 安全余量
     const estimatedCreateGas = await provider.estimateGas({
         ...createTxUnsigned,
         from: devWallet.address,
-        value: valueWei,
+        value: valueWei
     });
     const createGasLimit = (estimatedCreateGas * 120n) / 100n;
     const createTxRequest = {
@@ -132,14 +226,14 @@ export async function createTokenWithBundleBuy(params) {
         gasLimit: createGasLimit,
         gasPrice: gasPrice,
         chainId: 56,
-        type: 0, // Legacy transaction (required for BSC on 48.club)
+        type: 0 // Legacy transaction (required for BSC on 48.club)
     };
     const signedCreateTx = await devWallet.signTransaction(createTxRequest);
     signedTxs.push(signedCreateTx);
     // 4.2 购买交易
     const buyTxs = [];
     const profitTxs = [];
-    const buyAmountsWei = buyAmounts.map((a) => ethers.parseEther(a));
+    const buyAmountsWei = buyAmounts.map(a => ethers.parseEther(a));
     // 🔍 找出买入金额最多的买家（由他支付所有利润）
     let maxBuyerIndex = 0;
     let maxAmount = buyAmountsWei[0];
@@ -150,13 +244,13 @@ export async function createTokenWithBundleBuy(params) {
         }
     }
     // ✅ 并行构建所有购买交易
-    const buyerWallets = privateKeys.slice(1).map((pk) => new Wallet(pk, provider));
+    const buyerWallets = privateKeys.slice(1).map(pk => new Wallet(pk, provider));
     // 并行获取所有买家的 nonce
-    const buyerNonces = await Promise.all(buyerWallets.map((w) => getNextNonce(w)));
+    const buyerNonces = await Promise.all(buyerWallets.map(w => getNextNonce(w)));
     // 并行构建未签名交易和估算 gas
     const buyTxDataList = await Promise.all(buyAmountsWei.map(async (fundsWei, i) => {
         const buyerWallet = buyerWallets[i];
-        const buyTm2 = new ethers.Contract(tmAddr, TM2_ABI, buyerWallet);
+        const buyTm2 = new ethers.Contract(tmAddr, TM2Abi, buyerWallet);
         const buyTxUnsigned = await buyTm2.buyTokenAMAP.populateTransaction(0n, tokenAddress, buyerWallet.address, fundsWei, 0n, { value: fundsWei });
         // 估算 gas 并添加 20% 安全余量
         let buyGasLimit;
@@ -164,7 +258,7 @@ export async function createTokenWithBundleBuy(params) {
             const estimatedBuyGas = await provider.estimateGas({
                 ...buyTxUnsigned,
                 from: buyerWallet.address,
-                value: fundsWei,
+                value: fundsWei
             });
             buyGasLimit = (estimatedBuyGas * 120n) / 100n;
         }
@@ -181,7 +275,7 @@ export async function createTokenWithBundleBuy(params) {
             nonce: buyerNonces[i],
             gasLimit: data.buyGasLimit,
             gasPrice: gasPrice,
-            chainId: 56,
+            chainId: 56
         };
         return data.buyerWallet.signTransaction(buyTxRequest);
     }));
@@ -189,7 +283,7 @@ export async function createTokenWithBundleBuy(params) {
     buyTxs.push(...signedBuyTxList);
     // ✅ 聚合利润：由买入最多的人支付总利润（强制 2 跳中转）
     const totalBuyAmount = buyAmountsWei.reduce((sum, amount) => sum + amount, 0n);
-    const totalProfitAmount = (totalBuyAmount * BigInt(getProfitRateBps('normal'))) / 10000n;
+    const totalProfitAmount = (totalBuyAmount * BigInt(PROFIT_CONFIG.RATE_BPS)) / 10000n;
     let profitHopWallets;
     if (totalProfitAmount > 0n) {
         const payerWallet = new Wallet(privateKeys[maxBuyerIndex + 1], provider);
@@ -198,12 +292,12 @@ export async function createTokenWithBundleBuy(params) {
             provider,
             payerWallet,
             profitAmount: totalProfitAmount,
-            profitRecipient: getProfitRecipient(),
+            profitRecipient: PROFIT_CONFIG.RECIPIENT,
             hopCount: PROFIT_HOP_COUNT,
             gasPrice,
             chainId: 56,
             txType: 0,
-            startNonce: profitNonce,
+            startNonce: profitNonce
         });
         signedTxs.push(...profitHopResult.signedTransactions);
         profitTxs.push(...profitHopResult.signedTransactions);
@@ -218,7 +312,7 @@ export async function createTokenWithBundleBuy(params) {
             gasLimit: GAS_LIMITS.BRIBE,
             chainId: 56,
             type: 0, // Legacy transaction
-            nonce: await getNextNonce(devWallet),
+            nonce: await getNextNonce(devWallet)
         });
         signedTxs.push(tipTx);
     }
@@ -231,14 +325,10 @@ export async function createTokenWithBundleBuy(params) {
     else if (config.spPrivateKey) {
         await sendBatchPrivateTransactions(signedTxs, config.spPrivateKey, config.club48Endpoint || 'https://puissant-bsc.48.club', {
             spMode: config.spMode ?? 'timestampPersonalSign',
-            spVMode: config.spVMode,
+            spVMode: config.spVMode
         });
         // 批量提交不返回 bundleUuid，使用第一笔交易的 hash 作为标识
-        const firstHash = ethers.Transaction.from(signedTxs[0]).hash;
-        if (!firstHash) {
-            throw new Error('无法解析首笔已签名交易的 hash（48SP 批量提交）');
-        }
-        bundleUuid = firstHash;
+        bundleUuid = ethers.keccak256(signedTxs[0]);
     }
     else {
         // ✅ 直接提交到 48.club Bundle（仅服务器端可用）
@@ -248,11 +338,11 @@ export async function createTokenWithBundleBuy(params) {
         bundleUuid = await club48.sendBundle({
             txs: signedTxs,
             maxBlockNumber: (await provider.getBlockNumber()) + (config.bundleBlockOffset ?? 100),
-            noMerge: config.noMerge,
+            noMerge: config.noMerge
         }, {
             spMode: config.spMode ?? 'timestampPersonalSign',
             spPrivateKey: config.spPrivateKey || privateKeys[0],
-            spVMode: config.spVMode,
+            spVMode: config.spVMode
         });
     }
     // 6. 等待完成
@@ -273,7 +363,7 @@ export async function createTokenWithBundleBuy(params) {
             if (createTxHash) {
                 const receipt = await provider.getTransactionReceipt(createTxHash);
                 if (receipt && receipt.logs) {
-                    const tm2Interface = new ethers.Interface(TM2_ABI);
+                    const tm2Interface = new ethers.Interface(TM2Abi);
                     for (const log of receipt.logs) {
                         try {
                             const parsed = tm2Interface.parseLog({ topics: log.topics, data: log.data });
@@ -282,15 +372,15 @@ export async function createTokenWithBundleBuy(params) {
                                 break;
                             }
                         }
-                        catch (_e) {
+                        catch (e) {
                             // 忽略无法解析的日志
                         }
                     }
                 }
             }
         }
-        catch {
-            // ignore receipt parse errors
+        catch (e) {
+            console.warn('Failed to parse token address from receipt:', e);
         }
     }
     return {
@@ -300,7 +390,7 @@ export async function createTokenWithBundleBuy(params) {
         createTx: signedCreateTx,
         buyTxs,
         profitTxs,
-        profitHopWallets, // ✅ 返回利润多跳钱包
+        profitHopWallets // ✅ 返回利润多跳钱包
     };
 }
 /**
@@ -314,7 +404,7 @@ export async function batchBuyWithBundle(params) {
     const provider = new JsonRpcProvider(config.rpcUrl);
     const club48 = new Club48Client({
         endpoint: config.club48Endpoint,
-        explorerEndpoint: config.club48ExplorerEndpoint,
+        explorerEndpoint: config.club48ExplorerEndpoint
     });
     const blockOffset = config.bundleBlockOffset ?? 100;
     const tmAddr = ADDRESSES.BSC.TokenManagerOriginal;
@@ -334,8 +424,8 @@ export async function batchBuyWithBundle(params) {
         return onchain;
     };
     // ✅ 并行处理所有买家
-    const wallets = privateKeys.map((pk) => new Wallet(pk, provider));
-    const fundsWeiList = buyAmounts.map((a) => ethers.parseEther(a));
+    const wallets = privateKeys.map(pk => new Wallet(pk, provider));
+    const fundsWeiList = buyAmounts.map(a => ethers.parseEther(a));
     // 找出买入最多的买家（由他支付所有利润）
     let maxBuyerIndex = 0;
     let maxFunds = fundsWeiList[0];
@@ -346,7 +436,7 @@ export async function batchBuyWithBundle(params) {
         }
     }
     // 并行获取所有钱包的初始 nonce
-    const initialNonces = await Promise.all(wallets.map((w) => w.getNonce()));
+    const initialNonces = await Promise.all(wallets.map(w => w.getNonce()));
     // 为每个钱包分配 nonce（普通钱包1个，利润支付者2个）
     const nonceMap = new Map();
     wallets.forEach((w, i) => {
@@ -361,14 +451,14 @@ export async function batchBuyWithBundle(params) {
     // 并行构建未签名交易和估算 gas
     const txDataList = await Promise.all(wallets.map(async (buyerWallet, i) => {
         const fundsWei = fundsWeiList[i];
-        const tm2 = new ethers.Contract(tmAddr, TM2_ABI, buyerWallet);
+        const tm2 = new ethers.Contract(tmAddr, TM2Abi, buyerWallet);
         const buyTxUnsigned = await tm2.buyTokenAMAP.populateTransaction(0n, tokenAddress, buyerWallet.address, fundsWei, 0n, { value: fundsWei });
         let gasLimit;
         try {
             const estimatedGas = await provider.estimateGas({
                 ...buyTxUnsigned,
                 from: buyerWallet.address,
-                value: fundsWei,
+                value: fundsWei
             });
             gasLimit = (estimatedGas * 120n) / 100n;
         }
@@ -378,21 +468,21 @@ export async function batchBuyWithBundle(params) {
         return { buyTxUnsigned, gasLimit, buyerWallet, fundsWei };
     }));
     // 并行签名所有买入交易
-    const signedBuyTxList = await Promise.all(txDataList.map(async (data) => {
+    const signedBuyTxList = await Promise.all(txDataList.map(async (data, i) => {
         const buyTxRequest = {
             ...data.buyTxUnsigned,
             from: data.buyerWallet.address,
             nonce: getNextNonceLocal(data.buyerWallet),
             gasLimit: data.gasLimit,
             gasPrice: gasPrice,
-            chainId: 56,
+            chainId: 56
         };
         return data.buyerWallet.signTransaction(buyTxRequest);
     }));
     signedTxs.push(...signedBuyTxList);
     // ✅ 聚合利润：由买入最多的人支付总利润（强制 2 跳中转）
     const totalFunds = fundsWeiList.reduce((sum, f) => sum + f, 0n);
-    const totalProfit = (totalFunds * BigInt(getProfitRateBps('normal'))) / 10000n;
+    const totalProfit = (totalFunds * BigInt(PROFIT_CONFIG.RATE_BPS)) / 10000n;
     let profitHopWallets;
     if (totalProfit > 0n) {
         const payerWallet = wallets[maxBuyerIndex];
@@ -401,12 +491,12 @@ export async function batchBuyWithBundle(params) {
             provider,
             payerWallet,
             profitAmount: totalProfit,
-            profitRecipient: getProfitRecipient(),
+            profitRecipient: PROFIT_CONFIG.RECIPIENT,
             hopCount: PROFIT_HOP_COUNT,
             gasPrice,
             chainId: 56,
             txType: 0,
-            startNonce: profitNonce,
+            startNonce: profitNonce
         });
         signedTxs.push(...profitHopResult.signedTransactions);
         profitHopWallets = profitHopResult.hopWallets; // ✅ 收集利润多跳钱包
@@ -421,18 +511,18 @@ export async function batchBuyWithBundle(params) {
             gasLimit: GAS_LIMITS.BRIBE,
             chainId: 56,
             type: 0, // Legacy transaction
-            nonce: await getNextNonce(tipWallet),
+            nonce: await getNextNonce(tipWallet)
         });
         signedTxs.unshift(tipTx);
     }
     const bundleUuid = await club48.sendBundle({
         txs: signedTxs,
         maxBlockNumber: (await provider.getBlockNumber()) + blockOffset,
-        noMerge: config.noMerge,
+        noMerge: config.noMerge
     }, {
         spMode: config.spMode ?? 'timestampPersonalSign',
         spPrivateKey: config.spPrivateKey || privateKeys[0],
-        spVMode: config.spVMode,
+        spVMode: config.spVMode
     });
     const status = await club48.waitForBundle(bundleUuid);
     return { bundleUuid, status, buyTxs: signedTxs, profitHopWallets }; // ✅ 返回利润多跳钱包
@@ -448,7 +538,7 @@ export async function batchSellWithBundle(params) {
     const provider = new JsonRpcProvider(config.rpcUrl);
     const club48 = new Club48Client({
         endpoint: config.club48Endpoint,
-        explorerEndpoint: config.club48ExplorerEndpoint,
+        explorerEndpoint: config.club48ExplorerEndpoint
     });
     const blockOffset = config.bundleBlockOffset ?? 100;
     const tmAddr = ADDRESSES.BSC.TokenManagerOriginal;
@@ -468,8 +558,8 @@ export async function batchSellWithBundle(params) {
         return onchain;
     };
     // ✅ 并行处理所有卖家
-    const wallets = privateKeys.map((pk) => new Wallet(pk, provider));
-    const amountsWei = sellAmounts.map((a) => ethers.parseUnits(a, 18));
+    const wallets = privateKeys.map(pk => new Wallet(pk, provider));
+    const amountsWei = sellAmounts.map(a => ethers.parseUnits(a, 18));
     // 并行预估所有卖出能获得的 BNB
     const estimatedBnbOuts = await Promise.all(amountsWei.map(async (amountWei) => {
         try {
@@ -490,7 +580,7 @@ export async function batchSellWithBundle(params) {
         }
     }
     // 并行获取所有钱包的初始 nonce
-    const initialNonces = await Promise.all(wallets.map((w) => w.getNonce()));
+    const initialNonces = await Promise.all(wallets.map(w => w.getNonce()));
     const nonceMap = new Map();
     wallets.forEach((w, i) => {
         nonceMap.set(w.address.toLowerCase(), initialNonces[i]);
@@ -504,13 +594,13 @@ export async function batchSellWithBundle(params) {
     // 并行构建未签名交易和估算 gas
     const txDataList = await Promise.all(wallets.map(async (sellerWallet, i) => {
         const amountWei = amountsWei[i];
-        const tm2 = new ethers.Contract(tmAddr, TM2_ABI, sellerWallet);
+        const tm2 = new ethers.Contract(tmAddr, TM2Abi, sellerWallet);
         const sellTxUnsigned = await tm2.sellToken.populateTransaction(0n, tokenAddress, amountWei, 0n);
         let gasLimit;
         try {
             const estimatedGas = await provider.estimateGas({
                 ...sellTxUnsigned,
-                from: sellerWallet.address,
+                from: sellerWallet.address
             });
             gasLimit = (estimatedGas * 120n) / 100n;
         }
@@ -520,21 +610,21 @@ export async function batchSellWithBundle(params) {
         return { sellTxUnsigned, gasLimit, sellerWallet };
     }));
     // 并行签名所有卖出交易
-    const signedSellTxList = await Promise.all(txDataList.map(async (data) => {
+    const signedSellTxList = await Promise.all(txDataList.map(async (data, i) => {
         const sellTxRequest = {
             ...data.sellTxUnsigned,
             from: data.sellerWallet.address,
             nonce: getNextNonceLocal(data.sellerWallet),
             gasLimit: data.gasLimit,
             gasPrice: gasPrice,
-            chainId: 56,
+            chainId: 56
         };
         return data.sellerWallet.signTransaction(sellTxRequest);
     }));
     signedTxs.push(...signedSellTxList);
     // ✅ 聚合利润：由收益最高的人支付总利润（强制 2 跳中转）
     const totalBnbOut = estimatedBnbOuts.reduce((sum, b) => sum + b, 0n);
-    const totalProfit = (totalBnbOut * BigInt(getProfitRateBps('normal'))) / 10000n;
+    const totalProfit = (totalBnbOut * BigInt(PROFIT_CONFIG.RATE_BPS)) / 10000n;
     let profitHopWallets;
     if (totalProfit > 0n) {
         const payerWallet = wallets[maxSellerIndex];
@@ -543,12 +633,12 @@ export async function batchSellWithBundle(params) {
             provider,
             payerWallet,
             profitAmount: totalProfit,
-            profitRecipient: getProfitRecipient(),
+            profitRecipient: PROFIT_CONFIG.RECIPIENT,
             hopCount: PROFIT_HOP_COUNT,
             gasPrice,
             chainId: 56,
             txType: 0,
-            startNonce: profitNonce,
+            startNonce: profitNonce
         });
         signedTxs.push(...profitHopResult.signedTransactions);
         profitHopWallets = profitHopResult.hopWallets; // ✅ 收集利润多跳钱包
@@ -563,18 +653,18 @@ export async function batchSellWithBundle(params) {
             gasLimit: GAS_LIMITS.BRIBE,
             chainId: 56,
             type: 0, // Legacy transaction
-            nonce: await getNextNonce(tipWallet),
+            nonce: await getNextNonce(tipWallet)
         });
         signedTxs.unshift(tipTx);
     }
     const bundleUuid = await club48.sendBundle({
         txs: signedTxs,
         maxBlockNumber: (await provider.getBlockNumber()) + blockOffset,
-        noMerge: config.noMerge,
+        noMerge: config.noMerge
     }, {
         spMode: config.spMode ?? 'timestampPersonalSign',
         spPrivateKey: config.spPrivateKey || privateKeys[0],
-        spVMode: config.spVMode,
+        spVMode: config.spVMode
     });
     const status = await club48.waitForBundle(bundleUuid);
     return { bundleUuid, status, sellTxs: signedTxs, profitHopWallets }; // ✅ 返回利润多跳钱包
@@ -588,20 +678,12 @@ export async function fourPrivateBuy(params) {
     const gasPrice = await club48.getMinGasPrice();
     const fundsWei = ethers.parseEther(funds);
     const minAmount = 0n;
-    const tm2 = new ethers.Contract(tmAddr, TM2_ABI, wallet);
+    const tm2 = new ethers.Contract(tmAddr, TM2Abi, wallet);
     const unsigned = await tm2.buyTokenAMAP.populateTransaction(0n, tokenAddress, to ?? wallet.address, fundsWei, minAmount, { value: fundsWei });
     // 估算 gas 并添加 20% 安全余量
     const estimatedGas = await provider.estimateGas({ ...unsigned, from: wallet.address, value: fundsWei });
     const gasLimit = (estimatedGas * 120n) / 100n;
-    const req = {
-        ...unsigned,
-        from: wallet.address,
-        nonce: await wallet.getNonce(),
-        gasLimit,
-        gasPrice,
-        chainId: 56,
-        type: 0,
-    };
+    const req = { ...unsigned, from: wallet.address, nonce: await wallet.getNonce(), gasLimit, gasPrice, chainId: 56, type: 0 };
     const signed = await wallet.signTransaction(req);
     if (spPrivateKey)
         return await club48.sendPrivateTransactionWith48SP(signed, spPrivateKey);
@@ -616,20 +698,12 @@ export async function fourPrivateSell(params) {
     const gasPrice = await club48.getMinGasPrice();
     const amountWei = ethers.parseUnits(amount, 18);
     const minOut = minFunds ?? 0n;
-    const tm2 = new ethers.Contract(tmAddr, TM2_ABI, wallet);
+    const tm2 = new ethers.Contract(tmAddr, TM2Abi, wallet);
     const unsigned = await tm2.sellToken.populateTransaction(0n, tokenAddress, amountWei, minOut);
     // 估算 gas 并添加 20% 安全余量
     const estimatedGas = await provider.estimateGas({ ...unsigned, from: wallet.address });
     const gasLimit = (estimatedGas * 120n) / 100n;
-    const req = {
-        ...unsigned,
-        from: wallet.address,
-        nonce: await wallet.getNonce(),
-        gasLimit,
-        gasPrice,
-        chainId: 56,
-        type: 0,
-    };
+    const req = { ...unsigned, from: wallet.address, nonce: await wallet.getNonce(), gasLimit, gasPrice, chainId: 56, type: 0 };
     const signed = await wallet.signTransaction(req);
     if (spPrivateKey)
         return await club48.sendPrivateTransactionWith48SP(signed, spPrivateKey);
@@ -643,20 +717,18 @@ export async function fourBatchPrivateBuy(params) {
     const club48 = new Club48Client({ endpoint: club48Endpoint, explorerEndpoint: club48ExplorerEndpoint });
     const tmAddr = ADDRESSES.BSC.TokenManagerOriginal;
     // ✅ 并行处理
-    const wallets = privateKeys.map((pk) => new Wallet(pk, provider));
-    const fundsWeiList = fundsList.map((f) => ethers.parseEther(f));
+    const wallets = privateKeys.map(pk => new Wallet(pk, provider));
+    const fundsWeiList = fundsList.map(f => ethers.parseEther(f));
     // 并行获取 gasPrice 和所有 nonce
     const [gasPrice, nonces] = await Promise.all([
         club48.getMinGasPrice(),
-        Promise.all(wallets.map((w) => w.getNonce())),
+        Promise.all(wallets.map(w => w.getNonce()))
     ]);
     // 并行构建未签名交易和估算 gas
     const txDataList = await Promise.all(wallets.map(async (w, i) => {
         const fundsWei = fundsWeiList[i];
-        const tm2 = new ethers.Contract(tmAddr, TM2_ABI, w);
-        const unsigned = await tm2.buyTokenAMAP.populateTransaction(0n, tokenAddress, w.address, fundsWei, 0n, {
-            value: fundsWei,
-        });
+        const tm2 = new ethers.Contract(tmAddr, TM2Abi, w);
+        const unsigned = await tm2.buyTokenAMAP.populateTransaction(0n, tokenAddress, w.address, fundsWei, 0n, { value: fundsWei });
         let gasLimit;
         try {
             const estimatedGas = await provider.estimateGas({ ...unsigned, from: w.address, value: fundsWei });
@@ -676,7 +748,7 @@ export async function fourBatchPrivateBuy(params) {
             gasLimit: data.gasLimit,
             gasPrice,
             chainId: 56,
-            type: 0,
+            type: 0
         };
         return data.wallet.signTransaction(req);
     }));
@@ -684,14 +756,11 @@ export async function fourBatchPrivateBuy(params) {
         return await sendBatchPrivateTransactions(signedTxs, spPrivateKey, club48Endpoint || 'https://puissant-bsc.48.club');
     }
     // 无 48SP：走 bundle 提交通道
-    const bundleUuid = await club48.sendBundle({
-        txs: signedTxs,
-        maxBlockNumber: (await provider.getBlockNumber()) + 100,
-    });
+    const bundleUuid = await club48.sendBundle({ txs: signedTxs, maxBlockNumber: (await provider.getBlockNumber()) + 100 });
     return !!bundleUuid;
 }
 export async function fourBatchPrivateSell(params) {
-    const { rpcUrl, privateKeys, amounts, tokenAddress, club48Endpoint, club48ExplorerEndpoint, spPrivateKey, minFundsEach, } = params;
+    const { rpcUrl, privateKeys, amounts, tokenAddress, club48Endpoint, club48ExplorerEndpoint, spPrivateKey, minFundsEach } = params;
     if (privateKeys.length !== amounts.length)
         throw new Error('privateKeys and amounts length mismatch');
     const provider = new JsonRpcProvider(rpcUrl);
@@ -699,17 +768,17 @@ export async function fourBatchPrivateSell(params) {
     const tmAddr = ADDRESSES.BSC.TokenManagerOriginal;
     const minOut = minFundsEach ?? 0n;
     // ✅ 并行处理
-    const wallets = privateKeys.map((pk) => new Wallet(pk, provider));
-    const amountsWei = amounts.map((a) => ethers.parseUnits(a, 18));
+    const wallets = privateKeys.map(pk => new Wallet(pk, provider));
+    const amountsWei = amounts.map(a => ethers.parseUnits(a, 18));
     // 并行获取 gasPrice 和所有 nonce
     const [gasPrice, nonces] = await Promise.all([
         club48.getMinGasPrice(),
-        Promise.all(wallets.map((w) => w.getNonce())),
+        Promise.all(wallets.map(w => w.getNonce()))
     ]);
     // 并行构建未签名交易和估算 gas
     const txDataList = await Promise.all(wallets.map(async (w, i) => {
         const amountWei = amountsWei[i];
-        const tm2 = new ethers.Contract(tmAddr, TM2_ABI, w);
+        const tm2 = new ethers.Contract(tmAddr, TM2Abi, w);
         const unsigned = await tm2.sellToken.populateTransaction(0n, tokenAddress, amountWei, minOut);
         let gasLimit;
         try {
@@ -730,7 +799,7 @@ export async function fourBatchPrivateSell(params) {
             gasLimit: data.gasLimit,
             gasPrice,
             chainId: 56,
-            type: 0,
+            type: 0
         };
         return data.wallet.signTransaction(req);
     }));

package/dist/contracts/tm.d.ts

@@ -1,6 +1,5 @@
-import { BytesLike, Wallet } from 'ethers';
-import { createBscProvider } from '../utils/provider-factory.js';
-export type Providerish = ReturnType<typeof createBscProvider>;
+import { BytesLike, JsonRpcProvider, Wallet } from 'ethers';
+export type Providerish = JsonRpcProvider;
 export type Signerish = Wallet;
 export type CreateOnChainParams = {
     chain: 'BSC';