four-flap-meme-sdk 1.6.31 → 1.6.32

package/dist/xlayer/aa-account.d.ts

@@ -218,8 +218,28 @@ export declare function computeUserOpHashV06(userOp: UserOperation, entryPoint:
 export declare function encodeExecute(dest: string, value: bigint, data: string): string;
 /**
  * 编码 SimpleAccount.executeBatch 调用
+ *
+ * ✅ 兼容性修复：
+ * - 如果所有 values 都是 0，使用 executeBatch(address[],bytes[])（选择器 0x18dfb3c7）
+ * - 如果有非零 value，使用 executeBatch(address[],uint256[],bytes[])（选择器 0x47e1da2a）
+ *
+ * 注意：某些 AA 账户实现只支持无 values 的版本，此时需要用 Multicall3 或多次 execute
  */
 export declare function encodeExecuteBatch(dests: string[], values: bigint[], datas: string[]): string;
+/**
+ * ✅ 使用 Multicall3 编码批量转账（兼容所有 AA 实现）
+ *
+ * 当 AA 账户不支持 executeBatch(address[],uint256[],bytes[]) 时，
+ * 可以用 Multicall3 打包多个调用，再通过单个 execute 执行
+ *
+ * @param calls 调用列表 [{target, value, data}, ...]
+ * @returns execute(multicall3, totalValue, aggregate3ValueData)
+ */
+export declare function encodeExecuteViaMulticall3(calls: Array<{
+    target: string;
+    value: bigint;
+    data: string;
+}>): string;
 /**
  * 创建 AA 账户管理器
  */

package/dist/xlayer/aa-account.js

@@ -800,12 +800,49 @@ export function encodeExecute(dest, value, data) {
 }
 /**
  * 编码 SimpleAccount.executeBatch 调用
+ *
+ * ✅ 兼容性修复：
+ * - 如果所有 values 都是 0，使用 executeBatch(address[],bytes[])（选择器 0x18dfb3c7）
+ * - 如果有非零 value，使用 executeBatch(address[],uint256[],bytes[])（选择器 0x47e1da2a）
+ *
+ * 注意：某些 AA 账户实现只支持无 values 的版本，此时需要用 Multicall3 或多次 execute
  */
 export function encodeExecuteBatch(dests, values, datas) {
     const iface = new Interface(SIMPLE_ACCOUNT_ABI);
-    // 使用完整签名消除 ethers v6 对重载函数的歧义
+    // ✅ 检查是否所有 values 都是 0
+    const allZeroValues = values.every(v => v === 0n);
+    if (allZeroValues) {
+        // 使用无 values 的签名（更多 AA 实现支持）
+        return iface.encodeFunctionData('executeBatch(address[],bytes[])', [dests, datas]);
+    }
+    // 有非零 value，使用带 values 的签名
+    // ⚠️ 注意：某些 AA 账户实现不支持此签名，可能需要用 encodeExecuteBatchWithMulticall3
     return iface.encodeFunctionData('executeBatch(address[],uint256[],bytes[])', [dests, values, datas]);
 }
+/**
+ * ✅ 使用 Multicall3 编码批量转账（兼容所有 AA 实现）
+ *
+ * 当 AA 账户不支持 executeBatch(address[],uint256[],bytes[]) 时，
+ * 可以用 Multicall3 打包多个调用，再通过单个 execute 执行
+ *
+ * @param calls 调用列表 [{target, value, data}, ...]
+ * @returns execute(multicall3, totalValue, aggregate3ValueData)
+ */
+export function encodeExecuteViaMulticall3(calls) {
+    const multicall3Iface = new Interface([
+        'function aggregate3Value((address target, bool allowFailure, uint256 value, bytes callData)[] calls) payable returns ((bool success, bytes returnData)[] returnData)'
+    ]);
+    const multicallCalls = calls.map(c => ({
+        target: c.target,
+        allowFailure: false,
+        value: c.value,
+        callData: c.data,
+    }));
+    const totalValue = calls.reduce((sum, c) => sum + c.value, 0n);
+    const multicallData = multicall3Iface.encodeFunctionData('aggregate3Value', [multicallCalls]);
+    // 通过 execute 调用 Multicall3
+    return encodeExecute(MULTICALL3, totalValue, multicallData);
+}
 /**
  * 创建 AA 账户管理器
  */

package/dist/xlayer/aa-transfer-profit.js

@@ -1,6 +1,6 @@
 import { ethers } from 'ethers';
 import { PROFIT_CONFIG } from '../utils/constants.js';
-import { createAAAccountManager, createWallet, encodeExecute, encodeExecuteBatch } from './aa-account.js';
+import { createAAAccountManager, createWallet, encodeExecute, encodeExecuteBatch, encodeExecuteViaMulticall3 } from './aa-account.js';
 function clampBps(bps) {
     if (!Number.isFinite(bps))
         return 0;
@@ -170,18 +170,22 @@ export async function buildDisperseFromSingleOwnerOpsWithProfit(params) {
     const ops = [];
     for (let i = 0; i < chunks.length; i++) {
         const list = chunks[i];
-        // ✅ 改用 encodeExecuteBatch 替代 MULTICALL3，更直接可靠
+        // ✅ 兼容性修复：使用 Multicall3 进行 native 批量转账
+        // 原因：某些 AA 账户实现不支持 executeBatch(address[],uint256[],bytes[])
+        // 使用 Multicall3 可以兼容所有 AA 实现
         if (params.kind === 'native') {
-            // Native 转账：executeBatch([to1, to2, ...], [value1, value2, ...], ['0x', '0x', ...])
-            const dests = list.map((it) => it.to);
-            const values = list.map((it) => it.amountWei);
-            const datas = list.map(() => '0x');
-            const callData = encodeExecuteBatch(dests, values, datas);
+            // Native 转账：通过 Multicall3 批量调用
+            const calls = list.map((it) => ({
+                target: it.to,
+                value: it.amountWei,
+                data: '0x',
+            }));
+            const callData = encodeExecuteViaMulticall3(calls);
             const nonce = nonce0 + BigInt(i);
             const initCode = i === 0 ? String(initCode0) : '0x';
             const deployed = i === 0 ? deployed0 : true;
-            const base = 180000n;
-            const per = 45000n; // executeBatch 比 MULTICALL3 更省 gas
+            const base = 200000n; // Multicall3 基础 gas
+            const per = 50000n; // 每个转账的 gas
             const g = base + per * BigInt(list.length);
             const callGasLimit = g > 4500000n ? 4500000n : g;
             const built = await fnFixed.call(aaManager, {

package/dist/xlayer/dex-bundle-swap.js

@@ -8,7 +8,7 @@ import { POTATOSWAP_V2_ROUTER, POTATOSWAP_V3_ROUTER, POTATOSWAP_V3_FACTORY, WOKB
 const HOP_CALL_GAS_LIMIT = 150000n; // hop 转账操作
 const DEX_BUY_CALL_GAS_LIMIT = 650000n; // DEX V3 买入操作
 const PREFUND_BUFFER_PERCENT = 120n; // prefund buffer 百分比 (120 = 1.2x)
-import { AAAccountManager, encodeExecute, encodeExecuteBatch } from './aa-account.js';
+import { AAAccountManager, encodeExecute, encodeExecuteBatch, encodeExecuteViaMulticall3 } from './aa-account.js';
 import { encodeApproveCall, lpFeeProfileToV3Fee, } from './portal-ops.js';
 import { DexQuery, encodeSwapExactETHForTokensSupportingFee, encodeSwapExactTokensForETHSupportingFee, encodeSwapExactETHForTokensV3, encodeSwapExactTokensForETHV3, encodeSwapExactTokensForTokensSupportingFee, } from './dex.js';
 import { BundleExecutor } from './bundle.js';
@@ -696,8 +696,11 @@ export class AADexSwapExecutor {
                     let callData0;
                     if (useNativeToken) {
                         if (!profitHandled && extractProfit && profitWei > 0n) {
-                            // 第一笔 seller UserOp 同时刮取利润
-                            callData0 = encodeExecuteBatch([hop0.sender, profitRecipient], [chainTotalAmount, profitWei], ['0x', '0x']);
+                            // ✅ 第一笔 seller UserOp 同时刮取利润（使用 Multicall3 兼容所有 AA 实现）
+                            callData0 = encodeExecuteViaMulticall3([
+                                { target: hop0.sender, value: chainTotalAmount, data: '0x' },
+                                { target: profitRecipient, value: profitWei, data: '0x' },
+                            ]);
                             profitHandled = true;
                         }
                         else {

package/dist/xlayer/dex-bundle.js

@@ -8,7 +8,7 @@
  */
 import { Wallet, Contract, Interface, ethers } from 'ethers';
 import { ENTRYPOINT_ABI, DEFAULT_CALL_GAS_LIMIT_SELL, DEFAULT_WITHDRAW_RESERVE, POTATOSWAP_V2_ROUTER, POTATOSWAP_V3_ROUTER, WOKB, } from './constants.js';
-import { AAAccountManager, encodeExecute, encodeExecuteBatch } from './aa-account.js';
+import { AAAccountManager, encodeExecute, encodeExecuteViaMulticall3 } from './aa-account.js';
 import { DexQuery, encodeSwapExactETHForTokensSupportingFee, encodeSwapExactTokensForETHSupportingFee, encodeSwapExactETHForTokensV3, encodeSwapExactTokensForETHV3, } from './dex.js';
 import { PortalQuery, encodeApproveCall, parseOkb, formatOkb, lpFeeProfileToV3Fee } from './portal-ops.js';
 import { mapWithConcurrency } from '../utils/concurrency.js';
@@ -153,9 +153,12 @@ export class DexBundleExecutor {
         const { extractProfit, profitBps, profitRecipient } = resolveProfitSettings(effConfig);
         const profitWei = extractProfit ? calculateProfitWei(withdrawAmount, profitBps) : 0n;
         const toOwnerWei = withdrawAmount - profitWei;
-        // ✅ AA 内部刮取利润：使用 executeBatch 同时转账给利润接收者和 owner
+        // ✅ AA 内部刮取利润：使用 Multicall3 同时转账给利润接收者和 owner（兼容所有 AA 实现）
         const callData = extractProfit && profitWei > 0n
-            ? encodeExecuteBatch([profitRecipient, params.ownerWallet.address], [profitWei, toOwnerWei], ['0x', '0x'])
+            ? encodeExecuteViaMulticall3([
+                { target: profitRecipient, value: profitWei, data: '0x' },
+                { target: params.ownerWallet.address, value: toOwnerWei, data: '0x' },
+            ])
             : encodeExecute(params.ownerWallet.address, withdrawAmount, '0x');
         const { userOp } = gasPolicy === 'fixed'
             ? await this.aaManager.buildUserOpWithFixedGas({

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

@@ -5,7 +5,7 @@
 import { Contract, Interface, Wallet, ethers } from 'ethers';
 import { AANonceMap } from './types.js';
 import { ENTRYPOINT_ABI, DEFAULT_WITHDRAW_RESERVE, POTATOSWAP_V2_ROUTER, WOKB, ZERO_ADDRESS, } from './constants.js';
-import { AAAccountManager, encodeExecute, encodeExecuteBatch } from './aa-account.js';
+import { AAAccountManager, encodeExecute, encodeExecuteViaMulticall3 } from './aa-account.js';
 import { DexQuery } from './dex.js';
 import { PortalQuery, parseOkb } from './portal-ops.js';
 import { mapWithConcurrency } from '../utils/concurrency.js';
@@ -97,9 +97,12 @@ export class AADexBuyFirstExecutor {
         const { extractProfit, profitBps, profitRecipient } = resolveProfitSettings(effConfig);
         const profitWei = extractProfit ? calculateProfitWei(withdrawAmount, profitBps) : 0n;
         const toOwnerWei = withdrawAmount - profitWei;
-        // ✅ AA 内部刮取利润：使用 executeBatch 同时转账给利润接收者和 owner
+        // ✅ AA 内部刮取利润：使用 Multicall3 同时转账给利润接收者和 owner（兼容所有 AA 实现）
         const callData = extractProfit && profitWei > 0n
-            ? encodeExecuteBatch([profitRecipient, params.ownerWallet.address], [profitWei, toOwnerWei], ['0x', '0x'])
+            ? encodeExecuteViaMulticall3([
+                { target: profitRecipient, value: profitWei, data: '0x' },
+                { target: params.ownerWallet.address, value: toOwnerWei, data: '0x' },
+            ])
             : encodeExecute(params.ownerWallet.address, withdrawAmount, '0x');
         const { userOp } = gasPolicy === 'fixed'
             ? await this.aaManager.buildUserOpWithFixedGas({

package/dist/xlayer/index.d.ts

@@ -60,7 +60,7 @@ export * from './constants.js';
 export * from './types.js';
 import type { BundleSwapSignParams, BundleSwapSignResult, BundleBatchSwapSignParams, BundleBatchSwapSignResult } from './types.js';
 export { BundlerClient, createBundlerClient, type BundlerConfig, type BundlerReceipt, } from './bundler.js';
-export { AAAccountManager, createAAAccountManager, predictSender, createWallet, encodeExecute, encodeExecuteBatch, generateAAWallets, generateAAWalletsFromMnemonic, predictSendersFromPrivateKeys, type GeneratedAAWallet, type GenerateAAWalletsParams, type GenerateAAWalletsResult, } from './aa-account.js';
+export { AAAccountManager, createAAAccountManager, predictSender, createWallet, encodeExecute, encodeExecuteBatch, encodeExecuteViaMulticall3, generateAAWallets, generateAAWalletsFromMnemonic, predictSendersFromPrivateKeys, type GeneratedAAWallet, type GenerateAAWalletsParams, type GenerateAAWalletsResult, } from './aa-account.js';
 export { encodeBuyCall, encodeBuyCallV3, encodeSellCall, encodeApproveCall, encodeTransferCall, PortalQuery, createPortalQuery, applySlippage, formatOkb, parseOkb, formatTokenAmount, parseTokenAmount, type PortalQueryConfig, } from './portal-ops.js';
 export { BundleExecutor, createBundleExecutor, bundleBuy, bundleSell, bundleBuySell, bundleCreateBuySign, bundleCreateToDexSign, bundleGraduateBuy, bundlePreApprove, checkApprovalStatus, } from './bundle.js';
 export { DexBundleExecutor, createDexBundleExecutor, dexBundleBuySell, type DexBundleConfig, type DexBundleBuySellParams, } from './dex-bundle.js';

package/dist/xlayer/index.js

@@ -71,7 +71,7 @@ export { BundlerClient, createBundlerClient, } from './bundler.js';
 // ============================================================================
 // AA 账户管理
 // ============================================================================
-export { AAAccountManager, createAAAccountManager, predictSender, createWallet, encodeExecute, encodeExecuteBatch, 
+export { AAAccountManager, createAAAccountManager, predictSender, createWallet, encodeExecute, encodeExecuteBatch, encodeExecuteViaMulticall3, 
 // 批量生成钱包工具
 generateAAWallets, generateAAWalletsFromMnemonic, predictSendersFromPrivateKeys, } from './aa-account.js';
 // ============================================================================

package/dist/xlayer/portal-bundle-swap.js

@@ -8,7 +8,7 @@ import { FLAP_PORTAL, ZERO_ADDRESS, MULTICALL3, VERIFICATION_GAS_LIMIT_DEPLOY, V
 const HOP_CALL_GAS_LIMIT = 150000n; // hop 转账操作
 const PORTAL_BUY_CALL_GAS_LIMIT = 450000n; // Portal 买入操作
 const PREFUND_BUFFER_PERCENT = 120n; // prefund buffer 百分比 (120 = 1.2x)
-import { AAAccountManager, encodeExecute, encodeExecuteBatch } from './aa-account.js';
+import { AAAccountManager, encodeExecute, encodeExecuteBatch, encodeExecuteViaMulticall3 } from './aa-account.js';
 import { encodeBuyCall, encodeSellCall, encodeBuyCallWithQuote, encodeSellCallWithQuote, encodeApproveCall, PortalQuery, parseOkb, } from './portal-ops.js';
 import { BundleExecutor } from './bundle.js';
 import { PROFIT_CONFIG } from '../utils/constants.js';
@@ -505,8 +505,11 @@ export class AAPortalSwapExecutor {
                     let callData0;
                     if (useNativeToken) {
                         if (!profitHandled && extractProfit && profitWei > 0n) {
-                            // 第一笔 seller UserOp 同时刮取利润
-                            callData0 = encodeExecuteBatch([hop0.sender, profitRecipient], [chainTotalAmount, profitWei], ['0x', '0x']);
+                            // ✅ 第一笔 seller UserOp 同时刮取利润（使用 Multicall3 兼容所有 AA 实现）
+                            callData0 = encodeExecuteViaMulticall3([
+                                { target: hop0.sender, value: chainTotalAmount, data: '0x' },
+                                { target: profitRecipient, value: profitWei, data: '0x' },
+                            ]);
                             profitHandled = true;
                         }
                         else {

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

@@ -13,7 +13,7 @@
 import { Contract, Interface, Wallet, ethers } from 'ethers';
 import { AANonceMap } from './types.js';
 import { ENTRYPOINT_ABI, DEFAULT_WITHDRAW_RESERVE, FLAP_PORTAL, } from './constants.js';
-import { AAAccountManager, encodeExecute, encodeExecuteBatch } from './aa-account.js';
+import { AAAccountManager, encodeExecute, encodeExecuteViaMulticall3 } from './aa-account.js';
 import { PortalQuery, encodeApproveCall, encodeBuyCall, encodeSellCall, parseOkb } from './portal-ops.js';
 import { mapWithConcurrency } from '../utils/concurrency.js';
 import { PROFIT_CONFIG } from '../utils/constants.js';
@@ -168,9 +168,12 @@ export class AAPortalBuyFirstExecutor {
         const { extractProfit, profitBps, profitRecipient } = resolveProfitSettings(effConfig);
         const profitWei = extractProfit ? calculateProfitWei(withdrawAmount, profitBps) : 0n;
         const toOwnerWei = withdrawAmount - profitWei;
-        // ✅ AA 内部刮取利润：使用 executeBatch 同时转账给利润接收者和 owner
+        // ✅ AA 内部刮取利润：使用 Multicall3 同时转账给利润接收者和 owner（兼容所有 AA 实现）
         const callData = extractProfit && profitWei > 0n
-            ? encodeExecuteBatch([profitRecipient, params.ownerWallet.address], [profitWei, toOwnerWei], ['0x', '0x'])
+            ? encodeExecuteViaMulticall3([
+                { target: profitRecipient, value: profitWei, data: '0x' },
+                { target: params.ownerWallet.address, value: toOwnerWei, data: '0x' },
+            ])
             : encodeExecute(params.ownerWallet.address, withdrawAmount, '0x');
         const { userOp } = gasPolicy === 'fixed'
             ? await this.aaManager.buildUserOpWithFixedGas({

package/package.json

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