four-flap-meme-sdk 2.2.0 → 2.2.2

package/dist/chains/xlayer/eoa/eoa-wash-volume.js

@@ -11,9 +11,8 @@
  * 支持池子类型：V2, V3
  */
 import { ethers, Wallet, Contract } from 'ethers';
-import { createXLayerProvider } from '../../../utils/provider-factory.js';
-import { directV2BatchBuy, directV2BatchSell, directV3BatchBuy, directV3BatchSell, } from '../../../dex/direct-router.js';
-import { getProfitRecipient } from '../../../shared/constants/index.js';
+import { directV2BatchBuy, directV2BatchSell, directV3BatchBuy, directV3BatchSell } from '../../../dex/direct-router.js';
+import { PROFIT_CONFIG } from '../../../utils/constants.js';
 // ============================================================================
 // 辅助函数
 // ============================================================================
@@ -55,8 +54,8 @@ export async function signEoaWashBuyTransactions(params) {
         throw new Error('[signEoaWashBuyTransactions] 私钥数量与买入金额数量不一致');
     }
     // 创建钱包
-    const provider = createXLayerProvider(config.rpcUrl);
-    const wallets = privateKeys.map((pk) => new Wallet(pk, provider));
+    const provider = new ethers.JsonRpcProvider(config.rpcUrl);
+    const wallets = privateKeys.map(pk => new Wallet(pk, provider));
     let result;
     if (poolType === 'V2') {
         result = await directV2BatchBuy({
@@ -70,7 +69,7 @@ export async function signEoaWashBuyTransactions(params) {
             config: {
                 ...config,
                 skipProfit: true, // 买入时不刮取利润（卖出时刮取）
-            },
+            }
         });
     }
     else {
@@ -87,9 +86,10 @@ export async function signEoaWashBuyTransactions(params) {
             config: {
                 ...config,
                 skipProfit: true, // 买入时不刮取利润（卖出时刮取）
-            },
+            }
         });
     }
+    console.log(`[signEoaWashBuyTransactions] 签名 ${result.signedTransactions.length} 笔买入交易`);
     return {
         signedTransactions: result.signedTransactions,
         wallets,
@@ -107,32 +107,35 @@ export async function signEoaWashBuyTransactions(params) {
  */
 export async function signEoaWashSellTransactions(params, wallets, tokenDecimals) {
     const { tokenAddress, poolType, routerAddress, quoteToken, config } = params;
-    const provider = createXLayerProvider(config.rpcUrl);
+    const provider = new ethers.JsonRpcProvider(config.rpcUrl);
     // 获取代币精度
-    const decimals = tokenDecimals ?? (await getTokenDecimals(provider, tokenAddress));
+    const decimals = tokenDecimals ?? await getTokenDecimals(provider, tokenAddress);
+    console.log(`[signEoaWashSellTransactions] 代币精度: ${decimals}`);
     // 查询所有钱包的代币余额
-    const balancesWei = await Promise.all(wallets.map((w) => getTokenBalance(provider, tokenAddress, w.address)));
+    const balancesWei = await Promise.all(wallets.map(w => getTokenBalance(provider, tokenAddress, w.address)));
     // 转换为格式化金额
-    const sellAmounts = balancesWei.map((balance) => {
+    const sellAmounts = balancesWei.map(balance => {
         if (balance <= 0n)
             return '0';
         return ethers.formatUnits(balance, decimals);
     });
+    console.log(`[signEoaWashSellTransactions] 钱包余额:`, sellAmounts);
     // 过滤出有余额的钱包
     const validIndices = sellAmounts
         .map((amt, i) => ({ amt, i }))
         .filter(({ amt }) => parseFloat(amt) > 0)
         .map(({ i }) => i);
     if (validIndices.length === 0) {
+        console.warn('[signEoaWashSellTransactions] 所有钱包余额为 0，无法卖出');
         return {
             signedTransactions: [],
             profitHopWallets: [],
             profitAmount: '0',
-            profitRecipient: getProfitRecipient(),
+            profitRecipient: PROFIT_CONFIG.RECIPIENT,
         };
     }
-    const validPrivateKeys = validIndices.map((i) => wallets[i].privateKey);
-    const validSellAmounts = validIndices.map((i) => sellAmounts[i]);
+    const validPrivateKeys = validIndices.map(i => wallets[i].privateKey);
+    const validSellAmounts = validIndices.map(i => sellAmounts[i]);
     let result;
     if (poolType === 'V2') {
         result = await directV2BatchSell({
@@ -145,7 +148,7 @@ export async function signEoaWashSellTransactions(params, wallets, tokenDecimals
             config: {
                 ...config,
                 // ✅ 卖出时正常刮取利润（XLayer 不使用多跳，直接转账）
-            },
+            }
         });
     }
     else {
@@ -161,14 +164,15 @@ export async function signEoaWashSellTransactions(params, wallets, tokenDecimals
             config: {
                 ...config,
                 // ✅ 卖出时正常刮取利润（XLayer 不使用多跳，直接转账）
-            },
+            }
         });
     }
+    console.log(`[signEoaWashSellTransactions] 签名 ${result.signedTransactions.length} 笔卖出交易（含利润）`);
     return {
         signedTransactions: result.signedTransactions,
         profitHopWallets: result.profitHopWallets ?? [],
         profitAmount: result.metadata?.profitAmount ?? '0',
-        profitRecipient: result.metadata?.profitRecipient ?? getProfitRecipient(),
+        profitRecipient: result.metadata?.profitRecipient ?? PROFIT_CONFIG.RECIPIENT,
     };
 }
 /**
@@ -186,12 +190,13 @@ export async function signEoaWashVolumeTransactions(params) {
     // 第一步：签名买入交易
     const buyResult = await signEoaWashBuyTransactions(params);
     // 注意：这里的卖出签名是基于预估的，实际使用时应该在买入确认后重新签名
+    console.log(`[signEoaWashVolumeTransactions] ⚠️ 注意：卖出签名应在买入确认后根据实际余额重新生成`);
     // 暂时返回空的卖出签名（实际使用时应该在买入确认后调用 signEoaWashSellTransactions）
     return {
         buySignedTransactions: buyResult.signedTransactions,
         sellSignedTransactions: [], // 需要在买入确认后重新签名
         profitHopWallets: [],
         profitAmount: '0',
-        profitRecipient: getProfitRecipient(),
+        profitRecipient: PROFIT_CONFIG.RECIPIENT,
     };
 }

package/dist/chains/xlayer/eoa/index.d.ts

@@ -11,18 +11,14 @@
  */
 export * from './constants.js';
 export * from './types.js';
-import { createPortalQuery } from './portal-ops.js';
-import { xlayerQuickBatchSwapMerkle, xlayerCrossSwapMerkle, xlayerPureCrossSwapMerkle } from './eoa-bundle-swap.js';
-import { signEoaWashVolumeTransactions } from './eoa-wash-volume.js';
 export { encodeBuyCall, encodeBuyCallV3, encodeSellCall, encodeApproveCall, encodeTransferCall, PortalQuery, createPortalQuery, applySlippage, formatOkb, parseOkb, formatTokenAmount, parseTokenAmount, type PortalQueryConfig, } from './portal-ops.js';
 export { signEoaWashBuyTransactions, signEoaWashSellTransactions, signEoaWashVolumeTransactions, type EoaWashPoolType, type EoaWashVolumeParams, type EoaWashVolumeResult, } from './eoa-wash-volume.js';
-export { xlayerQuickBatchSwapMerkle, xlayerCrossSwapMerkle, xlayerPureCrossSwapMerkle, type XLayerPureCrossSwapParams, type XLayerPureCrossSwapResult, } from './eoa-bundle-swap.js';
-export type { XLayerEoaSwapConfig, XLayerQuickBatchSwapParams, XLayerQuickBatchSwapResult, XLayerCrossSwapParams, XLayerCrossSwapResult, UserType as XLayerUserType, RouteParams as XLayerRouteParams, V2RouteParams as XLayerV2RouteParams, V3SingleRouteParams as XLayerV3SingleRouteParams, V3MultiRouteParams as XLayerV3MultiRouteParams, } from './eoa-bundle-swap-helpers.js';
+export { xlayerQuickBatchSwapMerkle, xlayerCrossSwapMerkle, xlayerPureCrossSwapMerkle, type XLayerEoaSwapConfig, type XLayerQuickBatchSwapParams, type XLayerQuickBatchSwapResult, type XLayerCrossSwapParams, type XLayerCrossSwapResult, type XLayerPureCrossSwapParams, type XLayerPureCrossSwapResult, type UserType as XLayerUserType, type RouteParams as XLayerRouteParams, type V2RouteParams as XLayerV2RouteParams, type V3SingleRouteParams as XLayerV3SingleRouteParams, } from './eoa-bundle-swap.js';
 export declare const xlayer: {
-    createPortalQuery: typeof createPortalQuery;
-    xlayerQuickBatchSwapMerkle: typeof xlayerQuickBatchSwapMerkle;
-    xlayerCrossSwapMerkle: typeof xlayerCrossSwapMerkle;
-    xlayerPureCrossSwapMerkle: typeof xlayerPureCrossSwapMerkle;
-    signEoaWashVolumeTransactions: typeof signEoaWashVolumeTransactions;
+    createPortalQuery: (config?: import("./portal-ops.js").PortalQueryConfig | undefined) => Promise<import("./portal-ops.js").PortalQuery>;
+    xlayerQuickBatchSwapMerkle: (params: import("./eoa-bundle-swap.js").XLayerQuickBatchSwapParams) => Promise<import("./eoa-bundle-swap.js").XLayerQuickBatchSwapResult>;
+    xlayerCrossSwapMerkle: (params: import("./eoa-bundle-swap.js").XLayerCrossSwapParams) => Promise<import("./eoa-bundle-swap.js").XLayerCrossSwapResult>;
+    xlayerPureCrossSwapMerkle: (params: import("./eoa-bundle-swap.js").XLayerPureCrossSwapParams) => Promise<import("./eoa-bundle-swap.js").XLayerPureCrossSwapResult>;
+    signEoaWashVolumeTransactions: (params: import("./eoa-wash-volume.js").EoaWashVolumeParams) => Promise<import("./eoa-wash-volume.js").EoaWashVolumeResult>;
 };
 export default xlayer;

package/dist/chains/xlayer/eoa/index.js

@@ -17,9 +17,6 @@ export * from './constants.js';
 // 类型
 // ============================================================================
 export * from './types.js';
-import { createPortalQuery } from './portal-ops.js';
-import { xlayerQuickBatchSwapMerkle, xlayerCrossSwapMerkle, xlayerPureCrossSwapMerkle } from './eoa-bundle-swap.js';
-import { signEoaWashVolumeTransactions } from './eoa-wash-volume.js';
 // ============================================================================
 // Portal 操作
 // ============================================================================
@@ -36,10 +33,28 @@ export { xlayerQuickBatchSwapMerkle, xlayerCrossSwapMerkle, xlayerPureCrossSwapM
 // 便捷重导出
 // ============================================================================
 export const xlayer = {
-    createPortalQuery,
-    xlayerQuickBatchSwapMerkle,
-    xlayerCrossSwapMerkle,
-    xlayerPureCrossSwapMerkle,
-    signEoaWashVolumeTransactions,
+    // Portal 查询
+    createPortalQuery: async (...args) => {
+        const { createPortalQuery } = await import('./portal-ops.js');
+        return createPortalQuery(...args);
+    },
+    // EOA 换手
+    xlayerQuickBatchSwapMerkle: async (...args) => {
+        const { xlayerQuickBatchSwapMerkle } = await import('./eoa-bundle-swap.js');
+        return xlayerQuickBatchSwapMerkle(...args);
+    },
+    xlayerCrossSwapMerkle: async (...args) => {
+        const { xlayerCrossSwapMerkle } = await import('./eoa-bundle-swap.js');
+        return xlayerCrossSwapMerkle(...args);
+    },
+    xlayerPureCrossSwapMerkle: async (...args) => {
+        const { xlayerPureCrossSwapMerkle } = await import('./eoa-bundle-swap.js');
+        return xlayerPureCrossSwapMerkle(...args);
+    },
+    // EOA 刷量
+    signEoaWashVolumeTransactions: async (...args) => {
+        const { signEoaWashVolumeTransactions } = await import('./eoa-wash-volume.js');
+        return signEoaWashVolumeTransactions(...args);
+    },
 };
 export default xlayer;

package/dist/chains/xlayer/eoa/portal-ops.js

@@ -165,9 +165,6 @@ export function encodeCreateCallV5(params) {
  * - 代币状态
  */
 export class PortalQuery {
-    provider;
-    portal;
-    portalAddress;
     constructor(config = {}) {
         const rpcUrl = config.rpcUrl ?? DEFAULT_RPC_URL;
         const chainId = config.chainId ?? XLAYER_CHAIN_ID;
@@ -449,10 +446,8 @@ export function applySlippage(expectedOutput, slippageBps) {
  */
 export function lpFeeProfileToV3Fee(profile) {
     switch (profile) {
-        case 1:
-            return 100; // 0.01%
-        case 2:
-            return 10000; // 1%
+        case 1: return 100; // 0.01%
+        case 2: return 10000; // 1%
         case 0:
         default:
             return 2500; // 0.25%

package/dist/chains/xlayer/eoa/router-manager.js

@@ -2,7 +2,7 @@
  * XLayer Router 管理器
  * 统一管理 V2/V3 Router 地址和授权目标选择逻辑
  */
-import { POTATOSWAP_V2_ROUTER, POTATOSWAP_V3_ROUTER, FLAP_PORTAL } from './constants.js';
+import { POTATOSWAP_V2_ROUTER, POTATOSWAP_V3_ROUTER, FLAP_PORTAL, } from './constants.js';
 /**
  * ✅ 获取 Router 地址
  * @param params.routerVersion - Router 版本（V2 或 V3）
@@ -49,9 +49,9 @@ export function getApprovalTargetAddress(target) {
  * @returns 目标信息数组
  */
 export function getAllApprovalTargets(targets) {
-    return targets.map((target) => ({
+    return targets.map(target => ({
         target,
-        address: getApprovalTargetAddress(target),
+        address: getApprovalTargetAddress(target)
     }));
 }
 /**

package/dist/chains/xlayer/eoa/types.d.ts

@@ -100,12 +100,12 @@ export interface XLayerConfig {
     extractProfit?: boolean;
     /**
      * 利润比例（基点 bps，1 bps = 0.01%）
-     * - 默认使用 `getProfitRateBps('normal')`
+     * - 默认使用公共常量 PROFIT_CONFIG.RATE_BPS（当前为 30 bps）
      */
     profitBps?: number;
     /**
      * 利润接收地址
-     * - 默认使用 `getProfitRecipient()`
+     * - 默认使用公共常量 PROFIT_CONFIG.RECIPIENT
      */
     profitRecipient?: string;
     /**

package/dist/chains/xlayer/eoa/types.js

@@ -15,7 +15,9 @@
  * - 对“可能不生成 op”的分支（例如 withdraw 返回 null），使用 peek + commit，避免提前消耗 nonce。
  */
 export class AANonceMap {
-    nextBySenderLower = new Map();
+    constructor() {
+        this.nextBySenderLower = new Map();
+    }
     init(sender, startNonce) {
         const k = sender.toLowerCase();
         const cur = this.nextBySenderLower.get(k);

package/dist/chains/xlayer/index.d.ts

@@ -10,6 +10,5 @@ export * as eoa from './eoa/index.js';
 export * as eip7702 from './eip7702/index.js';
 export { PortalQuery, createPortalQuery, xlayerQuickBatchSwapMerkle, xlayerCrossSwapMerkle, xlayerPureCrossSwapMerkle, signEoaWashBuyTransactions, signEoaWashSellTransactions, signEoaWashVolumeTransactions, } from './eoa/index.js';
 export type { BundleSwapParams, BundleSwapSignParams, BundleSwapResult, BundleSwapSignResult, BundleBatchSwapParams, BundleBatchSwapSignParams, BundleBatchSwapResult, BundleBatchSwapSignResult, BuyFirstParams, BuyFirstResult, BuyParams, SellParams, } from './eoa/types.js';
-export * from './eip7702/flat-aliases.js';
-export { default as xlayer, default as XLayer } from './eoa/index.js';
-export { lpFeeProfileToV3Fee } from './eoa/portal-ops.js';
+export { bundleBuy as xlayerEip7702BundleBuy, bundleSell as xlayerEip7702BundleSell, bundleSwap as xlayerEip7702BundleSwap, bundleApprove as xlayerEip7702BundleApprove, bundleCreateBuy as xlayerEip7702BundleCreate, washVolume as xlayerEip7702WashVolume, bundleVolume as xlayerEip7702BundleVolume, } from './eip7702/index.js';
+export { default as xlayer } from './eoa/index.js';

package/dist/chains/xlayer/index.js

@@ -22,9 +22,12 @@ xlayerQuickBatchSwapMerkle, xlayerCrossSwapMerkle, xlayerPureCrossSwapMerkle,
 // EOA 刷量
 signEoaWashBuyTransactions, signEoaWashSellTransactions, signEoaWashVolumeTransactions, } from './eoa/index.js';
 // ============================================================================
-// 快捷导出 - EIP-7702 模式（与包根 `xlayerEip7702*` 别名一致，见 flat-aliases）
+// 快捷导出 - EIP-7702 模式（使用实际名称）
 // ============================================================================
-export * from './eip7702/flat-aliases.js';
+export { 
+// Bundle 操作
+bundleBuy as xlayerEip7702BundleBuy, bundleSell as xlayerEip7702BundleSell, bundleSwap as xlayerEip7702BundleSwap, bundleApprove as xlayerEip7702BundleApprove, bundleCreateBuy as xlayerEip7702BundleCreate, 
+// 刷量
+washVolume as xlayerEip7702WashVolume, bundleVolume as xlayerEip7702BundleVolume, } from './eip7702/index.js';
 // 导出旧模块的默认对象（向后兼容）
-export { default as xlayer, default as XLayer } from './eoa/index.js';
-export { lpFeeProfileToV3Fee } from './eoa/portal-ops.js';
+export { default as xlayer } from './eoa/index.js';

package/dist/contracts/helper3.d.ts

@@ -1,19 +1,4 @@
 import { JsonRpcProvider, Wallet } from 'ethers';
-/** 与 Helper3 `getTokenInfo` 返回值一致（作 `calcBuyAmount` 等函数的 `ti` 入参） */
-export type TokenManagerHelper3TokenInfo = {
-    version: bigint;
-    tokenManager: string;
-    quote: string;
-    lastPrice: bigint;
-    tradingFeeRate: bigint;
-    minTradingFee: bigint;
-    launchTime: bigint;
-    offers: bigint;
-    maxOffers: bigint;
-    funds: bigint;
-    maxFunds: bigint;
-    liquidityAdded: boolean;
-};
 type Providerish = JsonRpcProvider;
 type Signerish = Wallet;
 export declare class Helper3 {
@@ -22,14 +7,14 @@ export declare class Helper3 {
     protected constructor(address: string, provider: Providerish);
     static connectByChain(chain: 'BSC' | 'BASE' | 'ARBITRUM_ONE', rpcUrl: string): Helper3;
     private get contract();
-    getTokenInfo(token: string): Promise<TokenManagerHelper3TokenInfo>;
+    getTokenInfo(token: string): Promise<any>;
     tryBuy(token: string, amount: bigint, funds: bigint): Promise<any>;
     trySell(token: string, amount: bigint): Promise<any>;
     calcInitialPrice(maxRaising: bigint, totalSupply: bigint, offers: bigint, reserves: bigint): Promise<any>;
-    calcBuyAmount(ti: TokenManagerHelper3TokenInfo, funds: bigint): Promise<any>;
-    calcBuyCost(ti: TokenManagerHelper3TokenInfo, amount: bigint): Promise<any>;
-    calcSellCost(ti: TokenManagerHelper3TokenInfo, amount: bigint): Promise<any>;
-    calcTradingFee(ti: TokenManagerHelper3TokenInfo, funds: bigint): Promise<any>;
+    calcBuyAmount(ti: any, funds: bigint): Promise<any>;
+    calcBuyCost(ti: any, amount: bigint): Promise<any>;
+    calcSellCost(ti: any, amount: bigint): Promise<any>;
+    calcTradingFee(ti: any, funds: bigint): Promise<any>;
     getPancakePair(token: string): Promise<any>;
     WETH(): Promise<any>;
     WHITE_LIST(): Promise<any>;

package/dist/contracts/helper3.js

@@ -1,10 +1,7 @@
 import { Contract, JsonRpcProvider, Wallet } from 'ethers';
-import Helper3Abi from '../abis/contracts/TokenManagerHelper3.json' with { type: 'json' };
-import { ADDRESSES } from '../shared/constants/index.js';
-const HELPER3_ABI = Helper3Abi;
+import Helper3Abi from '../shared/abis/TokenManagerHelper3.json' with { type: 'json' };
+import { ADDRESSES } from '../utils/constants.js';
 export class Helper3 {
-    address;
-    provider;
     constructor(address, provider) {
         this.address = address;
         this.provider = provider;
@@ -18,56 +15,25 @@ export class Helper3 {
         return new Helper3(addresses[chain], new JsonRpcProvider(rpcUrl));
     }
     get contract() {
-        return new Contract(this.address, HELPER3_ABI, this.provider);
-    }
-    async getTokenInfo(token) {
-        return await this.contract.getTokenInfo(token);
-    }
-    async tryBuy(token, amount, funds) {
-        return await this.contract.tryBuy(token, amount, funds);
-    }
-    async trySell(token, amount) {
-        return await this.contract.trySell(token, amount);
-    }
-    async calcInitialPrice(maxRaising, totalSupply, offers, reserves) {
-        return await this.contract.calcInitialPrice(maxRaising, totalSupply, offers, reserves);
-    }
-    async calcBuyAmount(ti, funds) {
-        return await this.contract.calcBuyAmount(ti, funds);
-    }
-    async calcBuyCost(ti, amount) {
-        return await this.contract.calcBuyCost(ti, amount);
-    }
-    async calcSellCost(ti, amount) {
-        return await this.contract.calcSellCost(ti, amount);
-    }
-    async calcTradingFee(ti, funds) {
-        return await this.contract.calcTradingFee(ti, funds);
-    }
-    async getPancakePair(token) {
-        return await this.contract.getPancakePair(token);
-    }
-    async WETH() {
-        return await this.contract.WETH();
-    }
-    async WHITE_LIST() {
-        return await this.contract.WHITE_LIST();
-    }
-    async calcEthIn(token, amount) {
-        return await this.contract.calcEthIn(token, amount);
-    }
-    async calcEthOut(token, amount) {
-        return await this.contract.calcEthOut(token, amount);
-    }
-    async calcTokenIn(token, amountEth) {
-        return await this.contract.calcTokenIn(token, amountEth);
-    }
-    async calcTokenOut(token, amountEth) {
-        return await this.contract.calcTokenOut(token, amountEth);
-    }
+        return new Contract(this.address, Helper3Abi, this.provider);
+    }
+    async getTokenInfo(token) { return await this.contract.getTokenInfo(token); }
+    async tryBuy(token, amount, funds) { return await this.contract.tryBuy(token, amount, funds); }
+    async trySell(token, amount) { return await this.contract.trySell(token, amount); }
+    async calcInitialPrice(maxRaising, totalSupply, offers, reserves) { return await this.contract.calcInitialPrice(maxRaising, totalSupply, offers, reserves); }
+    async calcBuyAmount(ti, funds) { return await this.contract.calcBuyAmount(ti, funds); }
+    async calcBuyCost(ti, amount) { return await this.contract.calcBuyCost(ti, amount); }
+    async calcSellCost(ti, amount) { return await this.contract.calcSellCost(ti, amount); }
+    async calcTradingFee(ti, funds) { return await this.contract.calcTradingFee(ti, funds); }
+    async getPancakePair(token) { return await this.contract.getPancakePair(token); }
+    async WETH() { return await this.contract.WETH(); }
+    async WHITE_LIST() { return await this.contract.WHITE_LIST(); }
+    async calcEthIn(token, amount) { return await this.contract.calcEthIn(token, amount); }
+    async calcEthOut(token, amount) { return await this.contract.calcEthOut(token, amount); }
+    async calcTokenIn(token, amountEth) { return await this.contract.calcTokenIn(token, amountEth); }
+    async calcTokenOut(token, amountEth) { return await this.contract.calcTokenOut(token, amountEth); }
 }
 export class Helper3Writer extends Helper3 {
-    signer;
     constructor(address, signer) {
         super(address, signer.provider);
         this.signer = signer;
@@ -82,9 +48,7 @@ export class Helper3Writer extends Helper3 {
         const signer = new Wallet(privateKey, provider);
         return new Helper3Writer(addresses[chain], signer);
     }
-    get writeContract() {
-        return new Contract(this.address, HELPER3_ABI, this.signer);
-    }
+    get writeContract() { return new Contract(this.address, Helper3Abi, this.signer); }
     async buyWithEth(origin, token, to, funds, minAmount) {
         const tx = await this.writeContract.buyWithEth(origin, token, to, funds, minAmount, { value: funds });
         return await tx.wait();

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

@@ -1 +1,26 @@
-export { approveFourTokenManagerBatch, type ApproveFourTokenManagerBatchParams, type ApproveFourTokenManagerBatchResult, } from '../../bundle-core/four-meme/approve-tokenmanager.js';
+import type { FourSignConfig } from './types.js';
+/** ✅ 批量授权参数（直接提交到链上） */
+export type ApproveFourTokenManagerBatchParams = {
+    privateKeys: string[];
+    tokenAddress: string;
+    amounts: string[];
+    config: FourSignConfig;
+};
+/** ✅ 批量授权结果（包含提交状态） */
+export type ApproveFourTokenManagerBatchResult = {
+    success: boolean;
+    signedTransactions: string[];
+    approvedCount: number;
+    skippedCount: number;
+    txHashes?: string[];
+    message: string;
+};
+/**
+ * 批量授权代币给 TokenManager（用于 Private Buy/Sell）
+ * ✅ 直接通过 RPC 提交到链上并等待确认
+ * ✅ 不需要 Merkle API Key，使用普通 RPC 即可
+ * ✅ 专门用于授权给 TokenManagerOriginal 合约
+ * ✅ 用于 fourBatchPrivateSell 和 fourBatchSellWithBundleMerkle
+ * ✅ 优化：并行获取 gasPrice、decimals、allowances
+ */
+export declare function approveFourTokenManagerBatch(params: ApproveFourTokenManagerBatchParams): Promise<ApproveFourTokenManagerBatchResult>;

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

@@ -1 +1,113 @@
-export { approveFourTokenManagerBatch, } from '../../bundle-core/four-meme/approve-tokenmanager.js';
+import { ethers, Wallet } from 'ethers';
+import { NonceManager, getOptimizedGasPrice } from '../../utils/bundle-helpers.js';
+import { ADDRESSES } from '../../utils/constants.js';
+import { ERC20_ABI } from '../../shared/abis/common.js';
+import { getTxType, getGasPriceConfig } from './config.js';
+import { batchCheckAllowances } from '../../utils/erc20.js';
+/**
+ * 批量授权代币给 TokenManager（用于 Private Buy/Sell）
+ * ✅ 直接通过 RPC 提交到链上并等待确认
+ * ✅ 不需要 Merkle API Key，使用普通 RPC 即可
+ * ✅ 专门用于授权给 TokenManagerOriginal 合约
+ * ✅ 用于 fourBatchPrivateSell 和 fourBatchSellWithBundleMerkle
+ * ✅ 优化：并行获取 gasPrice、decimals、allowances
+ */
+export async function approveFourTokenManagerBatch(params) {
+    const { privateKeys, tokenAddress, amounts, config } = params;
+    if (privateKeys.length === 0 || amounts.length !== privateKeys.length) {
+        throw new Error('Private key count and amount count must match');
+    }
+    const tmAddr = ADDRESSES.BSC.TokenManagerOriginal;
+    const chainId = config.chainId ?? 56;
+    // ✅ 直接使用传入的 RPC URL 创建 provider（不依赖 Merkle）
+    const provider = new ethers.JsonRpcProvider(config.rpcUrl, {
+        chainId: chainId,
+        name: 'BSC'
+    });
+    const wallets = privateKeys.map(k => new Wallet(k, provider));
+    const allMax = amounts.every(a => a === 'max');
+    // ✅ 优化：并行获取 gasPrice、decimals（如果需要）、allowances
+    const [gasPrice, decimals, allowances] = await Promise.all([
+        getOptimizedGasPrice(provider, getGasPriceConfig(config)),
+        allMax
+            ? Promise.resolve(18) // 如果都是 'max'，不需要查询 decimals
+            : (async () => {
+                try {
+                    const tokenContract = new ethers.Contract(tokenAddress, ERC20_ABI, provider);
+                    return await tokenContract.decimals();
+                }
+                catch (error) {
+                    throw new Error(`查询代币 decimals 失败: ${error.message}`);
+                }
+            })(),
+        batchCheckAllowances(provider, tokenAddress, wallets.map(w => w.address), tmAddr)
+    ]);
+    const amountsBigInt = amounts.map(a => a === 'max' ? ethers.MaxUint256 : ethers.parseUnits(a, decimals));
+    // 只授权不足的
+    // ✅ 策略：如果授权额度 < MaxUint256 / 2n，就重新授权（确保授权足够大）
+    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) {
+        return {
+            success: true,
+            signedTransactions: [],
+            approvedCount: 0,
+            skippedCount: skippedCount,
+            message: '所有钱包已授权，无需重复授权'
+        };
+    }
+    // ✅ 优化：计算 gasLimit（不需要 RPC）
+    const getGasLimit = (cfg) => {
+        if (cfg.gasLimit)
+            return BigInt(cfg.gasLimit);
+        if (cfg.gasLimitMultiplier)
+            return BigInt(Math.ceil(60000 * cfg.gasLimitMultiplier));
+        return 60000n; // 默认授权 gas limit
+    };
+    const finalGasLimit = getGasLimit(config);
+    const txType = getTxType(config);
+    // ✅ 优化：并行获取 nonces 和构建未签名交易
+    const nonceManager = new NonceManager(provider);
+    const needApprovalTokens = needApproval.map(w => new ethers.Contract(tokenAddress, ERC20_ABI, w));
+    const [nonces, unsignedApprovals] = await Promise.all([
+        nonceManager.getNextNoncesForWallets(needApproval), // ✅ 批量获取 nonces（JSON-RPC 批量请求）
+        Promise.all(needApprovalTokens.map((token, i) => token.approve.populateTransaction(tmAddr, needApprovalAmounts[i])))
+    ]);
+    // ✅ 并行签名所有授权交易
+    const signedTxs = await Promise.all(unsignedApprovals.map((unsigned, i) => needApproval[i].signTransaction({
+        ...unsigned,
+        from: needApproval[i].address,
+        nonce: nonces[i],
+        gasLimit: finalGasLimit,
+        gasPrice,
+        chainId,
+        type: txType
+    })));
+    nonceManager.clearTemp();
+    try {
+        // ✅ 并行广播所有授权交易
+        const txResponses = await Promise.all(signedTxs.map(tx => provider.broadcastTransaction(tx)));
+        const txHashes = txResponses.map(r => r.hash);
+        // ✅ 并行等待所有授权交易确认（至少1个确认）
+        await Promise.all(txResponses.map(tx => tx.wait(1)));
+        return {
+            success: true,
+            signedTransactions: signedTxs,
+            approvedCount: signedTxs.length,
+            skippedCount: skippedCount,
+            txHashes: txHashes,
+            message: `授权成功！共 ${signedTxs.length} 个钱包已授权，跳过 ${skippedCount} 个已授权钱包`
+        };
+    }
+    catch (error) {
+        return {
+            success: false,
+            signedTransactions: signedTxs,
+            approvedCount: 0,
+            skippedCount: skippedCount,
+            message: `授权提交失败: ${error.message}`
+        };
+    }
+}