four-flap-meme-sdk 1.5.43 → 1.5.46

package/dist/xlayer/bundle.js

@@ -1135,8 +1135,8 @@ export class BundleExecutor {
         // 2. 构造 UserOperations (主要涵盖发币和购买)
         const ops = [];
         const nonceMap = new AANonceMap();
-        const devAccount = await this.aaManager.getAccountInfo(devWallet.address);
-        nonceMap.init(devAccount.sender, devAccount.nonce);
+        const payerAccount = await this.aaManager.getAccountInfo(payer.address);
+        nonceMap.init(payerAccount.sender, payerAccount.nonce);
         const useV4 = params.dexId !== undefined || params.lpFeeProfile !== undefined;
         const useV3 = !useV4 && !!params.extensionID;
         let createCallData;
@@ -1195,14 +1195,14 @@ export class BundleExecutor {
             });
         }
         const devCreateOp = await this.aaManager.buildUserOpWithFixedGas({
-            ownerWallet: devWallet,
-            sender: devAccount.sender,
+            ownerWallet: payer, // ✅ 改用 payer 作为发币者
+            sender: payerAccount.sender,
             callData: encodeExecute(this.portalAddress, params.quoteAmt || 0n, createCallData),
-            nonce: nonceMap.next(devAccount.sender),
-            initCode: devAccount.deployed ? '0x' : this.aaManager.generateInitCode(devWallet.address),
-            deployed: devAccount.deployed
+            nonce: nonceMap.next(payerAccount.sender),
+            initCode: payerAccount.deployed ? '0x' : this.aaManager.generateInitCode(payer.address),
+            deployed: payerAccount.deployed
         });
-        const signedDevOp = await this.aaManager.signUserOp(devCreateOp.userOp, devWallet);
+        const signedDevOp = await this.aaManager.signUserOp(devCreateOp.userOp, payer);
         ops.push(signedDevOp.userOp);
         const profitSettings = resolveProfitSettings(effConfig);
         const inputToken = params.quoteToken && params.quoteToken !== ZERO_ADDRESS ? params.quoteToken : ZERO_ADDRESS;
@@ -1270,6 +1270,10 @@ export class BundleExecutor {
         const provider = this.aaManager.getProvider();
         const startNonce = params.payerStartNonce ?? await provider.getTransactionCount(payer.address, 'pending');
         const signedTransactions = [];
+        const feeData = await provider.getFeeData();
+        const gasPrice = feeData.gasPrice ?? 100000000n;
+        const chainId = (await provider.getNetwork()).chainId;
+        // === 1. AA handleOps 交易（包含所有 UserOps：创建 + 买入）===
         const signedMainTx = await this.signHandleOpsTx({
             ops,
             payerWallet: payer,
@@ -1277,17 +1281,16 @@ export class BundleExecutor {
             nonce: startNonce
         });
         signedTransactions.push(signedMainTx);
+        // === 2. 利润提取交易（独立的 EOA 转账）===
         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
+                gasPrice,
+                chainId
             };
             const signedProfitTx = await payer.signTransaction(profitTxRequest);
             signedTransactions.push(signedProfitTx);
@@ -1298,7 +1301,7 @@ export class BundleExecutor {
             metadata: {
                 tokenAddress,
                 devOwner: devWallet.address,
-                devSender: devAccount.sender,
+                devSender: payerAccount.sender,
                 buyerOwners: buyerWallets.map(w => w.address),
                 buyerSenders,
                 totalBuyWei: totalBuyWei.toString()

package/package.json

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