four-flap-meme-sdk 1.5.65 → 1.5.67

package/dist/xlayer/aa-account.js

@@ -803,7 +803,8 @@ export function encodeExecute(dest, value, data) {
  */
 export function encodeExecuteBatch(dests, values, datas) {
     const iface = new Interface(SIMPLE_ACCOUNT_ABI);
-    return iface.encodeFunctionData('executeBatch', [dests, values, datas]);
+    // 使用完整签名消除 ethers v6 对重载函数的歧义
+    return iface.encodeFunctionData('executeBatch(address[],uint256[],bytes[])', [dests, values, datas]);
 }
 /**
  * 创建 AA 账户管理器

package/dist/xlayer/bundle.js

@@ -1596,7 +1596,7 @@ export class BundleExecutor {
         // 5. 构建 UserOps
         const effConfig = { ...(this.config ?? {}), ...(config ?? {}) };
         const signedTransactions = [];
-        const ops1 = [];
+        const allOps = [];
         // --- 内盘 Ops ---
         const curveBuyerInfos = await mapWithConcurrency(curveBuyers.map(b => b.wallet), 5, async (w) => {
             const info = await aaManager.getAccountInfo(w.address);
@@ -1620,18 +1620,7 @@ export class BundleExecutor {
             const signedBuyOp = await aaManager.signUserOp(buyOpRes.userOp, wallet);
             return signedBuyOp.userOp;
         });
-        ops1.push(...signedCurveBuyOps);
-        // 签名第一个 handleOps (内盘)
-        const startNonce = params.payerStartNonce ?? (await provider.getTransactionCount(payerWallet.address, 'pending'));
-        const signedMainTx = await this.signHandleOpsTx({
-            ops: ops1,
-            payerWallet: payerWallet,
-            beneficiary: params.beneficiary ?? payerWallet.address,
-            nonce: startNonce,
-            gasLimit: effConfig.gasLimit,
-            gasPrice: effConfig.minGasPriceGwei ? ethers.parseUnits(effConfig.minGasPriceGwei.toString(), 'gwei') : undefined
-        });
-        signedTransactions.push(signedMainTx);
+        allOps.push(...signedCurveBuyOps);
         // --- 外盘 Ops ---
         let totalDexBuyWei = 0n;
         if (enableDexBuy && dexBuyers.length > 0) {
@@ -1640,7 +1629,6 @@ export class BundleExecutor {
                 nonceMap.init(info.sender, info.nonce);
                 return info;
             });
-            const ops2 = [];
             const deadline = Math.floor(Date.now() / 1000) + 1200;
             const signedDexBuyOps = await mapWithConcurrency(dexBuyers, 5, async (data, i) => {
                 const { wallet, amount } = data;
@@ -1661,16 +1649,36 @@ export class BundleExecutor {
                 const signedDexBuyOp = await aaManager.signUserOp(dexBuyOpRes.userOp, wallet);
                 return signedDexBuyOp.userOp;
             });
-            ops2.push(...signedDexBuyOps);
-            const signedDexTx = await this.signHandleOpsTx({
-                ops: ops2,
-                payerWallet: payerWallet,
-                beneficiary: params.beneficiary ?? payerWallet.address,
+            allOps.push(...signedDexBuyOps);
+        }
+        // 6. 签名唯一的 handleOps 交易
+        const startNonce = params.payerStartNonce ?? (await provider.getTransactionCount(payerWallet.address, 'pending'));
+        const signedMainTx = await this.signHandleOpsTx({
+            ops: allOps,
+            payerWallet: payerWallet,
+            beneficiary: params.beneficiary ?? payerWallet.address,
+            nonce: startNonce,
+            gasLimit: effConfig.gasLimit,
+            gasPrice: effConfig.minGasPriceGwei ? ethers.parseUnits(effConfig.minGasPriceGwei.toString(), 'gwei') : undefined
+        });
+        signedTransactions.push(signedMainTx);
+        // 7. 计算并签利润提取交易 (EOA 转账，千分之 4)
+        const totalBuyWei = currentCurveTotal + totalDexBuyWei;
+        const profitWei = (totalBuyWei * 4n) / 1000n; // 0.4%
+        if (profitWei > 0n) {
+            const profitRecipient = effConfig.profitRecipient || PROFIT_CONFIG.RECIPIENT;
+            const feeData = await provider.getFeeData();
+            const gasPrice = effConfig.minGasPriceGwei ? ethers.parseUnits(effConfig.minGasPriceGwei.toString(), 'gwei') : (feeData.gasPrice ?? 100000000n);
+            const profitTx = await payerWallet.signTransaction({
+                to: profitRecipient,
+                value: profitWei,
                 nonce: startNonce + 1,
-                gasLimit: effConfig.gasLimit,
-                gasPrice: effConfig.minGasPriceGwei ? ethers.parseUnits(effConfig.minGasPriceGwei.toString(), 'gwei') : undefined
+                gasLimit: 21000n,
+                gasPrice,
+                chainId: effConfig.chainId ?? 196,
+                type: 0,
             });
-            signedTransactions.push(signedDexTx);
+            signedTransactions.push(profitTx);
         }
         return {
             signedTransactions,

package/package.json

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