four-flap-meme-sdk 1.5.41 → 1.5.43

package/dist/xlayer/bundle.d.ts

@@ -91,9 +91,6 @@ export declare class BundleExecutor {
      * 捆绑发射代币 + 购买（签名版本）
      */
     bundleCreateBuySign(params: BundleCreateBuySignParams): Promise<BundleCreateBuySignResult>;
-    /**
-     * 捆绑发射代币 + 购买（执行版本）
-     */
     bundleCreateBuy(params: BundleCreateBuyParams): Promise<BundleCreateBuyResult>;
     /**
      * 检查多个 AA 账户的授权状态

package/dist/xlayer/bundle.js

@@ -1131,12 +1131,10 @@ export class BundleExecutor {
         console.log('token:', tokenInfo.symbol);
         console.log('dev:', devWallet.address);
         console.log('buyers:', buyerWallets.length);
-        // 1. 准备代币地址
         const tokenAddress = params.tokenAddress || ZERO_ADDRESS;
-        // 2. 构造 UserOperations
+        // 2. 构造 UserOperations (主要涵盖发币和购买)
         const ops = [];
         const nonceMap = new AANonceMap();
-        // 2a. Dev 发射代币
         const devAccount = await this.aaManager.getAccountInfo(devWallet.address);
         nonceMap.init(devAccount.sender, devAccount.nonce);
         const useV4 = params.dexId !== undefined || params.lpFeeProfile !== undefined;
@@ -1206,16 +1204,13 @@ 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 本位利润
+        let totalBuyProfitWei = 0n;
         const buyerSenders = [];
-        const profitWeis = [];
         const portalIface = new Interface(PORTAL_ABI);
         for (let i = 0; i < buyerWallets.length; i++) {
             const buyer = buyerWallets[i];
@@ -1230,11 +1225,9 @@ export class BundleExecutor {
             }
             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 swapData = portalIface.encodeFunctionData('swapExactInput', [
                 {
                     inputToken,
@@ -1255,10 +1248,9 @@ export class BundleExecutor {
             const signedBuyOp = await this.aaManager.signUserOp(buyOp.userOp, buyer);
             ops.push(signedBuyOp.userOp);
         }
-        // ✅ 刮取利润：折算并转账（SignOnly 模式也需要包含此 UserOp）
+        let nativeProfitAmount = 0n;
         if (profitSettings.extractProfit && totalBuyProfitWei > 0n) {
-            // 1. 获取 OKB 报价（SignOnly 模式也需要这个报价来决定最终转账金额）
-            let nativeProfitAmount = totalBuyProfitWei;
+            nativeProfitAmount = totalBuyProfitWei;
             if (!useNativeToken) {
                 try {
                     const dq = new DexQuery(effConfig);
@@ -1274,38 +1266,34 @@ export class BundleExecutor {
                     }
                 }
             }
-            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({
+        const provider = this.aaManager.getProvider();
+        const startNonce = params.payerStartNonce ?? await provider.getTransactionCount(payer.address, 'pending');
+        const signedTransactions = [];
+        const signedMainTx = await this.signHandleOpsTx({
             ops,
             payerWallet: payer,
-            beneficiary: useBeneficiary
+            beneficiary: useBeneficiary,
+            nonce: startNonce
         });
+        signedTransactions.push(signedMainTx);
+        if (nativeProfitAmount > 0n) {
+            console.log(`[利润提取-签名] 非 AA 转账: ${useNativeToken ? formatOkb(nativeProfitAmount) : `${formatOkb(totalBuyProfitWei)} (ERC20) -> ${formatOkb(nativeProfitAmount)} (OKB)`} -> ${profitSettings.profitRecipient}`);
+            const feeData = await provider.getFeeData();
+            const gasPrice = feeData.gasPrice ?? 100000000n;
+            const profitTxRequest = {
+                to: profitSettings.profitRecipient,
+                value: nativeProfitAmount,
+                nonce: startNonce + 1,
+                gasLimit: 21000n,
+                gasPrice: gasPrice,
+                chainId: (await provider.getNetwork()).chainId
+            };
+            const signedProfitTx = await payer.signTransaction(profitTxRequest);
+            signedTransactions.push(signedProfitTx);
+        }
         return {
-            signedTransactions: [signedTx],
+            signedTransactions,
             tokenAddress,
             metadata: {
                 tokenAddress,
@@ -1317,42 +1305,47 @@ export class BundleExecutor {
             }
         };
     }
-    /**
-     * 捆绑发射代币 + 购买（执行版本）
-     */
     async bundleCreateBuy(params) {
         const signResult = await this.bundleCreateBuySign({
             ...params,
             payerPrivateKey: params.privateKeys[0]
         });
         const sharedProvider = this.aaManager.getProvider();
-        const tx = await sharedProvider.broadcastTransaction(signResult.signedTransactions[0]);
-        const receipt = await tx.wait();
-        const epIface = new Interface(ENTRYPOINT_ABI);
+        let mainTxHash = '';
+        let lastReceipt;
         const userOpEvents = [];
-        if (receipt) {
-            for (const log of receipt.logs) {
-                try {
-                    const parsed = epIface.parseLog(log);
-                    if (parsed?.name === 'UserOperationEvent') {
-                        userOpEvents.push({
-                            userOpHash: parsed.args.userOpHash,
-                            sender: parsed.args.sender,
-                            paymaster: parsed.args.paymaster,
-                            success: parsed.args.success,
-                            actualGasCost: parsed.args.actualGasCost,
-                            actualGasUsed: parsed.args.actualGasUsed
-                        });
+        const epIface = new Interface(ENTRYPOINT_ABI);
+        for (let i = 0; i < signResult.signedTransactions.length; i++) {
+            const signedTx = signResult.signedTransactions[i];
+            const tx = await sharedProvider.broadcastTransaction(signedTx);
+            if (i === 0)
+                mainTxHash = tx.hash;
+            const receipt = await tx.wait();
+            lastReceipt = receipt;
+            if (receipt) {
+                for (const log of receipt.logs) {
+                    try {
+                        const parsed = epIface.parseLog(log);
+                        if (parsed?.name === 'UserOperationEvent') {
+                            userOpEvents.push({
+                                userOpHash: parsed.args.userOpHash,
+                                sender: parsed.args.sender,
+                                paymaster: parsed.args.paymaster,
+                                success: parsed.args.success,
+                                actualGasCost: parsed.args.actualGasCost,
+                                actualGasUsed: parsed.args.actualGasUsed
+                            });
+                        }
                     }
+                    catch { }
                 }
-                catch { }
             }
         }
         return {
             createBuyResult: {
-                txHash: tx.hash,
-                blockNumber: receipt?.blockNumber ?? 0,
-                status: receipt?.status ?? 0,
+                txHash: mainTxHash,
+                blockNumber: lastReceipt?.blockNumber ?? 0,
+                status: lastReceipt?.status ?? 0,
                 userOpEvents
             },
             tokenAddress: signResult.tokenAddress

package/package.json

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