four-flap-meme-sdk 1.5.42 → 1.5.44

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,13 +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
-        const mainOps = [];
-        const profitOps = [];
+        // 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,8 +1203,7 @@ export class BundleExecutor {
             deployed: devAccount.deployed
         });
         const signedDevOp = await this.aaManager.signUserOp(devCreateOp.userOp, devWallet);
-        mainOps.push(signedDevOp.userOp);
-        // 2b. Buyers 买入
+        ops.push(signedDevOp.userOp);
         const profitSettings = resolveProfitSettings(effConfig);
         const inputToken = params.quoteToken && params.quoteToken !== ZERO_ADDRESS ? params.quoteToken : ZERO_ADDRESS;
         const useNativeToken = inputToken === ZERO_ADDRESS;
@@ -1215,7 +1211,6 @@ export class BundleExecutor {
         let totalBuyWei = 0n;
         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,7 +1225,6 @@ 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);
@@ -1252,11 +1246,11 @@ export class BundleExecutor {
                 deployed: buyerAccount.deployed
             });
             const signedBuyOp = await this.aaManager.signUserOp(buyOp.userOp, buyer);
-            mainOps.push(signedBuyOp.userOp);
+            ops.push(signedBuyOp.userOp);
         }
-        // ✅ 刮取利润：单独作为一个交易签名
+        let nativeProfitAmount = 0n;
         if (profitSettings.extractProfit && totalBuyProfitWei > 0n) {
-            let nativeProfitAmount = totalBuyProfitWei;
+            nativeProfitAmount = totalBuyProfitWei;
             if (!useNativeToken) {
                 try {
                     const dq = new DexQuery(effConfig);
@@ -1272,47 +1266,77 @@ export class BundleExecutor {
                     }
                 }
             }
-            if (nativeProfitAmount > 0n) {
-                const maxProfitIndex = profitWeis.reduce((maxIdx, p, idx) => p > (profitWeis[maxIdx] ?? 0n) ? idx : maxIdx, 0);
-                const pOwner = buyerWallets[maxProfitIndex];
-                const pSender = buyerSenders[maxProfitIndex];
-                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',
-                    deployed: true,
-                    fixedGas: {
-                        ...(effConfig.fixedGas ?? {}),
-                        callGasLimit: effConfig.fixedGas?.callGasLimit ?? DEFAULT_CALL_GAS_LIMIT_WITHDRAW,
-                    }
-                });
-                const signedProfitOp = await this.aaManager.signUserOp(profitOp.userOp, pOwner);
-                profitOps.push(signedProfitOp.userOp);
-            }
         }
-        // 3. 签名 handleOps 交易
         const provider = this.aaManager.getProvider();
         const startNonce = params.payerStartNonce ?? await provider.getTransactionCount(payer.address, 'pending');
         const signedTransactions = [];
-        // 3a. 签名主交易
+        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 交易 ===
         const signedMainTx = await this.signHandleOpsTx({
-            ops: mainOps,
+            ops,
             payerWallet: payer,
             beneficiary: useBeneficiary,
-            nonce: startNonce
+            nonce: currentNonce
         });
         signedTransactions.push(signedMainTx);
-        // 3b. 签名利润交易
-        if (profitOps.length > 0) {
-            const signedProfitTx = await this.signHandleOpsTx({
-                ops: profitOps,
-                payerWallet: payer,
-                beneficiary: useBeneficiary,
-                nonce: startNonce + 1
-            });
+        currentNonce++;
+        // === 3. 利润提取交易 ===
+        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,
+                gasLimit: 21000n,
+                gasPrice,
+                chainId
+            };
+            const signedProfitTx = await payer.signTransaction(profitTxRequest);
             signedTransactions.push(signedProfitTx);
         }
         return {
@@ -1328,9 +1352,6 @@ export class BundleExecutor {
             }
         };
     }
-    /**
-     * 捆绑发射代币 + 购买（执行版本）
-     */
     async bundleCreateBuy(params) {
         const signResult = await this.bundleCreateBuySign({
             ...params,

package/package.json

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