four-flap-meme-sdk 1.5.41 → 1.5.42

package/dist/xlayer/bundle.js

@@ -1134,7 +1134,8 @@ export class BundleExecutor {
         // 1. 准备代币地址
         const tokenAddress = params.tokenAddress || ZERO_ADDRESS;
         // 2. 构造 UserOperations
-        const ops = [];
+        const mainOps = [];
+        const profitOps = [];
         const nonceMap = new AANonceMap();
         // 2a. Dev 发射代币
         const devAccount = await this.aaManager.getAccountInfo(devWallet.address);
@@ -1205,15 +1206,14 @@ export class BundleExecutor {
             deployed: devAccount.deployed
         });
         const signedDevOp = await this.aaManager.signUserOp(devCreateOp.userOp, devWallet);
-        ops.push(signedDevOp.userOp);
+        mainOps.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);
@@ -1234,7 +1234,6 @@ export class BundleExecutor {
             const buyerAccount = await this.aaManager.getAccountInfo(buyer.address);
             buyerSenders.push(buyerAccount.sender);
             nonceMap.init(buyerAccount.sender, buyerAccount.nonce);
-            // 买入：使用扣除利润后的金额
             const swapData = portalIface.encodeFunctionData('swapExactInput', [
                 {
                     inputToken,
@@ -1253,11 +1252,10 @@ export class BundleExecutor {
                 deployed: buyerAccount.deployed
             });
             const signedBuyOp = await this.aaManager.signUserOp(buyOp.userOp, buyer);
-            ops.push(signedBuyOp.userOp);
+            mainOps.push(signedBuyOp.userOp);
         }
-        // ✅ 刮取利润：折算并转账（SignOnly 模式也需要包含此 UserOp）
+        // ✅ 刮取利润：单独作为一个交易签名
         if (profitSettings.extractProfit && totalBuyProfitWei > 0n) {
-            // 1. 获取 OKB 报价（SignOnly 模式也需要这个报价来决定最终转账金额）
             let nativeProfitAmount = totalBuyProfitWei;
             if (!useNativeToken) {
                 try {
@@ -1275,19 +1273,16 @@ 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
+                    initCode: '0x',
                     deployed: true,
                     fixedGas: {
                         ...(effConfig.fixedGas ?? {}),
@@ -1295,17 +1290,33 @@ export class BundleExecutor {
                     }
                 });
                 const signedProfitOp = await this.aaManager.signUserOp(profitOp.userOp, pOwner);
-                ops.push(signedProfitOp.userOp);
+                profitOps.push(signedProfitOp.userOp);
             }
         }
         // 3. 签名 handleOps 交易
-        const signedTx = await this.signHandleOpsTx({
-            ops,
+        const provider = this.aaManager.getProvider();
+        const startNonce = params.payerStartNonce ?? await provider.getTransactionCount(payer.address, 'pending');
+        const signedTransactions = [];
+        // 3a. 签名主交易
+        const signedMainTx = await this.signHandleOpsTx({
+            ops: mainOps,
             payerWallet: payer,
-            beneficiary: useBeneficiary
+            beneficiary: useBeneficiary,
+            nonce: startNonce
         });
+        signedTransactions.push(signedMainTx);
+        // 3b. 签名利润交易
+        if (profitOps.length > 0) {
+            const signedProfitTx = await this.signHandleOpsTx({
+                ops: profitOps,
+                payerWallet: payer,
+                beneficiary: useBeneficiary,
+                nonce: startNonce + 1
+            });
+            signedTransactions.push(signedProfitTx);
+        }
         return {
-            signedTransactions: [signedTx],
+            signedTransactions,
             tokenAddress,
             metadata: {
                 tokenAddress,
@@ -1326,33 +1337,41 @@ export class BundleExecutor {
             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.42",
   "description": "SDK for Flap bonding curve and four.meme TokenManager",
   "type": "module",
   "main": "dist/index.js",