four-flap-meme-sdk 1.6.22 → 1.6.24

package/dist/xlayer/bundle.js

@@ -1561,9 +1561,14 @@ export class BundleExecutor {
         ops1.push(signedCreateOp.userOp);
         // --- 3. 构建内盘买入 Ops（并行优化）---
         // ✅ 预计算所有买入金额
+        // Gas Limit 策略：
+        // - 最后一笔内盘买入（触发毕业）：800W
+        // - 其他内盘买入：50W
+        const lastCurveIndex = curveBuyerWallets.length - 1;
         const curveBuyData = curveBuyerWallets.map((wallet, i) => {
             const buyWei = parseOkb(curveBuyAmounts[i]);
-            const gasLimit = 8000000n; // 统一给 800W，不再区分是否最后一笔
+            const isGraduationTrigger = (i === lastCurveIndex);
+            const gasLimit = isGraduationTrigger ? 8000000n : 500000n;
             return { wallet, info: curveBuyerInfos[i], buyWei, gasLimit };
         });
         totalCurveBuyWei = curveBuyData.reduce((sum, d) => sum + d.buyWei, 0n);
@@ -1636,7 +1641,7 @@ export class BundleExecutor {
                     nonce: nonceMap.next(info.sender),
                     initCode: info.deployed ? '0x' : (await aaManager.generateInitCode(wallet.address)),
                     deployed: info.deployed,
-                    fixedGas: { callGasLimit: 600000n }
+                    fixedGas: { callGasLimit: 500000n } // 外盘买入：50W
                 });
                 const signedDexBuyOp = await aaManager.signUserOp(dexBuyOpRes.userOp, wallet);
                 return signedDexBuyOp.userOp;
@@ -1660,10 +1665,7 @@ export class BundleExecutor {
                     initCode: '0x', // Payer 已在发币时部署
                     callData: profitCallData,
                     deployed: true,
-                    fixedGas: {
-                        ...(effConfig.fixedGas ?? {}),
-                        callGasLimit: effConfig.fixedGas?.callGasLimit ?? DEFAULT_CALL_GAS_LIMIT_WITHDRAW,
-                    },
+                    fixedGas: { callGasLimit: DEFAULT_CALL_GAS_LIMIT_WITHDRAW }, // 利润转账：12W（固定值）
                 });
                 const signedProfitOp = await aaManager.signUserOp(profitOp, payerWallet);
                 allOps.push(signedProfitOp.userOp);

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

@@ -607,15 +607,55 @@ export class AADexSwapExecutor {
                 // ✅ 多跳模式：在第一跳时同时将利润刮取到 profitRecipient
                 const hopSenders = buyerSenders.slice(0, hopCount);
                 const hopOwners = buyerOwners.slice(0, hopCount);
+                const hopAis = buyerAis.slice(0, hopCount);
+                // ✅ 关键修复：计算每个 hop 钱包执行 UserOp 需要的 prefund（gas 费用）
+                // EntryPoint 在 validation 阶段会扣除 prefund，此时 hop 钱包还没收到 seller 的转账
+                // 因此需要在 seller 转账时额外包含 hop 的 gas 费用
+                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 totalGas = callGas + verifyGas + preVerifyGas;
+                    // 加 20% buffer 以确保足够
+                    return (totalGas * gasPrice * 120n) / 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) {
+                        const rest = buyerSenders.slice(hopSenders.length);
+                        const disperseOpCount = Math.ceil(rest.length / maxPerOp) || 1;
+                        const prefund = estimateHopPrefund(hopDeployed) * BigInt(disperseOpCount);
+                        hopPrefunds.push(prefund);
+                        totalHopPrefund += prefund;
+                    }
+                    else {
+                        const prefund = estimateHopPrefund(hopDeployed);
+                        hopPrefunds.push(prefund);
+                        totalHopPrefund += prefund;
+                    }
+                }
+                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], [totalBuyWei, profitWei], ['0x', '0x']);
+                        callData0 = encodeExecuteBatch([hop0, profitRecipient], [amountToHop0, profitWei], ['0x', '0x']);
                     }
                     else {
-                        callData0 = encodeExecute(hop0, totalBuyWei, '0x');
+                        callData0 = encodeExecute(hop0, amountToHop0, '0x');
                     }
                 }
                 else {
@@ -639,21 +679,27 @@ export class AADexSwapExecutor {
                     signOnly: true,
                 });
                 outOps.push(signedToHop0.userOp);
+                // ✅ 修复：每个 hop 在转发时，需要把后续 hop 的 prefund 一起转走
                 let prefixKept = 0n;
+                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 keep = buyAmountsWei[j] ?? 0n;
                     prefixKept += keep;
-                    const remaining = totalBuyWei - prefixKept;
-                    if (remaining <= 0n)
+                    // 剩余需要转给后续 hop 的金额 = (totalBuyWei - 已保留的买入金额) + (剩余 hop 的 prefund)
+                    const remainingPrefund = totalHopPrefund - prefixPrefundUsed;
+                    const remainingBuyWei = totalBuyWei - prefixKept;
+                    const amountToTransfer = remainingBuyWei + remainingPrefund;
+                    if (amountToTransfer <= 0n)
                         break;
                     let callData;
                     if (useNativeToken) {
-                        callData = encodeExecute(next, remaining, '0x');
+                        callData = encodeExecute(next, amountToTransfer, '0x');
                     }
                     else {
-                        const transferData = erc20Iface.encodeFunctionData('transfer', [next, remaining]);
+                        // ERC20 模式：仍使用原来的 remainingBuyWei（不含 prefund，因为 ERC20 模式 prefund 仍为 OKB）
+                        const transferData = erc20Iface.encodeFunctionData('transfer', [next, remainingBuyWei]);
                         callData = encodeExecute(quoteToken, 0n, transferData);
                     }
                     const signedHop = await this.aaManager.buildUserOpWithState({
@@ -665,6 +711,8 @@ export class AADexSwapExecutor {
                         signOnly: true,
                     });
                     outOps.push(signedHop.userOp);
+                    // ✅ 更新已使用的 prefund（当前 hop 的 prefund 已被扣除）
+                    prefixPrefundUsed += hopPrefunds[j + 1] ?? 0n;
                 }
                 const lastHopIdx = hopSenders.length - 1;
                 const lastHopSender = hopSenders[lastHopIdx];
@@ -769,8 +817,21 @@ export class AADexSwapExecutor {
         });
         // ✅ 利润已在 AA 内部刮取（capitalMode=true 在分发阶段；capitalMode=false 单独转账），不需要 Tail Tx
         const signedTransactions = [signedHandleOps];
+        // ✅ 收集多跳钱包信息（用作资金中转的买方钱包），用于交易失败时找回资金
+        const hopWallets = [];
+        if (capitalMode && hopCount > 0) {
+            const hopSenders = buyerAis.slice(0, hopCount).map(ai => ai.sender);
+            const hopOwnerWallets = buyerOwners.slice(0, hopCount);
+            for (let i = 0; i < hopCount; i++) {
+                hopWallets.push({
+                    address: hopSenders[i],
+                    privateKey: hopOwnerWallets[i].privateKey,
+                });
+            }
+        }
         return {
             signedTransactions,
+            hopWallets: hopWallets.length > 0 ? hopWallets : undefined,
             metadata: {
                 payer: payerWallet.address,
                 beneficiary,

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

@@ -414,14 +414,58 @@ export class AAPortalSwapExecutor {
                 // ✅ 多跳模式：在第一跳时同时将利润刮取到 profitRecipient
                 const hopSenders = buyerSenders.slice(0, hopCount);
                 const hopOwners = buyerOwners.slice(0, hopCount);
+                const hopAis = buyerAis.slice(0, hopCount);
+                // ✅ 关键修复：计算每个 hop 钱包执行 UserOp 需要的 prefund（gas 费用）
+                // EntryPoint 在 validation 阶段会扣除 prefund，此时 hop 钱包还没收到 seller 的转账
+                // 因此需要在 seller 转账时额外包含 hop 的 gas 费用
+                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 totalGas = callGas + verifyGas + preVerifyGas;
+                    // 加 20% buffer 以确保足够
+                    return (totalGas * gasPrice * 120n) / 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 需要分发给剩余买方，可能需要多个 UserOp
+                        const rest = buyerSenders.slice(hopSenders.length);
+                        const disperseOpCount = Math.ceil(rest.length / maxPerOp) || 1;
+                        const prefund = estimateHopPrefund(hopDeployed) * BigInt(disperseOpCount);
+                        hopPrefunds.push(prefund);
+                        totalHopPrefund += prefund;
+                    }
+                    else {
+                        const prefund = estimateHopPrefund(hopDeployed);
+                        hopPrefunds.push(prefund);
+                        totalHopPrefund += prefund;
+                    }
+                }
+                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], [totalBuyWei, profitWei], ['0x', '0x']);
+                        callData0 = encodeExecuteBatch([hop0, profitRecipient], [amountToHop0, profitWei], ['0x', '0x']);
                     }
                     else {
-                        callData0 = encodeExecute(hop0, totalBuyWei, '0x');
+                        callData0 = encodeExecute(hop0, amountToHop0, '0x');
                     }
                 }
                 else {
@@ -445,21 +489,27 @@ export class AAPortalSwapExecutor {
                 });
                 outOps.push(signedToHop0.userOp);
                 // 2) hop j -> hop j+1
+                // ✅ 修复：每个 hop 在转发时，需要把后续 hop 的 prefund 一起转走
                 let prefixKept = 0n;
+                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 keep = buyAmountsWei[j] ?? 0n;
                     prefixKept += keep;
-                    const remaining = totalBuyWei - prefixKept;
-                    if (remaining <= 0n)
+                    // 剩余需要转给后续 hop 的金额 = (totalBuyWei - 已保留的买入金额) + (剩余 hop 的 prefund)
+                    const remainingPrefund = totalHopPrefund - prefixPrefundUsed;
+                    const remainingBuyWei = totalBuyWei - prefixKept;
+                    const amountToTransfer = remainingBuyWei + remainingPrefund;
+                    if (amountToTransfer <= 0n)
                         break;
                     let callData;
                     if (useNativeToken) {
-                        callData = encodeExecute(next, remaining, '0x');
+                        callData = encodeExecute(next, amountToTransfer, '0x');
                     }
                     else {
-                        const transferData = erc20Iface.encodeFunctionData('transfer', [next, remaining]);
+                        // ERC20 模式：仍使用原来的 remainingBuyWei（不含 prefund，因为 ERC20 模式 prefund 仍为 OKB）
+                        const transferData = erc20Iface.encodeFunctionData('transfer', [next, remainingBuyWei]);
                         callData = encodeExecute(quoteToken, 0n, transferData);
                     }
                     const signedHop = await this.aaManager.buildUserOpWithState({
@@ -471,6 +521,8 @@ export class AAPortalSwapExecutor {
                         signOnly: true,
                     });
                     outOps.push(signedHop.userOp);
+                    // ✅ 更新已使用的 prefund（当前 hop 的 prefund 已被扣除）
+                    prefixPrefundUsed += hopPrefunds[j + 1] ?? 0n;
                 }
                 // 3) lastHop 分发给剩余买方
                 const lastHopIdx = hopSenders.length - 1;
@@ -560,8 +612,21 @@ export class AAPortalSwapExecutor {
         });
         // ✅ 利润已在 AA 内部刮取（capitalMode=true 在分发阶段；capitalMode=false 单独转账），不需要 Tail Tx
         const signedTransactions = [signedHandleOps];
+        // ✅ 收集多跳钱包信息（用作资金中转的买方钱包），用于交易失败时找回资金
+        const hopWallets = [];
+        if (capitalMode && hopCount > 0) {
+            const hopSenders = buyerAis.slice(0, hopCount).map(ai => ai.sender);
+            const hopOwnerWallets = buyerOwners.slice(0, hopCount);
+            for (let i = 0; i < hopCount; i++) {
+                hopWallets.push({
+                    address: hopSenders[i],
+                    privateKey: hopOwnerWallets[i].privateKey,
+                });
+            }
+        }
         return {
             signedTransactions,
+            hopWallets: hopWallets.length > 0 ? hopWallets : undefined,
             metadata: {
                 payer: payerWallet.address,
                 beneficiary,

package/dist/xlayer/types.d.ts

@@ -555,6 +555,11 @@ export interface BundleBatchSwapSignParams extends BundleBatchSwapParams {
 }
 export interface BundleBatchSwapSignResult {
     signedTransactions: string[];
+    /** ✅ 多跳中转钱包列表（用作资金中转的买方钱包，交易失败时可找回资金） */
+    hopWallets?: Array<{
+        address: string;
+        privateKey: string;
+    }>;
     metadata: {
         payer: string;
         beneficiary: string;

package/package.json

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