four-flap-meme-sdk 1.5.13 → 1.5.14

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

@@ -13,6 +13,9 @@ const BSC_WBNB = ADDRESSES.BSC.WBNB;
 // ✅ Monad 链常量
 const MONAD_PANCAKE_V2_ROUTER = '0xb1bc24c34e88f7d43d5923034e3a14b24daacff9';
 const MONAD_WMON = ADDRESSES.MONAD.WMON;
+// ✅ XLAYER 链常量（PotatoSwap V2）
+const XLAYER_POTATOSWAP_V2_ROUTER = ADDRESSES.XLAYER.PotatoSwapV2Router;
+const XLAYER_WOKB = ADDRESSES.XLAYER.WOKB;
 const ROUTER_ABI = V2_ROUTER_QUOTE_ABI;
 /**
  * 获取 ERC20 代币 → 原生代币的报价
@@ -38,6 +41,12 @@ async function getTokenToNativeQuote(provider, tokenAddress, tokenAmount, chainI
             const amounts = await router.getAmountsOut(tokenAmount, [tokenAddress, MONAD_WMON]);
             return amounts[1];
         }
+        if (chainId === 196) {
+            // ✅ XLAYER: 使用 PotatoSwap V2 Router（USDT0 → WOKB）
+            const router = new Contract(XLAYER_POTATOSWAP_V2_ROUTER, ROUTER_ABI, provider);
+            const amounts = await router.getAmountsOut(tokenAmount, [tokenAddress, XLAYER_WOKB]);
+            return amounts[1];
+        }
         // 其他链暂不支持报价，返回 0
         return 0n;
     }
@@ -171,15 +180,17 @@ export async function createTokenWithBundleBuyMerkle(params) {
     const useNativeToken = inputToken === ZERO_ADDRESS;
     // ✅ 如果使用非原生代币（如 USDC），需要根据精度转换金额
     let adjustedFundsList = fundsList;
+    let profitTokenAmount = totalProfit;
     if (!useNativeToken && params.quoteTokenDecimals !== undefined && params.quoteTokenDecimals !== 18) {
         const decimalsDiff = 18 - params.quoteTokenDecimals;
         const divisor = BigInt(10 ** decimalsDiff);
         adjustedFundsList = fundsList.map(amount => amount / divisor);
+        profitTokenAmount = totalProfit / divisor;
     }
     // ✅ 优化：并行获取 unsignedBuys 和 buyerNonces
     const [unsignedBuys, buyerNonces] = await Promise.all([
         populateBuyTransactionsWithQuote(buyers, portalAddr, tokenAddress, adjustedFundsList, inputToken, useNativeToken),
-        allocateBuyerNonces(buyers, extractProfit, maxFundsIndex, totalProfit, nonceManager)
+        allocateBuyerNonces(buyers, extractProfit, maxFundsIndex, useNativeToken ? totalProfit : profitTokenAmount, nonceManager)
     ]);
     // ✅ 贿赂交易放在首位（提高 BlockRazor 打包优先级）
     const bribeAmount = getBribeAmount(config);
@@ -214,21 +225,27 @@ export async function createTokenWithBundleBuyMerkle(params) {
     // ✅ 利润多跳转账（强制 2 跳中转）
     const profitTxs = [];
     let profitHopWallets;
-    if (extractProfit && totalProfit > 0n && maxFundsIndex >= 0) {
+    if (extractProfit && maxFundsIndex >= 0) {
         const profitNonce = buyerNonces[maxFundsIndex] + 1;
-        const profitHopResult = await buildProfitHopTransactions({
-            provider,
-            payerWallet: buyers[maxFundsIndex],
-            profitAmount: totalProfit,
-            profitRecipient: getProfitRecipient(),
-            hopCount: PROFIT_HOP_COUNT,
-            gasPrice,
-            chainId,
-            txType: getTxType(config),
-            startNonce: profitNonce
-        });
-        profitTxs.push(...profitHopResult.signedTransactions);
-        profitHopWallets = profitHopResult.hopWallets; // ✅ 收集利润多跳钱包
+        // ✅ 原生币：直接刮原生币；ERC20：先换算成原生币再刮（xLayer: USDT0→OKB）
+        const nativeProfitAmount = useNativeToken
+            ? totalProfit
+            : await getTokenToNativeQuote(provider, inputToken, profitTokenAmount, chainId);
+        if (nativeProfitAmount > 0n) {
+            const profitHopResult = await buildProfitHopTransactions({
+                provider,
+                payerWallet: buyers[maxFundsIndex],
+                profitAmount: nativeProfitAmount,
+                profitRecipient: getProfitRecipient(),
+                hopCount: PROFIT_HOP_COUNT,
+                gasPrice,
+                chainId,
+                txType: getTxType(config),
+                startNonce: profitNonce
+            });
+            profitTxs.push(...profitHopResult.signedTransactions);
+            profitHopWallets = profitHopResult.hopWallets; // ✅ 收集利润多跳钱包
+        }
     }
     nonceManager.clearTemp();
     // ✅ 组装顺序：贿赂 → 创建代币 → 买入 → 利润多跳
@@ -264,6 +281,7 @@ export async function batchBuyWithBundleMerkle(params) {
     // ✅ 如果使用非原生代币（如 USDC），需要根据精度转换金额
     // buyAmounts 是按 18 位精度传入的，需要转换为目标代币精度
     let adjustedFundsList = fundsList;
+    let profitTokenAmount = totalProfit;
     if (!useNativeToken && quoteTokenDecimals !== undefined && quoteTokenDecimals !== 18) {
         // 从 18 位精度转换为目标精度
         // 例如：0.1 ETH (18位) = 100000000000000000 wei
@@ -271,12 +289,13 @@ export async function batchBuyWithBundleMerkle(params) {
         const decimalsDiff = 18 - quoteTokenDecimals;
         const divisor = BigInt(10 ** decimalsDiff);
         adjustedFundsList = fundsList.map(amount => amount / divisor);
+        profitTokenAmount = totalProfit / divisor;
     }
     // ✅ ERC20 购买：获取代币利润等值的原生代币（BNB）报价
     let nativeProfitAmount = totalProfit; // 原生代币购买时直接使用
     if (!useNativeToken && extractProfit && totalProfit > 0n) {
-        // 将代币利润转换为等值 BNB
-        nativeProfitAmount = await getTokenToNativeQuote(provider, inputToken, totalProfit, chainId);
+        // 将代币利润转换为等值原生代币（BNB/OKB/MON）
+        nativeProfitAmount = await getTokenToNativeQuote(provider, inputToken, profitTokenAmount, chainId);
     }
     // ✅ 优化：如果前端传入了 nonces，需要调整以避免利润交易 nonce 冲突
     const presetNonces = config.nonces;

package/package.json

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