four-flap-meme-sdk 1.6.30 → 1.6.31

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

@@ -3,7 +3,11 @@
  */
 import { Wallet, ethers } from 'ethers';
 import { AANonceMap, } from './types.js';
-import { POTATOSWAP_V2_ROUTER, POTATOSWAP_V3_ROUTER, POTATOSWAP_V3_FACTORY, WOKB, MULTICALL3, } from './constants.js';
+import { POTATOSWAP_V2_ROUTER, POTATOSWAP_V3_ROUTER, POTATOSWAP_V3_FACTORY, WOKB, MULTICALL3, VERIFICATION_GAS_LIMIT_DEPLOY, VERIFICATION_GAS_LIMIT_NORMAL, PRE_VERIFICATION_GAS, } from './constants.js';
+// 多跳 prefund 估算用的 gas 常量（可配置）
+const HOP_CALL_GAS_LIMIT = 150000n; // hop 转账操作
+const DEX_BUY_CALL_GAS_LIMIT = 650000n; // DEX V3 买入操作
+const PREFUND_BUFFER_PERCENT = 120n; // prefund buffer 百分比 (120 = 1.2x)
 import { AAAccountManager, encodeExecute, encodeExecuteBatch } from './aa-account.js';
 import { encodeApproveCall, lpFeeProfileToV3Fee, } from './portal-ops.js';
 import { DexQuery, encodeSwapExactETHForTokensSupportingFee, encodeSwapExactTokensForETHSupportingFee, encodeSwapExactETHForTokensV3, encodeSwapExactTokensForETHV3, encodeSwapExactTokensForTokensSupportingFee, } from './dex.js';
@@ -586,13 +590,12 @@ export class AADexSwapExecutor {
                 const feeData = await this.aaManager.getFeeData();
                 const gasPrice = feeData.gasPrice ?? feeData.maxFeePerGas ?? 5000000000n; // 5 gwei fallback
                 const estimateBuyerPrefund = (deployed) => {
-                    // 买入操作的 gas：V3 swap 约 650,000，部署需要额外 verificationGas
-                    const callGas = 650000n;
-                    const verifyGas = deployed ? 250000n : 800000n;
-                    const preVerifyGas = 60000n;
+                    // 买入操作的 gas（使用常量）
+                    const callGas = DEX_BUY_CALL_GAS_LIMIT;
+                    const verifyGas = deployed ? VERIFICATION_GAS_LIMIT_NORMAL : VERIFICATION_GAS_LIMIT_DEPLOY;
+                    const preVerifyGas = PRE_VERIFICATION_GAS;
                     const totalGas = callGas + verifyGas + preVerifyGas;
-                    // 加 20% buffer 以确保足够
-                    return (totalGas * gasPrice * 120n) / 100n;
+                    return (totalGas * gasPrice * PREFUND_BUFFER_PERCENT) / 100n;
                 };
                 // 计算每个买方需要的 prefund
                 const buyerPrefunds = buyerAis.map(ai => estimateBuyerPrefund(ai.deployed));
@@ -637,183 +640,149 @@ export class AADexSwapExecutor {
                 }
             }
             else {
-                // ✅ 多跳模式：动态生成独立的多跳钱包（不再使用买方钱包）
-                console.log('[AA DEX 批量换手] 进入多跳模式 (hopCount > 0):', { hopCount });
-                // ✅ 动态生成 hopCount 个独立的多跳钱包
-                const generatedHopWallets = [];
-                for (let i = 0; i < hopCount; i++) {
-                    const randomWallet = ethers.Wallet.createRandom();
-                    generatedHopWallets.push(new ethers.Wallet(randomWallet.privateKey));
-                }
-                // 预测这些 hop 钱包的 AA sender 地址
-                const hopAiPromises = generatedHopWallets.map(async (w) => {
-                    const sender = await this.aaManager.predictSenderAddress(w.address);
-                    const code = await provider.getCode(sender);
-                    const deployed = code && code !== '0x';
-                    const initCode = deployed ? '0x' : this.aaManager.generateInitCode(w.address);
-                    return { sender, deployed, initCode, ownerAddress: w.address };
-                });
-                const hopAis = await Promise.all(hopAiPromises);
-                const hopSenders = hopAis.map(ai => ai.sender);
-                const hopOwners = generatedHopWallets;
-                // ✅ 关键：为动态生成的 hop 钱包初始化 nonce（新账户从 0 开始）
-                for (const hopAi of hopAis) {
-                    nonceMap.init(hopAi.sender, 0n);
-                }
-                // ✅ 关键修复：计算每个 hop 钱包执行 UserOp 需要的 prefund（gas 费用）
-                // EntryPoint 在 validation 阶段会扣除 prefund，此时 hop 钱包还没收到 seller 的转账
-                // 因此需要在 seller 转账时额外包含 hop 的 gas 费用
+                // ✅ 多跳模式（BSC 模式）：每个买方有独立的多跳链
+                // 填写 3 跳 + 2 个买方 = 2 条独立的多跳链，每条 3 个 hop 钱包 = 6 个动态生成的 hop 钱包
+                console.log('[AA DEX 批量换手] 进入多跳模式 (hopCount > 0):', { hopCount, buyerCount: buyerSenders.length });
                 const feeData = await this.aaManager.getFeeData();
-                const gasPrice = feeData.gasPrice ?? feeData.maxFeePerGas ?? 5000000000n; // 5 gwei fallback
-                // 每个 hop 钱包的预估 prefund：(callGasLimit + verificationGasLimit + preVerificationGas) * gasPrice
-                // 未部署账户需要更高的 verificationGasLimit（约 800,000），已部署约 250,000
-                // callGasLimit 约 150,000（native 转账），preVerificationGas 约 21,000
-                const estimateHopPrefund = (deployed) => {
-                    const callGas = 150000n;
-                    const verifyGas = deployed ? 250000n : 800000n;
-                    const preVerifyGas = 21000n;
+                const gasPrice = feeData.gasPrice ?? feeData.maxFeePerGas ?? 5000000000n;
+                // 预估 prefund 的函数（使用全局常量）
+                const estimatePrefund = (callGas, deployed) => {
+                    const verifyGas = deployed ? VERIFICATION_GAS_LIMIT_NORMAL : VERIFICATION_GAS_LIMIT_DEPLOY;
+                    const preVerifyGas = PRE_VERIFICATION_GAS;
                     const totalGas = callGas + verifyGas + preVerifyGas;
-                    // 加 20% buffer 以确保足够
-                    return (totalGas * gasPrice * 120n) / 100n;
+                    return (totalGas * gasPrice * PREFUND_BUFFER_PERCENT) / 100n;
                 };
-                // 计算所有 hop 钱包需要的总 prefund
-                let totalHopPrefund = 0n;
-                const hopPrefunds = [];
-                for (let j = 0; j < hopSenders.length; j++) {
-                    const isLastHop = j === hopSenders.length - 1;
-                    const hopAi = hopAis[j];
-                    const hopDeployed = hopAi.deployed;
-                    if (isLastHop) {
-                        // ✅ 最后一个 hop 需要分发给所有买方
-                        const disperseOpCount = Math.ceil(buyerSenders.length / maxPerOp) || 1;
-                        const prefund = estimateHopPrefund(hopDeployed) * BigInt(disperseOpCount);
-                        hopPrefunds.push(prefund);
-                        totalHopPrefund += prefund;
-                    }
-                    else {
-                        const prefund = estimateHopPrefund(hopDeployed);
-                        hopPrefunds.push(prefund);
-                        totalHopPrefund += prefund;
+                // ✅ 为每个买方生成独立的多跳链
+                // hopChains[buyerIdx] = [hop0, hop1, ..., hop(H-1)] 每条链有 hopCount 个 hop 钱包
+                const allGeneratedHopWallets = [];
+                for (let buyerIdx = 0; buyerIdx < buyerSenders.length; buyerIdx++) {
+                    const chainHops = [];
+                    for (let h = 0; h < hopCount; h++) {
+                        const randomWallet = ethers.Wallet.createRandom();
+                        const wallet = new ethers.Wallet(randomWallet.privateKey);
+                        const sender = await this.aaManager.predictSenderAddress(wallet.address);
+                        const code = await provider.getCode(sender);
+                        const deployed = code !== null && code !== '0x';
+                        const initCode = deployed ? '0x' : this.aaManager.generateInitCode(wallet.address);
+                        chainHops.push({ wallet, sender, deployed, initCode });
+                        // 初始化 nonce
+                        nonceMap.init(sender, 0n);
                     }
+                    allGeneratedHopWallets.push(chainHops);
                 }
-                console.log(`[AA DEX 多跳] hop 数量: ${hopSenders.length}, 总 prefund 预估: ${ethers.formatEther(totalHopPrefund)} OKB`);
-                const hop0 = hopSenders[0];
-                let callData0;
-                // ✅ 关键修复：seller 转给 hop0 时，额外包含所有 hop 的 gas 费用
-                const amountToHop0 = totalBuyWei + totalHopPrefund;
-                if (useNativeToken) {
-                    // ✅ 原生代币模式
-                    if (extractProfit && profitWei > 0n) {
-                        callData0 = encodeExecuteBatch([hop0, profitRecipient], [amountToHop0, profitWei], ['0x', '0x']);
+                console.log(`[AA DEX 多跳] 总 hop 钱包数: ${buyerSenders.length * hopCount} (${buyerSenders.length} 条链 × ${hopCount} 跳)`);
+                // ✅ 利润刮取（只在第一笔 seller UserOp 中执行）
+                let profitHandled = false;
+                // ✅ 构建每条多跳链的 UserOps
+                for (let buyerIdx = 0; buyerIdx < buyerSenders.length; buyerIdx++) {
+                    const chainHops = allGeneratedHopWallets[buyerIdx];
+                    const buyerSender = buyerSenders[buyerIdx];
+                    const buyerAi = buyerAis[buyerIdx];
+                    const buyAmount = buyAmountsWei[buyerIdx] ?? 0n;
+                    if (buyAmount <= 0n)
+                        continue;
+                    // 计算这条链上所有 hop 的 prefund（使用常量）
+                    const hopPrefunds = chainHops.map((hop, idx) => {
+                        // 最后一个 hop 转账给 buyer，中间 hop 转账给下一个 hop
+                        return estimatePrefund(HOP_CALL_GAS_LIMIT, hop.deployed);
+                    });
+                    const totalHopPrefund = hopPrefunds.reduce((a, b) => a + b, 0n);
+                    // 计算 buyer 的 prefund（用于买入，使用常量）
+                    const buyerPrefund = estimatePrefund(DEX_BUY_CALL_GAS_LIMIT, buyerAi.deployed);
+                    // 这条链的总金额 = 买入金额 + 所有 hop prefund + buyer prefund
+                    const chainTotalAmount = buyAmount + totalHopPrefund + buyerPrefund;
+                    // 1) seller → hop0
+                    const hop0 = chainHops[0];
+                    let callData0;
+                    if (useNativeToken) {
+                        if (!profitHandled && extractProfit && profitWei > 0n) {
+                            // 第一笔 seller UserOp 同时刮取利润
+                            callData0 = encodeExecuteBatch([hop0.sender, profitRecipient], [chainTotalAmount, profitWei], ['0x', '0x']);
+                            profitHandled = true;
+                        }
+                        else {
+                            callData0 = encodeExecute(hop0.sender, chainTotalAmount, '0x');
+                        }
                     }
                     else {
-                        callData0 = encodeExecute(hop0, amountToHop0, '0x');
-                    }
-                }
-                else {
-                    // ✅ ERC20 模式
-                    if (extractProfit && profitWei > 0n) {
-                        const transferToHop0 = erc20Iface.encodeFunctionData('transfer', [hop0, totalBuyWei]);
-                        const transferToProfit = erc20Iface.encodeFunctionData('transfer', [profitRecipient, profitWei]);
-                        callData0 = encodeExecuteBatch([quoteToken, quoteToken], [0n, 0n], [transferToHop0, transferToProfit]);
+                        if (!profitHandled && extractProfit && profitWei > 0n) {
+                            const transferToHop0 = erc20Iface.encodeFunctionData('transfer', [hop0.sender, buyAmount]);
+                            const transferToProfit = erc20Iface.encodeFunctionData('transfer', [profitRecipient, profitWei]);
+                            callData0 = encodeExecuteBatch([quoteToken, quoteToken], [0n, 0n], [transferToHop0, transferToProfit]);
+                            profitHandled = true;
+                        }
+                        else {
+                            const transferData = erc20Iface.encodeFunctionData('transfer', [hop0.sender, buyAmount]);
+                            callData0 = encodeExecute(quoteToken, 0n, transferData);
+                        }
                     }
-                    else {
-                        const transferData = erc20Iface.encodeFunctionData('transfer', [hop0, totalBuyWei]);
-                        callData0 = encodeExecute(quoteToken, 0n, transferData);
+                    const signedSellerToHop0 = await this.aaManager.buildUserOpWithState({
+                        ownerWallet: sellerOwner,
+                        sender: sellerAi.sender,
+                        nonce: nonceMap.next(sellerAi.sender),
+                        initCode: consumeInitCode(sellerAi.sender),
+                        callData: callData0,
+                        signOnly: true,
+                    });
+                    outOps.push(signedSellerToHop0.userOp);
+                    // 2) hop[j] → hop[j+1] (中间跳)
+                    let remainingPrefund = totalHopPrefund;
+                    for (let j = 0; j < chainHops.length - 1; j++) {
+                        const currentHop = chainHops[j];
+                        const nextHop = chainHops[j + 1];
+                        // 当前 hop 扣除自己的 prefund 后转给下一个
+                        remainingPrefund -= hopPrefunds[j];
+                        const amountToTransfer = buyAmount + remainingPrefund + buyerPrefund;
+                        let callData;
+                        if (useNativeToken) {
+                            callData = encodeExecute(nextHop.sender, amountToTransfer, '0x');
+                        }
+                        else {
+                            const transferData = erc20Iface.encodeFunctionData('transfer', [nextHop.sender, buyAmount]);
+                            callData = encodeExecute(quoteToken, 0n, transferData);
+                        }
+                        const signedHop = await this.aaManager.buildUserOpWithState({
+                            ownerWallet: currentHop.wallet,
+                            sender: currentHop.sender,
+                            nonce: nonceMap.next(currentHop.sender),
+                            initCode: currentHop.initCode,
+                            callData,
+                            signOnly: true,
+                        });
+                        outOps.push(signedHop.userOp);
                     }
-                }
-                const signedToHop0 = await this.aaManager.buildUserOpWithState({
-                    ownerWallet: sellerOwner,
-                    sender: sellerAi.sender,
-                    nonce: nonceMap.next(sellerAi.sender),
-                    initCode: consumeInitCode(sellerAi.sender),
-                    callData: callData0,
-                    signOnly: true,
-                });
-                outOps.push(signedToHop0.userOp);
-                // 2) hop j -> hop j+1
-                // ✅ 修复：动态生成的 hop 钱包只做资金中转，不保留任何金额
-                let prefixPrefundUsed = hopPrefunds[0] ?? 0n; // hop0 自己用掉的 prefund
-                for (let j = 0; j < hopSenders.length - 1; j++) {
-                    const sender = hopSenders[j];
-                    const next = hopSenders[j + 1];
-                    const hopAi = hopAis[j];
-                    // 剩余需要转给后续 hop 的金额 = totalBuyWei + (剩余 hop 的 prefund)
-                    const remainingPrefund = totalHopPrefund - prefixPrefundUsed;
-                    const amountToTransfer = totalBuyWei + remainingPrefund;
-                    if (amountToTransfer <= 0n)
-                        break;
-                    let callData;
+                    // 3) lastHop → buyer
+                    const lastHop = chainHops[chainHops.length - 1];
+                    const amountToBuyer = buyAmount + buyerPrefund;
+                    let callDataLast;
                     if (useNativeToken) {
-                        callData = encodeExecute(next, amountToTransfer, '0x');
+                        callDataLast = encodeExecute(buyerSender, amountToBuyer, '0x');
                     }
                     else {
-                        // ERC20 模式：仍使用原来的 totalBuyWei（不含 prefund，因为 ERC20 模式 prefund 仍为 OKB）
-                        const transferData = erc20Iface.encodeFunctionData('transfer', [next, totalBuyWei]);
-                        callData = encodeExecute(quoteToken, 0n, transferData);
+                        const transferData = erc20Iface.encodeFunctionData('transfer', [buyerSender, buyAmount]);
+                        callDataLast = encodeExecute(quoteToken, 0n, transferData);
                     }
-                    const signedHop = await this.aaManager.buildUserOpWithState({
-                        ownerWallet: hopOwners[j],
-                        sender,
-                        nonce: nonceMap.next(sender),
-                        initCode: hopAi.initCode || '0x', // ✅ 使用动态生成的 hop 钱包的 initCode
-                        callData,
+                    const signedLastHop = await this.aaManager.buildUserOpWithState({
+                        ownerWallet: lastHop.wallet,
+                        sender: lastHop.sender,
+                        nonce: nonceMap.next(lastHop.sender),
+                        initCode: lastHop.initCode,
+                        callData: callDataLast,
                         signOnly: true,
                     });
-                    outOps.push(signedHop.userOp);
-                    // ✅ 更新已使用的 prefund（当前 hop 的 prefund 已被扣除）
-                    prefixPrefundUsed += hopPrefunds[j + 1] ?? 0n;
+                    outOps.push(signedLastHop.userOp);
                 }
-                // 3) lastHop 分发给所有买方（动态生成 hop 后，所有买方都是真正买方）
-                const lastHopIdx = hopSenders.length - 1;
-                const lastHopSender = hopSenders[lastHopIdx];
-                const lastHopOwner = hopOwners[lastHopIdx];
-                const lastHopAi = hopAis[lastHopIdx];
-                // ✅ 计算每个买方需要的 prefund（用于执行买入 UserOp）
-                const estimateBuyerPrefund = (deployed) => {
-                    const callGas = 650000n; // DEX V3 买入
-                    const verifyGas = deployed ? 250000n : 800000n;
-                    const preVerifyGas = 60000n;
-                    const totalGas = callGas + verifyGas + preVerifyGas;
-                    return (totalGas * gasPrice * 120n) / 100n;
-                };
-                const buyerPrefunds = buyerAis.map(ai => estimateBuyerPrefund(ai.deployed));
-                // ✅ 分发金额 = 买入金额 + 买方 prefund
-                const allItems = buyerSenders.map((to, i) => ({
-                    to,
-                    value: (buyAmountsWei[i] ?? 0n) + (buyerPrefunds[i] ?? 0n)
-                })).filter(x => x.value > 0n);
-                const restChunks = chunkArray(allItems, maxPerOp);
-                for (const ch of restChunks) {
-                    let callData;
-                    if (useNativeToken) {
-                        const { totalValue, data } = encodeNativeDisperseViaMulticall3({
-                            to: ch.map(x => x.to),
-                            values: ch.map(x => x.value),
+                // ✅ 保存所有动态生成的多跳钱包信息，用于后续导出
+                const allHopWalletsFlat = [];
+                for (const chainHops of allGeneratedHopWallets) {
+                    for (const hop of chainHops) {
+                        allHopWalletsFlat.push({
+                            address: hop.sender,
+                            privateKey: hop.wallet.privateKey,
                         });
-                        callData = encodeExecute(MULTICALL3, totalValue, data);
                     }
-                    else {
-                        const targets = ch.map(() => quoteToken);
-                        const values = ch.map(() => 0n);
-                        const datas = ch.map(x => erc20Iface.encodeFunctionData('transfer', [x.to, x.value]));
-                        callData = encodeExecuteBatch(targets, values, datas);
-                    }
-                    const signedDisperse = await this.aaManager.buildUserOpWithState({
-                        ownerWallet: lastHopOwner,
-                        sender: lastHopSender,
-                        nonce: nonceMap.next(lastHopSender),
-                        initCode: lastHopAi.initCode || '0x', // ✅ 使用动态生成的 hop 钱包的 initCode
-                        callData,
-                        signOnly: true,
-                    });
-                    outOps.push(signedDisperse.userOp);
                 }
-                // ✅ 保存动态生成的多跳钱包信息，用于后续导出
-                this._generatedHopWallets = generatedHopWallets.map((w, i) => ({
-                    address: hopSenders[i],
-                    privateKey: w.privateKey,
-                }));
+                this._generatedHopWallets = allHopWalletsFlat;
             }
         }
         else if (!capitalMode && extractProfit && profitWei > 0n) {

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

@@ -3,7 +3,11 @@
  */
 import { Wallet, ethers } from 'ethers';
 import { AANonceMap, } from './types.js';
-import { FLAP_PORTAL, ZERO_ADDRESS, MULTICALL3, } from './constants.js';
+import { FLAP_PORTAL, ZERO_ADDRESS, MULTICALL3, VERIFICATION_GAS_LIMIT_DEPLOY, VERIFICATION_GAS_LIMIT_NORMAL, PRE_VERIFICATION_GAS, } from './constants.js';
+// 多跳 prefund 估算用的 gas 常量（可配置）
+const HOP_CALL_GAS_LIMIT = 150000n; // hop 转账操作
+const PORTAL_BUY_CALL_GAS_LIMIT = 450000n; // Portal 买入操作
+const PREFUND_BUFFER_PERCENT = 120n; // prefund buffer 百分比 (120 = 1.2x)
 import { AAAccountManager, encodeExecute, encodeExecuteBatch } from './aa-account.js';
 import { encodeBuyCall, encodeSellCall, encodeBuyCallWithQuote, encodeSellCallWithQuote, encodeApproveCall, PortalQuery, parseOkb, } from './portal-ops.js';
 import { BundleExecutor } from './bundle.js';
@@ -395,13 +399,12 @@ export class AAPortalSwapExecutor {
                 const feeData = await this.aaManager.getFeeData();
                 const gasPrice = feeData.gasPrice ?? feeData.maxFeePerGas ?? 5000000000n; // 5 gwei fallback
                 const estimateBuyerPrefund = (deployed) => {
-                    // 买入操作的 gas：Portal 买入约 450,000，部署需要额外 verificationGas
-                    const callGas = 450000n;
-                    const verifyGas = deployed ? 250000n : 800000n;
-                    const preVerifyGas = 60000n;
+                    // 买入操作的 gas（使用常量）
+                    const callGas = PORTAL_BUY_CALL_GAS_LIMIT;
+                    const verifyGas = deployed ? VERIFICATION_GAS_LIMIT_NORMAL : VERIFICATION_GAS_LIMIT_DEPLOY;
+                    const preVerifyGas = PRE_VERIFICATION_GAS;
                     const totalGas = callGas + verifyGas + preVerifyGas;
-                    // 加 20% buffer 以确保足够
-                    return (totalGas * gasPrice * 120n) / 100n;
+                    return (totalGas * gasPrice * PREFUND_BUFFER_PERCENT) / 100n;
                 };
                 // 计算每个买方需要的 prefund
                 const buyerPrefunds = buyerAis.map(ai => estimateBuyerPrefund(ai.deployed));
@@ -444,185 +447,151 @@ export class AAPortalSwapExecutor {
                 }
             }
             else {
-                // ✅ 多跳模式：动态生成独立的多跳钱包（不再使用买方钱包）
-                console.log('[AA Portal 批量换手] 进入多跳模式 (hopCount > 0):', { hopCount });
-                // ✅ 动态生成 hopCount 个独立的多跳钱包
-                const generatedHopWallets = [];
-                for (let i = 0; i < hopCount; i++) {
-                    const randomWallet = ethers.Wallet.createRandom();
-                    generatedHopWallets.push(new ethers.Wallet(randomWallet.privateKey));
-                }
-                // 预测这些 hop 钱包的 AA sender 地址
-                const provider = this.aaManager.getProvider();
-                const hopAiPromises = generatedHopWallets.map(async (w) => {
-                    const sender = await this.aaManager.predictSenderAddress(w.address);
-                    const code = await provider.getCode(sender);
-                    const deployed = code && code !== '0x';
-                    const initCode = deployed ? '0x' : this.aaManager.generateInitCode(w.address);
-                    return { sender, deployed, initCode, ownerAddress: w.address };
-                });
-                const hopAis = await Promise.all(hopAiPromises);
-                const hopSenders = hopAis.map(ai => ai.sender);
-                const hopOwners = generatedHopWallets;
-                // ✅ 关键：为动态生成的 hop 钱包初始化 nonce（新账户从 0 开始）
-                for (const hopAi of hopAis) {
-                    nonceMap.init(hopAi.sender, 0n);
-                }
-                // ✅ 关键修复：计算每个 hop 钱包执行 UserOp 需要的 prefund（gas 费用）
-                // EntryPoint 在 validation 阶段会扣除 prefund，此时 hop 钱包还没收到 seller 的转账
-                // 因此需要在 seller 转账时额外包含 hop 的 gas 费用
+                // ✅ 多跳模式（BSC 模式）：每个买方有独立的多跳链
+                // 填写 3 跳 + 2 个买方 = 2 条独立的多跳链，每条 3 个 hop 钱包 = 6 个动态生成的 hop 钱包
+                console.log('[AA Portal 批量换手] 进入多跳模式 (hopCount > 0):', { hopCount, buyerCount: buyerSenders.length });
                 const feeData = await this.aaManager.getFeeData();
-                const gasPrice = feeData.gasPrice ?? feeData.maxFeePerGas ?? 5000000000n; // 5 gwei fallback
-                // 每个 hop 钱包的预估 prefund：(callGasLimit + verificationGasLimit + preVerificationGas) * gasPrice
-                // 未部署账户需要更高的 verificationGasLimit（约 800,000），已部署约 250,000
-                // callGasLimit 约 150,000（native 转账），preVerificationGas 约 21,000
-                const estimateHopPrefund = (deployed) => {
-                    const callGas = 150000n;
-                    const verifyGas = deployed ? 250000n : 800000n;
-                    const preVerifyGas = 21000n;
+                const gasPrice = feeData.gasPrice ?? feeData.maxFeePerGas ?? 5000000000n;
+                const provider = this.aaManager.getProvider();
+                // 预估 prefund 的函数（使用全局常量）
+                const estimatePrefund = (callGas, deployed) => {
+                    const verifyGas = deployed ? VERIFICATION_GAS_LIMIT_NORMAL : VERIFICATION_GAS_LIMIT_DEPLOY;
+                    const preVerifyGas = PRE_VERIFICATION_GAS;
                     const totalGas = callGas + verifyGas + preVerifyGas;
-                    // 加 20% buffer 以确保足够
-                    return (totalGas * gasPrice * 120n) / 100n;
+                    return (totalGas * gasPrice * PREFUND_BUFFER_PERCENT) / 100n;
                 };
-                // 计算所有 hop 钱包需要的总 prefund
-                let totalHopPrefund = 0n;
-                const hopPrefunds = [];
-                for (let j = 0; j < hopSenders.length; j++) {
-                    // hop[j] 需要执行的 UserOp 数量：
-                    // - 中间 hop (j < length-1)：1 个转账 UserOp
-                    // - 最后一个 hop：需要分发给所有买方，可能需要多个 UserOp
-                    const isLastHop = j === hopSenders.length - 1;
-                    const hopAi = hopAis[j];
-                    const hopDeployed = hopAi.deployed;
-                    if (isLastHop) {
-                        // ✅ 最后一个 hop 需要分发给所有买方（动态生成 hop 钱包后，所有买方都是真正买方）
-                        const disperseOpCount = Math.ceil(buyerSenders.length / maxPerOp) || 1;
-                        const prefund = estimateHopPrefund(hopDeployed) * BigInt(disperseOpCount);
-                        hopPrefunds.push(prefund);
-                        totalHopPrefund += prefund;
-                    }
-                    else {
-                        const prefund = estimateHopPrefund(hopDeployed);
-                        hopPrefunds.push(prefund);
-                        totalHopPrefund += prefund;
+                // ✅ 为每个买方生成独立的多跳链
+                // hopChains[buyerIdx] = [hop0, hop1, ..., hop(H-1)] 每条链有 hopCount 个 hop 钱包
+                const allGeneratedHopWallets = [];
+                for (let buyerIdx = 0; buyerIdx < buyerSenders.length; buyerIdx++) {
+                    const chainHops = [];
+                    for (let h = 0; h < hopCount; h++) {
+                        const randomWallet = ethers.Wallet.createRandom();
+                        const wallet = new ethers.Wallet(randomWallet.privateKey);
+                        const sender = await this.aaManager.predictSenderAddress(wallet.address);
+                        const code = await provider.getCode(sender);
+                        const deployed = code !== null && code !== '0x';
+                        const initCode = deployed ? '0x' : this.aaManager.generateInitCode(wallet.address);
+                        chainHops.push({ wallet, sender, deployed, initCode });
+                        // 初始化 nonce
+                        nonceMap.init(sender, 0n);
                     }
+                    allGeneratedHopWallets.push(chainHops);
                 }
-                console.log(`[AA 多跳] hop 数量: ${hopSenders.length}, 总 prefund 预估: ${ethers.formatEther(totalHopPrefund)} OKB`);
-                const hop0 = hopSenders[0];
-                let callData0;
-                // ✅ 关键修复：seller 转给 hop0 时，额外包含所有 hop 的 gas 费用
-                const amountToHop0 = totalBuyWei + totalHopPrefund;
-                if (useNativeToken) {
-                    if (extractProfit && profitWei > 0n) {
-                        callData0 = encodeExecuteBatch([hop0, profitRecipient], [amountToHop0, profitWei], ['0x', '0x']);
+                console.log(`[AA 多跳] 总 hop 钱包数: ${buyerSenders.length * hopCount} (${buyerSenders.length} 条链 × ${hopCount} 跳)`);
+                // ✅ 利润刮取（只在第一笔 seller UserOp 中执行）
+                let profitHandled = false;
+                // ✅ 构建每条多跳链的 UserOps
+                for (let buyerIdx = 0; buyerIdx < buyerSenders.length; buyerIdx++) {
+                    const chainHops = allGeneratedHopWallets[buyerIdx];
+                    const buyerSender = buyerSenders[buyerIdx];
+                    const buyerAi = buyerAis[buyerIdx];
+                    const buyAmount = buyAmountsWei[buyerIdx] ?? 0n;
+                    if (buyAmount <= 0n)
+                        continue;
+                    // 计算这条链上所有 hop 的 prefund（使用常量）
+                    const hopPrefunds = chainHops.map((hop, idx) => {
+                        const isLastHop = idx === chainHops.length - 1;
+                        // 最后一个 hop 转账给 buyer，中间 hop 转账给下一个 hop
+                        return estimatePrefund(HOP_CALL_GAS_LIMIT, hop.deployed);
+                    });
+                    const totalHopPrefund = hopPrefunds.reduce((a, b) => a + b, 0n);
+                    // 计算 buyer 的 prefund（用于买入，使用常量）
+                    const buyerPrefund = estimatePrefund(PORTAL_BUY_CALL_GAS_LIMIT, buyerAi.deployed);
+                    // 这条链的总金额 = 买入金额 + 所有 hop prefund + buyer prefund
+                    const chainTotalAmount = buyAmount + totalHopPrefund + buyerPrefund;
+                    // 1) seller → hop0
+                    const hop0 = chainHops[0];
+                    let callData0;
+                    if (useNativeToken) {
+                        if (!profitHandled && extractProfit && profitWei > 0n) {
+                            // 第一笔 seller UserOp 同时刮取利润
+                            callData0 = encodeExecuteBatch([hop0.sender, profitRecipient], [chainTotalAmount, profitWei], ['0x', '0x']);
+                            profitHandled = true;
+                        }
+                        else {
+                            callData0 = encodeExecute(hop0.sender, chainTotalAmount, '0x');
+                        }
                     }
                     else {
-                        callData0 = encodeExecute(hop0, amountToHop0, '0x');
+                        if (!profitHandled && extractProfit && profitWei > 0n) {
+                            const transferToHop0 = erc20Iface.encodeFunctionData('transfer', [hop0.sender, buyAmount]);
+                            const transferToProfit = erc20Iface.encodeFunctionData('transfer', [profitRecipient, profitWei]);
+                            callData0 = encodeExecuteBatch([quoteToken, quoteToken], [0n, 0n], [transferToHop0, transferToProfit]);
+                            profitHandled = true;
+                        }
+                        else {
+                            const transferData = erc20Iface.encodeFunctionData('transfer', [hop0.sender, buyAmount]);
+                            callData0 = encodeExecute(quoteToken, 0n, transferData);
+                        }
                     }
-                }
-                else {
-                    if (extractProfit && profitWei > 0n) {
-                        const transferToHop0 = erc20Iface.encodeFunctionData('transfer', [hop0, totalBuyWei]);
-                        const transferToProfit = erc20Iface.encodeFunctionData('transfer', [profitRecipient, profitWei]);
-                        callData0 = encodeExecuteBatch([quoteToken, quoteToken], [0n, 0n], [transferToHop0, transferToProfit]);
-                    }
-                    else {
-                        const transferData = erc20Iface.encodeFunctionData('transfer', [hop0, totalBuyWei]);
-                        callData0 = encodeExecute(quoteToken, 0n, transferData);
+                    const signedSellerToHop0 = await this.aaManager.buildUserOpWithState({
+                        ownerWallet: sellerOwner,
+                        sender: sellerAi.sender,
+                        nonce: nonceMap.next(sellerAi.sender),
+                        initCode: consumeInitCode(sellerAi.sender),
+                        callData: callData0,
+                        signOnly: true,
+                    });
+                    outOps.push(signedSellerToHop0.userOp);
+                    // 2) hop[j] → hop[j+1] (中间跳)
+                    let remainingPrefund = totalHopPrefund;
+                    for (let j = 0; j < chainHops.length - 1; j++) {
+                        const currentHop = chainHops[j];
+                        const nextHop = chainHops[j + 1];
+                        // 当前 hop 扣除自己的 prefund 后转给下一个
+                        remainingPrefund -= hopPrefunds[j];
+                        const amountToTransfer = buyAmount + remainingPrefund + buyerPrefund;
+                        let callData;
+                        if (useNativeToken) {
+                            callData = encodeExecute(nextHop.sender, amountToTransfer, '0x');
+                        }
+                        else {
+                            const transferData = erc20Iface.encodeFunctionData('transfer', [nextHop.sender, buyAmount]);
+                            callData = encodeExecute(quoteToken, 0n, transferData);
+                        }
+                        const signedHop = await this.aaManager.buildUserOpWithState({
+                            ownerWallet: currentHop.wallet,
+                            sender: currentHop.sender,
+                            nonce: nonceMap.next(currentHop.sender),
+                            initCode: currentHop.initCode,
+                            callData,
+                            signOnly: true,
+                        });
+                        outOps.push(signedHop.userOp);
                     }
-                }
-                const signedToHop0 = await this.aaManager.buildUserOpWithState({
-                    ownerWallet: sellerOwner,
-                    sender: sellerAi.sender,
-                    nonce: nonceMap.next(sellerAi.sender),
-                    initCode: consumeInitCode(sellerAi.sender),
-                    callData: callData0,
-                    signOnly: true,
-                });
-                outOps.push(signedToHop0.userOp);
-                // 2) hop j -> hop j+1
-                // ✅ 修复：动态生成的 hop 钱包只做资金中转，不保留任何金额
-                let prefixPrefundUsed = hopPrefunds[0] ?? 0n; // hop0 自己用掉的 prefund
-                for (let j = 0; j < hopSenders.length - 1; j++) {
-                    const sender = hopSenders[j];
-                    const next = hopSenders[j + 1];
-                    const hopAi = hopAis[j];
-                    // 剩余需要转给后续 hop 的金额 = totalBuyWei + (剩余 hop 的 prefund)
-                    const remainingPrefund = totalHopPrefund - prefixPrefundUsed;
-                    const amountToTransfer = totalBuyWei + remainingPrefund;
-                    if (amountToTransfer <= 0n)
-                        break;
-                    let callData;
+                    // 3) lastHop → buyer
+                    const lastHop = chainHops[chainHops.length - 1];
+                    const amountToBuyer = buyAmount + buyerPrefund;
+                    let callDataLast;
                     if (useNativeToken) {
-                        callData = encodeExecute(next, amountToTransfer, '0x');
+                        callDataLast = encodeExecute(buyerSender, amountToBuyer, '0x');
                     }
                     else {
-                        // ERC20 模式：仍使用原来的 totalBuyWei（不含 prefund，因为 ERC20 模式 prefund 仍为 OKB）
-                        const transferData = erc20Iface.encodeFunctionData('transfer', [next, totalBuyWei]);
-                        callData = encodeExecute(quoteToken, 0n, transferData);
+                        const transferData = erc20Iface.encodeFunctionData('transfer', [buyerSender, buyAmount]);
+                        callDataLast = encodeExecute(quoteToken, 0n, transferData);
                     }
-                    const signedHop = await this.aaManager.buildUserOpWithState({
-                        ownerWallet: hopOwners[j],
-                        sender,
-                        nonce: nonceMap.next(sender),
-                        initCode: hopAi.initCode || '0x',
-                        callData,
+                    const signedLastHop = await this.aaManager.buildUserOpWithState({
+                        ownerWallet: lastHop.wallet,
+                        sender: lastHop.sender,
+                        nonce: nonceMap.next(lastHop.sender),
+                        initCode: lastHop.initCode,
+                        callData: callDataLast,
                         signOnly: true,
                     });
-                    outOps.push(signedHop.userOp);
-                    // ✅ 更新已使用的 prefund（当前 hop 的 prefund 已被扣除）
-                    prefixPrefundUsed += hopPrefunds[j + 1] ?? 0n;
+                    outOps.push(signedLastHop.userOp);
                 }
-                // 3) lastHop 分发给所有买方（动态生成 hop 后，所有买方都是真正买方）
-                const lastHopIdx = hopSenders.length - 1;
-                const lastHopSender = hopSenders[lastHopIdx];
-                const lastHopOwner = hopOwners[lastHopIdx];
-                const lastHopAi = hopAis[lastHopIdx];
-                // ✅ 计算每个买方需要的 prefund（用于执行买入 UserOp）
-                const estimateBuyerPrefund = (deployed) => {
-                    const callGas = 450000n; // Portal 买入
-                    const verifyGas = deployed ? 250000n : 800000n;
-                    const preVerifyGas = 60000n;
-                    const totalGas = callGas + verifyGas + preVerifyGas;
-                    return (totalGas * gasPrice * 120n) / 100n;
-                };
-                const buyerPrefunds = buyerAis.map(ai => estimateBuyerPrefund(ai.deployed));
-                // ✅ 分发金额 = 买入金额 + 买方 prefund
-                const allItems = buyerSenders.map((to, i) => ({
-                    to,
-                    value: (buyAmountsWei[i] ?? 0n) + (buyerPrefunds[i] ?? 0n)
-                })).filter(x => x.value > 0n);
-                const restChunks = chunkArray(allItems, maxPerOp);
-                for (const ch of restChunks) {
-                    let callData;
-                    if (useNativeToken) {
-                        const { totalValue, data } = encodeNativeDisperseViaMulticall3({
-                            to: ch.map(x => x.to),
-                            values: ch.map(x => x.value),
+                // ✅ 保存所有动态生成的多跳钱包信息，用于后续导出
+                const allHopWalletsFlat = [];
+                for (const chainHops of allGeneratedHopWallets) {
+                    for (const hop of chainHops) {
+                        allHopWalletsFlat.push({
+                            address: hop.sender,
+                            privateKey: hop.wallet.privateKey,
                         });
-                        callData = encodeExecute(MULTICALL3, totalValue, data);
                     }
-                    else {
-                        const targets = ch.map(() => quoteToken);
-                        const values = ch.map(() => 0n);
-                        const datas = ch.map(x => erc20Iface.encodeFunctionData('transfer', [x.to, x.value]));
-                        callData = encodeExecuteBatch(targets, values, datas);
-                    }
-                    const signedDisperse = await this.aaManager.buildUserOpWithState({
-                        ownerWallet: lastHopOwner,
-                        sender: lastHopSender,
-                        nonce: nonceMap.next(lastHopSender),
-                        initCode: lastHopAi.initCode || '0x', // ✅ 使用动态生成的 hop 钱包的 initCode
-                        callData,
-                        signOnly: true,
-                    });
-                    outOps.push(signedDisperse.userOp);
                 }
-                // ✅ 保存动态生成的多跳钱包信息，用于后续导出
-                this._generatedHopWallets = generatedHopWallets.map((w, i) => ({
-                    address: hopSenders[i],
-                    privateKey: w.privateKey,
-                }));
+                this._generatedHopWallets = allHopWalletsFlat;
             }
         }
         else if (!capitalMode && extractProfit && profitWei > 0n) {

package/package.json

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