four-flap-meme-sdk 1.5.95 → 1.5.98

package/dist/contracts/tm-bundle-merkle/index.d.ts

@@ -9,6 +9,7 @@ export { fourPrivateBuyMerkle, fourPrivateSellMerkle, fourBatchPrivateBuyMerkle,
 export { disperseWithBundleMerkle, sweepWithBundleMerkle, pairwiseTransferWithBundleMerkle } from './utils.js';
 export { fourPancakeProxyBatchBuyMerkle, fourPancakeProxyBatchSellMerkle, approveFourPancakeProxy, approveFourPancakeProxyBatch } from './pancake-proxy.js';
 export { approveFourTokenManagerBatch, type ApproveFourTokenManagerBatchParams, type ApproveFourTokenManagerBatchResult } from './approve-tokenmanager.js';
-export { submitBundleToMerkle, submitMultipleBundles, submitMultipleBundlesParallel, type MerkleSubmitConfig, type SubmitBundleResult, submitBundleToBlockRazor, submitMultipleBundlesToBlockRazor, submitMultipleBundlesToBlockRazorParallel, type BlockRazorSubmitConfig, type BlockRazorSubmitResult, submitDirectToRpc, submitDirectToRpcSequential, // ✅ 新增：顺序广播并等待确认（用于多跳）
+export { submitBundleToMerkle, submitMultipleBundles, submitMultipleBundlesParallel, type MerkleSubmitConfig, type SubmitBundleResult, submitBundleToBlockRazor, submitMultipleBundlesToBlockRazor, submitMultipleBundlesToBlockRazorParallel, type BlockRazorSubmitConfig, type BlockRazorSubmitResult, submitDirectToRpc, submitDirectToRpcSequential, // ✅ 顺序广播并等待确认（用于多跳）
+submitDirectToRpcSequentialNoWait, // ✅ 顺序广播但不等待确认（用于 AA handleOps + tail）
 submitDirectToRpcParallel, type DirectSubmitConfig, type DirectSubmitResult, type DirectTxResult } from './submit.js';
 export { fourBundleBuyFirstMerkle, type FourBundleBuyFirstSignParams, type FourBuyFirstSignConfig, type FourBuyFirstResult } from './swap-buy-first.js';

package/dist/contracts/tm-bundle-merkle/index.js

@@ -22,7 +22,8 @@ submitBundleToMerkle, submitMultipleBundles, submitMultipleBundlesParallel,
 // ✅ BlockRazor 提交方法
 submitBundleToBlockRazor, submitMultipleBundlesToBlockRazor, submitMultipleBundlesToBlockRazorParallel, 
 // ✅ Monad 等链的逐笔广播方法
-submitDirectToRpc, submitDirectToRpcSequential, // ✅ 新增：顺序广播并等待确认（用于多跳）
+submitDirectToRpc, submitDirectToRpcSequential, // ✅ 顺序广播并等待确认（用于多跳）
+submitDirectToRpcSequentialNoWait, // ✅ 顺序广播但不等待确认（用于 AA handleOps + tail）
 submitDirectToRpcParallel } from './submit.js';
 // 先买后卖换手方法
 export { fourBundleBuyFirstMerkle } from './swap-buy-first.js';

package/dist/contracts/tm-bundle-merkle/submit.d.ts

@@ -260,6 +260,17 @@ export declare function submitDirectToRpc(signedTransactions: string[], config:
  * @returns 广播结果
  */
 export declare function submitDirectToRpcSequential(signedTransactions: string[], config: DirectSubmitConfig): Promise<DirectSubmitResult>;
+/**
+ * ✅ 顺序广播但不等待确认（用于 AA handleOps + tail 等 nonce 连续的场景）
+ *
+ * 按顺序逐笔发送交易，每笔只等待广播成功（RPC 返回 txHash），不等待链上确认。
+ * 这样可以保证交易按顺序进入 mempool，同时避免等待确认超时。
+ *
+ * @param signedTransactions 签名后的交易数组
+ * @param config 直接广播配置
+ * @returns 广播结果
+ */
+export declare function submitDirectToRpcSequentialNoWait(signedTransactions: string[], config: DirectSubmitConfig): Promise<DirectSubmitResult>;
 /**
  * 并行逐笔广播到 RPC（速度更快，但可能有 nonce 冲突）
  *

package/dist/contracts/tm-bundle-merkle/submit.js

@@ -510,6 +510,94 @@ export async function submitDirectToRpcSequential(signedTransactions, config) {
         errorSummary: errors.length > 0 ? errors.join('; ') : undefined
     };
 }
+/**
+ * ✅ 顺序广播但不等待确认（用于 AA handleOps + tail 等 nonce 连续的场景）
+ *
+ * 按顺序逐笔发送交易，每笔只等待广播成功（RPC 返回 txHash），不等待链上确认。
+ * 这样可以保证交易按顺序进入 mempool，同时避免等待确认超时。
+ *
+ * @param signedTransactions 签名后的交易数组
+ * @param config 直接广播配置
+ * @returns 广播结果
+ */
+export async function submitDirectToRpcSequentialNoWait(signedTransactions, config) {
+    const totalTransactions = signedTransactions?.length ?? 0;
+    if (!signedTransactions || signedTransactions.length === 0) {
+        return {
+            code: false,
+            totalTransactions: 0,
+            successCount: 0,
+            failedCount: 0,
+            txHashes: [],
+            results: [],
+            errorSummary: 'signedTransactions cannot be empty'
+        };
+    }
+    if (!config.rpcUrl) {
+        return {
+            code: false,
+            totalTransactions,
+            successCount: 0,
+            failedCount: totalTransactions,
+            txHashes: [],
+            results: [],
+            errorSummary: 'rpcUrl is required in config'
+        };
+    }
+    const chainId = config.chainId ?? 143;
+    const chainName = config.chainName ?? 'MONAD';
+    const provider = new ethers.JsonRpcProvider(config.rpcUrl, {
+        chainId,
+        name: chainName
+    });
+    const results = [];
+    const txHashes = [];
+    const errors = [];
+    // ✅ 顺序广播，每笔只等待广播成功（不等待链上确认）
+    for (let i = 0; i < signedTransactions.length; i++) {
+        const signedTx = signedTransactions[i];
+        try {
+            // 广播交易，等待 RPC 返回 txHash
+            const txResponse = await provider.broadcastTransaction(signedTx);
+            results.push({
+                index: i,
+                success: true,
+                txHash: txResponse.hash
+            });
+            txHashes.push(txResponse.hash);
+            console.log(`✅ [${chainName}] 交易 ${i + 1}/${totalTransactions} 广播成功: ${txResponse.hash}`);
+        }
+        catch (error) {
+            const errorMessage = error?.message || String(error);
+            console.error(`❌ [${chainName}] 交易 ${i + 1}/${totalTransactions} 广播失败:`, errorMessage);
+            // ✅ 兼容：nonce too low / already known 等情况下，交易可能已经被接收
+            const recovered = await recoverTxHashIfAlreadySeen(provider, signedTx, errorMessage);
+            if (recovered) {
+                results.push({ index: i, success: true, txHash: recovered, error: errorMessage });
+                txHashes.push(recovered);
+                continue;
+            }
+            results.push({
+                index: i,
+                success: false,
+                error: errorMessage
+            });
+            errors.push(`交易 ${i + 1}: ${errorMessage}`);
+            // ✅ 如果某笔失败，继续尝试后续交易（可能是 nonce 问题可以自动恢复）
+        }
+    }
+    const successCount = txHashes.length;
+    const failedCount = totalTransactions - successCount;
+    return {
+        code: successCount > 0,
+        totalTransactions,
+        successCount,
+        failedCount,
+        txHashes,
+        results,
+        errorSummary: errors.length > 0 ? errors.join('; ') : undefined
+    };
+}
 /**
  * 并行逐笔广播到 RPC（速度更快，但可能有 nonce 冲突）
  *

package/dist/index.d.ts

@@ -49,7 +49,8 @@ export { flapBundleCurveToDex, type CurveToDexChain, type DexPoolType, type Curv
 export { flapBundleCreateToDex, type CreateToDexChain, type CreateToDexSignConfig, type CreateTokenInfo, type FlapCreateToDexParams, type FlapCreateToDexResult } from './flap/portal-bundle-merkle/create-to-dex.js';
 export { PROFIT_CONFIG } from './utils/constants.js';
 export { quoteV2, quoteV3, quote, getTokenToNativeQuote, getNativeToTokenQuote, getWrappedNativeAddress, getStableCoins, V3_FEE_TIERS, QUOTE_CONFIG, type QuoteParams, type QuoteResult, type SupportedChain, } from './utils/quote-helpers.js';
-export { submitDirectToRpc, submitDirectToRpcSequential, // ✅ 新增：顺序广播并等待确认（用于多跳）
+export { submitDirectToRpc, submitDirectToRpcSequential, // ✅ 顺序广播并等待确认（用于多跳）
+submitDirectToRpcSequentialNoWait, // ✅ 顺序广播但不等待确认（用于 AA handleOps + tail）
 submitDirectToRpcParallel, type DirectSubmitConfig, type DirectSubmitResult, type DirectTxResult } from './contracts/tm-bundle-merkle/submit.js';
 export { directV2BatchBuy, directV2BatchSell, directV3BatchBuy, directV3BatchSell, getRouterAddress, DIRECT_ROUTERS, type DirectV2BuyParams, type DirectV2SellParams, type DirectV3BuyParams, type DirectV3SellParams, type DirectRouterResult, type DirectRouterSignConfig, type DexKey, type RouterVersion, } from './dex/index.js';
 export * as XLayer from './xlayer/index.js';

package/dist/index.js

@@ -82,7 +82,8 @@ export { PROFIT_CONFIG } from './utils/constants.js';
 // ✅ V2/V3 报价工具（统一管理）
 export { quoteV2, quoteV3, quote, getTokenToNativeQuote, getNativeToTokenQuote, getWrappedNativeAddress, getStableCoins, V3_FEE_TIERS, QUOTE_CONFIG, } from './utils/quote-helpers.js';
 // ✅ Monad 等不支持 Bundle 的链：逐笔 RPC 广播方法（服务器端使用）
-export { submitDirectToRpc, submitDirectToRpcSequential, // ✅ 新增：顺序广播并等待确认（用于多跳）
+export { submitDirectToRpc, submitDirectToRpcSequential, // ✅ 顺序广播并等待确认（用于多跳）
+submitDirectToRpcSequentialNoWait, // ✅ 顺序广播但不等待确认（用于 AA handleOps + tail）
 submitDirectToRpcParallel } from './contracts/tm-bundle-merkle/submit.js';
 // ============================================================
 // ✅ DEX 直接交易（不走代理合约）

package/dist/xlayer/bundle.js

@@ -10,7 +10,7 @@
 import { Wallet, Interface, Contract, ethers } from 'ethers';
 import { FLAP_PORTAL, ENTRYPOINT_ABI, PORTAL_ABI, DEFAULT_CALL_GAS_LIMIT_SELL, DEFAULT_WITHDRAW_RESERVE, WOKB, POTATOSWAP_V2_ROUTER, POTATOSWAP_V3_ROUTER, } from './constants.js';
 import { AAAccountManager, encodeExecute, encodeExecuteBatch, createWallet } from './aa-account.js';
-import { encodeBuyCall, encodeBuyCallV3, encodeSellCall, encodeApproveCall, encodeTransferCall, encodeCreateCallV2, encodeCreateCallV3, encodeCreateCallV4, PortalQuery, parseOkb, formatOkb, lpFeeProfileToV3Fee, } from './portal-ops.js';
+import { encodeBuyCallV3, encodeSellCall, encodeApproveCall, encodeTransferCall, encodeCreateCallV2, encodeCreateCallV3, encodeCreateCallV4, PortalQuery, parseOkb, formatOkb, lpFeeProfileToV3Fee, } from './portal-ops.js';
 import { mapWithConcurrency } from '../utils/concurrency.js';
 import { PROFIT_CONFIG, ZERO_ADDRESS } from '../utils/constants.js';
 import { DexQuery } from './dex.js';
@@ -1418,28 +1418,58 @@ export class BundleExecutor {
             }
         }
         const provider = this.aaManager.getProvider();
-        const startNonce = params.payerStartNonce ?? await provider.getTransactionCount(payer.address, 'pending');
+        let currentNonce = params.payerStartNonce ?? await provider.getTransactionCount(payer.address, 'pending');
         const signedTransactions = [];
         const feeData = await provider.getFeeData();
         const gasPrice = feeData.gasPrice ?? 100000000n;
         const chainId = (await provider.getNetwork()).chainId;
+        // === 0. 向买家 AA 账户转入 OKB（prefund + 买入金额）===
+        // ✅ 修复 AA21 didn't pay prefund 错误：确保每个买家的 AA 账户有足够的 OKB
+        const DEFAULT_PREFUND_ESTIMATE = parseOkb('0.002'); // 预估每个 UserOp 的 prefund (gas 费用)
+        const BUFFER_WEI = parseOkb('0.0005'); // 缓冲金额
+        for (let i = 0; i < buyerWallets.length; i++) {
+            const buyerSender = buyerSenders[i];
+            const buyWei = buyerData[i].buyWei;
+            // 计算需要转入的金额：买入金额 + prefund + 缓冲
+            const requiredAmount = useNativeToken
+                ? buyWei + DEFAULT_PREFUND_ESTIMATE + BUFFER_WEI // 原生代币：需要买入金额 + gas
+                : DEFAULT_PREFUND_ESTIMATE + BUFFER_WEI; // ERC20 代币：只需要 gas
+            // 检查买家 AA 账户当前余额
+            const currentBalance = await provider.getBalance(buyerSender);
+            if (currentBalance < requiredAmount) {
+                const transferAmount = requiredAmount - currentBalance;
+                console.log(`[买家${i + 1}] 向 AA 账户 ${buyerSender} 转入 ${formatOkb(transferAmount)} OKB`);
+                const fundTxRequest = {
+                    to: buyerSender,
+                    value: transferAmount,
+                    nonce: currentNonce,
+                    gasLimit: 21000n,
+                    gasPrice,
+                    chainId
+                };
+                const signedFundTx = await payer.signTransaction(fundTxRequest);
+                signedTransactions.push(signedFundTx);
+                currentNonce++;
+            }
+        }
         // === 1. AA handleOps 交易（包含所有 UserOps：创建 + 买入）===
         const signedMainTx = await this.signHandleOpsTx({
             ops,
             payerWallet: payer,
             beneficiary: useBeneficiary,
-            nonce: startNonce,
+            nonce: currentNonce,
             gasLimit: effConfig.gasLimit,
             gasPrice: effConfig.minGasPriceGwei ? ethers.parseUnits(effConfig.minGasPriceGwei.toString(), 'gwei') : undefined
         });
         signedTransactions.push(signedMainTx);
+        currentNonce++;
         // === 2. 利润提取交易（独立的 EOA 转账）===
         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: startNonce + 1,
+                nonce: currentNonce,
                 gasLimit: 21000n,
                 gasPrice,
                 chainId
@@ -1539,9 +1569,11 @@ export class BundleExecutor {
         });
         totalCurveBuyWei = curveBuyData.reduce((sum, d) => sum + d.buyWei, 0n);
         // ✅ 并行构建和签名所有内盘买入 UserOps
+        // ✅ 使用 encodeBuyCallV3（支持 extensionData），与 V4 代币创建保持一致
+        const extensionData = params.extensionData ?? '0x';
         const signedCurveBuyOps = await mapWithConcurrency(curveBuyData, 5, async (data) => {
             const { wallet, info, buyWei, gasLimit } = data;
-            const buyData = encodeBuyCall(tokenAddress, buyWei, 0n);
+            const buyData = encodeBuyCallV3(tokenAddress, buyWei, 0n, extensionData);
             const buyCallData = encodeExecute(FLAP_PORTAL, buyWei, buyData);
             const buyOpRes = await aaManager.buildUserOpWithFixedGas({
                 ownerWallet: wallet,
@@ -1556,17 +1588,48 @@ export class BundleExecutor {
             return signedBuyOp.userOp;
         });
         ops1.push(...signedCurveBuyOps);
+        // === 向内盘买家 AA 账户转入 OKB（prefund + 买入金额）===
+        // ✅ 修复 AA21 didn't pay prefund 错误
+        const feeData = await provider.getFeeData();
+        const gasPrice = feeData.gasPrice ?? 100000000n;
+        const chainId = (await provider.getNetwork()).chainId;
+        let currentNonce = params.payerStartNonce ?? (await provider.getTransactionCount(payerWallet.address, 'pending'));
+        const DEFAULT_PREFUND_ESTIMATE = parseOkb('0.002'); // 预估每个 UserOp 的 prefund
+        const BUFFER_WEI = parseOkb('0.0005'); // 缓冲金额
+        for (let i = 0; i < curveBuyerWallets.length; i++) {
+            const buyerSender = curveBuyerInfos[i].sender;
+            const buyWei = curveBuyData[i].buyWei;
+            // 计算需要转入的金额：买入金额 + prefund + 缓冲
+            const requiredAmount = buyWei + DEFAULT_PREFUND_ESTIMATE + BUFFER_WEI;
+            // 检查买家 AA 账户当前余额
+            const currentBalance = await provider.getBalance(buyerSender);
+            if (currentBalance < requiredAmount) {
+                const transferAmount = requiredAmount - currentBalance;
+                console.log(`[内盘买家${i + 1}] 向 AA 账户 ${buyerSender} 转入 ${formatOkb(transferAmount)} OKB`);
+                const fundTxRequest = {
+                    to: buyerSender,
+                    value: transferAmount,
+                    nonce: currentNonce,
+                    gasLimit: 21000n,
+                    gasPrice,
+                    chainId
+                };
+                const signedFundTx = await payerWallet.signTransaction(fundTxRequest);
+                signedTransactions.push(signedFundTx);
+                currentNonce++;
+            }
+        }
         // 签名第一个 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,
+            nonce: currentNonce,
             gasLimit: effConfig.gasLimit,
             gasPrice: effConfig.minGasPriceGwei ? ethers.parseUnits(effConfig.minGasPriceGwei.toString(), 'gwei') : undefined
         });
         signedTransactions.push(signedMainTx);
+        currentNonce++;
         // --- 4. 构建外盘买入 handleOps (如果启用) ---
         if (enableDexBuy && dexBuyerPrivateKeys.length > 0) {
             const dexBuyerWallets = dexBuyerPrivateKeys.map(pk => createWallet(pk, config));
@@ -1584,10 +1647,34 @@ export class BundleExecutor {
                 return { wallet, info: dexBuyerInfos[i], buyWei };
             });
             totalDexBuyWei = dexBuyData.reduce((sum, d) => sum + d.buyWei, 0n);
+            // === 向外盘买家 AA 账户转入 OKB（prefund + 买入金额）===
+            for (let i = 0; i < dexBuyerWallets.length; i++) {
+                const buyerSender = dexBuyerInfos[i].sender;
+                const buyWei = dexBuyData[i].buyWei;
+                // 计算需要转入的金额：买入金额 + prefund + 缓冲
+                const requiredAmount = buyWei + DEFAULT_PREFUND_ESTIMATE + BUFFER_WEI;
+                // 检查买家 AA 账户当前余额
+                const dexBuyerBalance = await provider.getBalance(buyerSender);
+                if (dexBuyerBalance < requiredAmount) {
+                    const transferAmount = requiredAmount - dexBuyerBalance;
+                    console.log(`[外盘买家${i + 1}] 向 AA 账户 ${buyerSender} 转入 ${formatOkb(transferAmount)} OKB`);
+                    const fundTxRequest = {
+                        to: buyerSender,
+                        value: transferAmount,
+                        nonce: currentNonce,
+                        gasLimit: 21000n,
+                        gasPrice,
+                        chainId
+                    };
+                    const signedFundTx = await payerWallet.signTransaction(fundTxRequest);
+                    signedTransactions.push(signedFundTx);
+                    currentNonce++;
+                }
+            }
             // ✅ 并行构建和签名所有外盘买入 UserOps
             const signedDexBuyOps = await mapWithConcurrency(dexBuyData, 5, async (data) => {
                 const { wallet, info, buyWei } = data;
-                // ✅ 外盘买入：使用 Portal 的 swapExactInput 进行自动路由
+                // ✅ 外盘买入：使用 DEX Router 进行交换
                 let swapData;
                 let routerAddress;
                 if (dexType === 'V3') {
@@ -1625,11 +1712,12 @@ export class BundleExecutor {
                 ops: ops2,
                 payerWallet: payerWallet,
                 beneficiary: params.beneficiary ?? payerWallet.address,
-                nonce: startNonce + 1,
+                nonce: currentNonce,
                 gasLimit: effConfig.gasLimit,
                 gasPrice: effConfig.minGasPriceGwei ? ethers.parseUnits(effConfig.minGasPriceGwei.toString(), 'gwei') : undefined
             });
             signedTransactions.push(signedDexTx);
+            currentNonce++;
         }
         // --- 5. 利润提取 (Direct EOA transfer) ---
         let totalProfitWei = 0n;
@@ -1639,12 +1727,11 @@ export class BundleExecutor {
                 totalProfitWei += calculateProfitWei(totalDexBuyWei, profitSettings.profitBps);
             }
             if (totalProfitWei > 0n) {
-                const profitTxNonce = startNonce + (enableDexBuy ? 2 : 1);
                 const signedProfitTx = await this.signProfitTransaction({
                     payerWallet,
                     profitWei: totalProfitWei,
                     recipient: profitSettings.profitRecipient,
-                    nonce: profitTxNonce
+                    nonce: currentNonce
                 });
                 signedTransactions.push(signedProfitTx);
             }

package/package.json

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