four-flap-meme-sdk 1.5.75 → 1.5.77

package/dist/xlayer/bundle.js

@@ -1536,16 +1536,19 @@ export class BundleExecutor {
      * 自动计算剩余毕业容量，将钱包分为内盘和外盘组，生成签名的交易列表
      */
     async bundleGraduateBuy(params) {
-        const { tokenAddress, privateKeys, payerPrivateKey, amountMode, totalBuyAmount, minAmount, maxAmount, walletAmounts, enableDexBuy = false, config = {} } = params;
+        const { tokenAddress, privateKeys, payerPrivateKey, amountMode, totalBuyAmount, minAmount, maxAmount, walletAmounts, enableDexBuy = false, 
+        // ✅ 新增：前端传递的分组信息
+        curveAddresses, dexAddresses, graduationAmount, config = {} } = params;
         const aaManager = this.getAAManager();
         const provider = aaManager.getProvider();
         // 1. 获取代币状态，计算剩余毕业容量
         const tokenState = await this.portalQuery.getTokenV5(tokenAddress);
         const poolReserveOkb = ethers.formatEther(tokenState.reserve);
-        const graduateCapacity = 73.38; // 毕业阈值
+        // ✅ 优先使用前端传递的动态毕业阈值
+        const graduateCapacity = graduationAmount ?? 73.38;
         const remainingToGraduate = Math.max(0, graduateCapacity - parseFloat(poolReserveOkb));
         const remainingToGraduateWei = ethers.parseEther(remainingToGraduate.toFixed(18));
-        console.log(`[GraduateBuy] Pool Reserve: ${poolReserveOkb} OKB, Remaining: ${remainingToGraduate} OKB`);
+        console.log(`[GraduateBuy] Pool Reserve: ${poolReserveOkb} OKB, GraduateCapacity: ${graduateCapacity} OKB, Remaining: ${remainingToGraduate} OKB`);
         // 2. 准备钱包
         const sharedProvider = this.aaManager.getProvider();
         const wallets = privateKeys.map(pk => new Wallet(pk, sharedProvider));
@@ -1573,27 +1576,53 @@ export class BundleExecutor {
         // 4. 钱包分组
         const curveBuyers = [];
         const dexBuyers = [];
-        let currentCurveTotal = 0n;
-        for (let i = 0; i < wallets.length; i++) {
-            const wallet = wallets[i];
-            const amountWei = ethers.parseEther(finalAmounts[i].toFixed(18));
-            if (currentCurveTotal < remainingToGraduateWei) {
-                const needed = remainingToGraduateWei - currentCurveTotal;
-                if (amountWei <= needed) {
+        // ✅ 优先使用前端传递的分组信息
+        const hasFrontendGrouping = curveAddresses && curveAddresses.length > 0;
+        if (hasFrontendGrouping) {
+            // ✅ 使用前端计算好的分组，不再重新计算
+            const curveSet = new Set(curveAddresses.map(a => a.toLowerCase()));
+            const dexSet = dexAddresses ? new Set(dexAddresses.map(a => a.toLowerCase())) : new Set();
+            console.log(`[GraduateBuy] Using frontend grouping: ${curveAddresses.length} curve, ${dexAddresses?.length || 0} dex`);
+            for (let i = 0; i < wallets.length; i++) {
+                const wallet = wallets[i];
+                const addr = wallet.address.toLowerCase();
+                const amountWei = ethers.parseEther(finalAmounts[i].toFixed(18));
+                if (curveSet.has(addr)) {
                     curveBuyers.push({ wallet, amount: amountWei });
-                    currentCurveTotal += amountWei;
                 }
-                else {
-                    // 当前钱包金额超过了剩余容量，将其限制为 needed
-                    curveBuyers.push({ wallet, amount: needed });
-                    currentCurveTotal = remainingToGraduateWei;
-                    // 超出部分暂不处理（遵循单钱包单属性逻辑）
+                else if (dexSet.has(addr) && enableDexBuy) {
+                    dexBuyers.push({ wallet, amount: amountWei });
                 }
+                // 如果钱包既不在 curveSet 也不在 dexSet，则跳过
             }
-            else if (enableDexBuy) {
-                dexBuyers.push({ wallet, amount: amountWei });
+        }
+        else {
+            // ✅ 原逻辑：SDK 自动分组（可能与前端不一致）
+            console.log(`[GraduateBuy] No frontend grouping, using auto-split by remainingToGraduate=${remainingToGraduate} OKB`);
+            let currentCurveTotal = 0n;
+            for (let i = 0; i < wallets.length; i++) {
+                const wallet = wallets[i];
+                const amountWei = ethers.parseEther(finalAmounts[i].toFixed(18));
+                if (currentCurveTotal < remainingToGraduateWei) {
+                    const needed = remainingToGraduateWei - currentCurveTotal;
+                    if (amountWei <= needed) {
+                        curveBuyers.push({ wallet, amount: amountWei });
+                        currentCurveTotal += amountWei;
+                    }
+                    else {
+                        // 当前钱包金额超过了剩余容量，将其限制为 needed
+                        curveBuyers.push({ wallet, amount: needed });
+                        currentCurveTotal = remainingToGraduateWei;
+                        // 超出部分暂不处理（遵循单钱包单属性逻辑）
+                    }
+                }
+                else if (enableDexBuy) {
+                    dexBuyers.push({ wallet, amount: amountWei });
+                }
             }
         }
+        // ✅ 统一计算内盘买入总金额（无论使用哪种分组方式）
+        const curveTotalWei = curveBuyers.reduce((sum, b) => sum + b.amount, 0n);
         // 5. 构建 UserOps
         const effConfig = { ...(this.config ?? {}), ...(config ?? {}) };
         const signedTransactions = [];
@@ -1612,7 +1641,7 @@ export class BundleExecutor {
             // ✅ 判断是否是最后一笔内盘买入（触发毕业的那笔）
             const isGraduationTrigger = (i === curveBuyers.length - 1);
             const callGasLimit = isGraduationTrigger
-                ? 7000000n // 毕业触发交易需要更高 gas
+                ? 8000000n // 毕业触发交易需要更高 gas
                 : (effConfig.fixedGas?.callGasLimit ?? 800000n); // 其他买入使用前端配置或默认值
             const buyOpRes = await aaManager.buildUserOpWithFixedGas({
                 ownerWallet: wallet,
@@ -1652,7 +1681,7 @@ export class BundleExecutor {
                     nonce: nonceMap.next(info.sender),
                     initCode: info.deployed ? '0x' : (await aaManager.generateInitCode(wallet.address)),
                     deployed: info.deployed,
-                    fixedGas: { callGasLimit: effConfig.fixedGas?.callGasLimit ?? 800000n } // ✅ 提高到 800K
+                    fixedGas: { callGasLimit: effConfig.fixedGas?.callGasLimit ?? 600000n } // ✅ 提高到 800K
                 });
                 const signedDexBuyOp = await aaManager.signUserOp(dexBuyOpRes.userOp, wallet);
                 return signedDexBuyOp.userOp;
@@ -1671,7 +1700,7 @@ export class BundleExecutor {
         });
         signedTransactions.push(signedMainTx);
         // 7. 计算并签利润提取交易 (EOA 转账，千分之 4)
-        const totalBuyWei = currentCurveTotal + totalDexBuyWei;
+        const totalBuyWei = curveTotalWei + totalDexBuyWei;
         const profitWei = (totalBuyWei * 4n) / 1000n; // 0.4%
         if (profitWei > 0n) {
             const profitRecipient = effConfig.profitRecipient || PROFIT_CONFIG.RECIPIENT;
@@ -1693,7 +1722,7 @@ export class BundleExecutor {
             metadata: {
                 curveCount: curveBuyers.length,
                 dexCount: dexBuyers.length,
-                curveTotalAmount: ethers.formatEther(currentCurveTotal),
+                curveTotalAmount: ethers.formatEther(curveTotalWei),
                 dexTotalAmount: ethers.formatEther(totalDexBuyWei),
                 tokenAddress
             }

package/dist/xlayer/types.d.ts

@@ -856,6 +856,12 @@ export interface BundleGraduateBuyParams {
     walletAmounts?: Record<string, number>;
     /** 是否启用外盘买入（默认 false） */
     enableDexBuy?: boolean;
+    /** 内盘钱包地址列表（可选，传入则使用前端分组，不传则 SDK 自动分组） */
+    curveAddresses?: string[];
+    /** 外盘钱包地址列表（可选） */
+    dexAddresses?: string[];
+    /** 动态毕业阈值（可选，不传则使用默认 73.38 OKB） */
+    graduationAmount?: number;
     /** 配置覆盖 */
     config?: Partial<XLayerConfig>;
     /** Payer 起始 nonce */

package/package.json

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