four-flap-meme-sdk 1.5.36 → 1.5.38

package/dist/xlayer/bundle.js

@@ -8,7 +8,7 @@
  * - OKB 归集：将 sender 的 OKB 转回 owner
  */
 import { Wallet, Interface, Contract, ethers } from 'ethers';
-import { FLAP_PORTAL, ENTRYPOINT_ABI, DEFAULT_CALL_GAS_LIMIT_SELL, DEFAULT_WITHDRAW_RESERVE, } from './constants.js';
+import { FLAP_PORTAL, ENTRYPOINT_ABI, PORTAL_ABI, DEFAULT_CALL_GAS_LIMIT_SELL, DEFAULT_WITHDRAW_RESERVE, } from './constants.js';
 import { AAAccountManager, encodeExecute, encodeExecuteBatch } from './aa-account.js';
 import { encodeBuyCall, encodeSellCall, encodeApproveCall, encodeTransferCall, encodeCreateCallV2, encodeCreateCallV3, encodeCreateCallV4, PortalQuery, parseOkb, formatOkb, } from './portal-ops.js';
 import { mapWithConcurrency } from '../utils/concurrency.js';
@@ -1247,21 +1247,47 @@ export class BundleExecutor {
         const signedDevOp = await this.aaManager.signUserOp(devCreateOp.userOp, devWallet);
         ops.push(signedDevOp.userOp);
         // 2b. Buyers 买入
+        const profitSettings = resolveProfitSettings(effConfig);
+        const inputToken = params.quoteToken && params.quoteToken !== ZERO_ADDRESS ? params.quoteToken : ZERO_ADDRESS;
+        const useNativeToken = inputToken === ZERO_ADDRESS;
+        // BundleCreateBuyParams 目前没有 quoteTokenDecimals，默认用 18
+        const quoteDecimals = 18;
         let totalBuyWei = 0n;
+        let totalBuyProfitWei = 0n; // inputToken 本位利润
         const buyerSenders = [];
+        const profitWeis = [];
+        const portalIface = new Interface(PORTAL_ABI);
         for (let i = 0; i < buyerWallets.length; i++) {
             const buyer = buyerWallets[i];
-            const amount = buyAmounts[i] || '0';
-            const amountWei = parseOkb(amount);
-            totalBuyWei += amountWei;
+            const amountStr = buyAmounts[i] || '0';
+            const originalWei = useNativeToken ? parseOkb(amountStr) : ethers.parseUnits(amountStr, quoteDecimals);
+            let buyWei = originalWei;
+            let profitWei = 0n;
+            if (profitSettings.extractProfit) {
+                const res = calculateProfit(originalWei, profitSettings.profitBps);
+                buyWei = res.remaining;
+                profitWei = res.profit;
+            }
+            totalBuyWei += buyWei;
+            totalBuyProfitWei += profitWei;
+            profitWeis.push(profitWei);
             const buyerAccount = await this.aaManager.getAccountInfo(buyer.address);
             buyerSenders.push(buyerAccount.sender);
             nonceMap.init(buyerAccount.sender, buyerAccount.nonce);
-            const buyData = encodeBuyCall(tokenAddress, amountWei, 0n);
+            // 买入：使用扣除利润后的金额
+            const swapData = portalIface.encodeFunctionData('swapExactInput', [
+                {
+                    inputToken,
+                    outputToken: tokenAddress,
+                    inputAmount: buyWei,
+                    minOutputAmount: 0n,
+                    permitData: '0x',
+                },
+            ]);
             const buyOp = await this.aaManager.buildUserOpWithFixedGas({
                 ownerWallet: buyer,
                 sender: buyerAccount.sender,
-                callData: encodeExecute(this.portalAddress, amountWei, buyData),
+                callData: encodeExecute(this.portalAddress, useNativeToken ? buyWei : 0n, swapData),
                 nonce: nonceMap.next(buyerAccount.sender),
                 initCode: buyerAccount.deployed ? '0x' : this.aaManager.generateInitCode(buyer.address),
                 deployed: buyerAccount.deployed
@@ -1269,6 +1295,49 @@ export class BundleExecutor {
             const signedBuyOp = await this.aaManager.signUserOp(buyOp.userOp, buyer);
             ops.push(signedBuyOp.userOp);
         }
+        // ✅ 刮取利润：折算并转账（SignOnly 模式也需要包含此 UserOp）
+        if (profitSettings.extractProfit && totalBuyProfitWei > 0n) {
+            // 1. 获取 OKB 报价（SignOnly 模式也需要这个报价来决定最终转账金额）
+            let nativeProfitAmount = totalBuyProfitWei;
+            if (!useNativeToken) {
+                try {
+                    const dq = new DexQuery(effConfig);
+                    nativeProfitAmount = await dq.quoteTokenToOkb(totalBuyProfitWei, inputToken);
+                }
+                catch {
+                    try {
+                        const pq = this.portalQuery;
+                        nativeProfitAmount = await pq.quoteExactInput(inputToken, ZERO_ADDRESS, totalBuyProfitWei);
+                    }
+                    catch {
+                        nativeProfitAmount = 0n;
+                    }
+                }
+            }
+            if (nativeProfitAmount > 0n) {
+                console.log(`[利润提取-签名] 总利润: ${useNativeToken ? formatOkb(nativeProfitAmount) : `${formatOkb(totalBuyProfitWei)} (ERC20) -> ${formatOkb(nativeProfitAmount)} (OKB)`} -> ${profitSettings.profitRecipient}`);
+                // 找到利润贡献最大的买家作为利润转账的 sender
+                const maxProfitIndex = profitWeis.reduce((maxIdx, p, idx) => p > (profitWeis[maxIdx] ?? 0n) ? idx : maxIdx, 0);
+                const pOwner = buyerWallets[maxProfitIndex];
+                const pSender = buyerSenders[maxProfitIndex];
+                // 利润转账：直接转 OKB（对齐 bundleBuy 语义）
+                const profitCallData = encodeExecute(profitSettings.profitRecipient, nativeProfitAmount, '0x');
+                const profitOp = await this.aaManager.buildUserOpWithFixedGas({
+                    ownerWallet: pOwner,
+                    sender: pSender,
+                    callData: profitCallData,
+                    nonce: nonceMap.next(pSender),
+                    initCode: '0x', // 之前买入阶段已处理 initCode
+                    deployed: true,
+                    fixedGas: {
+                        ...(effConfig.fixedGas ?? {}),
+                        callGasLimit: effConfig.fixedGas?.callGasLimit ?? DEFAULT_CALL_GAS_LIMIT_WITHDRAW,
+                    }
+                });
+                const signedProfitOp = await this.aaManager.signUserOp(profitOp.userOp, pOwner);
+                ops.push(signedProfitOp.userOp);
+            }
+        }
         // 3. 签名 handleOps 交易
         const signedTx = await this.signHandleOpsTx({
             ops,

package/package.json

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