four-flap-meme-sdk 1.5.38 → 1.5.40

package/dist/xlayer/bundle.d.ts

@@ -7,7 +7,7 @@
  * - 买卖一体化：买入 -> 授权 -> 卖出 -> 归集
  * - OKB 归集：将 sender 的 OKB 转回 owner
  */
-import type { XLayerConfig, BundleBuyParams, BundleBuyResult, BundleSellParams, BundleSellResult, BundleBuySellParams, BundleBuySellResult, BundleCreateBuyParams, BundleCreateBuyResult, BundleCreateBuySignParams, BundleCreateBuySignResult } from './types.js';
+import type { XLayerConfig, BundleBuyParams, BundleBuyResult, BundleSellParams, BundleSellResult, BundleBuySellParams, BundleBuySellResult, BundleCreateBuyParams, BundleCreateBuyResult, BundleCreateBuySignParams, BundleCreateBuySignResult, BundlePreApproveParams, BundlePreApproveResult, ApprovalStatusResult } from './types.js';
 import { AAAccountManager } from './aa-account.js';
 import { PortalQuery } from './portal-ops.js';
 /**
@@ -95,6 +95,39 @@ export declare class BundleExecutor {
      * 捆绑发射代币 + 购买（执行版本）
      */
     bundleCreateBuy(params: BundleCreateBuyParams): Promise<BundleCreateBuyResult>;
+    /**
+     * 检查多个 AA 账户的授权状态
+     *
+     * 用于判断是否需要执行预授权，或查看当前授权进度
+     *
+     * @param tokenAddress - 代币地址
+     * @param privateKeys - Owner 私钥列表
+     * @param spender - 授权目标（默认 FLAP_PORTAL）
+     * @returns 每个地址的授权状态
+     */
+    checkApprovalStatus(tokenAddress: string, privateKeys: string[], spender?: string): Promise<ApprovalStatusResult[]>;
+    /**
+     * 批量预授权
+     *
+     * 提前授权代币给 Portal/Router，避免交易时等待授权确认
+     *
+     * @example
+     * ```typescript
+     * // 预授权给 Portal（用于内盘交易）
+     * const result = await executor.bundlePreApprove({
+     *   tokenAddress: '0x...',
+     *   privateKeys: ['0x...', '0x...'],
+     * });
+     *
+     * // 预授权给外盘 Router
+     * const result = await executor.bundlePreApprove({
+     *   tokenAddress: '0x...',
+     *   privateKeys: ['0x...'],
+     *   spender: POTATOSWAP_V2_ROUTER,
+     * });
+     * ```
+     */
+    bundlePreApprove(params: BundlePreApproveParams): Promise<BundlePreApproveResult>;
 }
 /**
  * 创建捆绑交易执行器
@@ -120,3 +153,15 @@ export declare function bundleCreateBuy(params: BundleCreateBuyParams): Promise<
  * 快速捆绑发射 + 购买（仅签名）
  */
 export declare function bundleCreateBuySign(params: BundleCreateBuySignParams): Promise<BundleCreateBuySignResult>;
+/**
+ * 快速预授权
+ *
+ * 一键授权多个 AA 账户的代币，避免交易时等待授权确认
+ */
+export declare function bundlePreApprove(params: BundlePreApproveParams): Promise<BundlePreApproveResult>;
+/**
+ * 检查授权状态
+ *
+ * 批量查询多个 AA 账户的代币授权状态
+ */
+export declare function checkApprovalStatus(tokenAddress: string, privateKeys: string[], spender?: string, config?: XLayerConfig): Promise<ApprovalStatusResult[]>;

package/dist/xlayer/bundle.js

@@ -765,40 +765,9 @@ export class BundleExecutor {
         for (const ai of accountInfos)
             nonceMap.init(ai.sender, ai.nonce);
         const tokenBalances = await this.portalQuery.getMultipleTokenBalances(tokenAddress, senders);
-        const allowances = await this.portalQuery.getMultipleAllowances(tokenAddress, senders);
-        // 1. 检查授权，必要时先 approve
-        const approveItems = [];
-        const didApprove = new Array(wallets.length).fill(false);
-        const touched = new Array(wallets.length).fill(false); // 任意阶段使用过 UserOp（用于决定 initCode=0x）
-        for (let i = 0; i < wallets.length; i++) {
-            const sender = senders[i];
-            const balance = tokenBalances.get(sender) ?? 0n;
-            const allowance = allowances.get(sender) ?? 0n;
-            if (balance === 0n)
-                continue;
-            if (allowance >= balance)
-                continue;
-            const ai = accountInfos[i];
-            const initCode = ai.deployed ? '0x' : this.aaManager.generateInitCode(wallets[i].address);
-            approveItems.push({ i, sender, nonce: nonceMap.next(sender), initCode });
-            didApprove[i] = true;
-            touched[i] = true;
-        }
-        const approveOps = [];
-        if (approveItems.length > 0) {
-            const signedApproves = await mapWithConcurrency(approveItems, 4, async (it) => {
-                const i = it.i;
-                const signed = await this.buildApproveUserOp(wallets[i], tokenAddress, this.portalAddress, it.sender, it.nonce, it.initCode, `owner${i + 1}`);
-                return { i, userOp: signed.userOp };
-            });
-            for (const r of signedApproves)
-                approveOps.push(r.userOp);
-        }
-        let approveResult;
-        if (approveOps.length > 0) {
-            approveResult = await this.runHandleOps('approveBundle', approveOps, bundlerSigner, beneficiary) ?? undefined;
-        }
-        // 2. 卖出
+        // ✅ 不再内联授权，假设已通过 bundlePreApprove 预先授权
+        const touched = new Array(wallets.length).fill(false);
+        // 直接卖出
         const sellOps = [];
         const sellItems = [];
         for (let i = 0; i < wallets.length; i++) {
@@ -811,16 +780,15 @@ export class BundleExecutor {
                 continue;
             const ai = accountInfos[i];
             const initCode = ai.deployed ? '0x' : this.aaManager.generateInitCode(wallets[i].address);
-            // approve 已单独打包并等待确认，因此这里不需要用“needApprove=真”去走保守 callGasLimit
-            const needApprove = false;
             const nonce = nonceMap.next(sender);
-            sellItems.push({ i, sender, nonce, initCode: didApprove[i] ? '0x' : initCode, needApprove, sellAmount });
+            sellItems.push({ i, sender, nonce, initCode, sellAmount });
             touched[i] = true;
         }
         if (sellItems.length > 0) {
             const signedSells = await mapWithConcurrency(sellItems, 4, async (it) => {
                 const i = it.i;
-                const signed = await this.buildSellUserOp(wallets[i], tokenAddress, it.sellAmount, it.sender, it.nonce, it.initCode, it.needApprove, `owner${i + 1}`);
+                const signed = await this.buildSellUserOp(wallets[i], tokenAddress, it.sellAmount, it.sender, it.nonce, it.initCode, false, // needApprove=false，假设已预先授权
+                `owner${i + 1}`);
                 return signed.userOp;
             });
             sellOps.push(...signedSells);
@@ -878,7 +846,6 @@ export class BundleExecutor {
             }
         }
         return {
-            approveResult,
             sellResult,
             withdrawResult,
             profit: withdrawToOwner
@@ -1058,8 +1025,7 @@ export class BundleExecutor {
         }
         // 获取买入后的代币余额
         const tokenBalances = await this.portalQuery.getMultipleTokenBalances(tokenAddress, senders);
-        const allowances = await this.portalQuery.getMultipleAllowances(tokenAddress, senders);
-        // 2. 授权 + 卖出（可以合并到同一笔 handleOps）
+        // 2. 直接卖出（✅ 不再内联授权，假设已通过 bundlePreApprove 预先授权）
         const sellOps = [];
         const sellPerWallet = await mapWithConcurrency(wallets, 4, async (w, i) => {
             const sender = senders[i];
@@ -1068,20 +1034,14 @@ export class BundleExecutor {
                 console.log(`[owner${i + 1}] 没买到代币，跳过卖出`);
                 return [];
             }
-            const allowance = allowances.get(sender) ?? 0n;
-            const needApprove = allowance < balance;
             const initCode = '0x';
             const out = [];
-            if (needApprove) {
-                const nonce = nonceMap.next(sender);
-                const approveOp = await this.buildApproveUserOp(w, tokenAddress, this.portalAddress, sender, nonce, initCode, `owner${i + 1}`);
-                out.push(approveOp.userOp);
-            }
             const sellAmount = (balance * BigInt(sellPercent)) / 100n;
             if (sellAmount === 0n)
                 return out;
             const sellNonce = nonceMap.next(sender);
-            const sellOp = await this.buildSellUserOp(w, tokenAddress, sellAmount, sender, sellNonce, initCode, needApprove, `owner${i + 1}`);
+            const sellOp = await this.buildSellUserOp(w, tokenAddress, sellAmount, sender, sellNonce, initCode, false, // needApprove=false，假设已预先授权
+            `owner${i + 1}`);
             out.push(sellOp.userOp);
             return out;
         });
@@ -1398,6 +1358,167 @@ export class BundleExecutor {
             tokenAddress: signResult.tokenAddress
         };
     }
+    // ============================================================================
+    // 预授权 API（一键授权，提升交易速度）
+    // ============================================================================
+    /**
+     * 检查多个 AA 账户的授权状态
+     *
+     * 用于判断是否需要执行预授权，或查看当前授权进度
+     *
+     * @param tokenAddress - 代币地址
+     * @param privateKeys - Owner 私钥列表
+     * @param spender - 授权目标（默认 FLAP_PORTAL）
+     * @returns 每个地址的授权状态
+     */
+    async checkApprovalStatus(tokenAddress, privateKeys, spender = FLAP_PORTAL) {
+        const sharedProvider = this.aaManager.getProvider();
+        const wallets = privateKeys.map((pk) => new Wallet(pk, sharedProvider));
+        // 批量获取账户信息
+        const accountInfos = await this.aaManager.getMultipleAccountInfo(wallets.map((w) => w.address));
+        const senders = accountInfos.map((ai) => ai.sender);
+        // 批量获取代币余额和授权额度
+        const [tokenBalances, allowances] = await Promise.all([
+            this.portalQuery.getMultipleTokenBalances(tokenAddress, senders),
+            this.portalQuery.getMultipleAllowances(tokenAddress, senders, spender),
+        ]);
+        // 组装结果
+        return wallets.map((wallet, i) => {
+            const sender = senders[i];
+            const tokenBalance = tokenBalances.get(sender) ?? 0n;
+            const currentAllowance = allowances.get(sender) ?? 0n;
+            // 如果授权额度 >= 代币余额，视为已授权（足够完成卖出）
+            const isApproved = currentAllowance >= tokenBalance;
+            return {
+                owner: wallet.address,
+                sender,
+                isApproved,
+                currentAllowance,
+                tokenBalance,
+            };
+        });
+    }
+    /**
+     * 批量预授权
+     *
+     * 提前授权代币给 Portal/Router，避免交易时等待授权确认
+     *
+     * @example
+     * ```typescript
+     * // 预授权给 Portal（用于内盘交易）
+     * const result = await executor.bundlePreApprove({
+     *   tokenAddress: '0x...',
+     *   privateKeys: ['0x...', '0x...'],
+     * });
+     *
+     * // 预授权给外盘 Router
+     * const result = await executor.bundlePreApprove({
+     *   tokenAddress: '0x...',
+     *   privateKeys: ['0x...'],
+     *   spender: POTATOSWAP_V2_ROUTER,
+     * });
+     * ```
+     */
+    async bundlePreApprove(params) {
+        const { tokenAddress, privateKeys, spender = FLAP_PORTAL, signOnly = false, config, payerPrivateKey } = params;
+        const sharedProvider = this.aaManager.getProvider();
+        const wallets = privateKeys.map((pk) => new Wallet(pk, sharedProvider));
+        // 如果提供了 payerPrivateKey，使用它作为 bundlerSigner（特别是 signOnly 模式下，payer 可能是单独的账号）
+        // 否则默认使用第一个 owner
+        const bundlerSigner = payerPrivateKey
+            ? new Wallet(payerPrivateKey, sharedProvider)
+            : wallets[0];
+        const beneficiary = bundlerSigner.address;
+        // 1. 批量获取账户信息
+        const accountInfos = await this.aaManager.getMultipleAccountInfo(wallets.map((w) => w.address));
+        const senders = accountInfos.map((ai) => ai.sender);
+        const nonceMap = new AANonceMap();
+        for (const ai of accountInfos)
+            nonceMap.init(ai.sender, ai.nonce);
+        // 2. 批量获取代币余额和授权额度
+        const [tokenBalances, allowances] = await Promise.all([
+            this.portalQuery.getMultipleTokenBalances(tokenAddress, senders),
+            this.portalQuery.getMultipleAllowances(tokenAddress, senders, spender),
+        ]);
+        // 3. 过滤需要授权的账户
+        const approveItems = [];
+        const details = [];
+        for (let i = 0; i < wallets.length; i++) {
+            const sender = senders[i];
+            const tokenBalance = tokenBalances.get(sender) ?? 0n;
+            const allowance = allowances.get(sender) ?? 0n;
+            const isApproved = allowance >= tokenBalance || tokenBalance === 0n;
+            details.push({
+                owner: wallets[i].address,
+                sender,
+                isApproved,
+                currentAllowance: allowance,
+                tokenBalance,
+            });
+            // 如果有余额且授权不足，需要授权
+            if (tokenBalance > 0n && allowance < tokenBalance) {
+                const ai = accountInfos[i];
+                const initCode = ai.deployed ? '0x' : this.aaManager.generateInitCode(wallets[i].address);
+                approveItems.push({ i, sender, nonce: nonceMap.next(sender), initCode });
+            }
+        }
+        const alreadyApprovedCount = details.filter((d) => d.isApproved).length;
+        // 如果全部已授权，直接返回
+        if (approveItems.length === 0) {
+            console.log('所有地址已授权，无需操作');
+            return {
+                approvedCount: 0,
+                alreadyApprovedCount,
+                details,
+                signedTransactions: signOnly ? [] : undefined,
+            };
+        }
+        console.log(`需要授权: ${approveItems.length}/${wallets.length}`);
+        // 4. 构建授权 UserOps（signOnly 模式跳过 prefund）
+        const approveOps = [];
+        const signedApproves = await mapWithConcurrency(approveItems, 4, async (it) => {
+            const i = it.i;
+            const signed = await this.buildApproveUserOp(wallets[i], tokenAddress, spender, it.sender, it.nonce, it.initCode, `owner${i + 1}`, signOnly // signOnly=true 时跳过 ensureSenderBalance
+            );
+            return signed.userOp;
+        });
+        approveOps.push(...signedApproves);
+        // ============ signOnly 模式：签名 handleOps 交易，返回 raw tx ============
+        if (signOnly) {
+            console.log('signOnly 模式：签名 handleOps 交易...');
+            const signedTx = await this.signHandleOpsTx({
+                ops: approveOps,
+                payerWallet: bundlerSigner,
+                beneficiary,
+            });
+            console.log('签名完成，返回 raw tx');
+            return {
+                approvedCount: approveItems.length,
+                alreadyApprovedCount,
+                details,
+                signedTransactions: [signedTx],
+            };
+        }
+        // ============ 非 signOnly 模式：执行 handleOps ============
+        const approveResult = await this.runHandleOps('preApproveBundle', approveOps, bundlerSigner, beneficiary);
+        if (!approveResult) {
+            throw new Error('预授权交易失败');
+        }
+        // 更新 details 中授权成功的状态
+        for (const it of approveItems) {
+            const detail = details.find((d) => d.sender === it.sender);
+            if (detail) {
+                detail.isApproved = true;
+                detail.currentAllowance = ethers.MaxUint256;
+            }
+        }
+        return {
+            approvedCount: approveItems.length,
+            alreadyApprovedCount,
+            approveResult,
+            details,
+        };
+    }
 }
 // ============================================================================
 // 便捷函数
@@ -1443,3 +1564,21 @@ export async function bundleCreateBuySign(params) {
     const executor = createBundleExecutor(params.config);
     return executor.bundleCreateBuySign(params);
 }
+/**
+ * 快速预授权
+ *
+ * 一键授权多个 AA 账户的代币，避免交易时等待授权确认
+ */
+export async function bundlePreApprove(params) {
+    const executor = createBundleExecutor(params.config);
+    return executor.bundlePreApprove(params);
+}
+/**
+ * 检查授权状态
+ *
+ * 批量查询多个 AA 账户的代币授权状态
+ */
+export async function checkApprovalStatus(tokenAddress, privateKeys, spender, config) {
+    const executor = createBundleExecutor(config);
+    return executor.checkApprovalStatus(tokenAddress, privateKeys, spender);
+}

package/dist/xlayer/examples/bundle-buy-sell.js

@@ -80,9 +80,6 @@ async function example3_bundleSell() {
         withdrawReserve: '0.00005', // 保留少量在 sender
         config,
     });
-    if (result.approveResult) {
-        console.log('授权交易哈希:', result.approveResult.txHash);
-    }
     console.log('卖出交易哈希:', result.sellResult.txHash);
     if (result.withdrawResult) {
         console.log('归集交易哈希:', result.withdrawResult.txHash);

package/dist/xlayer/index.d.ts

@@ -62,7 +62,7 @@ import type { BundleSwapSignParams, BundleSwapSignResult, BundleBatchSwapSignPar
 export { BundlerClient, createBundlerClient, type BundlerConfig, type BundlerReceipt, } from './bundler.js';
 export { AAAccountManager, createAAAccountManager, predictSender, createWallet, encodeExecute, encodeExecuteBatch, generateAAWallets, generateAAWalletsFromMnemonic, predictSendersFromPrivateKeys, type GeneratedAAWallet, type GenerateAAWalletsParams, type GenerateAAWalletsResult, } from './aa-account.js';
 export { encodeBuyCall, encodeSellCall, encodeApproveCall, encodeTransferCall, PortalQuery, createPortalQuery, applySlippage, formatOkb, parseOkb, formatTokenAmount, parseTokenAmount, type PortalQueryConfig, } from './portal-ops.js';
-export { BundleExecutor, createBundleExecutor, bundleBuy, bundleSell, bundleBuySell, bundleCreateBuy, bundleCreateBuySign, } from './bundle.js';
+export { BundleExecutor, createBundleExecutor, bundleBuy, bundleSell, bundleBuySell, bundleCreateBuy, bundleCreateBuySign, bundlePreApprove, checkApprovalStatus, } from './bundle.js';
 export { DexBundleExecutor, createDexBundleExecutor, dexBundleBuySell, type DexBundleConfig, type DexBundleBuySellParams, } from './dex-bundle.js';
 export { AAPortalSwapExecutor, } from './portal-bundle-swap.js';
 export { AADexSwapExecutor, } from './dex-bundle-swap.js';
@@ -96,6 +96,8 @@ export declare const xlayer: {
     bundleBatchSwapSign: (params: BundleBatchSwapSignParams & {
         skipApprovalCheck?: boolean;
     }) => Promise<BundleBatchSwapSignResult>;
+    bundlePreApprove: (params: import("./types.js").BundlePreApproveParams) => Promise<import("./types.js").BundlePreApproveResult>;
+    checkApprovalStatus: (tokenAddress: string, privateKeys: string[], spender?: string | undefined, config?: import("./types.js").XLayerConfig | undefined) => Promise<import("./types.js").ApprovalStatusResult[]>;
     makeVolume: (params: import("./types.js").VolumeParams) => Promise<import("./types.js").VolumeResult>;
     quoteOkbToToken: (okbAmount: bigint, tokenAddress: string, config?: import("./dex.js").DexConfig | undefined) => Promise<bigint>;
     quoteTokenToOkb: (tokenAmount: bigint, tokenAddress: string, config?: import("./dex.js").DexConfig | undefined) => Promise<bigint>;

package/dist/xlayer/index.js

@@ -81,7 +81,9 @@ export { encodeBuyCall, encodeSellCall, encodeApproveCall, encodeTransferCall, P
 // ============================================================================
 // 捆绑交易
 // ============================================================================
-export { BundleExecutor, createBundleExecutor, bundleBuy, bundleSell, bundleBuySell, bundleCreateBuy, bundleCreateBuySign, } from './bundle.js';
+export { BundleExecutor, createBundleExecutor, bundleBuy, bundleSell, bundleBuySell, bundleCreateBuy, bundleCreateBuySign, 
+// 预授权（一键授权）
+bundlePreApprove, checkApprovalStatus, } from './bundle.js';
 // ============================================================================
 // 外盘捆绑交易（DEX Bundle）
 // ============================================================================
@@ -166,6 +168,15 @@ export const xlayer = {
     // 捆绑换手（AA）：仅签名（raw signed tx）
     bundleSwapSign: async (...args) => bundleSwapSign(...args),
     bundleBatchSwapSign: async (...args) => bundleBatchSwapSign(...args),
+    // 预授权（一键授权）
+    bundlePreApprove: async (...args) => {
+        const { bundlePreApprove } = await import('./bundle.js');
+        return bundlePreApprove(...args);
+    },
+    checkApprovalStatus: async (...args) => {
+        const { checkApprovalStatus } = await import('./bundle.js');
+        return checkApprovalStatus(...args);
+    },
     // 刷量
     makeVolume: async (...args) => {
         const { makeVolume } = await import('./volume.js');

package/dist/xlayer/types.d.ts

@@ -565,8 +565,6 @@ export interface BundleBuyResult {
  * 捆绑卖出结果
  */
 export interface BundleSellResult {
-    /** 授权交易结果（如果需要） */
-    approveResult?: HandleOpsResult;
     /** 卖出交易结果 */
     sellResult: HandleOpsResult;
     /** 归集交易结果（如果 withdrawToOwner） */
@@ -588,8 +586,6 @@ export interface BundleSellResult {
 export interface BundleBuySellResult {
     /** 买入阶段结果 */
     buyResult: HandleOpsResult;
-    /** 授权阶段结果（如果需要） */
-    approveResult?: HandleOpsResult;
     /** 卖出阶段结果 */
     sellResult: HandleOpsResult;
     /** 归集阶段结果（如果 withdrawToOwner） */
@@ -699,6 +695,58 @@ export interface DexSwapResult {
     outputAmount: bigint;
     gasUsed: bigint;
 }
+/**
+ * 预授权参数
+ * 用于提前授权代币，避免在交易时等待授权确认
+ */
+export interface BundlePreApproveParams {
+    /** 代币地址 */
+    tokenAddress: string;
+    /** Owner 私钥列表 */
+    privateKeys: string[];
+    /** 授权目标（默认 FLAP_PORTAL，可传 Router 地址用于外盘交易） */
+    spender?: string;
+    /**
+     * 是否仅签名（不执行）
+     * - true: 返回签名后的 handleOps 交易，由前端发送到服务端广播
+     * - false（默认）: 直接执行 handleOps
+     */
+    signOnly?: boolean;
+    /** 配置覆盖 */
+    config?: Partial<XLayerConfig>;
+    /** Payer 私钥（signOnly=true 时必传，用于支付 gas） */
+    payerPrivateKey?: string;
+}
+/**
+ * 预授权结果
+ */
+export interface BundlePreApproveResult {
+    /** 发送授权交易的数量 */
+    approvedCount: number;
+    /** 已经授权无需操作的数量 */
+    alreadyApprovedCount: number;
+    /** 授权交易结果（signOnly=false 时有值） */
+    approveResult?: HandleOpsResult;
+    /** 每个地址的授权状态详情 */
+    details: ApprovalStatusResult[];
+    /** signOnly=true 时：签名后的 handleOps 交易（raw signed tx） */
+    signedTransactions?: string[];
+}
+/**
+ * 授权状态检查结果
+ */
+export interface ApprovalStatusResult {
+    /** Owner EOA 地址 */
+    owner: string;
+    /** AA Sender 地址 */
+    sender: string;
+    /** 是否已授权（授权额度 >= 代币余额） */
+    isApproved: boolean;
+    /** 当前授权额度 */
+    currentAllowance: bigint;
+    /** 当前代币余额 */
+    tokenBalance: bigint;
+}
 /**
  * 深度 Partial 类型
  */

package/package.json

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