four-flap-meme-sdk 1.5.8 → 1.5.9

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

@@ -250,6 +250,30 @@ export async function submitMultipleBundlesToBlockRazorParallel(bundles, config)
     const promises = bundles.map(signedTransactions => submitBundleToBlockRazor(signedTransactions, config));
     return await Promise.all(promises);
 }
+function shouldTreatBroadcastErrorAsMaybeSent(msg) {
+    const m = String(msg || '').toLowerCase();
+    // 常见：交易已被节点接收/已在 mempool/已上链，但节点返回报错
+    return (m.includes('already known') ||
+        m.includes('known transaction') ||
+        m.includes('nonce too low') ||
+        m.includes('nonce has already been used') ||
+        m.includes('nonce expired') ||
+        m.includes('replacement transaction underpriced'));
+}
+async function recoverTxHashIfAlreadySeen(provider, signedTx, errorMessage) {
+    if (!shouldTreatBroadcastErrorAsMaybeSent(errorMessage))
+        return undefined;
+    try {
+        const hash = ethers.keccak256(signedTx);
+        if (!hash)
+            return undefined;
+        const tx = await provider.getTransaction(hash);
+        return tx ? hash : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
 /**
  * 并行广播到 RPC（用于不支持 Bundle 的链，如 Monad）
  *
@@ -333,6 +357,17 @@ export async function submitDirectToRpc(signedTransactions, config) {
         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) {
+                if (config.waitForConfirmation) {
+                    try {
+                        await provider.waitForTransaction(recovered, 1, config.confirmationTimeout ?? 30000);
+                    }
+                    catch { }
+                }
+                return { index: i, success: true, txHash: recovered, error: errorMessage };
+            }
             return {
                 index: i,
                 success: false,
@@ -431,6 +466,29 @@ export async function submitDirectToRpcSequential(signedTransactions, config) {
         }
         catch (error) {
             const errorMessage = error?.message || String(error);
+            // ✅ 兼容：nonce too low / already known 等情况下，交易可能已经被接收
+            const recovered = await recoverTxHashIfAlreadySeen(provider, signedTx, errorMessage);
+            if (recovered) {
+                // 顺序模式依赖确认：尽量等待一下
+                try {
+                    const receipt = await provider.waitForTransaction(recovered, 1, confirmationTimeout);
+                    if (receipt && receipt.status === 1) {
+                        results.push({ index: i, success: true, txHash: recovered, error: errorMessage });
+                        txHashes.push(recovered);
+                        continue;
+                    }
+                    const errorMsg = `交易执行失败（status=${receipt?.status})`;
+                    results.push({ index: i, success: false, txHash: recovered, error: `${errorMessage} | ${errorMsg}` });
+                    errors.push(`交易 ${i + 1}: ${errorMessage} | ${errorMsg}`);
+                    continue;
+                }
+                catch {
+                    // 等待超时也先认为“已广播”，交给上层自行确认
+                    results.push({ index: i, success: true, txHash: recovered, error: errorMessage });
+                    txHashes.push(recovered);
+                    continue;
+                }
+            }
             results.push({
                 index: i,
                 success: false,

package/dist/flap/portal-bundle-merkle/private.js

@@ -22,7 +22,8 @@ export async function flapPrivateBuyMerkle(params) {
     // ✅ 并行获取 gasPrice、nonce 和构建未签名交易
     const [gasPrice, currentNonce, unsigned] = await Promise.all([
         getOptimizedGasPrice(provider, getGasPriceConfig(config)),
-        wallet.getNonce(),
+        // ✅ 使用 pending nonce，避免 xLayer 等链上“已有 pending 交易”导致 nonce too low
+        provider.getTransactionCount(wallet.address, 'pending'),
         portal.swapExactInput.populateTransaction({
             inputToken: ZERO_ADDRESS,
             outputToken: tokenAddress,
@@ -101,7 +102,8 @@ export async function flapPrivateSellMerkle(params) {
     // ✅ 并行获取 gasPrice、nonce、报价和构建未签名交易
     const [gasPrice, currentNonce, { quotedOutput }, unsigned] = await Promise.all([
         getOptimizedGasPrice(provider, getGasPriceConfig(config)),
-        wallet.getNonce(),
+        // ✅ 使用 pending nonce，避免 xLayer 等链上“已有 pending 交易”导致 nonce too low
+        provider.getTransactionCount(wallet.address, 'pending'),
         resolveSingleSellOutputs(portal, tokenAddress, amountWei, minOutputAmount),
         portal.swapExactInput.populateTransaction({
             inputToken: tokenAddress,
@@ -198,7 +200,8 @@ export async function flapBatchPrivateBuyMerkle(params) {
     // ✅ 并行获取 gasPrice、所有 nonces 和构建未签名交易
     const [gasPrice, initialNonces, unsignedList] = await Promise.all([
         getOptimizedGasPrice(provider, getGasPriceConfig(config)),
-        Promise.all(wallets.map(w => w.getNonce())),
+        // ✅ 使用 pending nonce，避免 xLayer 等链上“已有 pending 交易”导致 nonce too low
+        Promise.all(wallets.map(w => provider.getTransactionCount(w.address, 'pending'))),
         Promise.all(portals.map((portal, i) => portal.swapExactInput.populateTransaction({
             inputToken: ZERO_ADDRESS,
             outputToken: tokenAddress,
@@ -287,7 +290,8 @@ export async function flapBatchPrivateSellMerkle(params) {
     // ✅ 并行获取 gasPrice、所有 nonces、所有报价和构建未签名交易
     const [gasPrice, initialNonces, quotedOutputs, unsignedList] = await Promise.all([
         getOptimizedGasPrice(provider, getGasPriceConfig(config)),
-        Promise.all(wallets.map(w => w.getNonce())),
+        // ✅ 使用 pending nonce，避免 xLayer 等链上“已有 pending 交易”导致 nonce too low
+        Promise.all(wallets.map(w => provider.getTransactionCount(w.address, 'pending'))),
         Promise.all(amountsWei.map(amount => portal.quoteExactInput.staticCall({
             inputToken: tokenAddress,
             outputToken: ZERO_ADDRESS,

package/package.json

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