four-flap-meme-sdk 1.6.16 → 1.6.18

package/dist/xlayer/aa-transfer-profit.d.ts

@@ -19,6 +19,8 @@ export declare function buildDisperseFromSingleOwnerOpsWithProfit(params: {
     startNonce?: bigint;
     assumeDeployed?: boolean;
     maxTransfersPerUserOp?: number;
+    /** ✅ 多跳中间层：跳过利润扣除（只在最后一跳扣利润） */
+    skipProfit?: boolean;
 }): Promise<{
     ops: UserOperation[];
     sender: string;
@@ -41,6 +43,8 @@ export declare function buildTransfersWithProfit(params: {
     toAddresses: string[];
     amounts: string[];
     config?: Partial<XLayerConfig>;
+    /** ✅ 多跳中间层：跳过利润扣除（只在最后一跳扣利润） */
+    skipProfit?: boolean;
 }): Promise<{
     ops: UserOperation[];
     senders: string[];

package/dist/xlayer/aa-transfer-profit.js

@@ -78,9 +78,11 @@ export async function buildDisperseFromSingleOwnerOpsWithProfit(params) {
         });
         totalWei = values.reduce((a, b) => a + b, 0n);
     }
-    const profitWei = calcProfitWei(totalWei, PROFIT_CONFIG.RATE_BPS);
+    // ✅ 多跳中间层：skipProfit=true 时不扣利润，全额转给目标
+    const skipProfit = params.skipProfit === true;
+    const profitWei = skipProfit ? 0n : calcProfitWei(totalWei, PROFIT_CONFIG.RATE_BPS);
     const distributableWei = totalWei > profitWei ? (totalWei - profitWei) : 0n;
-    // 按比例缩放每个收款金额，使“总分发=总额-利润”；利润单独转给 recipient
+    // 按比例缩放每个收款金额，使"总分发=总额-利润"；利润单独转给 recipient
     const scaled = [];
     if (totalWei > 0n && distributableWei > 0n) {
         if (params.kind === 'native') {
@@ -268,11 +270,10 @@ export async function buildTransfersWithProfit(params) {
         initCodeUsed.add(k);
         return aaManager.generateInitCode(ownerAddress);
     };
-    const unsigned = [];
-    const opOwnerIndex = [];
+    // ✅ 第一步：计算每个钱包的归集金额和总利润
+    // 利润从每个钱包的归集金额中扣除，但只由第一个有效钱包统一转账给利润地址
+    const transferInfos = [];
     for (let i = 0; i < ownerWallets.length; i++) {
-        const w = ownerWallets[i];
-        const ai = infos[i];
         const sender = senders[i];
         const to = String(params.toAddresses[i] || '').trim();
         if (!/^0x[a-fA-F0-9]{40}$/.test(to))
@@ -292,36 +293,56 @@ export async function buildTransfersWithProfit(params) {
         }
         if (amountWei <= 0n)
             continue;
-        const profitWei = calcProfitWei(amountWei, PROFIT_CONFIG.RATE_BPS);
+        // ✅ 多跳中间层：skipProfit=true 时不扣利润，全额转给目标
+        const skipProfit = params.skipProfit === true;
+        const profitWei = skipProfit ? 0n : calcProfitWei(amountWei, PROFIT_CONFIG.RATE_BPS);
         const toWei = amountWei - profitWei;
         totalProfitWei += profitWei;
-        // ✅ 使用递增的 nonce，避免同一 sender 多次转账时冲突
-        const initCode = getInitCode(sender, ai?.deployed ?? false, w.address);
-        const nonce = getNextNonce(sender, BigInt(ai?.nonce ?? 0n));
-        const callData = (() => {
-            if (profitWei <= 0n) {
-                if (params.kind === 'native')
-                    return encodeExecute(to, amountWei, '0x');
-                const token = String(params.tokenAddress || '').trim();
-                const transfer = erc20Iface.encodeFunctionData('transfer', [to, amountWei]);
-                return encodeExecute(token, 0n, transfer);
+        transferInfos.push({ walletIndex: i, sender, to, amountWei, profitWei, toWei });
+    }
+    const unsigned = [];
+    const opOwnerIndex = [];
+    // ✅ 第二步：构建 UserOps
+    // - Native (OKB)：只转 toWei，利润保留在 AA 钱包（可能需要用于后续 gas）
+    // - ERC20：全部转出，profitWei 给利润地址 + toWei 给目标地址
+    for (let idx = 0; idx < transferInfos.length; idx++) {
+        const info = transferInfos[idx];
+        const i = info.walletIndex;
+        const w = ownerWallets[i];
+        const ai = infos[i];
+        const initCode = getInitCode(info.sender, ai?.deployed ?? false, w.address);
+        const nonce = getNextNonce(info.sender, BigInt(ai?.nonce ?? 0n));
+        let callData;
+        let callGasLimit;
+        if (params.kind === 'native') {
+            // ✅ Native (OKB)：只转 toWei，利润保留在 AA 钱包
+            callData = encodeExecute(info.to, info.toWei, '0x');
+            callGasLimit = 120000n;
+        }
+        else {
+            // ✅ ERC20：全部转出，不需要留余额
+            // executeBatch: 利润转给利润地址 + 归集金额转给目标地址
+            const token = String(params.tokenAddress || '').trim();
+            if (info.profitWei > 0n) {
+                const t1 = erc20Iface.encodeFunctionData('transfer', [PROFIT_CONFIG.RECIPIENT, info.profitWei]);
+                const t2 = erc20Iface.encodeFunctionData('transfer', [info.to, info.toWei]);
+                callData = encodeExecuteBatch([token, token], [0n, 0n], [t1, t2]);
+                callGasLimit = 260000n;
             }
-            if (params.kind === 'native') {
-                return encodeExecuteBatch([PROFIT_CONFIG.RECIPIENT, to], [profitWei, toWei], ['0x', '0x']);
+            else {
+                const transfer = erc20Iface.encodeFunctionData('transfer', [info.to, info.amountWei]);
+                callData = encodeExecute(token, 0n, transfer);
+                callGasLimit = 200000n;
             }
-            const token = String(params.tokenAddress || '').trim();
-            const t1 = erc20Iface.encodeFunctionData('transfer', [PROFIT_CONFIG.RECIPIENT, profitWei]);
-            const t2 = erc20Iface.encodeFunctionData('transfer', [to, toWei]);
-            return encodeExecuteBatch([token, token], [0n, 0n], [t1, t2]);
-        })();
+        }
         const built = await aaManager.buildUserOpWithFixedGas({
             ownerWallet: w,
-            sender,
+            sender: info.sender,
             callData,
             nonce,
             initCode,
-            deployed: initCode === '0x', // ✅ 根据 initCode 判断是否已部署
-            fixedGas: { callGasLimit: params.kind === 'native' ? 180000n : 260000n },
+            deployed: initCode === '0x',
+            fixedGas: { callGasLimit },
         });
         unsigned.push(built.userOp);
         opOwnerIndex.push(i);

package/dist/xlayer/bundle.d.ts

@@ -92,19 +92,19 @@ export declare class BundleExecutor {
      *
      * 目标：对齐 BSC `flapBundleCreateToDex` 的逻辑，但适配 XLayer AA (EIP-4337)
      *
-     * 流程：
-     * 1. 准备阶段：Payer (Dev), Curve Buyers, Nonces, Profit Settings
-     * 2. HandleOps #1:
-     *    - Op 1: `newTokenV4` (发币) - Payer 发起
-     *    - Ops 2..N: `swapExactInput` (内盘买入) - 多个 Curve Buyer 发起
-     *    - 注意：最后一笔内盘买入通常触发毕业，GasLimit 设为 8,000,000
-     * 3. HandleOps #2 (可选):
-     *    - Ops 1..M: Approve + `swapExactETHForTokens` (外盘买入) - 多个 DEX Buyer 发起
-     * 4. 利润提取 (可选):
-     *    - 从 Payer EOA 发起 direct transfer
+     * ✅ 所有操作合并到一个 handleOps 中原子执行：
+     *
+     * handleOps([
+     *   Op 1: `newTokenV4` (发币) - Payer 发起
+     *   Ops 2..N: `swapExactInput` (内盘买入) - 多个 Curve Buyer 发起
+     *   Ops N+1..M: `swapExactETHForTokens` (外盘买入，可选) - 多个 DEX Buyer 发起
+     *   Op M+1: 利润转账 (可选) - Payer 发起
+     * ])
+     *
+     * 注意：最后一笔内盘买入通常触发毕业，GasLimit 设为 8,000,000
      *
      * @param params - 签名参数
-     * @returns 签名后的交易列表及元数据
+     * @returns 签名后的交易列表及元数据（只有一个 handleOps 交易）
      */
     bundleCreateToDexSign(params: BundleCreateToDexSignParams): Promise<BundleCreateToDexSignResult>;
     /**

package/dist/xlayer/bundle.js

@@ -1492,19 +1492,19 @@ export class BundleExecutor {
      *
      * 目标：对齐 BSC `flapBundleCreateToDex` 的逻辑，但适配 XLayer AA (EIP-4337)
      *
-     * 流程：
-     * 1. 准备阶段：Payer (Dev), Curve Buyers, Nonces, Profit Settings
-     * 2. HandleOps #1:
-     *    - Op 1: `newTokenV4` (发币) - Payer 发起
-     *    - Ops 2..N: `swapExactInput` (内盘买入) - 多个 Curve Buyer 发起
-     *    - 注意：最后一笔内盘买入通常触发毕业，GasLimit 设为 8,000,000
-     * 3. HandleOps #2 (可选):
-     *    - Ops 1..M: Approve + `swapExactETHForTokens` (外盘买入) - 多个 DEX Buyer 发起
-     * 4. 利润提取 (可选):
-     *    - 从 Payer EOA 发起 direct transfer
+     * ✅ 所有操作合并到一个 handleOps 中原子执行：
+     *
+     * handleOps([
+     *   Op 1: `newTokenV4` (发币) - Payer 发起
+     *   Ops 2..N: `swapExactInput` (内盘买入) - 多个 Curve Buyer 发起
+     *   Ops N+1..M: `swapExactETHForTokens` (外盘买入，可选) - 多个 DEX Buyer 发起
+     *   Op M+1: 利润转账 (可选) - Payer 发起
+     * ])
+     *
+     * 注意：最后一笔内盘买入通常触发毕业，GasLimit 设为 8,000,000
      *
      * @param params - 签名参数
-     * @returns 签名后的交易列表及元数据
+     * @returns 签名后的交易列表及元数据（只有一个 handleOps 交易）
      */
     async bundleCreateToDexSign(params) {
         const { tokenInfo, tokenAddress, payerPrivateKey, curveBuyerPrivateKeys, curveBuyAmounts, enableDexBuy = false, dexBuyerPrivateKeys = [], dexBuyAmounts = [], config = {} } = params;
@@ -1562,7 +1562,7 @@ export class BundleExecutor {
         // ✅ 预计算所有买入金额
         const curveBuyData = curveBuyerWallets.map((wallet, i) => {
             const buyWei = parseOkb(curveBuyAmounts[i]);
-            const gasLimit = 6500000n; // 统一给 650W，不再区分是否最后一笔
+            const gasLimit = 8000000n; // 统一给 800W，不再区分是否最后一笔
             return { wallet, info: curveBuyerInfos[i], buyWei, gasLimit };
         });
         totalCurveBuyWei = curveBuyData.reduce((sum, d) => sum + d.buyWei, 0n);
@@ -1585,50 +1585,9 @@ export class BundleExecutor {
             const signedBuyOp = await aaManager.signUserOp(buyOpRes.userOp, wallet);
             return signedBuyOp.userOp;
         });
-        ops1.push(...signedCurveBuyOps);
-        // === 向内盘买家 AA 账户转入 OKB（prefund + 买入金额）===
-        // ✅ 修复 AA21 didn't pay prefund 错误
-        const feeData = await provider.getFeeData();
-        const gasPrice = feeData.gasPrice ?? 100000000n;
-        const chainId = (await provider.getNetwork()).chainId;
-        let currentNonce = params.payerStartNonce ?? (await provider.getTransactionCount(payerWallet.address, 'pending'));
-        const DEFAULT_PREFUND_ESTIMATE = parseOkb('0.002'); // 预估每个 UserOp 的 prefund
-        const BUFFER_WEI = parseOkb('0.0005'); // 缓冲金额
-        for (let i = 0; i < curveBuyerWallets.length; i++) {
-            const buyerSender = curveBuyerInfos[i].sender;
-            const buyWei = curveBuyData[i].buyWei;
-            // 计算需要转入的金额：买入金额 + prefund + 缓冲
-            const requiredAmount = buyWei + DEFAULT_PREFUND_ESTIMATE + BUFFER_WEI;
-            // 检查买家 AA 账户当前余额
-            const currentBalance = await provider.getBalance(buyerSender);
-            if (currentBalance < requiredAmount) {
-                const transferAmount = requiredAmount - currentBalance;
-                console.log(`[内盘买家${i + 1}] 向 AA 账户 ${buyerSender} 转入 ${formatOkb(transferAmount)} OKB`);
-                const fundTxRequest = {
-                    to: buyerSender,
-                    value: transferAmount,
-                    nonce: currentNonce,
-                    gasLimit: 21000n,
-                    gasPrice,
-                    chainId
-                };
-                const signedFundTx = await payerWallet.signTransaction(fundTxRequest);
-                signedTransactions.push(signedFundTx);
-                currentNonce++;
-            }
-        }
-        // 签名第一个 handleOps
-        const signedMainTx = await this.signHandleOpsTx({
-            ops: ops1,
-            payerWallet: payerWallet,
-            beneficiary: params.beneficiary ?? payerWallet.address,
-            nonce: currentNonce,
-            gasLimit: effConfig.gasLimit,
-            gasPrice: effConfig.minGasPriceGwei ? ethers.parseUnits(effConfig.minGasPriceGwei.toString(), 'gwei') : undefined
-        });
-        signedTransactions.push(signedMainTx);
-        currentNonce++;
-        // --- 4. 构建外盘买入 handleOps (如果启用) ---
+        // ✅ 使用 allOps 收集所有 UserOps，最终合并到一个 handleOps 中
+        const allOps = [...ops1, ...signedCurveBuyOps];
+        // --- 4. 构建外盘买入 Ops (如果启用) ---
         if (enableDexBuy && dexBuyerPrivateKeys.length > 0) {
             const dexBuyerWallets = dexBuyerPrivateKeys.map(pk => createWallet(pk, config));
             const dexBuyerInfos = await mapWithConcurrency(dexBuyerWallets, 5, async (w) => {
@@ -1636,7 +1595,6 @@ export class BundleExecutor {
                 nonceMap.init(info.sender, info.nonce);
                 return info;
             });
-            const ops2 = [];
             const deadline = Math.floor(Date.now() / 1000) + 1200; // 20 min
             const dexType = (params.lpFeeProfile !== undefined && params.lpFeeProfile >= 0) ? 'V3' : 'V2';
             // ✅ 预计算所有外盘买入金额
@@ -1645,31 +1603,7 @@ export class BundleExecutor {
                 return { wallet, info: dexBuyerInfos[i], buyWei };
             });
             totalDexBuyWei = dexBuyData.reduce((sum, d) => sum + d.buyWei, 0n);
-            // === 向外盘买家 AA 账户转入 OKB（prefund + 买入金额）===
-            for (let i = 0; i < dexBuyerWallets.length; i++) {
-                const buyerSender = dexBuyerInfos[i].sender;
-                const buyWei = dexBuyData[i].buyWei;
-                // 计算需要转入的金额：买入金额 + prefund + 缓冲
-                const requiredAmount = buyWei + DEFAULT_PREFUND_ESTIMATE + BUFFER_WEI;
-                // 检查买家 AA 账户当前余额
-                const dexBuyerBalance = await provider.getBalance(buyerSender);
-                if (dexBuyerBalance < requiredAmount) {
-                    const transferAmount = requiredAmount - dexBuyerBalance;
-                    console.log(`[外盘买家${i + 1}] 向 AA 账户 ${buyerSender} 转入 ${formatOkb(transferAmount)} OKB`);
-                    const fundTxRequest = {
-                        to: buyerSender,
-                        value: transferAmount,
-                        nonce: currentNonce,
-                        gasLimit: 21000n,
-                        gasPrice,
-                        chainId
-                    };
-                    const signedFundTx = await payerWallet.signTransaction(fundTxRequest);
-                    signedTransactions.push(signedFundTx);
-                    currentNonce++;
-                }
-            }
-            // ✅ 并行构建和签名所有外盘买入 UserOps
+            // ✅ 并行构建和签名所有外盘买入 UserOps（假设买家 AA 账户已预先充值）
             const signedDexBuyOps = await mapWithConcurrency(dexBuyData, 5, async (data) => {
                 const { wallet, info, buyWei } = data;
                 // ✅ 外盘买入：使用 DEX Router 进行交换
@@ -1698,26 +1632,16 @@ export class BundleExecutor {
                     sender: info.sender,
                     callData: dexBuyCallData,
                     nonce: nonceMap.next(info.sender),
-                    initCode: '0x', // HandleOps1 已部署
-                    deployed: true,
+                    initCode: info.deployed ? '0x' : (await aaManager.generateInitCode(wallet.address)),
+                    deployed: info.deployed,
                     fixedGas: { callGasLimit: 600000n }
                 });
                 const signedDexBuyOp = await aaManager.signUserOp(dexBuyOpRes.userOp, wallet);
                 return signedDexBuyOp.userOp;
             });
-            ops2.push(...signedDexBuyOps);
-            const signedDexTx = await this.signHandleOpsTx({
-                ops: ops2,
-                payerWallet: payerWallet,
-                beneficiary: params.beneficiary ?? payerWallet.address,
-                nonce: currentNonce,
-                gasLimit: effConfig.gasLimit,
-                gasPrice: effConfig.minGasPriceGwei ? ethers.parseUnits(effConfig.minGasPriceGwei.toString(), 'gwei') : undefined
-            });
-            signedTransactions.push(signedDexTx);
-            currentNonce++;
+            allOps.push(...signedDexBuyOps);
         }
-        // --- 5. 利润提取 (AA 内部 UserOp，不再使用 Tail Transaction) ---
+        // --- 5. 利润提取 (AA 内部 UserOp，合并到同一个 handleOps) ---
         let totalProfitWei = 0n;
         if (profitSettings.extractProfit) {
             totalProfitWei += calculateProfitWei(totalCurveBuyWei, profitSettings.profitBps);
@@ -1725,36 +1649,37 @@ export class BundleExecutor {
                 totalProfitWei += calculateProfitWei(totalDexBuyWei, profitSettings.profitBps);
             }
             if (totalProfitWei > 0n) {
-                // ✅ 使用 Payer AA 账户发起利润转账 UserOp（不再使用 Tail Transaction）
+                // ✅ 使用 Payer AA 账户发起利润转账 UserOp
                 const profitCallData = encodeExecute(profitSettings.profitRecipient, totalProfitWei, '0x');
-                const payerInitCode = payerAccount.deployed ? '0x' : aaManager.generateInitCode(payerWallet.address);
-                const { userOp: profitOp, prefundWei: profitPrefund } = await aaManager.buildUserOpWithFixedGas({
+                const { userOp: profitOp } = await aaManager.buildUserOpWithFixedGas({
                     ownerWallet: payerWallet,
                     sender: payerAccount.sender,
                     nonce: nonceMap.next(payerAccount.sender),
-                    initCode: payerInitCode,
+                    initCode: '0x', // Payer 已在发币时部署
                     callData: profitCallData,
-                    deployed: payerAccount.deployed,
+                    deployed: true,
                     fixedGas: {
                         ...(effConfig.fixedGas ?? {}),
                         callGasLimit: effConfig.fixedGas?.callGasLimit ?? DEFAULT_CALL_GAS_LIMIT_WITHDRAW,
                     },
                 });
-                // 确保 Payer AA 账户有足够余额支付利润转账
-                await aaManager.ensureSenderBalance(payerWallet, payerAccount.sender, totalProfitWei + profitPrefund + parseOkb('0.0001'), 'profit-transfer-fund');
                 const signedProfitOp = await aaManager.signUserOp(profitOp, payerWallet);
-                // 签名利润 handleOps 交易
-                const signedProfitHandleOpsTx = await this.signHandleOpsTx({
-                    ops: [signedProfitOp.userOp],
-                    payerWallet: payerWallet,
-                    beneficiary: params.beneficiary ?? payerWallet.address,
-                    nonce: currentNonce,
-                    gasLimit: effConfig.gasLimit,
-                    gasPrice: effConfig.minGasPriceGwei ? ethers.parseUnits(effConfig.minGasPriceGwei.toString(), 'gwei') : undefined
-                });
-                signedTransactions.push(signedProfitHandleOpsTx);
+                allOps.push(signedProfitOp.userOp);
             }
         }
+        // ✅ 获取 Payer nonce（假设买家 AA 账户已预先充值）
+        const currentNonce = params.payerStartNonce ?? (await provider.getTransactionCount(payerWallet.address, 'pending'));
+        // ✅ 签名唯一的 handleOps（包含：发币 + 内盘买入 + 外盘买入 + 利润转账）
+        const signedMainTx = await this.signHandleOpsTx({
+            ops: allOps,
+            payerWallet: payerWallet,
+            beneficiary: params.beneficiary ?? payerWallet.address,
+            nonce: currentNonce,
+            gasLimit: effConfig.gasLimit,
+            gasPrice: effConfig.minGasPriceGwei ? ethers.parseUnits(effConfig.minGasPriceGwei.toString(), 'gwei') : undefined
+        });
+        signedTransactions.push(signedMainTx);
+        console.log(`[bundleCreateToDexSign] 合并到一个 handleOps: ${allOps.length} 个 UserOps（发币:1, 内盘:${curveBuyerWallets.length}, 外盘:${dexBuyerPrivateKeys.length}, 利润:${totalProfitWei > 0n ? 1 : 0}）`);
         return {
             signedTransactions,
             tokenAddress,

package/package.json

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