four-flap-meme-sdk 1.2.17 → 1.2.19

package/dist/contracts/tm-bundle-merkle/approve-tokenmanager.d.ts

@@ -1,27 +1,21 @@
+import type { FourSignConfig } from './types.js';
+/** ✅ 批量授权参数（仅签名版本 - 精简） */
 export type ApproveFourTokenManagerBatchParams = {
     privateKeys: string[];
     tokenAddress: string;
     amounts: string[];
-    config: {
-        apiKey: string;
-        customRpcUrl?: string;
-        chainId?: number;
-        bundleBlockOffset?: number;
-        gasLimit?: number | bigint;
-        gasLimitMultiplier?: number;
-        gasPriceMultiplierPercent?: number;
-        minGasPriceGwei?: number;
-        txType?: 0 | 2;
-    };
+    config: FourSignConfig;
 };
+/** ✅ 批量授权结果（精简版 - 只返回签名交易） */
 export type ApproveFourTokenManagerBatchResult = {
-    success: boolean;
+    signedTransactions: string[];
     approvedCount: number;
-    bundleHash?: string;
+    skippedCount: number;
     message: string;
 };
 /**
  * 批量授权代币给 TokenManager（用于 Private Buy/Sell）
+ * ✅ 精简版：只负责签名交易，不提交到 Merkle
  * ✅ 专门用于授权给 TokenManagerOriginal 合约
  * ✅ 用于 fourBatchPrivateSell 和 fourBatchSellWithBundleMerkle
  */

package/dist/contracts/tm-bundle-merkle/approve-tokenmanager.js

@@ -1,5 +1,5 @@
 import { ethers, Wallet } from 'ethers';
-import { MerkleClient } from '../../clients/merkle.js';
+// import { MerkleClient } from '../../clients/merkle.js';
 import { NonceManager, getOptimizedGasPrice } from '../../utils/bundle-helpers.js';
 import { ADDRESSES } from '../../utils/constants.js';
 import { getTxType, getGasPriceConfig } from './config.js';
@@ -12,6 +12,7 @@ const ERC20_ABI = [
 ];
 /**
  * 批量授权代币给 TokenManager（用于 Private Buy/Sell）
+ * ✅ 精简版：只负责签名交易，不提交到 Merkle
  * ✅ 专门用于授权给 TokenManagerOriginal 合约
  * ✅ 用于 fourBatchPrivateSell 和 fourBatchSellWithBundleMerkle
  */
@@ -22,16 +23,30 @@ export async function approveFourTokenManagerBatch(params) {
     }
     const tmAddr = ADDRESSES.BSC.TokenManagerOriginal;
     const chainId = config.chainId ?? 56;
-    const merkle = new MerkleClient({
-        apiKey: config.apiKey,
+    // ✅ 直接使用传入的 RPC URL 创建 provider（不依赖 Merkle）
+    const provider = new ethers.JsonRpcProvider(config.rpcUrl, {
         chainId: chainId,
-        customRpcUrl: config.customRpcUrl
+        name: 'BSC'
     });
-    const provider = merkle.getProvider();
     const gasPrice = await getOptimizedGasPrice(provider, getGasPriceConfig(config));
-    // 查询 decimals
-    const tokenContract = new ethers.Contract(tokenAddress, ERC20_ABI, provider);
-    const decimals = await tokenContract.decimals();
+    // ✅ 优化：如果所有金额都是 'max'，则不需要查询 decimals
+    const allMax = amounts.every(a => a === 'max');
+    let decimals = 18; // 默认值
+    if (!allMax) {
+        try {
+            const tokenContract = new ethers.Contract(tokenAddress, ERC20_ABI, provider);
+            decimals = await tokenContract.decimals();
+        }
+        catch (error) {
+            console.error('⚠️ 查询代币 decimals 失败:', error.message);
+            console.error('   代币地址:', tokenAddress);
+            console.error('   请确认：');
+            console.error('   1. 代币地址是否正确');
+            console.error('   2. 代币是否已部署在 BSC 主网');
+            console.error('   3. RPC URL 是否可用');
+            throw new Error(`查询代币 decimals 失败: ${error.message}`);
+        }
+    }
     const wallets = privateKeys.map(k => new Wallet(k, provider));
     const amountsBigInt = amounts.map(a => a === 'max' ? ethers.MaxUint256 : ethers.parseUnits(a, decimals));
     // ✅ 检查是否有非 'max' 的授权
@@ -48,10 +63,13 @@ export async function approveFourTokenManagerBatch(params) {
     const APPROVAL_THRESHOLD = ethers.MaxUint256 / 2n;
     const needApproval = wallets.filter((_, i) => allowances[i] < APPROVAL_THRESHOLD);
     const needApprovalAmounts = amountsBigInt.filter((_, i) => allowances[i] < APPROVAL_THRESHOLD);
+    const skippedCount = wallets.length - needApproval.length;
     if (needApproval.length === 0) {
+        console.log('✅ 所有钱包已授权');
         return {
-            success: true,
+            signedTransactions: [],
             approvedCount: 0,
+            skippedCount: skippedCount,
             message: '所有钱包已授权'
         };
     }
@@ -63,8 +81,8 @@ export async function approveFourTokenManagerBatch(params) {
         if (cfg.gasLimit)
             return BigInt(cfg.gasLimit);
         if (cfg.gasLimitMultiplier)
-            return BigInt(Math.ceil(21000 * cfg.gasLimitMultiplier));
-        return 21000n; // 默认授权 gas limit
+            return BigInt(Math.ceil(60000 * cfg.gasLimitMultiplier));
+        return 60000n; // 默认授权 gas limit
     };
     const finalGasLimit = getGasLimit(config);
     // 签名授权交易
@@ -81,35 +99,11 @@ export async function approveFourTokenManagerBatch(params) {
     })));
     nonceManager.clearTemp();
     console.log(`✅ 已生成 ${signedTxs.length} 个授权交易签名`);
-    // ✅ 内部提交到 Merkle
-    const currentBlock = await provider.getBlockNumber();
-    const targetBlock = currentBlock + (config.bundleBlockOffset ?? 2);
-    console.log(`📤 正在提交授权交易到 Merkle...`);
-    const bundleResult = await merkle.sendBundle({
-        transactions: signedTxs,
-        targetBlock: targetBlock
-    });
-    console.log(`✅ 授权交易已提交，bundleHash: ${bundleResult.bundleHash}`);
-    // ✅ 等待授权确认
-    console.log(`⏳ 等待授权交易确认（约5-10秒）...`);
-    const confirmResults = await merkle.waitForBundleConfirmation(bundleResult.txHashes, 1, 60000);
-    const successCount = confirmResults.filter(r => r.success).length;
-    if (successCount > 0) {
-        console.log(`✅ 授权已确认，共 ${successCount} 笔交易成功`);
-        return {
-            success: true,
-            approvedCount: successCount,
-            bundleHash: bundleResult.bundleHash,
-            message: `授权成功，共 ${successCount} 个钱包`
-        };
-    }
-    else {
-        console.log(`⚠️ 授权交易未确认`);
-        return {
-            success: false,
-            approvedCount: 0,
-            bundleHash: bundleResult.bundleHash,
-            message: '授权交易未确认'
-        };
-    }
+    // ✅ 只返回签名交易，不提交到 Merkle
+    return {
+        signedTransactions: signedTxs,
+        approvedCount: signedTxs.length,
+        skippedCount: skippedCount,
+        message: `已生成 ${signedTxs.length} 个授权交易签名，跳过 ${skippedCount} 个已授权钱包`
+    };
 }

package/package.json

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