@polkadot/rpc-core 8.6.3-4 → 8.6.3-5

package/bundle.js

@@ -378,21 +378,33 @@ export class RpcCore {
     }, []);
   }
 
-  _formatStorageSetEntry(registry, blockHash, key, changes, witCache, entryIndex) {
+  _formatStorageSetEntry(registry, blockHash, key, changes, withCache, entryIndex) {
     const hexKey = key.toHex();
-    const found = changes.find(([key]) => key === hexKey); // if we don't find the value, this is our fallback
+    const found = changes.find(([key]) => key === hexKey);
+    const isNotFound = isUndefined(found); // if we don't find the value, this is our fallback
     //   - in the case of an array of values, fill the hole from the cache
     //   - if a single result value, don't fill - it is not an update hole
     //   - fallback to an empty option in all cases
 
-    const value = isUndefined(found) ? witCache && this.#storageCache.get(hexKey) || null : found[1];
+    if (isNotFound && withCache) {
+      const cached = this.#storageCache.get(hexKey);
+
+      if (cached) {
+        return cached;
+      }
+    }
+
+    const value = isNotFound ? null : found[1];
     const isEmpty = isNull(value);
-    const input = isEmpty || isTreatAsHex(key) ? value : u8aToU8a(value); // store the retrieved result - the only issue with this cache is that there is no
+    const input = isEmpty || isTreatAsHex(key) ? value : u8aToU8a(value);
+
+    const codec = this._newType(registry, blockHash, key, input, isEmpty, entryIndex); // store the retrieved result - the only issue with this cache is that there is no
     // clearing of it, so very long running processes (not just a couple of hours, longer)
     // will increase memory beyond what is allowed.
 
-    this.#storageCache.set(hexKey, value);
-    return this._newType(registry, blockHash, key, input, isEmpty, entryIndex);
+
+    this.#storageCache.set(hexKey, codec);
+    return codec;
   }
 
   _newType(registry, blockHash, key, input, isEmpty, entryIndex = -1) {

package/cjs/bundle.js

@@ -436,24 +436,36 @@ class RpcCore {
     }, []);
   }
 
-  _formatStorageSetEntry(registry, blockHash, key, changes, witCache, entryIndex) {
+  _formatStorageSetEntry(registry, blockHash, key, changes, withCache, entryIndex) {
     const hexKey = key.toHex();
     const found = changes.find(_ref7 => {
       let [key] = _ref7;
       return key === hexKey;
-    }); // if we don't find the value, this is our fallback
+    });
+    const isNotFound = (0, _util.isUndefined)(found); // if we don't find the value, this is our fallback
     //   - in the case of an array of values, fill the hole from the cache
     //   - if a single result value, don't fill - it is not an update hole
     //   - fallback to an empty option in all cases
 
-    const value = (0, _util.isUndefined)(found) ? witCache && this.#storageCache.get(hexKey) || null : found[1];
+    if (isNotFound && withCache) {
+      const cached = this.#storageCache.get(hexKey);
+
+      if (cached) {
+        return cached;
+      }
+    }
+
+    const value = isNotFound ? null : found[1];
     const isEmpty = (0, _util.isNull)(value);
-    const input = isEmpty || isTreatAsHex(key) ? value : (0, _util.u8aToU8a)(value); // store the retrieved result - the only issue with this cache is that there is no
+    const input = isEmpty || isTreatAsHex(key) ? value : (0, _util.u8aToU8a)(value);
+
+    const codec = this._newType(registry, blockHash, key, input, isEmpty, entryIndex); // store the retrieved result - the only issue with this cache is that there is no
     // clearing of it, so very long running processes (not just a couple of hours, longer)
     // will increase memory beyond what is allowed.
 
-    this.#storageCache.set(hexKey, value);
-    return this._newType(registry, blockHash, key, input, isEmpty, entryIndex);
+
+    this.#storageCache.set(hexKey, codec);
+    return codec;
   }
 
   _newType(registry, blockHash, key, input, isEmpty) {

package/cjs/packageInfo.js

@@ -11,6 +11,6 @@ const packageInfo = {
   name: '@polkadot/rpc-core',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '8.6.3-4'
+  version: '8.6.3-5'
 };
 exports.packageInfo = packageInfo;

package/package.json

@@ -20,7 +20,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "8.6.3-4",
+  "version": "8.6.3-5",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -96,9 +96,9 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.3",
-    "@polkadot/rpc-augment": "8.6.3-4",
-    "@polkadot/rpc-provider": "8.6.3-4",
-    "@polkadot/types": "8.6.3-4",
+    "@polkadot/rpc-augment": "8.6.3-5",
+    "@polkadot/rpc-provider": "8.6.3-5",
+    "@polkadot/types": "8.6.3-5",
     "@polkadot/util": "^9.3.2-1",
     "rxjs": "^7.5.5"
   }

package/packageInfo.js

@@ -5,5 +5,5 @@ export const packageInfo = {
   name: '@polkadot/rpc-core',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '8.6.3-4'
+  version: '8.6.3-5'
 };