four-flap-meme-sdk 1.5.27 → 1.5.29

package/dist/xlayer/bundle.js

@@ -7,7 +7,7 @@
  * - 买卖一体化：买入 -> 授权 -> 卖出 -> 归集
  * - OKB 归集：将 sender 的 OKB 转回 owner
  */
-import { Wallet, Interface, Contract, Transaction, ethers } from 'ethers';
+import { Wallet, Interface, Contract } from 'ethers';
 import { FLAP_PORTAL, ENTRYPOINT_ABI, DEFAULT_CALL_GAS_LIMIT_SELL, DEFAULT_WITHDRAW_RESERVE, } from './constants.js';
 import { AAAccountManager, encodeExecute } from './aa-account.js';
 import { encodeBuyCall, encodeSellCall, encodeApproveCall, encodeTransferCall, PortalQuery, parseOkb, formatOkb, } from './portal-ops.js';
@@ -204,237 +204,6 @@ export class BundleExecutor {
             return 18;
         }
     }
-    /**
-     * 构建买入 UserOp（已知 sender/nonce/initCode 的版本）
-     */
-    async buildBuyUserOpWithState(params) {
-        const swapData = encodeBuyCall(params.tokenAddress, params.buyAmountWei, 0n);
-        const callData = encodeExecute(this.portalAddress, params.buyAmountWei, swapData);
-        if (!params.signOnly) {
-            // 估算前确保 sender 有足够余额（用于模拟）；paymaster 场景会自动跳过
-            await this.aaManager.ensureSenderBalance(params.ownerWallet, params.sender, params.buyAmountWei + parseOkb('0.0003'), `${params.ownerName ?? 'owner'}/swap-buy-prefund-before-estimate`);
-        }
-        const gasPolicyRaw = this.config.gasPolicy ?? 'bundlerEstimate';
-        const gasPolicy = params.signOnly && gasPolicyRaw === 'bundlerEstimate' ? 'fixed' : gasPolicyRaw;
-        const { userOp, prefundWei } = gasPolicy === 'fixed'
-            ? await this.aaManager.buildUserOpWithFixedGas({
-                ownerWallet: params.ownerWallet,
-                sender: params.sender,
-                callData,
-                nonce: params.nonce,
-                initCode: params.initCode,
-                deployed: params.initCode === '0x',
-                fixedGas: {
-                    ...(this.config.fixedGas ?? {}),
-                    callGasLimit: this.config.fixedGas?.callGasLimit ?? DEFAULT_CALL_GAS_LIMIT_BUY,
-                },
-            })
-            : gasPolicy === 'localEstimate'
-                ? await this.aaManager.buildUserOpWithLocalEstimate({
-                    ownerWallet: params.ownerWallet,
-                    sender: params.sender,
-                    callData,
-                    nonce: params.nonce,
-                    initCode: params.initCode,
-                })
-                : await this.aaManager.buildUserOpWithBundlerEstimate({
-                    ownerWallet: params.ownerWallet,
-                    sender: params.sender,
-                    callData,
-                    nonce: params.nonce,
-                    initCode: params.initCode,
-                });
-        if (!params.signOnly) {
-            // 补足 prefund + 买入金额
-            await this.aaManager.ensureSenderBalance(params.ownerWallet, params.sender, params.buyAmountWei + prefundWei + parseOkb('0.0002'), `${params.ownerName ?? 'owner'}/swap-buy-fund`);
-        }
-        const signed = await this.aaManager.signUserOp(userOp, params.ownerWallet);
-        return { ...signed, prefundWei, ownerName: params.ownerName };
-    }
-    /**
-     * 构建换手所需的 UserOps（approve? + sell + buy），并返回元数据
-     */
-    async buildSwapOps(params, opts) {
-        const signOnly = opts?.signOnly ?? false;
-        const { tokenAddress, sellerPrivateKey, buyerPrivateKey, sellAmount, sellPercent = 100, buyAmountOkb, slippageBps = 100, } = params;
-        const provider = this.aaManager.getProvider();
-        const sellerOwner = new Wallet(sellerPrivateKey, provider);
-        const buyerOwner = new Wallet(buyerPrivateKey, provider);
-        const [sellerAi, buyerAi] = await this.aaManager.getMultipleAccountInfo([sellerOwner.address, buyerOwner.address]);
-        const sellerSender = sellerAi.sender;
-        const buyerSender = buyerAi.sender;
-        const nonceMap = new AANonceMap();
-        nonceMap.init(sellerSender, sellerAi.nonce);
-        nonceMap.init(buyerSender, buyerAi.nonce);
-        // 计算卖出数量
-        const decimals = await this.getErc20Decimals(tokenAddress);
-        const sellerTokenBal = await this.portalQuery.getTokenBalance(tokenAddress, sellerSender);
-        const sellAmountWei = (() => {
-            if (sellAmount && String(sellAmount).trim().length > 0) {
-                return ethers.parseUnits(String(sellAmount).trim(), decimals);
-            }
-            const pct = Math.max(0, Math.min(100, Math.floor(sellPercent)));
-            return (sellerTokenBal * BigInt(pct)) / 100n;
-        })();
-        if (sellAmountWei <= 0n) {
-            throw new Error('卖出数量为 0（请检查 sellAmount/sellPercent 或卖方余额）');
-        }
-        // 检查授权
-        const allowance = await this.portalQuery.getAllowance(tokenAddress, sellerSender, this.portalAddress);
-        const needApprove = allowance < sellAmountWei;
-        // 计算买入 OKB 数量（默认用 previewSell(sellAmount) * (1 - slippage)）
-        const buyAmountWei = buyAmountOkb && String(buyAmountOkb).trim().length > 0
-            ? parseOkb(String(buyAmountOkb).trim())
-            : (() => {
-                const bps = Math.max(0, Math.min(10000, Math.floor(slippageBps)));
-                return 0n; // placeholder, filled below
-            })();
-        let finalBuyAmountWei = buyAmountWei;
-        if (!(buyAmountOkb && String(buyAmountOkb).trim().length > 0)) {
-            const quoted = await this.portalQuery.previewSell(tokenAddress, sellAmountWei);
-            const bps = Math.max(0, Math.min(10000, Math.floor(slippageBps)));
-            finalBuyAmountWei = (quoted * BigInt(10000 - bps)) / 10000n;
-        }
-        if (finalBuyAmountWei <= 0n) {
-            throw new Error('买入 OKB 数量为 0（请检查 buyAmountOkb 或卖出预览输出）');
-        }
-        // initCode 处理：同一个 sender 的第一笔 op 才带 initCode
-        const sellerInitCode0 = sellerAi.deployed ? '0x' : this.aaManager.generateInitCode(sellerOwner.address);
-        const buyerInitCode0 = buyerAi.deployed ? '0x' : this.aaManager.generateInitCode(buyerOwner.address);
-        let sellerInitCodeForNext = sellerInitCode0;
-        let buyerInitCodeForNext = buyerInitCode0;
-        const outOps = [];
-        // 1) approve（可选）
-        if (needApprove) {
-            const approveNonce = nonceMap.next(sellerSender);
-            const signedApprove = await this.buildApproveUserOp(sellerOwner, tokenAddress, this.portalAddress, sellerSender, approveNonce, sellerInitCodeForNext, 'seller', signOnly);
-            outOps.push(signedApprove.userOp);
-            sellerInitCodeForNext = '0x';
-        }
-        // 2) sell
-        const sellNonce = nonceMap.next(sellerSender);
-        const signedSell = await this.buildSellUserOp(sellerOwner, tokenAddress, sellAmountWei, sellerSender, sellNonce, sellerInitCodeForNext, needApprove, 'seller', signOnly);
-        outOps.push(signedSell.userOp);
-        sellerInitCodeForNext = '0x';
-        // 3) buy（买方）
-        const buyNonce = nonceMap.next(buyerSender);
-        const signedBuy = await this.buildBuyUserOpWithState({
-            ownerWallet: buyerOwner,
-            sender: buyerSender,
-            nonce: buyNonce,
-            initCode: buyerInitCodeForNext,
-            tokenAddress,
-            buyAmountWei: finalBuyAmountWei,
-            ownerName: 'buyer',
-            signOnly,
-        });
-        outOps.push(signedBuy.userOp);
-        buyerInitCodeForNext = '0x';
-        return {
-            ops: outOps,
-            metadata: {
-                sellerOwner: sellerOwner.address,
-                sellerSender,
-                buyerOwner: buyerOwner.address,
-                buyerSender,
-                sellAmountWei: sellAmountWei.toString(),
-                buyAmountWei: finalBuyAmountWei.toString(),
-                hasApprove: needApprove,
-            },
-        };
-    }
-    async buildBatchSwapOps(params, opts) {
-        const signOnly = opts?.signOnly ?? false;
-        const { tokenAddress, sellerPrivateKey, buyerPrivateKeys, buyAmountsOkb, sellAmount, sellPercent = 100, } = params;
-        if (buyerPrivateKeys.length !== buyAmountsOkb.length) {
-            throw new Error('buyerPrivateKeys 和 buyAmountsOkb 长度必须一致');
-        }
-        if (buyerPrivateKeys.length === 0) {
-            throw new Error('至少需要 1 个 buyerPrivateKey');
-        }
-        const provider = this.aaManager.getProvider();
-        const sellerOwner = new Wallet(sellerPrivateKey, provider);
-        const buyerOwners = buyerPrivateKeys.map((pk) => new Wallet(pk, provider));
-        const accountInfos = await this.aaManager.getMultipleAccountInfo([
-            sellerOwner.address,
-            ...buyerOwners.map((w) => w.address),
-        ]);
-        const sellerAi = accountInfos[0];
-        const buyerAis = accountInfos.slice(1);
-        const sellerSender = sellerAi.sender;
-        const buyerSenders = buyerAis.map((ai) => ai.sender);
-        const nonceMap = new AANonceMap();
-        nonceMap.init(sellerSender, sellerAi.nonce);
-        for (const ai of buyerAis)
-            nonceMap.init(ai.sender, ai.nonce);
-        // 计算卖出数量
-        const decimals = await this.getErc20Decimals(tokenAddress);
-        const sellerTokenBal = await this.portalQuery.getTokenBalance(tokenAddress, sellerSender);
-        const sellAmountWei = (() => {
-            if (sellAmount && String(sellAmount).trim().length > 0) {
-                return ethers.parseUnits(String(sellAmount).trim(), decimals);
-            }
-            const pct = Math.max(0, Math.min(100, Math.floor(sellPercent)));
-            return (sellerTokenBal * BigInt(pct)) / 100n;
-        })();
-        if (sellAmountWei <= 0n) {
-            throw new Error('卖出数量为 0（请检查 sellAmount/sellPercent 或卖方余额）');
-        }
-        // 检查授权
-        const allowance = await this.portalQuery.getAllowance(tokenAddress, sellerSender, this.portalAddress);
-        const needApprove = allowance < sellAmountWei;
-        // initCode：同一个 sender 的第一笔 op 才带 initCode
-        let sellerInitCodeForNext = sellerAi.deployed ? '0x' : this.aaManager.generateInitCode(sellerOwner.address);
-        const buyerInitCodes = buyerAis.map((ai, idx) => ai.deployed ? '0x' : this.aaManager.generateInitCode(buyerOwners[idx].address));
-        const outOps = [];
-        // 1) approve（可选）
-        if (needApprove) {
-            const approveNonce = nonceMap.next(sellerSender);
-            const signedApprove = await this.buildApproveUserOp(sellerOwner, tokenAddress, this.portalAddress, sellerSender, approveNonce, sellerInitCodeForNext, 'seller', signOnly);
-            outOps.push(signedApprove.userOp);
-            sellerInitCodeForNext = '0x';
-        }
-        // 2) sell（一次）
-        const sellNonce = nonceMap.next(sellerSender);
-        const signedSell = await this.buildSellUserOp(sellerOwner, tokenAddress, sellAmountWei, sellerSender, sellNonce, sellerInitCodeForNext, needApprove, 'seller', signOnly);
-        outOps.push(signedSell.userOp);
-        sellerInitCodeForNext = '0x';
-        // 3) buyers buy（多笔）
-        const buyAmountsWei = buyAmountsOkb.map((v) => parseOkb(String(v)));
-        const signedBuys = await mapWithConcurrency(buyerOwners, 4, async (w, i) => {
-            const sender = buyerSenders[i];
-            const initCode = buyerInitCodes[i];
-            const nonce = nonceMap.next(sender);
-            const amountWei = buyAmountsWei[i] ?? 0n;
-            if (amountWei <= 0n) {
-                throw new Error(`buyAmountsOkb[${i}] 无效（<=0）`);
-            }
-            return await this.buildBuyUserOpWithState({
-                ownerWallet: w,
-                sender,
-                nonce,
-                initCode,
-                tokenAddress,
-                buyAmountWei: amountWei,
-                ownerName: `buyer${i + 1}`,
-                signOnly,
-            });
-        });
-        for (const s of signedBuys)
-            outOps.push(s.userOp);
-        return {
-            ops: outOps,
-            metadata: {
-                sellerOwner: sellerOwner.address,
-                sellerSender,
-                buyerOwners: buyerOwners.map((w) => w.address),
-                buyerSenders,
-                sellAmountWei: sellAmountWei.toString(),
-                buyAmountsWei: buyAmountsWei.map((x) => x.toString()),
-                hasApprove: needApprove,
-            },
-        };
-    }
     /**
      * 构建买入 UserOp
      */
@@ -1079,142 +848,6 @@ export class BundleExecutor {
         const finalBalances = await this.portalQuery.getMultipleOkbBalances(senders);
         return { buyResult, sellResult, withdrawResult, finalBalances };
     }
-    /**
-     * ✅ 捆绑换手（AA）：卖方卖出 → 买方买入，同一笔 handleOps 原子执行
-     */
-    async bundleSwap(params) {
-        const provider = this.aaManager.getProvider();
-        const payerWallet = new Wallet(params.sellerPrivateKey, provider);
-        const beneficiary = payerWallet.address;
-        const { ops, metadata } = await this.buildSwapOps(params, { signOnly: false });
-        const swapResult = await this.runHandleOps('swapBundle', ops, payerWallet, beneficiary);
-        if (!swapResult)
-            throw new Error('换手交易失败');
-        return { swapResult, metadata };
-    }
-    /**
-     * ✅ 捆绑换手（AA，仅签名）：返回 raw signed tx 列表（像 BSC 捆绑一样交给后端提交）
-     * - signedTransactions[0] = handleOps tx（payer 签名）
-     * - 如果传入 routeAddress，则 signedTransactions[1] = tailTx（nonce+1）
-     */
-    async bundleSwapSign(params) {
-        const provider = this.aaManager.getProvider();
-        const payerPk = (params.payerPrivateKey ?? params.sellerPrivateKey);
-        const payerWallet = new Wallet(payerPk, provider);
-        const beneficiary = params.beneficiary ?? payerWallet.address;
-        const { ops, metadata } = await this.buildSwapOps(params, { signOnly: true });
-        // 先签 handleOps
-        const signedHandleOpsTx = await this.signHandleOpsTx({
-            ops,
-            payerWallet,
-            beneficiary,
-            nonce: params.payerStartNonce,
-            gasLimit: params.handleOpsGasLimit,
-        });
-        const signedTxs = [signedHandleOpsTx];
-        // 可选：追加 route 尾交易（nonce+1）
-        if (params.routeAddress) {
-            const tx = Transaction.from(signedHandleOpsTx);
-            const nonce = Number(tx.nonce);
-            const chainId = Number(tx.chainId || 0);
-            if (!Number.isFinite(nonce) || nonce < 0)
-                throw new Error('解析 handleOps nonce 失败');
-            if (!Number.isFinite(chainId) || chainId <= 0)
-                throw new Error('解析 handleOps chainId 失败');
-            const tailTx = await payerWallet.signTransaction({
-                to: params.routeAddress,
-                value: 0n,
-                data: '0x',
-                nonce: nonce + 1,
-                gasLimit: 21000n,
-                gasPrice: tx.gasPrice ?? undefined,
-                chainId,
-                type: 0,
-            });
-            signedTxs.push(tailTx);
-        }
-        return {
-            signedTransactions: signedTxs,
-            metadata: {
-                payer: payerWallet.address,
-                beneficiary,
-                sellerOwner: metadata.sellerOwner,
-                sellerSender: metadata.sellerSender,
-                buyerOwner: metadata.buyerOwner,
-                buyerSender: metadata.buyerSender,
-                sellAmountWei: metadata.sellAmountWei,
-                buyAmountWei: metadata.buyAmountWei,
-                hasApprove: metadata.hasApprove,
-                routeAddress: params.routeAddress,
-            },
-        };
-    }
-    /**
-     * ✅ 批量捆绑换手（AA）：一卖多买，同一笔 handleOps 原子执行
-     */
-    async bundleBatchSwap(params) {
-        const provider = this.aaManager.getProvider();
-        const payerWallet = new Wallet(params.sellerPrivateKey, provider);
-        const beneficiary = payerWallet.address;
-        const { ops, metadata } = await this.buildBatchSwapOps(params, { signOnly: false });
-        const swapResult = await this.runHandleOps('batchSwapBundle', ops, payerWallet, beneficiary);
-        if (!swapResult)
-            throw new Error('批量换手交易失败');
-        return { swapResult, metadata };
-    }
-    /**
-     * ✅ 批量捆绑换手（AA，仅签名）
-     */
-    async bundleBatchSwapSign(params) {
-        const provider = this.aaManager.getProvider();
-        const payerPk = (params.payerPrivateKey ?? params.sellerPrivateKey);
-        const payerWallet = new Wallet(payerPk, provider);
-        const beneficiary = params.beneficiary ?? payerWallet.address;
-        const { ops, metadata } = await this.buildBatchSwapOps(params, { signOnly: true });
-        const signedHandleOpsTx = await this.signHandleOpsTx({
-            ops,
-            payerWallet,
-            beneficiary,
-            nonce: params.payerStartNonce,
-            gasLimit: params.handleOpsGasLimit,
-        });
-        const signedTxs = [signedHandleOpsTx];
-        if (params.routeAddress) {
-            const tx = Transaction.from(signedHandleOpsTx);
-            const nonce = Number(tx.nonce);
-            const chainId = Number(tx.chainId || 0);
-            if (!Number.isFinite(nonce) || nonce < 0)
-                throw new Error('解析 handleOps nonce 失败');
-            if (!Number.isFinite(chainId) || chainId <= 0)
-                throw new Error('解析 handleOps chainId 失败');
-            const tailTx = await payerWallet.signTransaction({
-                to: params.routeAddress,
-                value: 0n,
-                data: '0x',
-                nonce: nonce + 1,
-                gasLimit: 21000n,
-                gasPrice: tx.gasPrice ?? undefined,
-                chainId,
-                type: 0,
-            });
-            signedTxs.push(tailTx);
-        }
-        return {
-            signedTransactions: signedTxs,
-            metadata: {
-                payer: payerWallet.address,
-                beneficiary,
-                sellerOwner: metadata.sellerOwner,
-                sellerSender: metadata.sellerSender,
-                buyerOwners: metadata.buyerOwners,
-                buyerSenders: metadata.buyerSenders,
-                sellAmountWei: metadata.sellAmountWei,
-                buyAmountsWei: metadata.buyAmountsWei,
-                hasApprove: metadata.hasApprove,
-                routeAddress: params.routeAddress,
-            },
-        };
-    }
 }
 // ============================================================================
 // 便捷函数
@@ -1246,31 +879,3 @@ export async function bundleBuySell(params) {
     const executor = createBundleExecutor(params.config);
     return executor.bundleBuySell(params);
 }
-/**
- * 快速捆绑换手（链上执行）
- */
-export async function bundleSwap(params) {
-    const executor = createBundleExecutor(params.config);
-    return executor.bundleSwap(params);
-}
-/**
- * 快速捆绑换手（仅签名，返回 raw signed tx）
- */
-export async function bundleSwapSign(params) {
-    const executor = createBundleExecutor(params.config);
-    return executor.bundleSwapSign(params);
-}
-/**
- * 快速批量捆绑换手（链上执行）
- */
-export async function bundleBatchSwap(params) {
-    const executor = createBundleExecutor(params.config);
-    return executor.bundleBatchSwap(params);
-}
-/**
- * 快速批量捆绑换手（仅签名）
- */
-export async function bundleBatchSwapSign(params) {
-    const executor = createBundleExecutor(params.config);
-    return executor.bundleBatchSwapSign(params);
-}

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

@@ -0,0 +1,30 @@
+/**
+ * XLayer AA 外盘 (PotatoSwap/DEX) 捆绑换手实现
+ */
+import { XLayerConfig, BundleSwapSignParams, BundleSwapSignResult, BundleBatchSwapSignParams, BundleBatchSwapSignResult } from './types.js';
+/**
+ * XLayer AA 外盘换手执行器
+ */
+export declare class AADexSwapExecutor {
+    private aaManager;
+    private dexQuery;
+    private bundleExecutor;
+    private config;
+    constructor(config?: XLayerConfig);
+    /**
+     * 获取 Router 地址
+     */
+    private getEffectiveRouter;
+    /**
+     * AA 外盘单钱包换手签名
+     */
+    bundleSwapSign(params: BundleSwapSignParams & {
+        skipApprovalCheck?: boolean;
+    }): Promise<BundleSwapSignResult>;
+    /**
+     * AA 外盘批量换手签名
+     */
+    bundleBatchSwapSign(params: BundleBatchSwapSignParams & {
+        skipApprovalCheck?: boolean;
+    }): Promise<BundleBatchSwapSignResult>;
+}