four-flap-meme-sdk 2.2.7 → 2.2.10

package/dist/chains/xlayer/eip7702/bundle-sell.js

@@ -6,9 +6,9 @@
  *
  * 只生成签名，由调用方决定如何提交
  */
-import { ethers, Contract } from 'ethers';
+import { ethers, Contract, JsonRpcProvider } from 'ethers';
 import { getCachedProvider, createWallet, signAuthorizationsWithNonces, batchGetNonces, buildEIP7702TransactionSync, calculateProfitAmountByUserType, getProfitRecipient, } from './utils.js';
-import { UNIFIED_DELEGATE_ADDRESS, POTATOSWAP_V2_ROUTER, POTATOSWAP_V3_ROUTER, FLAP_PORTAL_ADDRESS, WOKB_ADDRESS, V3_FEE_TIERS, UNIFIED_DELEGATE_ABI, FLAP_PORTAL_ABI, ERC20_ABI, XLAYER_RPC_URL, } from './constants.js';
+import { UNIFIED_DELEGATE_ADDRESS, POTATOSWAP_V2_ROUTER, POTATOSWAP_V3_ROUTER, FLAP_PORTAL_ADDRESS, WOKB_ADDRESS, V3_FEE_TIERS, UNIFIED_DELEGATE_ABI, FLAP_PORTAL_ABI, ERC20_ABI, XLAYER_RPC_URL, XLAYER_CHAIN_ID, } from './constants.js';
 import { quoteV2, quoteV3 } from '../../../utils/quote-helpers.js';
 // ========================================
 // 路由地址获取
@@ -39,7 +39,7 @@ function getDefaultRouter(tradeType) {
 async function quoteSellOutput(totalSellAmount, tokenAddress, tradeType, fee, rpcUrl) {
     if (totalSellAmount <= 0n)
         return 0n;
-    const provider = getCachedProvider(rpcUrl || XLAYER_RPC_URL);
+    const provider = new JsonRpcProvider(rpcUrl || XLAYER_RPC_URL, { chainId: XLAYER_CHAIN_ID, name: 'xlayer', ensAddress: undefined });
     try {
         switch (tradeType) {
             case 'FLAP': {
@@ -48,10 +48,11 @@ async function quoteSellOutput(totalSellAmount, tokenAddress, tradeType, fee, rp
                 // 先尝试 quoteSell（Token → OKB）
                 try {
                     const okbOut = await portalContract.quoteSell(tokenAddress, totalSellAmount);
+                    console.log(`[Bundle Sell] FLAP quoteSell 成功: ${ethers.formatEther(okbOut)} OKB`);
                     return BigInt(okbOut.toString());
                 }
                 catch {
-                    // fallback to quoteExactInput
+                    console.warn(`[Bundle Sell] FLAP quoteSell 失败，尝试 quoteExactInput...`);
                 }
                 // 再尝试 quoteExactInput
                 try {
@@ -60,14 +61,16 @@ async function quoteSellOutput(totalSellAmount, tokenAddress, tradeType, fee, rp
                         outputToken: ethers.ZeroAddress, // OKB
                         inputAmount: totalSellAmount,
                     });
+                    console.log(`[Bundle Sell] FLAP quoteExactInput 成功: ${ethers.formatEther(okbOut)} OKB`);
                     return BigInt(okbOut.toString());
                 }
                 catch {
-                    // fallback to V2
+                    console.warn(`[Bundle Sell] FLAP quoteExactInput 失败，尝试 V2...`);
                 }
                 // 回退到 V2
                 const v2Result = await quoteV2(provider, tokenAddress, WOKB_ADDRESS, totalSellAmount, 'XLAYER');
                 if (v2Result.amountOut > 0n) {
+                    console.log(`[Bundle Sell] FLAP 回退 V2 报价成功: ${ethers.formatEther(v2Result.amountOut)} OKB`);
                     return v2Result.amountOut;
                 }
                 break;
@@ -75,6 +78,7 @@ async function quoteSellOutput(totalSellAmount, tokenAddress, tradeType, fee, rp
             case 'V2': {
                 const result = await quoteV2(provider, tokenAddress, WOKB_ADDRESS, totalSellAmount, 'XLAYER');
                 if (result.amountOut > 0n) {
+                    console.log(`[Bundle Sell] V2 报价成功: ${ethers.formatEther(result.amountOut)} OKB`);
                     return result.amountOut;
                 }
                 break;
@@ -82,20 +86,23 @@ async function quoteSellOutput(totalSellAmount, tokenAddress, tradeType, fee, rp
             case 'V3': {
                 const result = await quoteV3(provider, tokenAddress, WOKB_ADDRESS, totalSellAmount, 'XLAYER', fee);
                 if (result.amountOut > 0n) {
+                    console.log(`[Bundle Sell] V3 报价成功 (fee=${result.fee}): ${ethers.formatEther(result.amountOut)} OKB`);
                     return result.amountOut;
                 }
                 // 回退到 V2
                 const v2Result = await quoteV2(provider, tokenAddress, WOKB_ADDRESS, totalSellAmount, 'XLAYER');
                 if (v2Result.amountOut > 0n) {
+                    console.log(`[Bundle Sell] V3 回退 V2 报价成功: ${ethers.formatEther(v2Result.amountOut)} OKB`);
                     return v2Result.amountOut;
                 }
                 break;
             }
         }
     }
-    catch {
-        // quote failed, return 0
+    catch (error) {
+        console.error(`[Bundle Sell] 报价失败:`, error);
     }
+    console.warn(`[Bundle Sell] 无法获取报价，利润计算可能不准确`);
     return 0n;
 }
 // ========================================
@@ -106,8 +113,22 @@ async function getTokenBalances(wallets, tokenAddress) {
     if (!provider)
         throw new Error('Wallet has no provider');
     const tokenContract = new Contract(tokenAddress, ERC20_ABI, provider);
-    const balances = await Promise.all(wallets.map((w) => tokenContract.balanceOf(w.address)));
-    return balances.map((b) => BigInt(b.toString()));
+    const balances = await Promise.all(wallets.map(w => tokenContract.balanceOf(w.address)));
+    return balances.map(b => BigInt(b.toString()));
+}
+// ========================================
+// 卖出数量计算
+// ========================================
+async function calculateSellAmounts(wallets, tokenAddress, sellAmounts, sellPercent, tokenDecimals = 18) {
+    if (sellAmounts && sellAmounts.length === wallets.length) {
+        return sellAmounts.map(amt => ethers.parseUnits(amt, tokenDecimals));
+    }
+    const balances = await getTokenBalances(wallets, tokenAddress);
+    if (sellPercent !== undefined && sellPercent > 0) {
+        const percent = Math.min(100, Math.max(0, sellPercent));
+        return balances.map(b => (b * BigInt(percent)) / 100n);
+    }
+    return balances;
 }
 // ========================================
 // FLAP 内盘卖出
@@ -123,22 +144,18 @@ function buildFlapSellCalls(wallets, sellAmounts, tokenAddress) {
             continue;
         // ✅ 使用 swapExactInput 卖出（与 AA 模式保持一致）
         // outputToken = 0x0 表示卖出换取原生代币 (OKB)
-        const portalCallData = portalInterface.encodeFunctionData('swapExactInput', [
-            {
+        const portalCallData = portalInterface.encodeFunctionData('swapExactInput', [{
                 inputToken: tokenAddress,
                 outputToken: ethers.ZeroAddress, // 0x0 = OKB
                 inputAmount: amount,
                 minOutputAmount: 0n, // 无滑点保护
                 permitData: '0x', // 无 permit
-            },
-        ]);
-        const batchCalls = [
-            {
+            }]);
+        const batchCalls = [{
                 target: FLAP_PORTAL_ADDRESS,
                 value: 0n,
                 data: portalCallData,
-            },
-        ];
+            }];
         const callData = delegateInterface.encodeFunctionData('executeBatch', [batchCalls]);
         calls.push({
             target: wallet.address, // 以钱包身份调用，OKB 收益会到钱包
@@ -163,7 +180,11 @@ function buildV2SellCalls(wallets, sellAmounts, tokenAddress, routerAddress) {
         if (amount <= 0n)
             continue;
         // 使用 UnifiedDelegate 的 executeSellV2 函数
-        const callData = delegateInterface.encodeFunctionData('executeSellV2', [routerAddress, path, amount]);
+        const callData = delegateInterface.encodeFunctionData('executeSellV2', [
+            routerAddress,
+            path,
+            amount,
+        ]);
         calls.push({
             target: wallet.address,
             allowFailure: false,
@@ -214,6 +235,46 @@ function buildSellCalls(wallets, sellAmounts, tokenAddress, tradeType, routerAdd
             return buildV3SellCalls(wallets, sellAmounts, tokenAddress, routerAddress, fee);
     }
 }
+// ========================================
+// 批量卖出主函数
+// ========================================
+/**
+ * 批量卖出 - 生成签名后的交易
+ *
+ * @param params 卖出参数
+ * @returns 签名后的交易和元数据
+ *
+ * @example
+ * // FLAP 内盘卖出
+ * const result = await bundleSell({
+ *   mainPrivateKey: '0x...',
+ *   privateKeys: ['0x...', '0x...'],
+ *   sellPercent: 100, // 卖出 100%
+ *   tokenAddress: '0x...',
+ *   tradeType: 'FLAP',
+ * });
+ *
+ * @example
+ * // V2 卖出
+ * const result = await bundleSell({
+ *   mainPrivateKey: '0x...',
+ *   privateKeys: ['0x...', '0x...'],
+ *   sellPercent: 50, // 卖出 50%
+ *   tokenAddress: '0x...',
+ *   tradeType: 'V2',
+ * });
+ *
+ * @example
+ * // V3 卖出（默认）
+ * const result = await bundleSell({
+ *   mainPrivateKey: '0x...',
+ *   privateKeys: ['0x...', '0x...'],
+ *   sellAmounts: ['100', '200'], // 指定数量
+ *   tokenAddress: '0x...',
+ *   tradeType: 'V3',
+ *   fee: 2500,
+ * });
+ */
 export async function bundleSell(params) {
     const { mainPrivateKey, privateKeys, sellAmounts, sellPercent, tokenAddress, tokenDecimals = 18, tradeType = 'V3', routerAddress, fee = V3_FEE_TIERS.MEDIUM, userType = 'v0', // ✅ 用户类型（影响利润率）
     config, } = params;
@@ -225,37 +286,50 @@ export async function bundleSell(params) {
     // 同步操作 - 批量创建钱包
     // ========================================
     const mainWallet = createWallet(mainPrivateKey, provider);
-    const wallets = privateKeys.map((pk) => createWallet(pk, provider));
+    const wallets = privateKeys.map(pk => createWallet(pk, provider));
     const profitRecipient = getProfitRecipient(config);
     // 确定需要授权的钱包
-    const mainWalletIndex = wallets.findIndex((w) => w.address.toLowerCase() === mainWallet.address.toLowerCase());
-    const allWallets = mainWalletIndex === -1 ? [mainWallet, ...wallets] : wallets;
+    const mainWalletIndex = wallets.findIndex(w => w.address.toLowerCase() === mainWallet.address.toLowerCase());
+    const allWallets = mainWalletIndex === -1
+        ? [mainWallet, ...wallets]
+        : wallets;
     // ========================================
     // 并行获取所有异步数据
     // ========================================
-    const allAddresses = allWallets.map((w) => w.address);
+    const allAddresses = allWallets.map(w => w.address);
     // 判断是否需要查询代币余额
     const needBalanceQuery = !sellAmounts || sellAmounts.length !== wallets.length;
     // 构建并行请求
-    const [walletNonces, mainNonce, feeData, tokenBalances] = await Promise.all([
+    const parallelPromises = [
+        // 1. 批量获取授权钱包的 nonce
         batchGetNonces(allAddresses, provider),
+        // 2. 获取主钱包的交易 nonce
         provider.getTransactionCount(mainWallet.address, 'pending'),
+        // 3. 获取 gas 费用数据
         provider.getFeeData(),
-        needBalanceQuery ? getTokenBalances(wallets, tokenAddress) : Promise.resolve(null),
-    ]);
+    ];
+    // 4. 如果需要查询余额，并行获取
+    if (needBalanceQuery) {
+        parallelPromises.push(getTokenBalances(wallets, tokenAddress));
+    }
+    const results = await Promise.all(parallelPromises);
+    const walletNonces = results[0];
+    const mainNonce = results[1];
+    const feeData = results[2];
+    const tokenBalances = needBalanceQuery ? results[3] : null;
     // ========================================
     // 同步计算卖出数量
     // ========================================
     let sellAmountsWei;
     if (sellAmounts && sellAmounts.length === wallets.length) {
         // 直接解析指定的卖出数量
-        sellAmountsWei = sellAmounts.map((amt) => ethers.parseUnits(amt, tokenDecimals));
+        sellAmountsWei = sellAmounts.map(amt => ethers.parseUnits(amt, tokenDecimals));
     }
     else if (tokenBalances) {
         // 使用查询到的余额
         if (sellPercent !== undefined && sellPercent > 0) {
             const percent = Math.min(100, Math.max(0, sellPercent));
-            sellAmountsWei = tokenBalances.map((b) => (b * BigInt(percent)) / 100n);
+            sellAmountsWei = tokenBalances.map(b => (b * BigInt(percent)) / 100n);
         }
         else {
             sellAmountsWei = tokenBalances;
@@ -270,7 +344,12 @@ export async function bundleSell(params) {
     // 1. 先获取报价：卖出 totalSellAmount 代币能得到多少 OKB
     const estimatedOkbOut = await quoteSellOutput(totalSellAmount, tokenAddress, tradeType, fee, config?.rpcUrl);
     // 2. 基于预估的 OKB 输出计算利润（单边模式，isDoubleMode = false）
-    const profitAmount = estimatedOkbOut > 0n ? calculateProfitAmountByUserType(estimatedOkbOut, userType, false) : 0n;
+    const profitAmount = estimatedOkbOut > 0n
+        ? calculateProfitAmountByUserType(estimatedOkbOut, userType, false)
+        : 0n;
+    console.log(`[Bundle Sell] 卖出数量: ${ethers.formatUnits(totalSellAmount, tokenDecimals)} Token`);
+    console.log(`[Bundle Sell] 预估获得: ${ethers.formatEther(estimatedOkbOut)} OKB`);
+    console.log(`[Bundle Sell] 利润: ${ethers.formatEther(profitAmount)} OKB (userType=${userType})`);
     // ========================================
     // 同步构建授权和调用
     // ========================================
@@ -309,7 +388,10 @@ export async function bundleSell(params) {
                 target: wallets[i].address,
                 allowFailure: false,
                 value: 0n,
-                callData: delegateInterface.encodeFunctionData('transferAmount', [profitRecipient, walletProfit]),
+                callData: delegateInterface.encodeFunctionData('transferAmount', [
+                    profitRecipient,
+                    walletProfit,
+                ]),
             });
         }
     }

package/dist/chains/xlayer/eip7702/bundle-swap.d.ts

@@ -9,7 +9,28 @@
  * 支持 FLAP 内盘、V2 和 V3 三种交易类型
  * 只生成签名，由调用方决定如何提交
  */
-import type { BundleBatchSwapParams, BundleMultiSwapParams, BundleMultiSwapResult, BundleSwapParams, BundleSwapResult } from './types.js';
+import type { BundleSwapParams as BaseBundleSwapParams, BundleBatchSwapParams as BaseBundleBatchSwapParams, BundleSwapResult, TradeType, EIP7702Config } from './types.js';
+export interface BundleSwapParams extends BaseBundleSwapParams {
+    /** 用户类型（影响利润率） */
+    userType?: UserType;
+    /**
+     * 是否使用资金利用率模式（默认 false）
+     * - false（普通模式）: 卖家卖出 OKB 留在卖家账户，买家用自己预存的 OKB 买入
+     * - true（资金利用率模式）: 卖家卖出的 OKB 通过多跳转账给买家，买家用收到的 OKB 买入
+     */
+    useFundUtilization?: boolean;
+}
+export interface BundleBatchSwapParams extends BaseBundleBatchSwapParams {
+    /** 用户类型（影响利润率） */
+    userType?: UserType;
+    /**
+     * 是否使用资金利用率模式（默认 false）
+     * - false（普通模式）: 卖家卖出 OKB 留在卖家账户，买家用自己预存的 OKB 买入
+     * - true（资金利用率模式）: 卖家卖出的 OKB 通过多跳转账给买家，买家用收到的 OKB 买入
+     */
+    useFundUtilization?: boolean;
+}
+import { type UserType } from './utils.js';
 /**
  * 捆绑换手 - 生成签名后的交易
  *
@@ -27,7 +48,6 @@ import type { BundleBatchSwapParams, BundleMultiSwapParams, BundleMultiSwapResul
  *   hopCount: 2,
  * });
  */
-export type { BundleSwapParams, BundleBatchSwapParams } from './types.js';
 export declare function bundleSwap(params: BundleSwapParams): Promise<BundleSwapResult>;
 /**
  * 批量换手（一卖多买）- 生成签名后的交易
@@ -46,7 +66,49 @@ export declare function bundleSwap(params: BundleSwapParams): Promise<BundleSwap
  * });
  */
 export declare function bundleBatchSwap(params: BundleBatchSwapParams): Promise<BundleSwapResult>;
-export type { BundleMultiSwapParams, BundleMultiSwapResult } from './types.js';
+export interface BundleMultiSwapParams {
+    /** Payer 钱包私钥（支付 Gas 费） */
+    mainPrivateKey: string;
+    /** 卖出钱包私钥列表 */
+    sellerPrivateKeys: string[];
+    /** 买入钱包私钥列表 */
+    buyerPrivateKeys: string[];
+    /** 买入总金额 (OKB) */
+    totalBuyAmount: string;
+    /** 代币地址 */
+    tokenAddress: string;
+    /** 代币精度 */
+    tokenDecimals?: number;
+    /** 卖出百分比（1-100，默认 100） */
+    sellPercent?: number;
+    /** 交易类型：FLAP 内盘 / V2 / V3（默认 V3） */
+    tradeType?: TradeType;
+    /** 路由地址（可选，根据 tradeType 自动选择） */
+    routerAddress?: string;
+    /** V3 费率（可选，默认 2500，仅 V3 使用） */
+    fee?: number;
+    /** 用户类型（影响利润率） */
+    userType?: UserType;
+    /** 配置 */
+    config?: EIP7702Config;
+}
+export interface BundleMultiSwapResult {
+    /** 签名后的交易 */
+    signedTransaction: string;
+    /** 元数据 */
+    metadata: {
+        payerAddress: string;
+        sellerAddresses: string[];
+        buyerAddresses: string[];
+        sellerCount: number;
+        buyerCount: number;
+        totalBuyAmount: string;
+        totalSellAmount: string;
+        profitAmount: string;
+        profitRecipient: string;
+        userType: string;
+    };
+}
 /**
  * 多对多换手 - 多个卖家 + 多个买家
  *