four-flap-meme-sdk 1.5.34 → 1.5.35

package/dist/xlayer/bundle.js

@@ -435,9 +435,11 @@ export class BundleExecutor {
                     nonce: params.nonce,
                     initCode: params.initCode,
                 });
-        // 计算可归集金额（用已知余额近似；fund 发生时余额会变大，属于可接受的保守近似）
-        const withdrawAmount = senderBalance > prefundWei + params.reserveWei
-            ? senderBalance - prefundWei - params.reserveWei
+        // 使用最新余额计算可归集金额（避免因预充导致旧余额低估）
+        const freshBalance = await this.aaManager.getProvider().getBalance(params.sender);
+        const baseBalance = freshBalance > 0n ? freshBalance : senderBalance;
+        const withdrawAmount = baseBalance > prefundWei + params.reserveWei
+            ? baseBalance - prefundWei - params.reserveWei
             : 0n;
         if (withdrawAmount <= 0n) {
             console.log(`\n[${params.ownerName ?? 'owner'}] 归集后可转出=0（余额不足以覆盖 prefund+reserve）`);
@@ -674,7 +676,7 @@ export class BundleExecutor {
                 },
             });
             // 确保 profit sender 有足够余额（用于支付利润转账的 gas）
-            await this.aaManager.ensureSenderBalance(profitOwner, profitSender, profitPrefund + parseOkb('0.0001'), `profit-transfer-fund`);
+            await this.aaManager.ensureSenderBalance(profitOwner, profitSender, nativeProfitAmount + profitPrefund + parseOkb('0.0001'), `profit-transfer-fund`);
             const signedProfit = await this.aaManager.signUserOp(profitOp, profitOwner);
             profitOps.push(signedProfit.userOp);
         }
@@ -1021,7 +1023,7 @@ export class BundleExecutor {
                     callGasLimit: effProfitCfgBuySell.fixedGas?.callGasLimit ?? DEFAULT_CALL_GAS_LIMIT_WITHDRAW,
                 },
             });
-            await this.aaManager.ensureSenderBalance(profitOwner, profitSender, profitPrefund + parseOkb('0.0001'), `profit-transfer-fund`);
+            await this.aaManager.ensureSenderBalance(profitOwner, profitSender, nativeBuyProfitAmount + profitPrefund + parseOkb('0.0001'), `profit-transfer-fund`);
             const signedProfit = await this.aaManager.signUserOp(profitOp, profitOwner);
             profitOps.push(signedProfit.userOp);
         }

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

@@ -123,13 +123,13 @@ export class AAPortalSwapExecutor {
         })();
         const quotedSellOutWei = quoted;
         // 3.1 利润提取（从卖出输出 OKB 里按比例刮取；但必须保证买入资金充足）
-        const requestedBuyWei = buyAmountOkb
+        const profitWeiRaw = extractProfit ? calculateProfitWei(quotedSellOutWei, profitBps) : 0n;
+        let requestedBuyWei = buyAmountOkb
             ? parseOkb(String(buyAmountOkb))
-            : (quotedSellOutWei * BigInt(10000 - slippageBps)) / 10000n;
+            : (quotedSellOutWei - profitWeiRaw);
         if (requestedBuyWei > quotedSellOutWei) {
             throw new Error('AA 捆绑换手：buyAmountOkb 超过预估卖出输出（quotedSellOut）');
         }
-        const profitWeiRaw = extractProfit ? calculateProfitWei(quotedSellOutWei, profitBps) : 0n;
         const profitCap = quotedSellOutWei - requestedBuyWei;
         const profitWei = profitWeiRaw > profitCap ? profitCap : profitWeiRaw;
         const finalBuyAmountWei = requestedBuyWei;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "four-flap-meme-sdk",
-  "version": "1.5.34",
+  "version": "1.5.35",
   "description": "SDK for Flap bonding curve and four.meme TokenManager",
   "type": "module",
   "main": "dist/index.js",
@@ -36,4 +36,4 @@
   "devDependencies": {
     "typescript": "^5.6.3"
   }
-}
+}