four-flap-meme-sdk 1.2.95 → 1.2.97

package/dist/flap/portal-bundle-merkle/core.js

@@ -124,9 +124,9 @@ export async function createTokenWithBundleBuyMerkle(params) {
  * ✅ 支持 quoteToken：传入 USDC 等地址时使用该代币购买，否则使用原生代币
  */
 export async function batchBuyWithBundleMerkle(params) {
-    const { chain, privateKeys, buyAmounts, tokenAddress, quoteToken, config } = params;
+    const { chain, privateKeys, buyAmounts, tokenAddress, quoteToken, quoteTokenDecimals, config } = params;
     console.log('🔍 SDK batchBuyWithBundleMerkle - quoteToken:', quoteToken);
-    console.log('🔍 SDK batchBuyWithBundleMerkle - params.quoteToken:', params.quoteToken);
+    console.log('🔍 SDK batchBuyWithBundleMerkle - quoteTokenDecimals:', quoteTokenDecimals);
     if (privateKeys.length === 0 || buyAmounts.length !== privateKeys.length) {
         throw new Error(getErrorMessage('KEY_AMOUNT_MISMATCH'));
     }
@@ -142,12 +142,25 @@ export async function batchBuyWithBundleMerkle(params) {
     const inputToken = quoteToken && quoteToken !== ZERO_ADDRESS ? quoteToken : ZERO_ADDRESS;
     // ✅ 如果使用非原生代币，则 value 应为 0（不发送原生代币）
     const useNativeToken = inputToken === ZERO_ADDRESS;
+    // ✅ 如果使用非原生代币（如 USDC），需要根据精度转换金额
+    // buyAmounts 是按 18 位精度传入的，需要转换为目标代币精度
+    let adjustedFundsList = fundsList;
+    if (!useNativeToken && quoteTokenDecimals !== undefined && quoteTokenDecimals !== 18) {
+        // 从 18 位精度转换为目标精度
+        // 例如：0.1 ETH (18位) = 100000000000000000 wei
+        // 转为 USDC (6位) = 100000 (0.1 USDC)
+        const decimalsDiff = 18 - quoteTokenDecimals;
+        const divisor = BigInt(10 ** decimalsDiff);
+        adjustedFundsList = fundsList.map(amount => amount / divisor);
+        console.log('🔍 SDK 精度转换: 18 -> ', quoteTokenDecimals, ', 原始:', fundsList, ', 转换后:', adjustedFundsList);
+    }
     console.log('🔍 SDK inputToken 计算结果:', inputToken);
     console.log('🔍 SDK useNativeToken:', useNativeToken);
+    console.log('🔍 SDK adjustedFundsList:', adjustedFundsList);
     // ✅ 优化：并行执行 gasPrice 和 populateBuyTransactions（最耗时的两个操作）
     const [gasPrice, unsignedBuys] = await Promise.all([
         resolveGasPrice(provider, config),
-        populateBuyTransactionsWithQuote(buyers, FLAP_PORTAL_ADDRESSES[chain], tokenAddress, fundsList, inputToken, useNativeToken)
+        populateBuyTransactionsWithQuote(buyers, FLAP_PORTAL_ADDRESSES[chain], tokenAddress, adjustedFundsList, inputToken, useNativeToken)
     ]);
     const buyerNonces = await allocateBuyerNonces(buyers, extractProfit, maxFundsIndex, totalProfit, nonceManager);
     const signedBuys = await signBuyTransactions({

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

@@ -121,6 +121,8 @@ export type FlapBatchBuySignParams = {
     tokenAddress: string;
     /** 报价代币地址（如 USDC），零地址或不传表示使用原生代币（MON/BNB） */
     quoteToken?: string;
+    /** ✅ 报价代币精度（如 USDC 为 6），不传默认 18 */
+    quoteTokenDecimals?: number;
     minOutputAmounts?: (string | bigint)[];
     config: FlapSignConfig;
 };

package/dist/utils/lp-inspect.js

@@ -37,9 +37,27 @@ const I_UNIV3_FACTORY_ABI = ['function getPool(address,address,uint24) view retu
 const I_ROUTER_WITH_FACTORY_ABI = ['function factory() view returns (address)'];
 // 数字转字符串（避免 BigInt JSON 兼容问题）
 function toStr(v) { return typeof v === 'bigint' ? v.toString() : String(v); }
-// 格式化余额：将 Wei 转换为 Ether 单位（18 decimals）
-function formatBalance(balance, format) {
-    return format ? formatUnits(balance, 18) : balance.toString();
+// 格式化余额：将 Wei 转换为指定精度的单位
+function formatBalance(balance, format, decimals = 18) {
+    return format ? formatUnits(balance, decimals) : balance.toString();
+}
+// ✅ 动态查询代币精度（带缓存）
+const decimalsCache = new Map();
+async function getTokenDecimals(tokenAddress, provider) {
+    const key = tokenAddress.toLowerCase();
+    if (decimalsCache.has(key)) {
+        return decimalsCache.get(key);
+    }
+    try {
+        const contract = new Contract(tokenAddress, I_ERC20_ABI, provider);
+        const decimals = await contract.decimals();
+        const result = Number(decimals);
+        decimalsCache.set(key, result);
+        return result;
+    }
+    catch {
+        return 18; // 默认 18 位精度
+    }
 }
 export async function inspectTokenLP(token, opts) {
     const provider = new JsonRpcProvider(opts.rpcUrl);
@@ -189,7 +207,9 @@ export async function inspectTokenLP(token, opts) {
                     const [r0, r1] = await pair.getReserves();
                     const reserveToken = t0.toLowerCase() === token.toLowerCase() ? r0 : r1;
                     const reserveWBNB = t0.toLowerCase() === chainTokens.wrappedNative.toLowerCase() ? r0 : r1;
-                    v2.wbnbPair = { address: v2PairWbnb, reserveToken: formatBalance(reserveToken, shouldFormat), reserveWBNB: formatBalance(reserveWBNB, shouldFormat) };
+                    // ✅ 动态查询 WBNB/WMON 精度
+                    const wbnbDecimals = await getTokenDecimals(chainTokens.wrappedNative, provider);
+                    v2.wbnbPair = { address: v2PairWbnb, reserveToken: formatBalance(reserveToken, shouldFormat, tokenDecimals ?? 18), reserveWBNB: formatBalance(reserveWBNB, shouldFormat, wbnbDecimals) };
                 }
                 catch {
                     v2.wbnbPair = { address: v2PairWbnb, reserveToken: '0', reserveWBNB: '0' };
@@ -207,7 +227,9 @@ export async function inspectTokenLP(token, opts) {
                     const [r0, r1] = await pair.getReserves();
                     const reserveToken = t0.toLowerCase() === token.toLowerCase() ? r0 : r1;
                     const reserveUSDT = t0.toLowerCase() === chainTokens.stableCoin.toLowerCase() ? r0 : r1;
-                    v2.usdtPair = { address: v2PairUsdt, reserveToken: formatBalance(reserveToken, shouldFormat), reserveUSDT: formatBalance(reserveUSDT, shouldFormat) };
+                    // ✅ 动态查询稳定币精度
+                    const stableDecimals = await getTokenDecimals(chainTokens.stableCoin, provider);
+                    v2.usdtPair = { address: v2PairUsdt, reserveToken: formatBalance(reserveToken, shouldFormat, tokenDecimals ?? 18), reserveUSDT: formatBalance(reserveUSDT, shouldFormat, stableDecimals) };
                 }
                 catch {
                     v2.usdtPair = { address: v2PairUsdt, reserveToken: '0', reserveUSDT: '0' };
@@ -328,7 +350,9 @@ export async function inspectTokenLP(token, opts) {
                             console.log(`[V3 Debug] ${p.base} fee=${p.fee}: base balance decode error`, err);
                     }
                     idx++;
-                    v3Results.push({ base: p.base, fee: p.fee, pool: p.pool, tokenBalance: formatBalance(tb, shouldFormat), baseBalance: formatBalance(bb, shouldFormat) });
+                    // ✅ 动态查询基础代币精度
+                    const baseDecimals = await getTokenDecimals(p.baseAddress, provider);
+                    v3Results.push({ base: p.base, fee: p.fee, pool: p.pool, tokenBalance: formatBalance(tb, shouldFormat, tokenDecimals ?? 18), baseBalance: formatBalance(bb, shouldFormat, baseDecimals) });
                 }
                 if (v3Results.length > 0)
                     out.v3 = v3Results;
@@ -370,7 +394,9 @@ export async function inspectTokenLP(token, opts) {
                             bb = await baseContract.balanceOf(pool);
                         }
                         catch { }
-                        v3Results.push({ base: basePair.symbol, fee, pool, tokenBalance: formatBalance(tb, shouldFormat), baseBalance: formatBalance(bb, shouldFormat) });
+                        // ✅ 动态查询基础代币精度
+                        const baseDecimals = await getTokenDecimals(baseAddr, provider);
+                        v3Results.push({ base: basePair.symbol, fee, pool, tokenBalance: formatBalance(tb, shouldFormat, tokenDecimals ?? 18), baseBalance: formatBalance(bb, shouldFormat, baseDecimals) });
                     }
                 }
             }

package/package.json

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