four-flap-meme-sdk 1.5.18 → 1.5.20

package/dist/utils/bundle-helpers.d.ts

@@ -16,7 +16,9 @@ import { type GeneratedWallet } from './wallet.js';
 export declare class NonceManager {
     private provider;
     private tempNonceCache;
+    private chainIdPromise?;
     constructor(provider: JsonRpcProvider);
+    private getChainId;
     /**
      * 获取下一个可用的 nonce
      * @param wallet 钱包对象或地址

package/dist/utils/bundle-helpers.js

@@ -4,6 +4,47 @@
  */
 import { ethers, Wallet } from 'ethers';
 import { generateWallets } from './wallet.js';
+const GLOBAL_NONCE_TTL_MS = 60 * 1000; // 1 分钟：只用于短时间“pending 不同步”兜底，避免长时间缓存造成 nonce 过高
+const globalNonceCursorByChain = new Map();
+function isFlakyNonceChain(chainId) {
+    // ✅ XLayer: 196（OKX X Layer）
+    return Number(chainId) === 196;
+}
+function getCursorMap(chainId) {
+    let m = globalNonceCursorByChain.get(chainId);
+    if (!m) {
+        m = new Map();
+        globalNonceCursorByChain.set(chainId, m);
+    }
+    return m;
+}
+function getGlobalNextNonce(chainId, addrLower) {
+    const m = globalNonceCursorByChain.get(chainId);
+    if (!m)
+        return undefined;
+    const e = m.get(addrLower);
+    if (!e)
+        return undefined;
+    if (Date.now() - e.updatedAt > GLOBAL_NONCE_TTL_MS) {
+        m.delete(addrLower);
+        return undefined;
+    }
+    return e.nextNonce;
+}
+function setGlobalNextNonce(chainId, addrLower, nextNonce) {
+    const m = getCursorMap(chainId);
+    const cur = m.get(addrLower);
+    const next = Number(nextNonce);
+    if (!Number.isFinite(next) || next < 0)
+        return;
+    if (!cur || next > cur.nextNonce || (Date.now() - cur.updatedAt > GLOBAL_NONCE_TTL_MS)) {
+        m.set(addrLower, { nextNonce: next, updatedAt: Date.now() });
+    }
+    else {
+        // 刷新时间戳，避免短时间内频繁淘汰
+        cur.updatedAt = Date.now();
+    }
+}
 /**
  * Nonce 管理器
  * 用于在 bundle 交易中管理多个钱包的 nonce
@@ -19,6 +60,12 @@ export class NonceManager {
         this.tempNonceCache = new Map();
         this.provider = provider;
     }
+    async getChainId() {
+        if (!this.chainIdPromise) {
+            this.chainIdPromise = this.provider.getNetwork().then(n => Number(n.chainId)).catch(() => 0);
+        }
+        return this.chainIdPromise;
+    }
     /**
      * 获取下一个可用的 nonce
      * @param wallet 钱包对象或地址
@@ -27,18 +74,34 @@ export class NonceManager {
     async getNextNonce(wallet) {
         const address = typeof wallet === 'string' ? wallet : wallet.address;
         const key = address.toLowerCase();
+        const chainId = await this.getChainId();
+        const flaky = isFlakyNonceChain(chainId);
         // 检查临时缓存
         if (this.tempNonceCache.has(key)) {
             const cachedNonce = this.tempNonceCache.get(key);
             this.tempNonceCache.set(key, cachedNonce + 1);
+            if (flaky)
+                setGlobalNextNonce(chainId, key, cachedNonce + 1);
             return cachedNonce;
         }
         // ✅ 使用 'pending' 获取 nonce（包含待处理交易）
         // 由于前端已移除 nonce 缓存，SDK 每次都从链上获取最新状态
         const onchainNonce = await this.provider.getTransactionCount(address, 'pending');
+        // ✅ XLayer：如果链上 pending nonce 暂时没跟上，短时间内允许使用“全局游标”兜底（只允许小幅领先）
+        let effectiveNonce = onchainNonce;
+        if (flaky) {
+            const globalNext = getGlobalNextNonce(chainId, key);
+            if (globalNext !== undefined) {
+                const delta = globalNext - onchainNonce;
+                if (delta > 0 && delta <= 10) {
+                    effectiveNonce = globalNext;
+                }
+            }
+            setGlobalNextNonce(chainId, key, effectiveNonce + 1);
+        }
         // 缓存下一个值（仅在当前批次内有效）
-        this.tempNonceCache.set(key, onchainNonce + 1);
-        return onchainNonce;
+        this.tempNonceCache.set(key, effectiveNonce + 1);
+        return effectiveNonce;
     }
     /**
      * 批量获取连续 nonce（推荐用于同一地址的批量交易）
@@ -49,6 +112,8 @@ export class NonceManager {
     async getNextNonceBatch(wallet, count) {
         const address = typeof wallet === 'string' ? wallet : wallet.address;
         const key = address.toLowerCase();
+        const chainId = await this.getChainId();
+        const flaky = isFlakyNonceChain(chainId);
         let startNonce;
         if (this.tempNonceCache.has(key)) {
             startNonce = this.tempNonceCache.get(key);
@@ -56,8 +121,18 @@ export class NonceManager {
         else {
             startNonce = await this.provider.getTransactionCount(address, 'pending');
         }
+        if (flaky) {
+            const globalNext = getGlobalNextNonce(chainId, key);
+            if (globalNext !== undefined) {
+                const delta = globalNext - startNonce;
+                if (delta > 0 && delta <= 10)
+                    startNonce = globalNext;
+            }
+        }
         // 更新缓存
         this.tempNonceCache.set(key, startNonce + count);
+        if (flaky)
+            setGlobalNextNonce(chainId, key, startNonce + count);
         // 返回连续 nonce 数组
         return Array.from({ length: count }, (_, i) => startNonce + i);
     }
@@ -82,6 +157,8 @@ export class NonceManager {
     async getNextNoncesForWallets(wallets) {
         const addresses = wallets.map(w => typeof w === 'string' ? w : w.address);
         const keys = addresses.map(a => a.toLowerCase());
+        const chainId = await this.getChainId();
+        const flaky = isFlakyNonceChain(chainId);
         // 分离：已缓存的 vs 需要查询的
         const needQuery = [];
         const results = new Array(wallets.length);
@@ -91,6 +168,8 @@ export class NonceManager {
                 const cachedNonce = this.tempNonceCache.get(key);
                 results[i] = cachedNonce;
                 this.tempNonceCache.set(key, cachedNonce + 1);
+                if (flaky)
+                    setGlobalNextNonce(chainId, key, cachedNonce + 1);
             }
             else {
                 needQuery.push({ index: i, address: addresses[i] });
@@ -127,9 +206,20 @@ export class NonceManager {
             // 填充结果并更新缓存
             for (let i = 0; i < needQuery.length; i++) {
                 const { index, address } = needQuery[i];
-                const nonce = queryResults[i];
-                results[index] = nonce;
-                this.tempNonceCache.set(address.toLowerCase(), nonce + 1);
+                const key = address.toLowerCase();
+                const onchainNonce = queryResults[i];
+                let effectiveNonce = onchainNonce;
+                if (flaky) {
+                    const globalNext = getGlobalNextNonce(chainId, key);
+                    if (globalNext !== undefined) {
+                        const delta = globalNext - onchainNonce;
+                        if (delta > 0 && delta <= 10)
+                            effectiveNonce = globalNext;
+                    }
+                    setGlobalNextNonce(chainId, key, effectiveNonce + 1);
+                }
+                results[index] = effectiveNonce;
+                this.tempNonceCache.set(key, effectiveNonce + 1);
             }
         }
         return results;

package/package.json

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