four-flap-meme-sdk 1.5.28 → 1.5.29

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

@@ -0,0 +1,277 @@
+/**
+ * XLayer AA 内盘 (Flap Portal) 捆绑换手实现
+ */
+import { Wallet, ethers } from 'ethers';
+import { AANonceMap, } from './types.js';
+import { FLAP_PORTAL, } from './constants.js';
+import { AAAccountManager, encodeExecute } from './aa-account.js';
+import { encodeBuyCall, encodeSellCall, encodeApproveCall, PortalQuery, parseOkb, } from './portal-ops.js';
+import { BundleExecutor } from './bundle.js';
+/**
+ * XLayer AA 内盘换手执行器
+ */
+export class AAPortalSwapExecutor {
+    constructor(config = {}) {
+        this.config = config;
+        this.aaManager = new AAAccountManager(config);
+        this.portalQuery = new PortalQuery({
+            rpcUrl: config.rpcUrl,
+            chainId: config.chainId,
+        });
+        this.bundleExecutor = new BundleExecutor(config);
+    }
+    /**
+     * AA 内盘单钱包换手签名
+     */
+    async bundleSwapSign(params) {
+        const { tokenAddress, sellerPrivateKey, buyerPrivateKey, sellAmount, sellPercent = 100, buyAmountOkb, slippageBps = 100, payerPrivateKey, beneficiary: beneficiaryIn, payerStartNonce, routeAddress, skipApprovalCheck = false, } = params;
+        const provider = this.aaManager.getProvider();
+        const sellerOwner = new Wallet(sellerPrivateKey, provider);
+        const buyerOwner = new Wallet(buyerPrivateKey, provider);
+        const payerWallet = new Wallet(payerPrivateKey || sellerPrivateKey, provider);
+        const beneficiary = beneficiaryIn || payerWallet.address;
+        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);
+        // initCode：确保“同一 sender”只在第一笔 op 携带（对齐 BSC 的 nonce/顺序管理思想）
+        const initCodeBySenderLower = new Map();
+        const initIfNeeded = (sender, deployed, ownerAddress) => {
+            const k = sender.toLowerCase();
+            if (initCodeBySenderLower.has(k))
+                return;
+            initCodeBySenderLower.set(k, deployed ? '0x' : this.aaManager.generateInitCode(ownerAddress));
+        };
+        const consumeInitCode = (sender) => {
+            const k = sender.toLowerCase();
+            const cur = initCodeBySenderLower.get(k);
+            if (cur === undefined)
+                throw new Error(`initCode not initialized for sender: ${sender}`);
+            if (cur !== '0x')
+                initCodeBySenderLower.set(k, '0x');
+            return cur;
+        };
+        initIfNeeded(sellerSender, !!sellerAi?.deployed, sellerOwner.address);
+        initIfNeeded(buyerSender, !!buyerAi?.deployed, buyerOwner.address);
+        // 1. 计算卖出数量
+        const decimals = await this.bundleExecutor['getErc20Decimals'](tokenAddress);
+        const sellerTokenBal = await this.aaManager.getErc20Balance(tokenAddress, sellerSender);
+        const sellAmountWei = sellAmount
+            ? ethers.parseUnits(String(sellAmount), decimals)
+            : (sellerTokenBal * BigInt(sellPercent)) / 100n;
+        if (sellAmountWei <= 0n)
+            throw new Error('卖出数量无效');
+        // 2. 授权检查
+        let needApprove = false;
+        if (!skipApprovalCheck) {
+            const allowance = await this.aaManager.getErc20Allowance(tokenAddress, sellerSender, FLAP_PORTAL);
+            needApprove = allowance < sellAmountWei;
+        }
+        // 3. 报价买入 OKB
+        const quoted = await this.portalQuery.previewSell(tokenAddress, sellAmountWei);
+        const finalBuyAmountWei = buyAmountOkb
+            ? parseOkb(String(buyAmountOkb))
+            : (quoted * BigInt(10000 - slippageBps)) / 10000n;
+        // 4. 构建 Ops
+        const outOps = [];
+        if (needApprove) {
+            const { userOp } = await this.aaManager.buildUserOpWithFixedGas({
+                ownerWallet: sellerOwner,
+                sender: sellerSender,
+                nonce: nonceMap.next(sellerSender),
+                initCode: consumeInitCode(sellerSender),
+                callData: encodeExecute(tokenAddress, 0n, encodeApproveCall(FLAP_PORTAL)),
+                deployed: sellerAi.deployed,
+            });
+            const signedApprove = await this.aaManager.signUserOp(userOp, sellerOwner);
+            outOps.push(signedApprove.userOp);
+        }
+        // Sell op
+        const sellSwapData = encodeSellCall(tokenAddress, sellAmountWei, 0n);
+        const sellCallData = encodeExecute(FLAP_PORTAL, 0n, sellSwapData);
+        const signedSell = await this.aaManager.buildUserOpWithState({
+            ownerWallet: sellerOwner,
+            sender: sellerSender,
+            nonce: nonceMap.next(sellerSender),
+            initCode: consumeInitCode(sellerSender),
+            callData: sellCallData,
+            signOnly: true,
+        });
+        outOps.push(signedSell.userOp);
+        // Buy op
+        const buySwapData = encodeBuyCall(tokenAddress, finalBuyAmountWei, 0n);
+        const buyCallData = encodeExecute(FLAP_PORTAL, finalBuyAmountWei, buySwapData);
+        const signedBuy = await this.aaManager.buildUserOpWithState({
+            ownerWallet: buyerOwner,
+            sender: buyerSender,
+            nonce: nonceMap.next(buyerSender),
+            initCode: consumeInitCode(buyerSender),
+            callData: buyCallData,
+            signOnly: true,
+        });
+        outOps.push(signedBuy.userOp);
+        // 5. 签名 HandleOps
+        const signedHandleOps = await this.bundleExecutor['signHandleOpsTx']({
+            ops: outOps,
+            payerWallet,
+            beneficiary,
+            nonce: payerStartNonce,
+        });
+        const signedTransactions = [signedHandleOps];
+        if (routeAddress) {
+            const tx = ethers.Transaction.from(signedHandleOps);
+            const tailTx = await payerWallet.signTransaction({
+                to: routeAddress,
+                value: 0n,
+                nonce: Number(tx.nonce) + 1,
+                gasLimit: 21000n,
+                gasPrice: tx.gasPrice,
+                chainId: tx.chainId,
+                type: 0,
+            });
+            signedTransactions.push(tailTx);
+        }
+        return {
+            signedTransactions,
+            metadata: {
+                payer: payerWallet.address,
+                beneficiary,
+                sellerOwner: sellerOwner.address,
+                sellerSender,
+                buyerOwner: buyerOwner.address,
+                buyerSender,
+                sellAmountWei: sellAmountWei.toString(),
+                buyAmountWei: finalBuyAmountWei.toString(),
+                hasApprove: needApprove,
+                routeAddress,
+            },
+        };
+    }
+    /**
+     * AA 内盘批量换手签名 (一卖多买)
+     */
+    async bundleBatchSwapSign(params) {
+        const { tokenAddress, sellerPrivateKey, buyerPrivateKeys, buyAmountsOkb, sellAmount, sellPercent = 100, payerPrivateKey, beneficiary: beneficiaryIn, payerStartNonce, routeAddress, skipApprovalCheck = false, } = params;
+        const provider = this.aaManager.getProvider();
+        const sellerOwner = new Wallet(sellerPrivateKey, provider);
+        const buyerOwners = buyerPrivateKeys.map(pk => new Wallet(pk, provider));
+        const payerWallet = new Wallet(payerPrivateKey || sellerPrivateKey, provider);
+        const beneficiary = beneficiaryIn || payerWallet.address;
+        const accountInfos = await this.aaManager.getMultipleAccountInfo([sellerOwner.address, ...buyerOwners.map(w => w.address)]);
+        const sellerAi = accountInfos[0];
+        const buyerAis = accountInfos.slice(1);
+        const nonceMap = new AANonceMap();
+        nonceMap.init(sellerAi.sender, sellerAi.nonce);
+        buyerAis.forEach(ai => nonceMap.init(ai.sender, ai.nonce));
+        // initCode：确保同一 sender 只在第一笔 op 携带
+        const initCodeBySenderLower = new Map();
+        const initIfNeeded = (sender, deployed, ownerAddress) => {
+            const k = sender.toLowerCase();
+            if (initCodeBySenderLower.has(k))
+                return;
+            initCodeBySenderLower.set(k, deployed ? '0x' : this.aaManager.generateInitCode(ownerAddress));
+        };
+        const consumeInitCode = (sender) => {
+            const k = sender.toLowerCase();
+            const cur = initCodeBySenderLower.get(k);
+            if (cur === undefined)
+                throw new Error(`initCode not initialized for sender: ${sender}`);
+            if (cur !== '0x')
+                initCodeBySenderLower.set(k, '0x');
+            return cur;
+        };
+        initIfNeeded(sellerAi.sender, sellerAi.deployed, sellerOwner.address);
+        for (let i = 0; i < buyerOwners.length; i++) {
+            initIfNeeded(buyerAis[i].sender, buyerAis[i].deployed, buyerOwners[i].address);
+        }
+        const decimals = await this.bundleExecutor['getErc20Decimals'](tokenAddress);
+        const sellerTokenBal = await this.aaManager.getErc20Balance(tokenAddress, sellerAi.sender);
+        const sellAmountWei = sellAmount
+            ? ethers.parseUnits(String(sellAmount), decimals)
+            : (sellerTokenBal * BigInt(sellPercent)) / 100n;
+        let needApprove = false;
+        if (!skipApprovalCheck) {
+            const allowance = await this.aaManager.getErc20Allowance(tokenAddress, sellerAi.sender, FLAP_PORTAL);
+            needApprove = allowance < sellAmountWei;
+        }
+        const outOps = [];
+        if (needApprove) {
+            const { userOp } = await this.aaManager.buildUserOpWithFixedGas({
+                ownerWallet: sellerOwner,
+                sender: sellerAi.sender,
+                nonce: nonceMap.next(sellerAi.sender),
+                initCode: consumeInitCode(sellerAi.sender),
+                callData: encodeExecute(tokenAddress, 0n, encodeApproveCall(FLAP_PORTAL)),
+                deployed: sellerAi.deployed,
+            });
+            const signedApprove = await this.aaManager.signUserOp(userOp, sellerOwner);
+            outOps.push(signedApprove.userOp);
+        }
+        // Sell op
+        const sellSwapData = encodeSellCall(tokenAddress, sellAmountWei, 0n);
+        const sellCallData = encodeExecute(FLAP_PORTAL, 0n, sellSwapData);
+        const signedSell = await this.aaManager.buildUserOpWithState({
+            ownerWallet: sellerOwner,
+            sender: sellerAi.sender,
+            nonce: nonceMap.next(sellerAi.sender),
+            initCode: consumeInitCode(sellerAi.sender),
+            callData: sellCallData,
+            signOnly: true,
+        });
+        outOps.push(signedSell.userOp);
+        // Batch Buy ops
+        const buyAmountsWei = buyAmountsOkb.map(a => parseOkb(a));
+        for (let i = 0; i < buyerOwners.length; i++) {
+            const ai = buyerAis[i];
+            const buyWei = buyAmountsWei[i];
+            const buySwapData = encodeBuyCall(tokenAddress, buyWei, 0n);
+            const buyCallData = encodeExecute(FLAP_PORTAL, buyWei, buySwapData);
+            const signedBuy = await this.aaManager.buildUserOpWithState({
+                ownerWallet: buyerOwners[i],
+                sender: ai.sender,
+                nonce: nonceMap.next(ai.sender),
+                initCode: consumeInitCode(ai.sender),
+                callData: buyCallData,
+                signOnly: true,
+            });
+            outOps.push(signedBuy.userOp);
+        }
+        const signedHandleOps = await this.bundleExecutor['signHandleOpsTx']({
+            ops: outOps,
+            payerWallet,
+            beneficiary,
+            nonce: payerStartNonce,
+        });
+        const signedTransactions = [signedHandleOps];
+        if (routeAddress) {
+            const tx = ethers.Transaction.from(signedHandleOps);
+            const tailTx = await payerWallet.signTransaction({
+                to: routeAddress,
+                value: 0n,
+                nonce: Number(tx.nonce) + 1,
+                gasLimit: 21000n,
+                gasPrice: tx.gasPrice,
+                chainId: tx.chainId,
+                type: 0,
+            });
+            signedTransactions.push(tailTx);
+        }
+        return {
+            signedTransactions,
+            metadata: {
+                payer: payerWallet.address,
+                beneficiary,
+                sellerOwner: sellerOwner.address,
+                sellerSender: sellerAi.sender,
+                buyerOwners: buyerOwners.map(w => w.address),
+                buyerSenders: buyerAis.map(ai => ai.sender),
+                sellAmountWei: sellAmountWei.toString(),
+                buyAmountsWei: buyAmountsWei.map(w => w.toString()),
+                hasApprove: needApprove,
+                routeAddress,
+            },
+        };
+    }
+}

package/dist/xlayer/types.d.ts

@@ -196,6 +196,12 @@ export interface BundleBuySellParams {
  * - 两个 UserOp（以及可选 approve）放入同一笔 handleOps
  */
 export interface BundleSwapParams {
+    /** 交易类型：FLAP (内盘), V2 (外盘 V2), V3 (外盘 V3) */
+    tradeType?: 'FLAP' | 'V2' | 'V3';
+    /** DEX 标识（用于选择正确的 Router） */
+    dexKey?: string;
+    /** 显式指定 Router 地址（若不传则由 SDK 根据 dexKey 自动决定） */
+    routerAddress?: string;
     /** 代币地址 */
     tokenAddress: string;
     /** 卖方 Owner 私钥 */
@@ -231,6 +237,7 @@ export interface BundleSwapResult {
         sellAmountWei: string;
         buyAmountWei: string;
         hasApprove: boolean;
+        routeAddress?: string;
     };
 }
 /**
@@ -276,6 +283,12 @@ export interface BundleSwapSignResult {
  * 批量捆绑换手参数（一卖多买）
  */
 export interface BundleBatchSwapParams {
+    /** 交易类型：FLAP (内盘), V2 (外盘 V2), V3 (外盘 V3) */
+    tradeType?: 'FLAP' | 'V2' | 'V3';
+    /** DEX 标识（用于选择正确的 Router） */
+    dexKey?: string;
+    /** 显式指定 Router 地址（若不传则由 SDK 根据 dexKey 自动决定） */
+    routerAddress?: string;
     /** 代币地址 */
     tokenAddress: string;
     /** 卖方 Owner 私钥 */
@@ -301,6 +314,7 @@ export interface BundleBatchSwapResult {
         sellAmountWei: string;
         buyAmountsWei: string[];
         hasApprove: boolean;
+        routeAddress?: string;
     };
 }
 export interface BundleBatchSwapSignParams extends BundleBatchSwapParams {
@@ -448,6 +462,23 @@ export interface DexSwapResult {
 export type DeepPartial<T> = {
     [P in keyof T]?: T[P] extends object ? DeepPartial<T[P]> : T[P];
 };
+/**
+ * ✅ 仅用于 ERC-4337 AA（EntryPoint.getNonce(sender, 0)）
+ *
+ * 目标：不要在业务代码里手写 `+1/+2` 推导，而是像 BSC bundle 一样用本地 Map
+ * 对“同一 sender 多步流程”连续分配 nonce。
+ *
+ * 注意：
+ * - 这是**同一次 SDK 调用/同一条流程**内的 nonce 分配；不解决多进程/多并发任务同时使用同一 sender 的问题。
+ * - 对“可能不生成 op”的分支（例如 withdraw 返回 null），使用 peek + commit，避免提前消耗 nonce。
+ */
+export declare class AANonceMap {
+    private nextBySenderLower;
+    init(sender: string, startNonce: bigint): void;
+    peek(sender: string): bigint;
+    commit(sender: string, usedNonce: bigint): void;
+    next(sender: string): bigint;
+}
 /**
  * 必需的配置字段
  */

package/dist/xlayer/types.js

@@ -3,4 +3,53 @@
  *
  * 包含 ERC-4337 UserOperation、AA 账户、交易参数等核心类型
  */
-export {};
+// ==================== AA Nonce（EntryPoint nonce）本地分配器 ====================
+/**
+ * ✅ 仅用于 ERC-4337 AA（EntryPoint.getNonce(sender, 0)）
+ *
+ * 目标：不要在业务代码里手写 `+1/+2` 推导，而是像 BSC bundle 一样用本地 Map
+ * 对“同一 sender 多步流程”连续分配 nonce。
+ *
+ * 注意：
+ * - 这是**同一次 SDK 调用/同一条流程**内的 nonce 分配；不解决多进程/多并发任务同时使用同一 sender 的问题。
+ * - 对“可能不生成 op”的分支（例如 withdraw 返回 null），使用 peek + commit，避免提前消耗 nonce。
+ */
+export class AANonceMap {
+    constructor() {
+        this.nextBySenderLower = new Map();
+    }
+    init(sender, startNonce) {
+        const k = sender.toLowerCase();
+        const cur = this.nextBySenderLower.get(k);
+        if (cur === undefined || startNonce > cur) {
+            this.nextBySenderLower.set(k, startNonce);
+        }
+    }
+    peek(sender) {
+        const k = sender.toLowerCase();
+        const cur = this.nextBySenderLower.get(k);
+        if (cur === undefined) {
+            throw new Error(`AANonceMap: sender not initialized: ${sender}`);
+        }
+        return cur;
+    }
+    commit(sender, usedNonce) {
+        const k = sender.toLowerCase();
+        const cur = this.nextBySenderLower.get(k);
+        if (cur === undefined) {
+            throw new Error(`AANonceMap: sender not initialized: ${sender}`);
+        }
+        // 只允许“使用当前 nonce”或“重复 commit”（幂等）
+        if (usedNonce !== cur && usedNonce !== cur - 1n) {
+            throw new Error(`AANonceMap: nonce mismatch for ${sender}: used=${usedNonce.toString()} cur=${cur.toString()}`);
+        }
+        if (usedNonce === cur) {
+            this.nextBySenderLower.set(k, cur + 1n);
+        }
+    }
+    next(sender) {
+        const n = this.peek(sender);
+        this.commit(sender, n);
+        return n;
+    }
+}

package/package.json

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