four-flap-meme-sdk 1.5.61 → 1.5.63

package/dist/xlayer/bundle.js

@@ -131,7 +131,7 @@ export class BundleExecutor {
     /**
      * 执行 handleOps 并解析结果
      */
-    async runHandleOps(label, ops, bundlerSigner, beneficiary) {
+    async runHandleOps(label, ops, bundlerSigner, beneficiary, overrides) {
         if (ops.length === 0) {
             console.log(`\n[${label}] 没有 ops，跳过`);
             return null;
@@ -142,7 +142,16 @@ export class BundleExecutor {
         console.log(`\n[${label}] 发送 handleOps，ops=${ops.length} ...`);
         // 使用 bundlerSigner 创建新的合约实例以调用 handleOps
         const entryPointWithSigner = new Contract(entryPointAddress, ENTRYPOINT_ABI, bundlerSigner);
-        const tx = await entryPointWithSigner.handleOps(ops, beneficiary, { gasPrice: feeData.gasPrice ?? 100000000n });
+        // 优先使用手动指定的 gas 配置，其次使用实例全局配置中的配置，最后使用网络获取的值或默认值
+        const gasPrice = overrides?.gasPrice ??
+            (this.config.minGasPriceGwei ? ethers.parseUnits(this.config.minGasPriceGwei.toString(), 'gwei') : undefined) ??
+            feeData.gasPrice ??
+            100000000n;
+        const gasLimit = overrides?.gasLimit ?? this.config.gasLimit;
+        const tx = await entryPointWithSigner.handleOps(ops, beneficiary, {
+            gasPrice,
+            ...(gasLimit ? { gasLimit } : {})
+        });
         console.log(`[${label}] txHash:`, tx.hash);
         const receipt = await tx.wait();
         console.log(`[${label}] mined block=${receipt.blockNumber} status=${receipt.status}`);
@@ -189,9 +198,12 @@ export class BundleExecutor {
         const epIface = new Interface(ENTRYPOINT_ABI);
         const data = epIface.encodeFunctionData('handleOps', [params.ops, params.beneficiary]);
         const feeData = await provider.getFeeData();
-        const gasPrice = params.gasPrice ?? feeData.gasPrice ?? 100000000n;
+        const gasPrice = params.gasPrice ??
+            (this.config.minGasPriceGwei ? ethers.parseUnits(this.config.minGasPriceGwei.toString(), 'gwei') : undefined) ??
+            feeData.gasPrice ??
+            100000000n;
         const nonce = params.nonce ?? await provider.getTransactionCount(params.payerWallet.address, 'pending');
-        let gasLimit = params.gasLimit;
+        let gasLimit = params.gasLimit ?? this.config.gasLimit;
         if (!gasLimit) {
             try {
                 const est = await provider.estimateGas({
@@ -675,14 +687,24 @@ export class BundleExecutor {
             }
         });
         const initCodes = accountInfos.map((ai, i) => ai.deployed ? '0x' : this.aaManager.generateInitCode(wallets[i].address));
-        const { userOps: buyUserOps, prefundWeis } = await this.aaManager.buildUserOpsWithBundlerEstimateBatch({
-            ops: accountInfos.map((ai, i) => ({
+        // ✅ 使用固定 Gas 构建买入 UserOps（避免 Bundler 估算对未部署账户不准确）
+        const buyNonces = accountInfos.map((ai) => nonceMap.next(ai.sender));
+        const buyUserOpsBuilt = await mapWithConcurrency(accountInfos, 6, async (ai, i) => {
+            return this.aaManager.buildUserOpWithFixedGas({
+                ownerWallet: wallets[i],
                 sender: ai.sender,
-                nonce: nonceMap.next(ai.sender),
                 callData: buyCallDatas[i],
+                nonce: buyNonces[i],
                 initCode: initCodes[i],
-            })),
+                deployed: ai.deployed,
+                fixedGas: {
+                    ...(effConfig.fixedGas ?? {}),
+                    callGasLimit: effConfig.fixedGas?.callGasLimit ?? DEFAULT_CALL_GAS_LIMIT_BUY,
+                },
+            });
         });
+        const buyUserOps = buyUserOpsBuilt.map((r) => r.userOp);
+        const prefundWeis = buyUserOpsBuilt.map((r) => r.prefundWei);
         // 补足 prefund + 买入金额（使用扣除利润后的金额）
         await mapWithConcurrency(accountInfos, 6, async (ai, i) => {
             if (useNativeToken) {
@@ -726,7 +748,10 @@ export class BundleExecutor {
         }
         // 2. 执行买入 + 利润转账（同一笔 handleOps）
         const allBuyOps = [...buyOps, ...profitOps];
-        const buyResult = await this.runHandleOps('buyBundle', allBuyOps, bundlerSigner, beneficiary);
+        const buyResult = await this.runHandleOps('buyBundle', allBuyOps, bundlerSigner, beneficiary, {
+            gasLimit: effConfig.gasLimit,
+            gasPrice: effConfig.minGasPriceGwei ? ethers.parseUnits(effConfig.minGasPriceGwei.toString(), 'gwei') : undefined
+        });
         if (!buyResult) {
             throw new Error('买入交易失败');
         }
@@ -825,7 +850,11 @@ export class BundleExecutor {
             });
             sellOps.push(...signedSells);
         }
-        const sellResult = await this.runHandleOps('sellBundle', sellOps, bundlerSigner, beneficiary);
+        const effConfig = { ...(this.config ?? {}), ...(config ?? {}) };
+        const sellResult = await this.runHandleOps('sellBundle', sellOps, bundlerSigner, beneficiary, {
+            gasLimit: effConfig.gasLimit,
+            gasPrice: effConfig.minGasPriceGwei ? ethers.parseUnits(effConfig.minGasPriceGwei.toString(), 'gwei') : undefined
+        });
         if (!sellResult) {
             throw new Error('卖出交易失败');
         }
@@ -874,7 +903,10 @@ export class BundleExecutor {
                     withdrawOps.push(op);
             }
             if (withdrawOps.length > 0) {
-                withdrawResult = await this.runHandleOps('withdrawBundle', withdrawOps, bundlerSigner, beneficiary) ?? undefined;
+                withdrawResult = await this.runHandleOps('withdrawBundle', withdrawOps, bundlerSigner, beneficiary, {
+                    gasLimit: effConfig.gasLimit,
+                    gasPrice: effConfig.minGasPriceGwei ? ethers.parseUnits(effConfig.minGasPriceGwei.toString(), 'gwei') : undefined
+                }) ?? undefined;
             }
         }
         return {
@@ -915,8 +947,8 @@ export class BundleExecutor {
         const nonceMap = new AANonceMap();
         for (const ai of accountInfos)
             nonceMap.init(ai.sender, ai.nonce);
-        const effProfitCfgBuySell = { ...(this.config ?? {}), ...(config ?? {}) };
-        const profitSettingsBuySell = resolveProfitSettings(effProfitCfgBuySell);
+        const effConfig = { ...(this.config ?? {}), ...(config ?? {}) };
+        const profitSettingsBuySell = resolveProfitSettings(effConfig);
         // ✅ 确定 inputToken：如果传入了 quoteToken 且非零地址，则使用它；否则使用零地址（原生代币）
         const inputToken = quoteToken && quoteToken !== ZERO_ADDRESS ? quoteToken : ZERO_ADDRESS;
         const useNativeToken = inputToken === ZERO_ADDRESS;
@@ -947,7 +979,7 @@ export class BundleExecutor {
         // ✅ ERC20 购买：获取代币利润等值的原生代币（OKB）报价
         let nativeBuyProfitAmount = totalBuyProfitWei; // 原生代币购买时直接使用
         if (!useNativeToken && profitSettingsBuySell.extractProfit && totalBuyProfitWei > 0n) {
-            const dexQuery = new DexQuery(effProfitCfgBuySell);
+            const dexQuery = new DexQuery(effConfig);
             try {
                 nativeBuyProfitAmount = await dexQuery.quoteTokenToOkb(totalBuyProfitWei, inputToken);
             }
@@ -1012,14 +1044,24 @@ export class BundleExecutor {
             }
         });
         const initCodes = accountInfos.map((ai, i) => (ai.deployed ? '0x' : this.aaManager.generateInitCode(wallets[i].address)));
-        const { userOps: buyUserOps, prefundWeis } = await this.aaManager.buildUserOpsWithBundlerEstimateBatch({
-            ops: accountInfos.map((ai, i) => ({
+        // ✅ 使用固定 Gas 构建买入 UserOps（避免 Bundler 估算对未部署账户不准确）
+        const buyNonces = accountInfos.map((ai) => nonceMap.next(ai.sender));
+        const buyUserOpsBuilt = await mapWithConcurrency(accountInfos, 6, async (ai, i) => {
+            return this.aaManager.buildUserOpWithFixedGas({
+                ownerWallet: wallets[i],
                 sender: ai.sender,
-                nonce: nonceMap.next(ai.sender),
                 callData: buyCallDatas[i],
+                nonce: buyNonces[i],
                 initCode: initCodes[i],
-            })),
+                deployed: ai.deployed,
+                fixedGas: {
+                    ...(effConfig.fixedGas ?? {}),
+                    callGasLimit: effConfig.fixedGas?.callGasLimit ?? DEFAULT_CALL_GAS_LIMIT_BUY,
+                },
+            });
         });
+        const buyUserOps = buyUserOpsBuilt.map((r) => r.userOp);
+        const prefundWeis = buyUserOpsBuilt.map((r) => r.prefundWei);
         await mapWithConcurrency(accountInfos, 6, async (ai, i) => {
             const buyWei = buyWeis[i] ?? 0n;
             if (useNativeToken) {
@@ -1050,8 +1092,8 @@ export class BundleExecutor {
                 callData: profitCallData,
                 deployed: accountInfos[maxProfitIndex].deployed,
                 fixedGas: {
-                    ...(effProfitCfgBuySell.fixedGas ?? {}),
-                    callGasLimit: effProfitCfgBuySell.fixedGas?.callGasLimit ?? DEFAULT_CALL_GAS_LIMIT_WITHDRAW,
+                    ...(effConfig.fixedGas ?? {}),
+                    callGasLimit: effConfig.fixedGas?.callGasLimit ?? DEFAULT_CALL_GAS_LIMIT_WITHDRAW,
                 },
             });
             await this.aaManager.ensureSenderBalance(profitOwner, profitSender, nativeBuyProfitAmount + profitPrefund + parseOkb('0.0001'), `profit-transfer-fund`);
@@ -1059,7 +1101,10 @@ export class BundleExecutor {
             profitOps.push(signedProfit.userOp);
         }
         const allBuyOps = [...buyOps, ...profitOps];
-        const buyResult = await this.runHandleOps('buyBundle', allBuyOps, bundlerSigner, beneficiary);
+        const buyResult = await this.runHandleOps('buyBundle', allBuyOps, bundlerSigner, beneficiary, {
+            gasLimit: effConfig.gasLimit,
+            gasPrice: effConfig.minGasPriceGwei ? ethers.parseUnits(effConfig.minGasPriceGwei.toString(), 'gwei') : undefined
+        });
         if (!buyResult) {
             throw new Error('买入交易失败');
         }
@@ -1087,7 +1132,10 @@ export class BundleExecutor {
         });
         for (const ops of sellPerWallet)
             sellOps.push(...ops);
-        const sellResult = await this.runHandleOps('sellBundle', sellOps, bundlerSigner, beneficiary);
+        const sellResult = await this.runHandleOps('sellBundle', sellOps, bundlerSigner, beneficiary, {
+            gasLimit: effConfig.gasLimit,
+            gasPrice: effConfig.minGasPriceGwei ? ethers.parseUnits(effConfig.minGasPriceGwei.toString(), 'gwei') : undefined
+        });
         if (!sellResult) {
             throw new Error('卖出交易失败');
         }
@@ -1132,7 +1180,10 @@ export class BundleExecutor {
                     withdrawOps.push(op);
             }
             if (withdrawOps.length > 0) {
-                withdrawResult = await this.runHandleOps('withdrawBundle', withdrawOps, bundlerSigner, beneficiary) ?? undefined;
+                withdrawResult = await this.runHandleOps('withdrawBundle', withdrawOps, bundlerSigner, beneficiary, {
+                    gasLimit: effConfig.gasLimit,
+                    gasPrice: effConfig.minGasPriceGwei ? ethers.parseUnits(effConfig.minGasPriceGwei.toString(), 'gwei') : undefined
+                }) ?? undefined;
                 if (profitSettingsBuySell.extractProfit) {
                     const totalProfitForTail = nativeBuyProfitAmount + totalSellWithdrawProfitWei;
                     if (totalProfitForTail > 0n) {
@@ -1356,7 +1407,9 @@ export class BundleExecutor {
             ops,
             payerWallet: payer,
             beneficiary: useBeneficiary,
-            nonce: startNonce
+            nonce: startNonce,
+            gasLimit: effConfig.gasLimit,
+            gasPrice: effConfig.minGasPriceGwei ? ethers.parseUnits(effConfig.minGasPriceGwei.toString(), 'gwei') : undefined
         });
         signedTransactions.push(signedMainTx);
         // === 2. 利润提取交易（独立的 EOA 转账）===
@@ -1415,7 +1468,8 @@ export class BundleExecutor {
         const payerAccount = await aaManager.getAccountInfo(payerWallet.address);
         const nonceMap = new AANonceMap();
         nonceMap.init(payerAccount.sender, payerAccount.nonce);
-        const profitSettings = resolveProfitSettings(config);
+        const effConfig = { ...(this.config ?? {}), ...(config ?? {}) };
+        const profitSettings = resolveProfitSettings(effConfig);
         const signedTransactions = [];
         let totalCurveBuyWei = 0n;
         let totalDexBuyWei = 0n;
@@ -1490,7 +1544,9 @@ export class BundleExecutor {
             ops: ops1,
             payerWallet: payerWallet,
             beneficiary: params.beneficiary ?? payerWallet.address,
-            nonce: startNonce
+            nonce: startNonce,
+            gasLimit: effConfig.gasLimit,
+            gasPrice: effConfig.minGasPriceGwei ? ethers.parseUnits(effConfig.minGasPriceGwei.toString(), 'gwei') : undefined
         });
         signedTransactions.push(signedMainTx);
         // --- 4. 构建外盘买入 handleOps (如果启用) ---
@@ -1533,7 +1589,9 @@ export class BundleExecutor {
                 ops: ops2,
                 payerWallet: payerWallet,
                 beneficiary: params.beneficiary ?? payerWallet.address,
-                nonce: startNonce + 1
+                nonce: startNonce + 1,
+                gasLimit: effConfig.gasLimit,
+                gasPrice: effConfig.minGasPriceGwei ? ethers.parseUnits(effConfig.minGasPriceGwei.toString(), 'gwei') : undefined
             });
             signedTransactions.push(signedDexTx);
         }
@@ -1712,7 +1770,11 @@ export class BundleExecutor {
             };
         }
         // ============ 非 signOnly 模式：执行 handleOps ============
-        const approveResult = await this.runHandleOps('preApproveBundle', approveOps, bundlerSigner, beneficiary);
+        const effConfig = { ...(this.config ?? {}), ...(config ?? {}) };
+        const approveResult = await this.runHandleOps('preApproveBundle', approveOps, bundlerSigner, beneficiary, {
+            gasLimit: effConfig.gasLimit,
+            gasPrice: effConfig.minGasPriceGwei ? ethers.parseUnits(effConfig.minGasPriceGwei.toString(), 'gwei') : undefined
+        });
         if (!approveResult) {
             throw new Error('预授权交易失败');
         }

package/dist/xlayer/types.d.ts

@@ -76,6 +76,10 @@ export interface XLayerConfig {
     timeoutMs?: number;
     /** Gas 估算安全余量倍数 */
     gasLimitMultiplier?: number;
+    /** Payer handleOps 交易的 gasLimit（手动覆盖） */
+    gasLimit?: bigint;
+    /** Payer handleOps 交易的最小 gasPrice (Gwei) */
+    minGasPriceGwei?: number;
     /** 利润尾笔原生转账 gasLimit（默认 21000n） */
     profitTailGasLimit?: bigint;
     /**

package/package.json

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