four-flap-meme-sdk 1.6.59 → 1.6.60

package/dist/xlayer/bundle-buy-first.js

@@ -17,7 +17,7 @@ import { createAAAccountManager, encodeExecute, createWallet } from './aa-accoun
 import { encodeBuyCall, encodeSellCall } from './portal-ops.js';
 import { encodeSwapExactETHForTokensSupportingFee, encodeSwapExactTokensForETHSupportingFee, encodeSwapExactETHForTokensV3, encodeSwapExactTokensForETHV3, } from './dex.js';
 import { encodeApproveCall } from './portal-ops.js';
-import { FLAP_PORTAL, WOKB, } from './constants.js';
+import { FLAP_PORTAL, WOKB, XLAYER_CHAIN_ID, DEFAULT_RPC_URL, ENTRYPOINT_V06, SIMPLE_ACCOUNT_FACTORY, PARTICLE_BUNDLER_URL, } from './constants.js';
 import { PROFIT_CONFIG } from '../utils/constants.js';
 import { mapWithConcurrency } from '../utils/concurrency.js';
 // ============================================================================
@@ -41,6 +41,27 @@ function toBigIntSalt(v) {
     }
     return 0n;
 }
+/**
+ * 归一化 XLayer AA 配置，填充默认值
+ * 与前端的 normalizeXLayerAAConfig 保持一致
+ */
+function normalizeConfig(cfg) {
+    const rpcUrl = String(cfg?.rpcUrl || DEFAULT_RPC_URL).trim();
+    if (!rpcUrl)
+        throw new Error('[buildBundleOps] rpcUrl 为空');
+    return {
+        rpcUrl,
+        bundlerUrl: cfg?.bundlerUrl || PARTICLE_BUNDLER_URL,
+        chainId: cfg?.chainId ?? XLAYER_CHAIN_ID,
+        entryPoint: cfg?.entryPoint || ENTRYPOINT_V06,
+        factory: cfg?.factory || SIMPLE_ACCOUNT_FACTORY,
+        salt: toBigIntSalt(cfg?.salt),
+        paymaster: cfg?.paymaster,
+        paymasterData: cfg?.paymasterData,
+        timeoutMs: cfg?.timeoutMs,
+        gasLimitMultiplier: cfg?.gasLimitMultiplier,
+    };
+}
 // ============================================================================
 // 买入 UserOps 构建
 // ============================================================================
@@ -61,12 +82,8 @@ export async function buildBundleBuyOps(params) {
     if (params.ownerPrivateKeys.length !== params.buyAmountsOkb.length) {
         throw new Error('[buildBundleBuyOps] 私钥数量与买入金额数量不一致');
     }
-    // ✅ 确保 salt 类型正确（bigint）
-    const rawConfig = params.config ?? {};
-    const config = {
-        ...rawConfig,
-        salt: toBigIntSalt(rawConfig.salt),
-    };
+    // ✅ 归一化配置，填充默认值（与前端 normalizeXLayerAAConfig 保持一致）
+    const config = normalizeConfig(params.config);
     const aaManager = createAAAccountManager(config);
     const ownerWallets = params.ownerPrivateKeys.map(pk => createWallet(pk, config));
     const owners = ownerWallets.map(w => w.address);
@@ -218,12 +235,8 @@ export async function buildBundleSellOps(params) {
     if (params.ownerPrivateKeys.length !== params.sellAmounts.length) {
         throw new Error('[buildBundleSellOps] 私钥数量与卖出金额数量不一致');
     }
-    // ✅ 确保 salt 类型正确（bigint）
-    const rawConfig = params.config ?? {};
-    const config = {
-        ...rawConfig,
-        salt: toBigIntSalt(rawConfig.salt),
-    };
+    // ✅ 归一化配置，填充默认值（与前端 normalizeXLayerAAConfig 保持一致）
+    const config = normalizeConfig(params.config);
     const aaManager = createAAAccountManager(config);
     const ownerWallets = params.ownerPrivateKeys.map(pk => createWallet(pk, config));
     const owners = ownerWallets.map(w => w.address);
@@ -324,12 +337,8 @@ export async function buildBundleSellOps(params) {
 export async function buildBundleProfitOp(params) {
     if (params.profitWei <= 0n)
         return null;
-    // ✅ 确保 salt 类型正确（bigint）
-    const rawConfig = params.config ?? {};
-    const config = {
-        ...rawConfig,
-        salt: toBigIntSalt(rawConfig.salt),
-    };
+    // ✅ 归一化配置，填充默认值（与前端 normalizeXLayerAAConfig 保持一致）
+    const config = normalizeConfig(params.config);
     const aaManager = createAAAccountManager(config);
     const ownerWallet = createWallet(params.ownerPrivateKey, config);
     const accountInfo = await aaManager.getAccountInfo(ownerWallet.address);

package/dist/xlayer/wash-ops.js

@@ -16,7 +16,7 @@ import { ethers } from 'ethers';
 import { createAAAccountManager, encodeExecute, createWallet } from './aa-account.js';
 import { encodeBuyCall, encodeSellCall, PortalQuery } from './portal-ops.js';
 import { encodeSwapExactETHForTokensSupportingFee, encodeSwapExactTokensForETHSupportingFee, encodeSwapExactETHForTokensV3, encodeSwapExactTokensForETHV3, DexQuery, } from './dex.js';
-import { FLAP_PORTAL, WOKB, } from './constants.js';
+import { FLAP_PORTAL, WOKB, XLAYER_CHAIN_ID, DEFAULT_RPC_URL, ENTRYPOINT_V06, SIMPLE_ACCOUNT_FACTORY, PARTICLE_BUNDLER_URL, } from './constants.js';
 import { PROFIT_CONFIG } from '../utils/constants.js';
 import { mapWithConcurrency } from '../utils/concurrency.js';
 // ============================================================================
@@ -40,6 +40,27 @@ function toBigIntSalt(v) {
     }
     return 0n;
 }
+/**
+ * 归一化 XLayer AA 配置，填充默认值
+ * 与前端的 normalizeXLayerAAConfig 保持一致
+ */
+function normalizeConfig(cfg) {
+    const rpcUrl = String(cfg?.rpcUrl || DEFAULT_RPC_URL).trim();
+    if (!rpcUrl)
+        throw new Error('[buildWashOps] rpcUrl 为空');
+    return {
+        rpcUrl,
+        bundlerUrl: cfg?.bundlerUrl || PARTICLE_BUNDLER_URL,
+        chainId: cfg?.chainId ?? XLAYER_CHAIN_ID,
+        entryPoint: cfg?.entryPoint || ENTRYPOINT_V06,
+        factory: cfg?.factory || SIMPLE_ACCOUNT_FACTORY,
+        salt: toBigIntSalt(cfg?.salt),
+        paymaster: cfg?.paymaster,
+        paymasterData: cfg?.paymasterData,
+        timeoutMs: cfg?.timeoutMs,
+        gasLimitMultiplier: cfg?.gasLimitMultiplier,
+    };
+}
 // ============================================================================
 // 核心实现
 // ============================================================================
@@ -73,12 +94,8 @@ export async function buildWashOps(params) {
     if (params.ownerPrivateKeys.length !== params.buyAmountsOkb.length) {
         throw new Error('[buildWashOps] 私钥数量与买入金额数量不一致');
     }
-    // ✅ 确保 salt 类型正确（bigint）
-    const rawConfig = params.config ?? {};
-    const config = {
-        ...rawConfig,
-        salt: toBigIntSalt(rawConfig.salt), // 转换 salt 为 bigint
-    };
+    // ✅ 归一化配置，填充默认值（与前端 normalizeXLayerAAConfig 保持一致）
+    const config = normalizeConfig(params.config);
     const aaManager = createAAAccountManager(config);
     // ✅ 预先过滤无效私钥并保持索引对应
     const validEntries = [];

package/package.json

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