four-flap-meme-sdk 1.2.47 → 1.2.49

package/dist/contracts/tm-bundle-merkle/pancake-proxy.d.ts

@@ -7,7 +7,7 @@ export declare function approveFourPancakeProxy(params: FourPancakeProxyApproval
     approved: boolean;
 }>;
 /**
- * 批量授权代币给 PancakeSwapProxy（Merkle Bundle 版本）
+ * 批量授权代币给 PancakeSwapProxy（内部直接广播提交）
  */
 export declare function approveFourPancakeProxyBatch(params: FourPancakeProxyApprovalBatchParams): Promise<FourPancakeProxyApprovalBatchResult>;
 /**

package/dist/contracts/tm-bundle-merkle/pancake-proxy.js

@@ -1,5 +1,4 @@
 import { ethers, Wallet, JsonRpcProvider, Contract } from 'ethers';
-import { MerkleClient } from '../../clients/merkle.js';
 import { NonceManager, getOptimizedGasPrice } from '../../utils/bundle-helpers.js';
 import { ADDRESSES } from '../../utils/constants.js';
 import { getTxType, getBundleOptions, getGasPriceConfig, shouldExtractProfit, calculateProfit, calculateBatchProfit, getProfitRecipient } from './config.js';
@@ -201,7 +200,7 @@ export async function approveFourPancakeProxy(params) {
     };
 }
 /**
- * 批量授权代币给 PancakeSwapProxy（Merkle Bundle 版本）
+ * 批量授权代币给 PancakeSwapProxy（内部直接广播提交）
  */
 export async function approveFourPancakeProxyBatch(params) {
     const { privateKeys, tokenAddress, amounts, config } = params;
@@ -209,13 +208,10 @@ export async function approveFourPancakeProxyBatch(params) {
         throw new Error('Private key count and amount count must match');
     }
     const pancakeProxyAddress = ADDRESSES.BSC.PancakeProxy;
-    const merkle = new MerkleClient({
-        apiKey: config.apiKey,
-        chainId: 56, // Four.meme 固定 BSC
-        customRpcUrl: config.customRpcUrl
+    const provider = new ethers.JsonRpcProvider(config.rpcUrl, {
+        chainId: 56,
+        name: 'BSC'
     });
-    const provider = merkle.getProvider();
-    const blockOffset = config.bundleBlockOffset ?? 2;
     const gasPrice = await getOptimizedGasPrice(provider, getGasPriceConfig(config));
     // 查询 decimals
     const decimals = await getTokenDecimals(tokenAddress, provider);
@@ -231,6 +227,7 @@ export async function approveFourPancakeProxyBatch(params) {
         return {
             success: true,
             approvedCount: 0,
+            signedTransactions: [],
             message: '所有钱包已授权'
         };
     }
@@ -253,30 +250,35 @@ export async function approveFourPancakeProxyBatch(params) {
         type: txType
     })));
     nonceManager.clearTemp();
-    // ✅ 内部提交到 Merkle
-    const currentBlock = await provider.getBlockNumber();
-    const targetBlock = currentBlock + blockOffset;
-    const bundleResult = await merkle.sendBundle({
-        transactions: signedTxs,
-        targetBlock: targetBlock
-    });
-    // ✅ 等待授权确认
-    const confirmResults = await merkle.waitForBundleConfirmation(bundleResult.txHashes, 1, 60000);
-    const successCount = confirmResults.filter(r => r.success).length;
+    // ✅ 内部直接广播提交（逐个发送）
+    const txHashes = [];
+    const errors = [];
+    for (let i = 0; i < signedTxs.length; i++) {
+        try {
+            const tx = await provider.broadcastTransaction(signedTxs[i]);
+            txHashes.push(tx.hash);
+        }
+        catch (error) {
+            errors.push(`钱包 ${i} 授权失败: ${error.message}`);
+        }
+    }
+    const successCount = txHashes.length;
     if (successCount > 0) {
         return {
             success: true,
             approvedCount: successCount,
-            bundleHash: bundleResult.bundleHash,
-            message: `授权成功，共 ${successCount} 个钱包`
+            signedTransactions: signedTxs,
+            txHashes,
+            message: `授权成功，共 ${successCount} 个钱包${errors.length > 0 ? `，${errors.length} 个失败` : ''}`
         };
     }
     else {
         return {
             success: false,
             approvedCount: 0,
-            bundleHash: bundleResult.bundleHash,
-            message: '授权交易未确认'
+            signedTransactions: signedTxs,
+            txHashes: [],
+            message: `授权失败: ${errors.join('; ')}`
         };
     }
 }

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

@@ -368,12 +368,14 @@ export type FourPancakeProxyApprovalBatchParams = {
     privateKeys: string[];
     tokenAddress: string;
     amounts: (string | 'max')[];
-    config: FourBundleMerkleConfig;
+    config: FourSignConfig;
 };
 /** ✅ PancakeProxy 批量授权结果 */
 export type FourPancakeProxyApprovalBatchResult = {
     success: boolean;
     approvedCount: number;
+    signedTransactions: string[];
+    txHashes?: string[];
     bundleHash?: string;
     message: string;
 };

package/dist/flap/portal-bundle-merkle/pancake-proxy.d.ts

@@ -7,7 +7,7 @@ export declare function approvePancakeProxy(params: PancakeProxyApprovalParams):
     approved: boolean;
 }>;
 /**
- * 批量授权代币给 PancakeSwapProxy（Merkle Bundle 版本）
+ * 批量授权代币给 PancakeSwapProxy（内部直接广播提交）
  */
 export declare function approvePancakeProxyBatch(params: PancakeProxyApprovalBatchParams): Promise<PancakeProxyApprovalBatchResult>;
 /**

package/dist/flap/portal-bundle-merkle/pancake-proxy.js

@@ -1,5 +1,4 @@
 import { ethers, Wallet, JsonRpcProvider, Contract } from 'ethers';
-import { MerkleClient } from '../../clients/merkle.js';
 import { NonceManager, getOptimizedGasPrice } from '../../utils/bundle-helpers.js';
 import { ADDRESSES } from '../../utils/constants.js';
 import { CHAIN_ID_MAP, getTxType, getBundleOptions, getGasPriceConfig, shouldExtractProfit, calculateProfit, calculateBatchProfit, getProfitRecipient } from './config.js';
@@ -200,7 +199,7 @@ export async function approvePancakeProxy(params) {
     };
 }
 /**
- * 批量授权代币给 PancakeSwapProxy（Merkle Bundle 版本）
+ * 批量授权代币给 PancakeSwapProxy（内部直接广播提交）
  */
 export async function approvePancakeProxyBatch(params) {
     const { chain, privateKeys, tokenAddress, amounts, config } = params;
@@ -209,13 +208,10 @@ export async function approvePancakeProxyBatch(params) {
     }
     const pancakeProxyAddress = ADDRESSES.BSC.PancakeProxy;
     const chainId = CHAIN_ID_MAP[chain];
-    const merkle = new MerkleClient({
-        apiKey: config.apiKey,
-        chainId: chainId,
-        customRpcUrl: config.customRpcUrl
+    const provider = new ethers.JsonRpcProvider(config.rpcUrl, {
+        chainId,
+        name: chain.toUpperCase()
     });
-    const provider = merkle.getProvider();
-    const blockOffset = config.bundleBlockOffset ?? 2;
     const gasPrice = await getOptimizedGasPrice(provider, getGasPriceConfig(config));
     // 查询 decimals
     const decimals = await getTokenDecimals(tokenAddress, provider);
@@ -231,6 +227,7 @@ export async function approvePancakeProxyBatch(params) {
         return {
             success: true,
             approvedCount: 0,
+            signedTransactions: [],
             message: '所有钱包已授权'
         };
     }
@@ -252,30 +249,35 @@ export async function approvePancakeProxyBatch(params) {
         type: getTxType(config)
     })));
     nonceManager.clearTemp();
-    // ✅ 内部提交到 Merkle
-    const currentBlock = await provider.getBlockNumber();
-    const targetBlock = currentBlock + blockOffset;
-    const bundleResult = await merkle.sendBundle({
-        transactions: signedTxs,
-        targetBlock: targetBlock
-    });
-    // ✅ 等待授权确认
-    const confirmResults = await merkle.waitForBundleConfirmation(bundleResult.txHashes, 1, 60000);
-    const successCount = confirmResults.filter(r => r.success).length;
+    // ✅ 内部直接广播提交（逐个发送）
+    const txHashes = [];
+    const errors = [];
+    for (let i = 0; i < signedTxs.length; i++) {
+        try {
+            const tx = await provider.broadcastTransaction(signedTxs[i]);
+            txHashes.push(tx.hash);
+        }
+        catch (error) {
+            errors.push(`钱包 ${i} 授权失败: ${error.message}`);
+        }
+    }
+    const successCount = txHashes.length;
     if (successCount > 0) {
         return {
             success: true,
             approvedCount: successCount,
-            bundleHash: bundleResult.bundleHash,
-            message: `授权成功，共 ${successCount} 个钱包`
+            signedTransactions: signedTxs,
+            txHashes,
+            message: `授权成功，共 ${successCount} 个钱包${errors.length > 0 ? `，${errors.length} 个失败` : ''}`
         };
     }
     else {
         return {
             success: false,
             approvedCount: 0,
-            bundleHash: bundleResult.bundleHash,
-            message: '授权交易未确认'
+            signedTransactions: signedTxs,
+            txHashes: [],
+            message: `授权失败: ${errors.join('; ')}`
         };
     }
 }

package/dist/flap/portal-bundle-merkle/types.d.ts

@@ -265,12 +265,14 @@ export type PancakeProxyApprovalBatchParams = {
     privateKeys: string[];
     tokenAddress: string;
     amounts: (string | 'max')[];
-    config: FlapBundleMerkleConfig;
+    config: FlapSignConfig;
 };
 /** ✅ PancakeProxy 批量授权结果 */
 export type PancakeProxyApprovalBatchResult = {
     success: boolean;
     approvedCount: number;
+    signedTransactions: string[];
+    txHashes?: string[];
     bundleHash?: string;
     message: string;
 };

package/dist/utils/lp-inspect.d.ts

@@ -2,6 +2,7 @@ import { type FlapChain } from '../flap/portal.js';
 export type LPPlatform = 'FOUR' | 'FLAP' | 'PANCAKE_V2' | 'PANCAKE_V3' | 'PANCAKE_MIXED' | 'UNKNOWN';
 export type LPInfo = {
     platform: LPPlatform;
+    decimals?: number;
     four?: {
         helper: string;
         reserveNative?: string;

package/dist/utils/lp-inspect.js

@@ -41,6 +41,14 @@ export async function inspectTokenLP(token, opts) {
             multicall3 = '0xca11bde05977b3631167028862be2a173976ca11';
         }
     }
+    // 查询代币精度
+    try {
+        const tokenContract = new Contract(token, I_ERC20_ABI, provider);
+        out.decimals = await tokenContract.decimals();
+    }
+    catch {
+        // 如果查询失败，不设置 decimals（保持 undefined）
+    }
     async function resolveFactories() {
         // 1) 直接给出工厂
         if (opts.factoryV2 && opts.factoryV3)

package/package.json

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