@xyo-network/xl1-protocol-sdk 1.24.12 → 1.24.13

package/dist/neutral/index.mjs

@@ -3340,10 +3340,10 @@ var HydratedCache = class {
   cache;
   context;
   hydrateFunction;
-  constructor(context, hydrateFunction, maxSize = 200) {
+  constructor(context, hydrateFunction, maxCount = 2e3, ttl = Number.MAX_SAFE_INTEGER) {
     this.context = context;
     this.hydrateFunction = hydrateFunction;
-    this.cache = new LRUCache2({ max: maxSize });
+    this.cache = new LRUCache2({ max: maxCount, ttl });
   }
   async get(hash) {
     const existing = this.cache.get(hash);
@@ -3373,7 +3373,8 @@ var SimpleBlockViewer = class extends AbstractCreatableProvider {
   chainContractViewer;
   dataLakeViewer;
   finalizationViewer;
-  _payloadCache;
+  payloadCache = new LruCacheMap({ max: 1e4 });
+  signedHydratedBlockWithDataLakePayloadsCache = new LruCacheMap({ max: 2e3, ttl: 1e3 * 60 * 60 });
   _signedHydratedBlockCache;
   get finalizedArchivist() {
     return this.params.finalizedArchivist;
@@ -3384,14 +3385,9 @@ var SimpleBlockViewer = class extends AbstractCreatableProvider {
     this._signedHydratedBlockCache = new HydratedCache(context, async (context2, hash, maxDepth, minDepth) => {
       const result = await hydrateBlock(context2, hash, maxDepth, minDepth);
       return asSignedHydratedBlockWithStorageMeta(result, true);
-    }, 200);
+    }, 2e3);
     return this._signedHydratedBlockCache;
   }
-  get payloadCache() {
-    if (this._payloadCache) return this._payloadCache;
-    this._payloadCache = new LruCacheMap({ max: 1e4 });
-    return this._payloadCache;
-  }
   get store() {
     return this._store;
   }
@@ -3403,9 +3399,17 @@ var SimpleBlockViewer = class extends AbstractCreatableProvider {
   }
   async blockByHash(hash) {
     return await this.spanAsync("blockByHash", async () => {
+      const cachedBlock = this.signedHydratedBlockWithDataLakePayloadsCache.get(hash);
+      if (cachedBlock) {
+        return cachedBlock;
+      }
       const cache = this.hydratedBlockCache;
       const block = await cache.get(hash);
-      return block ? await this.addDataLakePayloadsToBlock(block) : null;
+      const result = block ? await this.addDataLakePayloadsToBlock(block) : null;
+      if (result) {
+        this.signedHydratedBlockWithDataLakePayloadsCache.set(hash, result);
+      }
+      return result;
     }, this.context);
   }
   async blockByNumber(blockNumber) {
@@ -3478,16 +3482,15 @@ var SimpleBlockViewer = class extends AbstractCreatableProvider {
   }
   async payloadsByHash(hashes) {
     let remainingHashes = [...hashes];
-    const cachedPayloads = await this.payloadCache.getMany(remainingHashes);
+    const cachedPayloads = this.payloadCache.getMany(remainingHashes);
     const cachedHashes = new Set(cachedPayloads.map((p) => p._hash));
     remainingHashes = remainingHashes.filter((h) => !cachedHashes.has(h));
     const finalizedPayloads = remainingHashes.length > 0 ? await this.finalizedArchivist.get(remainingHashes) : [];
-    await Promise.all(finalizedPayloads.map(async (payload) => {
-      await this.payloadCache.set(payload._hash, payload);
-    }));
-    const finalizedHashes = new Set(finalizedPayloads.map((p) => p._hash));
-    remainingHashes = remainingHashes.filter((h) => !finalizedHashes.has(h));
-    return await this.addDataLakePayloadsToPayloads(hashes, [...cachedPayloads, ...finalizedPayloads.filter(exists4)]);
+    const resultPayloads = await this.addDataLakePayloadsToPayloads(hashes, [...cachedPayloads, ...finalizedPayloads.filter(exists4)]);
+    resultPayloads.map((payload) => {
+      this.payloadCache.set(payload._hash, payload);
+    });
+    return resultPayloads;
   }
   async rate(range, timeUnit) {
     return await calculateBlockRate(this, range, timeUnit);