four-flap-meme-sdk 1.6.99 → 1.7.2

package/dist/xlayer/eoa-bundle-swap.d.ts

@@ -79,6 +79,8 @@ export interface XLayerCrossSwapParams {
     quoteTokenDecimals?: number;
     buyersPerSell?: number;
     disperseHopCount?: number;
+    /** ✅ 预获取的 nonce（地址 -> nonce），避免 nonce 不同步 */
+    startNonces?: Map<string, number>;
 }
 export interface XLayerCrossSwapResult {
     signedTransactions: string[];

package/dist/xlayer/eoa-bundle-swap.js

@@ -9,16 +9,19 @@
 import { ethers, Contract, Wallet } from 'ethers';
 import { calculateSellAmount } from '../utils/swap-helpers.js';
 import { NonceManager, getDeadline, buildProfitHopTransactions, PROFIT_HOP_COUNT } from '../utils/bundle-helpers.js';
-import { ADDRESSES, PROFIT_CONFIG, BLOCKRAZOR_BUILDER_EOA } from '../utils/constants.js';
+import { PROFIT_CONFIG, BLOCKRAZOR_BUILDER_EOA } from '../utils/constants.js';
 import { quoteV2, quoteV3 } from '../utils/quote-helpers.js';
 import { V2_ROUTER_ABI, V3_ROUTER02_ABI } from '../abis/common.js';
 import { generateWallets } from '../utils/wallet.js';
+// ✅ 从 XLayer 常量导入正确的路由地址
+import { POTATOSWAP_V2_ROUTER, POTATOSWAP_SWAP_ROUTER02, WOKB as WOKB_CONST } from './constants.js';
 // ==================== XLayer 专用常量 ====================
 const XLAYER_CHAIN_ID = 196;
 const XLAYER_CHAIN_NAME = 'XLAYER';
-const WOKB_ADDRESS = ADDRESSES.XLAYER.WOKB;
-const POTATO_V2_ROUTER = '0x881fb2f98c13d521009464e7d1cbf16e1b394e8e';
-const POTATO_V3_ROUTER = '0x4e57fe71624fBCD5F1175C6B1a1e5d5fE2e4Da45';
+const WOKB_ADDRESS = ethers.getAddress(WOKB_CONST);
+// ✅ 强制校验和，避免大小写错误导致的 bad address checksum
+const POTATO_V2_ROUTER = ethers.getAddress(POTATOSWAP_V2_ROUTER);
+const POTATO_V3_ROUTER = ethers.getAddress(POTATOSWAP_SWAP_ROUTER02); // ✅ SwapRouter02 用于 V3 交易
 const NATIVE_TRANSFER_GAS_LIMIT = 21055n;
 const ERC20_TRANSFER_GAS_LIMIT = 65000n;
 const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000';
@@ -87,6 +90,17 @@ async function quoteSellOutput(provider, routeParams, sellAmountWei) {
             console.log(`[XLayer quoteSellOutput] V3 报价成功: ${ethers.formatEther(result.amountOut)} OKB`);
             return result.amountOut;
         }
+        // ❗️兜底：如果 V3 报价失败且提供了 v2Path，则尝试 V2 报价（避免因为无对应费率池导致失败）
+        if (params.v2Path && params.v2Path.length >= 2) {
+            console.warn('[XLayer quoteSellOutput] V3 报价失败，尝试 V2 兜底');
+            const tokenIn = params.v2Path[0];
+            const tokenOut = params.v2Path[params.v2Path.length - 1];
+            const v2Result = await quoteV2(provider, tokenIn, tokenOut, sellAmountWei, XLAYER_CHAIN_NAME);
+            if (v2Result.amountOut > 0n) {
+                console.log(`[XLayer quoteSellOutput] V2 兜底报价成功: ${ethers.formatEther(v2Result.amountOut)} OKB`);
+                return v2Result.amountOut;
+            }
+        }
         throw new Error(`V3 单跳报价失败: tokenIn=${params.v3TokenIn}, tokenOut=${params.v3TokenOut}, fee=${params.v3Fee}`);
     }
     if (routeParams.routeType === 'v3-multi') {
@@ -97,6 +111,17 @@ async function quoteSellOutput(provider, routeParams, sellAmountWei) {
             console.log(`[XLayer quoteSellOutput] V3 多跳报价成功: ${ethers.formatEther(result.amountOut)} OKB`);
             return result.amountOut;
         }
+        // ❗️兜底：如果 V3 多跳失败且提供 v2Path，则尝试 V2 报价
+        if (params.v2Path && params.v2Path.length >= 2) {
+            console.warn('[XLayer quoteSellOutput] V3 多跳报价失败，尝试 V2 兜底');
+            const tokenInV2 = params.v2Path[0];
+            const tokenOutV2 = params.v2Path[params.v2Path.length - 1];
+            const v2Result = await quoteV2(provider, tokenInV2, tokenOutV2, sellAmountWei, XLAYER_CHAIN_NAME);
+            if (v2Result.amountOut > 0n) {
+                console.log(`[XLayer quoteSellOutput] V2 多跳兜底成功: ${ethers.formatEther(v2Result.amountOut)} OKB`);
+                return v2Result.amountOut;
+            }
+        }
         throw new Error(`V3 多跳报价失败`);
     }
     throw new Error(`不支持的路由类型: ${routeParams.routeType}`);
@@ -458,7 +483,7 @@ export async function xlayerQuickBatchSwapMerkle(params) {
 }
 // ==================== XLayer 交叉换手 ====================
 export async function xlayerCrossSwapMerkle(params) {
-    const { sellerPrivateKeys, sellAmounts, buyerPrivateKeys, tokenAddress, routeParams, config, quoteToken, quoteTokenDecimals = 18, buyersPerSell, disperseHopCount = 0 } = params;
+    const { sellerPrivateKeys, sellAmounts, buyerPrivateKeys, tokenAddress, routeParams, config, quoteToken, quoteTokenDecimals = 18, buyersPerSell, disperseHopCount = 0, startNonces: inputNonces } = params;
     if (sellerPrivateKeys.length === 0)
         throw new Error('至少需要一个卖方');
     if (sellerPrivateKeys.length !== sellAmounts.length)
@@ -469,16 +494,28 @@ export async function xlayerCrossSwapMerkle(params) {
     const nonceManager = new NonceManager(context.provider);
     const allSellerWallets = sellerPrivateKeys.map(pk => new Wallet(pk, context.provider));
     const allBuyerWallets = buyerPrivateKeys.map(pk => new Wallet(pk, context.provider));
-    // 预先获取所有钱包的初始 nonce
+    // ✅ 优先使用前端传入的 nonce，避免 nonce 不同步
     const addressToNonce = new Map();
     for (const wallet of allSellerWallets) {
         if (!addressToNonce.has(wallet.address)) {
-            addressToNonce.set(wallet.address, await nonceManager.getNextNonce(wallet));
+            const inputNonce = inputNonces?.get(wallet.address.toLowerCase()) ?? inputNonces?.get(wallet.address);
+            if (inputNonce !== undefined) {
+                addressToNonce.set(wallet.address, inputNonce);
+            }
+            else {
+                addressToNonce.set(wallet.address, await nonceManager.getNextNonce(wallet));
+            }
         }
     }
     for (const wallet of allBuyerWallets) {
         if (!addressToNonce.has(wallet.address)) {
-            addressToNonce.set(wallet.address, await nonceManager.getNextNonce(wallet));
+            const inputNonce = inputNonces?.get(wallet.address.toLowerCase()) ?? inputNonces?.get(wallet.address);
+            if (inputNonce !== undefined) {
+                addressToNonce.set(wallet.address, inputNonce);
+            }
+            else {
+                addressToNonce.set(wallet.address, await nonceManager.getNextNonce(wallet));
+            }
         }
     }
     console.log(`[xlayerCrossSwapMerkle] 初始化: ${sellerPrivateKeys.length} 卖方, ${buyerPrivateKeys.length} 买方`);

package/package.json

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