four-flap-meme-sdk 1.5.44 → 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;
@@ -1273,65 +1273,21 @@ export class BundleExecutor {
         const feeData = await provider.getFeeData();
         const gasPrice = feeData.gasPrice ?? 100000000n;
         const chainId = (await provider.getNetwork()).chainId;
-        let currentNonce = startNonce;
-        // === 1. 预存资金交易：payer -> 各个 AA sender ===
-        // 计算每个 buyer sender 需要的 OKB（买入金额 + gas 余量）
-        const GAS_BUFFER = parseOkb('0.001'); // 0.001 OKB 作为 gas 缓冲
-        const prefundTargets = [];
-        // Dev sender 需要 quoteAmt（发币时的首次购买金额）
-        const devQuoteAmt = params.quoteAmt || 0n;
-        if (useNativeToken && devQuoteAmt > 0n) {
-            prefundTargets.push({ sender: devAccount.sender, amount: devQuoteAmt + GAS_BUFFER });
-        }
-        // Buyer senders 需要各自的买入金额
-        for (let i = 0; i < buyerWallets.length; i++) {
-            const amountStr = buyAmounts[i] || '0';
-            const originalWei = useNativeToken ? parseOkb(amountStr) : ethers.parseUnits(amountStr, quoteDecimals);
-            let buyWei = originalWei;
-            if (profitSettings.extractProfit) {
-                const res = calculateProfit(originalWei, profitSettings.profitBps);
-                buyWei = res.remaining;
-            }
-            if (buyWei > 0n) {
-                prefundTargets.push({ sender: buyerSenders[i], amount: buyWei + GAS_BUFFER });
-            }
-        }
-        // 如果有需要预存资金的地址，生成批量转账交易
-        if (prefundTargets.length > 0) {
-            const totalPrefund = prefundTargets.reduce((sum, t) => sum + t.amount, 0n);
-            console.log(`[预存资金] 共 ${prefundTargets.length} 个 AA sender，总计: ${formatOkb(totalPrefund)} OKB`);
-            // 批量转账：使用多个单独交易（因为普通 EOA 无法一次转账到多个地址）
-            for (const target of prefundTargets) {
-                const prefundTx = {
-                    to: target.sender,
-                    value: target.amount,
-                    nonce: currentNonce,
-                    gasLimit: 21000n,
-                    gasPrice,
-                    chainId
-                };
-                const signedPrefundTx = await payer.signTransaction(prefundTx);
-                signedTransactions.push(signedPrefundTx);
-                currentNonce++;
-                console.log(` - prefund ${target.sender.slice(0, 10)}... = ${formatOkb(target.amount)} OKB (nonce: ${currentNonce - 1})`);
-            }
-        }
-        // === 2. AA handleOps 交易 ===
+        // === 1. AA handleOps 交易（包含所有 UserOps：创建 + 买入）===
         const signedMainTx = await this.signHandleOpsTx({
             ops,
             payerWallet: payer,
             beneficiary: useBeneficiary,
-            nonce: currentNonce
+            nonce: startNonce
         });
         signedTransactions.push(signedMainTx);
-        currentNonce++;
-        // === 3. 利润提取交易 ===
+        // === 2. 利润提取交易（独立的 EOA 转账）===
         if (nativeProfitAmount > 0n) {
             console.log(`[利润提取-签名] 非 AA 转账: ${useNativeToken ? formatOkb(nativeProfitAmount) : `${formatOkb(totalBuyProfitWei)} (ERC20) -> ${formatOkb(nativeProfitAmount)} (OKB)`} -> ${profitSettings.profitRecipient}`);
             const profitTxRequest = {
                 to: profitSettings.profitRecipient,
                 value: nativeProfitAmount,
-                nonce: currentNonce,
+                nonce: startNonce + 1,
                 gasLimit: 21000n,
                 gasPrice,
                 chainId
@@ -1345,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.44",
+  "version": "1.5.46",
   "description": "SDK for Flap bonding curve and four.meme TokenManager",
   "type": "module",
   "main": "dist/index.js",