@polkadot/rpc-core 9.5.1 → 9.6.1

package/bundle.js

@@ -1,5 +1,6 @@
 // Copyright 2017-2022 @polkadot/rpc-core authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 import { Observable, publishReplay, refCount } from 'rxjs';
 import { rpcDefinitions } from '@polkadot/types';
 import { hexToU8a, isFunction, isNull, isUndefined, lazyMethod, logger, memoize, objectSpread, u8aConcat, u8aToU8a } from '@polkadot/util';
@@ -20,10 +21,10 @@ const EMPTY_META = {
     },
     isMap: false
   }
-}; // utility method to create a nicely-formatted error
+};
 
+// utility method to create a nicely-formatted error
 /** @internal */
-
 function logErrorMessage(method, {
   noErrorLog,
   params,
@@ -32,7 +33,6 @@ function logErrorMessage(method, {
   if (noErrorLog) {
     return;
   }
-
   const inputs = params.map(({
     isOptional,
     name,
@@ -40,12 +40,12 @@ function logErrorMessage(method, {
   }) => `${name}${isOptional ? '?' : ''}: ${type}`).join(', ');
   l.error(`${method}(${inputs}): ${type}:: ${error.message}`);
 }
-
 function isTreatAsHex(key) {
   // :code is problematic - it does not have the length attached, which is
   // unlike all other storage entries where it is indeed properly encoded
   return ['0x3a636f6465'].includes(key.toHex());
 }
+
 /**
  * @name Rpc
  * @summary The API may use a HTTP or WebSockets provider.
@@ -69,8 +69,6 @@ function isTreatAsHex(key) {
  * const rpc = new Rpc(provider);
  * ```
  */
-
-
 export class RpcCore {
   #instanceId;
   #registryDefault;
@@ -79,93 +77,83 @@ export class RpcCore {
   #storageCache = new Map();
   mapping = new Map();
   sections = [];
+
   /**
    * @constructor
    * Default constructor for the Api Object
    * @param  {ProviderInterface} provider An API provider using HTTP or WebSocket
    */
-
   constructor(instanceId, registry, provider, userRpc = {}) {
     // eslint-disable-next-line @typescript-eslint/unbound-method
     if (!provider || !isFunction(provider.send)) {
       throw new Error('Expected Provider to API create');
     }
-
     this.#instanceId = instanceId;
     this.#registryDefault = registry;
     this.provider = provider;
-    const sectionNames = Object.keys(rpcDefinitions); // these are the base keys (i.e. part of jsonrpc)
+    const sectionNames = Object.keys(rpcDefinitions);
 
-    this.sections.push(...sectionNames); // decorate all interfaces, defined and user on this instance
+    // these are the base keys (i.e. part of jsonrpc)
+    this.sections.push(...sectionNames);
 
+    // decorate all interfaces, defined and user on this instance
     this.addUserInterfaces(userRpc);
   }
+
   /**
    * @description Returns the connected status of a provider
    */
-
-
   get isConnected() {
     return this.provider.isConnected;
   }
+
   /**
    * @description Manually connect from the attached provider
    */
-
-
   connect() {
     return this.provider.connect();
   }
+
   /**
    * @description Manually disconnect from the attached provider
    */
-
-
   disconnect() {
     return this.provider.disconnect();
   }
+
   /**
    * @description Sets a registry swap (typically from Api)
    */
-
-
   setRegistrySwap(registrySwap) {
     this.#getBlockRegistry = memoize(registrySwap, {
       getInstanceId: () => this.#instanceId
     });
   }
+
   /**
    * @description Sets a function to resolve block hash from block number
    */
-
-
   setResolveBlockHash(resolveBlockHash) {
     this.#getBlockHash = memoize(resolveBlockHash, {
       getInstanceId: () => this.#instanceId
     });
   }
-
   addUserInterfaces(userRpc) {
     // add any extra user-defined sections
     this.sections.push(...Object.keys(userRpc).filter(k => !this.sections.includes(k)));
-
     for (let s = 0; s < this.sections.length; s++) {
       const section = this.sections[s];
       const defs = objectSpread({}, rpcDefinitions[section], userRpc[section]);
       const methods = Object.keys(defs);
-
       for (let m = 0; m < methods.length; m++) {
         const method = methods[m];
         const def = defs[method];
         const jsonrpc = def.endpoint || `${section}_${method}`;
-
         if (!this.mapping.has(jsonrpc)) {
           const isSubscription = !!def.pubsub;
-
           if (!this[section]) {
             this[section] = {};
           }
-
           this.mapping.set(jsonrpc, objectSpread({}, def, {
             isSubscription,
             jsonrpc,
@@ -177,7 +165,6 @@ export class RpcCore {
       }
     }
   }
-
   _memomize(creator, def) {
     const memoOpts = {
       getInstanceId: () => this.#instanceId
@@ -187,36 +174,32 @@ export class RpcCore {
     memoized.meta = def;
     return memoized;
   }
-
   _formatResult(isScale, registry, blockHash, method, def, params, result) {
     return isScale ? this._formatOutput(registry, blockHash, method, def, params, result) : result;
   }
-
   _createMethodSend(section, method, def) {
     const rpcName = def.endpoint || `${section}_${method}`;
     const hashIndex = def.params.findIndex(({
       isHistoric
     }) => isHistoric);
-    let memoized = null; // execute the RPC call, doing a registry swap for historic as applicable
+    let memoized = null;
 
+    // execute the RPC call, doing a registry swap for historic as applicable
     const callWithRegistry = async (isScale, values) => {
       var _this$getBlockHash;
-
       const blockId = hashIndex === -1 ? null : values[hashIndex];
-      const blockHash = blockId && def.params[hashIndex].type === 'BlockNumber' ? await ((_this$getBlockHash = this.#getBlockHash) === null || _this$getBlockHash === void 0 ? void 0 : _this$getBlockHash.call(this, blockId)) : blockId;
+      const blockHash = blockId && def.params[hashIndex].type === 'BlockNumber' ? await ((_this$getBlockHash = this.#getBlockHash) == null ? void 0 : _this$getBlockHash.call(this, blockId)) : blockId;
       const {
         registry
       } = isScale && blockHash && this.#getBlockRegistry ? await this.#getBlockRegistry(u8aToU8a(blockHash)) : {
         registry: this.#registryDefault
       };
+      const params = this._formatInputs(registry, null, def, values);
 
-      const params = this._formatInputs(registry, null, def, values); // only cache .at(<blockHash>) queries, e.g. where valid blockHash was supplied
-
-
+      // only cache .at(<blockHash>) queries, e.g. where valid blockHash was supplied
       const result = await this.provider.send(rpcName, params.map(p => p.toJSON()), !!blockHash);
       return this._formatResult(isScale, registry, blockHash, method, def, params, result);
     };
-
     const creator = isScale => (...values) => {
       const isDelayed = isScale && hashIndex !== -1 && !!values[hashIndex];
       return new Observable(observer => {
@@ -232,24 +215,22 @@ export class RpcCore {
           // delete old results from cache
           if (isScale) {
             var _memoized;
-
-            (_memoized = memoized) === null || _memoized === void 0 ? void 0 : _memoized.unmemoize(...values);
+            (_memoized = memoized) == null ? void 0 : _memoized.unmemoize(...values);
           } else {
             var _memoized2;
-
-            (_memoized2 = memoized) === null || _memoized2 === void 0 ? void 0 : _memoized2.raw.unmemoize(...values);
+            (_memoized2 = memoized) == null ? void 0 : _memoized2.raw.unmemoize(...values);
           }
         };
-      }).pipe(publishReplay(1), // create a Replay(1)
+      }).pipe(publishReplay(1),
+      // create a Replay(1)
       isDelayed ? refCountDelay() // Unsubscribe after delay
       : refCount());
     };
-
     memoized = this._memomize(creator, def);
     return memoized;
-  } // create a subscriptor, it subscribes once and resolves with the id as subscribe
-
+  }
 
+  // create a subscriptor, it subscribes once and resolves with the id as subscribe
   _createSubscriber({
     paramsJson,
     subName,
@@ -263,43 +244,35 @@ export class RpcCore {
       });
     });
   }
-
   _createMethodSubscribe(section, method, def) {
     const [updateType, subMethod, unsubMethod] = def.pubsub;
     const subName = `${section}_${subMethod}`;
     const unsubName = `${section}_${unsubMethod}`;
     const subType = `${section}_${updateType}`;
     let memoized = null;
-
     const creator = isScale => (...values) => {
       return new Observable(observer => {
         // Have at least an empty promise, as used in the unsubscribe
         let subscriptionPromise = Promise.resolve(null);
         const registry = this.#registryDefault;
-
         const errorHandler = error => {
           logErrorMessage(method, def, error);
           observer.error(error);
         };
-
         try {
           const params = this._formatInputs(registry, null, def, values);
-
           const paramsJson = params.map(p => p.toJSON());
-
           const update = (error, result) => {
             if (error) {
               logErrorMessage(method, def, error);
               return;
             }
-
             try {
               observer.next(this._formatResult(isScale, registry, null, method, def, params, result));
             } catch (error) {
               observer.error(error);
             }
           };
-
           subscriptionPromise = this._createSubscriber({
             paramsJson,
             subName,
@@ -308,46 +281,39 @@ export class RpcCore {
           }, errorHandler);
         } catch (error) {
           errorHandler(error);
-        } // Teardown logic
-
+        }
 
+        // Teardown logic
         return () => {
           // Delete from cache, so old results don't hang around
           if (isScale) {
             var _memoized3;
-
-            (_memoized3 = memoized) === null || _memoized3 === void 0 ? void 0 : _memoized3.unmemoize(...values);
+            (_memoized3 = memoized) == null ? void 0 : _memoized3.unmemoize(...values);
           } else {
             var _memoized4;
+            (_memoized4 = memoized) == null ? void 0 : _memoized4.raw.unmemoize(...values);
+          }
 
-            (_memoized4 = memoized) === null || _memoized4 === void 0 ? void 0 : _memoized4.raw.unmemoize(...values);
-          } // Unsubscribe from provider
-
-
+          // Unsubscribe from provider
           subscriptionPromise.then(subscriptionId => isNull(subscriptionId) ? Promise.resolve(false) : this.provider.unsubscribe(subType, unsubName, subscriptionId)).catch(error => logErrorMessage(method, def, error));
         };
       }).pipe(drr());
     };
-
     memoized = this._memomize(creator, def);
     return memoized;
   }
-
   _formatInputs(registry, blockHash, def, inputs) {
     const reqArgCount = def.params.filter(({
       isOptional
     }) => !isOptional).length;
     const optText = reqArgCount === def.params.length ? '' : ` (${def.params.length - reqArgCount} optional)`;
-
     if (inputs.length < reqArgCount || inputs.length > def.params.length) {
       throw new Error(`Expected ${def.params.length} parameters${optText}, ${inputs.length} found instead`);
     }
-
     return inputs.map((input, index) => registry.createTypeUnsafe(def.params[index].type, [input], {
       blockHash
     }));
   }
-
   _formatOutput(registry, blockHash, method, rpc, params, result) {
     if (rpc.type === 'StorageData') {
       const key = params[0];
@@ -359,75 +325,71 @@ export class RpcCore {
       const mapped = result.map(({
         block,
         changes
-      }) => [registry.createType('Hash', block), this._formatStorageSet(registry, block, params[0], changes)]); // we only query at a specific block, not a range - flatten
+      }) => [registry.createType('Hash', block), this._formatStorageSet(registry, block, params[0], changes)]);
 
+      // we only query at a specific block, not a range - flatten
       return method === 'queryStorageAt' ? mapped[0][1] : mapped;
     }
-
     return registry.createTypeUnsafe(rpc.type, [result], {
       blockHash
     });
   }
-
   _formatStorageData(registry, blockHash, key, value) {
-    const isEmpty = isNull(value); // we convert to Uint8Array since it maps to the raw encoding, all
-    // data will be correctly encoded (incl. numbers, excl. :code)
+    const isEmpty = isNull(value);
 
+    // we convert to Uint8Array since it maps to the raw encoding, all
+    // data will be correctly encoded (incl. numbers, excl. :code)
     const input = isEmpty ? null : isTreatAsHex(key) ? value : u8aToU8a(value);
     return this._newType(registry, blockHash, key, input, isEmpty);
   }
-
   _formatStorageSet(registry, blockHash, keys, changes) {
     // For StorageChangeSet, the changes has the [key, value] mappings
-    const withCache = keys.length !== 1; // multiple return values (via state.storage subscription), decode the values
+    const withCache = keys.length !== 1;
+
+    // multiple return values (via state.storage subscription), decode the values
     // one at a time, all based on the query types. Three values can be returned -
     //   - Codec - There is a valid value, non-empty
     //   - null - The storage key is empty
-
     return keys.reduce((results, key, index) => {
       results.push(this._formatStorageSetEntry(registry, blockHash, key, changes, withCache, index));
       return results;
     }, []);
   }
-
   _formatStorageSetEntry(registry, blockHash, key, changes, withCache, entryIndex) {
     const hexKey = key.toHex();
     const found = changes.find(([key]) => key === hexKey);
-    const isNotFound = isUndefined(found); // if we don't find the value, this is our fallback
+    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
-
     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);
+    const codec = this._newType(registry, blockHash, key, input, isEmpty, entryIndex);
 
-    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
+    // 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, codec);
     return codec;
   }
-
   _newType(registry, blockHash, key, input, isEmpty, entryIndex = -1) {
     // single return value (via state.getStorage), decode the value based on the
     // outputType that we have specified. Fallback to Raw on nothing
     const type = key.outputType || 'Raw';
     const meta = key.meta || EMPTY_META;
     const entryNum = entryIndex === -1 ? '' : ` entry ${entryIndex}:`;
-
     try {
-      return registry.createTypeUnsafe(type, [isEmpty ? meta.fallback // For old-style Linkage, we add an empty linkage at the end
+      return registry.createTypeUnsafe(type, [isEmpty ? meta.fallback
+      // For old-style Linkage, we add an empty linkage at the end
       ? type.includes('Linkage<') ? u8aConcat(hexToU8a(meta.fallback.toHex()), new Uint8Array(2)) : hexToU8a(meta.fallback.toHex()) : undefined : meta.modifier.isOptional ? registry.createTypeUnsafe(type, [input], {
         blockHash,
         isPedantic: true
@@ -440,5 +402,4 @@ export class RpcCore {
       throw new Error(`Unable to decode storage ${key.section || 'unknown'}.${key.method || 'unknown'}:${entryNum}: ${error.message}`);
     }
   }
-
 }

package/cjs/bundle.js

@@ -14,15 +14,10 @@ Object.defineProperty(exports, "packageInfo", {
     return _packageInfo.packageInfo;
   }
 });
-
 var _rxjs = require("rxjs");
-
 var _types = require("@polkadot/types");
-
 var _util = require("@polkadot/util");
-
 var _util2 = require("./util");
-
 Object.keys(_util2).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -34,11 +29,10 @@ Object.keys(_util2).forEach(function (key) {
     }
   });
 });
-
 var _packageInfo = require("./packageInfo");
-
 // Copyright 2017-2022 @polkadot/rpc-core authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 const l = (0, _util.logger)('rpc-core');
 const EMPTY_META = {
   fallback: undefined,
@@ -53,21 +47,19 @@ const EMPTY_META = {
     },
     isMap: false
   }
-}; // utility method to create a nicely-formatted error
+};
 
+// utility method to create a nicely-formatted error
 /** @internal */
-
 function logErrorMessage(method, _ref, error) {
   let {
     noErrorLog,
     params,
     type
   } = _ref;
-
   if (noErrorLog) {
     return;
   }
-
   const inputs = params.map(_ref2 => {
     let {
       isOptional,
@@ -78,12 +70,12 @@ function logErrorMessage(method, _ref, error) {
   }).join(', ');
   l.error(`${method}(${inputs}): ${type}:: ${error.message}`);
 }
-
 function isTreatAsHex(key) {
   // :code is problematic - it does not have the length attached, which is
   // unlike all other storage entries where it is indeed properly encoded
   return ['0x3a636f6465'].includes(key.toHex());
 }
+
 /**
  * @name Rpc
  * @summary The API may use a HTTP or WebSockets provider.
@@ -107,8 +99,6 @@ function isTreatAsHex(key) {
  * const rpc = new Rpc(provider);
  * ```
  */
-
-
 class RpcCore {
   #instanceId;
   #registryDefault;
@@ -117,95 +107,84 @@ class RpcCore {
   #storageCache = new Map();
   mapping = new Map();
   sections = [];
+
   /**
    * @constructor
    * Default constructor for the Api Object
    * @param  {ProviderInterface} provider An API provider using HTTP or WebSocket
    */
-
   constructor(instanceId, registry, provider) {
     let userRpc = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
-
     // eslint-disable-next-line @typescript-eslint/unbound-method
     if (!provider || !(0, _util.isFunction)(provider.send)) {
       throw new Error('Expected Provider to API create');
     }
-
     this.#instanceId = instanceId;
     this.#registryDefault = registry;
     this.provider = provider;
-    const sectionNames = Object.keys(_types.rpcDefinitions); // these are the base keys (i.e. part of jsonrpc)
+    const sectionNames = Object.keys(_types.rpcDefinitions);
 
-    this.sections.push(...sectionNames); // decorate all interfaces, defined and user on this instance
+    // these are the base keys (i.e. part of jsonrpc)
+    this.sections.push(...sectionNames);
 
+    // decorate all interfaces, defined and user on this instance
     this.addUserInterfaces(userRpc);
   }
+
   /**
    * @description Returns the connected status of a provider
    */
-
-
   get isConnected() {
     return this.provider.isConnected;
   }
+
   /**
    * @description Manually connect from the attached provider
    */
-
-
   connect() {
     return this.provider.connect();
   }
+
   /**
    * @description Manually disconnect from the attached provider
    */
-
-
   disconnect() {
     return this.provider.disconnect();
   }
+
   /**
    * @description Sets a registry swap (typically from Api)
    */
-
-
   setRegistrySwap(registrySwap) {
     this.#getBlockRegistry = (0, _util.memoize)(registrySwap, {
       getInstanceId: () => this.#instanceId
     });
   }
+
   /**
    * @description Sets a function to resolve block hash from block number
    */
-
-
   setResolveBlockHash(resolveBlockHash) {
     this.#getBlockHash = (0, _util.memoize)(resolveBlockHash, {
       getInstanceId: () => this.#instanceId
     });
   }
-
   addUserInterfaces(userRpc) {
     // add any extra user-defined sections
     this.sections.push(...Object.keys(userRpc).filter(k => !this.sections.includes(k)));
-
     for (let s = 0; s < this.sections.length; s++) {
       const section = this.sections[s];
       const defs = (0, _util.objectSpread)({}, _types.rpcDefinitions[section], userRpc[section]);
       const methods = Object.keys(defs);
-
       for (let m = 0; m < methods.length; m++) {
         const method = methods[m];
         const def = defs[method];
         const jsonrpc = def.endpoint || `${section}_${method}`;
-
         if (!this.mapping.has(jsonrpc)) {
           const isSubscription = !!def.pubsub;
-
           if (!this[section]) {
             this[section] = {};
           }
-
           this.mapping.set(jsonrpc, (0, _util.objectSpread)({}, def, {
             isSubscription,
             jsonrpc,
@@ -217,7 +196,6 @@ class RpcCore {
       }
     }
   }
-
   _memomize(creator, def) {
     const memoOpts = {
       getInstanceId: () => this.#instanceId
@@ -227,11 +205,9 @@ class RpcCore {
     memoized.meta = def;
     return memoized;
   }
-
   _formatResult(isScale, registry, blockHash, method, def, params, result) {
     return isScale ? this._formatOutput(registry, blockHash, method, def, params, result) : result;
   }
-
   _createMethodSend(section, method, def) {
     const rpcName = def.endpoint || `${section}_${method}`;
     const hashIndex = def.params.findIndex(_ref3 => {
@@ -240,31 +216,28 @@ class RpcCore {
       } = _ref3;
       return isHistoric;
     });
-    let memoized = null; // execute the RPC call, doing a registry swap for historic as applicable
+    let memoized = null;
 
+    // execute the RPC call, doing a registry swap for historic as applicable
     const callWithRegistry = async (isScale, values) => {
       var _this$getBlockHash;
-
       const blockId = hashIndex === -1 ? null : values[hashIndex];
-      const blockHash = blockId && def.params[hashIndex].type === 'BlockNumber' ? await ((_this$getBlockHash = this.#getBlockHash) === null || _this$getBlockHash === void 0 ? void 0 : _this$getBlockHash.call(this, blockId)) : blockId;
+      const blockHash = blockId && def.params[hashIndex].type === 'BlockNumber' ? await ((_this$getBlockHash = this.#getBlockHash) == null ? void 0 : _this$getBlockHash.call(this, blockId)) : blockId;
       const {
         registry
       } = isScale && blockHash && this.#getBlockRegistry ? await this.#getBlockRegistry((0, _util.u8aToU8a)(blockHash)) : {
         registry: this.#registryDefault
       };
+      const params = this._formatInputs(registry, null, def, values);
 
-      const params = this._formatInputs(registry, null, def, values); // only cache .at(<blockHash>) queries, e.g. where valid blockHash was supplied
-
-
+      // only cache .at(<blockHash>) queries, e.g. where valid blockHash was supplied
       const result = await this.provider.send(rpcName, params.map(p => p.toJSON()), !!blockHash);
       return this._formatResult(isScale, registry, blockHash, method, def, params, result);
     };
-
     const creator = isScale => function () {
       for (var _len = arguments.length, values = new Array(_len), _key = 0; _key < _len; _key++) {
         values[_key] = arguments[_key];
       }
-
       const isDelayed = isScale && hashIndex !== -1 && !!values[hashIndex];
       return new _rxjs.Observable(observer => {
         callWithRegistry(isScale, values).then(value => {
@@ -279,24 +252,22 @@ class RpcCore {
           // delete old results from cache
           if (isScale) {
             var _memoized;
-
-            (_memoized = memoized) === null || _memoized === void 0 ? void 0 : _memoized.unmemoize(...values);
+            (_memoized = memoized) == null ? void 0 : _memoized.unmemoize(...values);
           } else {
             var _memoized2;
-
-            (_memoized2 = memoized) === null || _memoized2 === void 0 ? void 0 : _memoized2.raw.unmemoize(...values);
+            (_memoized2 = memoized) == null ? void 0 : _memoized2.raw.unmemoize(...values);
           }
         };
-      }).pipe((0, _rxjs.publishReplay)(1), // create a Replay(1)
+      }).pipe((0, _rxjs.publishReplay)(1),
+      // create a Replay(1)
       isDelayed ? (0, _util2.refCountDelay)() // Unsubscribe after delay
       : (0, _rxjs.refCount)());
     };
-
     memoized = this._memomize(creator, def);
     return memoized;
-  } // create a subscriptor, it subscribes once and resolves with the id as subscribe
-
+  }
 
+  // create a subscriptor, it subscribes once and resolves with the id as subscribe
   _createSubscriber(_ref4, errorHandler) {
     let {
       paramsJson,
@@ -311,49 +282,39 @@ class RpcCore {
       });
     });
   }
-
   _createMethodSubscribe(section, method, def) {
     var _this = this;
-
     const [updateType, subMethod, unsubMethod] = def.pubsub;
     const subName = `${section}_${subMethod}`;
     const unsubName = `${section}_${unsubMethod}`;
     const subType = `${section}_${updateType}`;
     let memoized = null;
-
     const creator = isScale => function () {
       for (var _len2 = arguments.length, values = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
         values[_key2] = arguments[_key2];
       }
-
       return new _rxjs.Observable(observer => {
         // Have at least an empty promise, as used in the unsubscribe
         let subscriptionPromise = Promise.resolve(null);
         const registry = _this.#registryDefault;
-
         const errorHandler = error => {
           logErrorMessage(method, def, error);
           observer.error(error);
         };
-
         try {
           const params = _this._formatInputs(registry, null, def, values);
-
           const paramsJson = params.map(p => p.toJSON());
-
           const update = (error, result) => {
             if (error) {
               logErrorMessage(method, def, error);
               return;
             }
-
             try {
               observer.next(_this._formatResult(isScale, registry, null, method, def, params, result));
             } catch (error) {
               observer.error(error);
             }
           };
-
           subscriptionPromise = _this._createSubscriber({
             paramsJson,
             subName,
@@ -362,31 +323,27 @@ class RpcCore {
           }, errorHandler);
         } catch (error) {
           errorHandler(error);
-        } // Teardown logic
-
+        }
 
+        // Teardown logic
         return () => {
           // Delete from cache, so old results don't hang around
           if (isScale) {
             var _memoized3;
-
-            (_memoized3 = memoized) === null || _memoized3 === void 0 ? void 0 : _memoized3.unmemoize(...values);
+            (_memoized3 = memoized) == null ? void 0 : _memoized3.unmemoize(...values);
           } else {
             var _memoized4;
+            (_memoized4 = memoized) == null ? void 0 : _memoized4.raw.unmemoize(...values);
+          }
 
-            (_memoized4 = memoized) === null || _memoized4 === void 0 ? void 0 : _memoized4.raw.unmemoize(...values);
-          } // Unsubscribe from provider
-
-
+          // Unsubscribe from provider
           subscriptionPromise.then(subscriptionId => (0, _util.isNull)(subscriptionId) ? Promise.resolve(false) : _this.provider.unsubscribe(subType, unsubName, subscriptionId)).catch(error => logErrorMessage(method, def, error));
         };
       }).pipe((0, _util2.drr)());
     };
-
     memoized = this._memomize(creator, def);
     return memoized;
   }
-
   _formatInputs(registry, blockHash, def, inputs) {
     const reqArgCount = def.params.filter(_ref5 => {
       let {
@@ -395,16 +352,13 @@ class RpcCore {
       return !isOptional;
     }).length;
     const optText = reqArgCount === def.params.length ? '' : ` (${def.params.length - reqArgCount} optional)`;
-
     if (inputs.length < reqArgCount || inputs.length > def.params.length) {
       throw new Error(`Expected ${def.params.length} parameters${optText}, ${inputs.length} found instead`);
     }
-
     return inputs.map((input, index) => registry.createTypeUnsafe(def.params[index].type, [input], {
       blockHash
     }));
   }
-
   _formatOutput(registry, blockHash, method, rpc, params, result) {
     if (rpc.type === 'StorageData') {
       const key = params[0];
@@ -419,69 +373,65 @@ class RpcCore {
           changes
         } = _ref6;
         return [registry.createType('Hash', block), this._formatStorageSet(registry, block, params[0], changes)];
-      }); // we only query at a specific block, not a range - flatten
+      });
 
+      // we only query at a specific block, not a range - flatten
       return method === 'queryStorageAt' ? mapped[0][1] : mapped;
     }
-
     return registry.createTypeUnsafe(rpc.type, [result], {
       blockHash
     });
   }
-
   _formatStorageData(registry, blockHash, key, value) {
-    const isEmpty = (0, _util.isNull)(value); // we convert to Uint8Array since it maps to the raw encoding, all
-    // data will be correctly encoded (incl. numbers, excl. :code)
+    const isEmpty = (0, _util.isNull)(value);
 
+    // we convert to Uint8Array since it maps to the raw encoding, all
+    // data will be correctly encoded (incl. numbers, excl. :code)
     const input = isEmpty ? null : isTreatAsHex(key) ? value : (0, _util.u8aToU8a)(value);
     return this._newType(registry, blockHash, key, input, isEmpty);
   }
-
   _formatStorageSet(registry, blockHash, keys, changes) {
     // For StorageChangeSet, the changes has the [key, value] mappings
-    const withCache = keys.length !== 1; // multiple return values (via state.storage subscription), decode the values
+    const withCache = keys.length !== 1;
+
+    // multiple return values (via state.storage subscription), decode the values
     // one at a time, all based on the query types. Three values can be returned -
     //   - Codec - There is a valid value, non-empty
     //   - null - The storage key is empty
-
     return keys.reduce((results, key, index) => {
       results.push(this._formatStorageSetEntry(registry, blockHash, key, changes, withCache, index));
       return results;
     }, []);
   }
-
   _formatStorageSetEntry(registry, blockHash, key, changes, withCache, entryIndex) {
     const hexKey = key.toHex();
     const found = changes.find(_ref7 => {
       let [key] = _ref7;
       return key === hexKey;
     });
-    const isNotFound = (0, _util.isUndefined)(found); // 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
-
     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);
+    const codec = this._newType(registry, blockHash, key, input, isEmpty, entryIndex);
 
-    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
+    // 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, codec);
     return codec;
   }
-
   _newType(registry, blockHash, key, input, isEmpty) {
     let entryIndex = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : -1;
     // single return value (via state.getStorage), decode the value based on the
@@ -489,9 +439,9 @@ class RpcCore {
     const type = key.outputType || 'Raw';
     const meta = key.meta || EMPTY_META;
     const entryNum = entryIndex === -1 ? '' : ` entry ${entryIndex}:`;
-
     try {
-      return registry.createTypeUnsafe(type, [isEmpty ? meta.fallback // For old-style Linkage, we add an empty linkage at the end
+      return registry.createTypeUnsafe(type, [isEmpty ? meta.fallback
+      // For old-style Linkage, we add an empty linkage at the end
       ? type.includes('Linkage<') ? (0, _util.u8aConcat)((0, _util.hexToU8a)(meta.fallback.toHex()), new Uint8Array(2)) : (0, _util.hexToU8a)(meta.fallback.toHex()) : undefined : meta.modifier.isOptional ? registry.createTypeUnsafe(type, [input], {
         blockHash,
         isPedantic: true
@@ -504,7 +454,5 @@ class RpcCore {
       throw new Error(`Unable to decode storage ${key.section || 'unknown'}.${key.method || 'unknown'}:${entryNum}: ${error.message}`);
     }
   }
-
 }
-
 exports.RpcCore = RpcCore;

package/cjs/detectOther.js

@@ -4,11 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _packageInfo = require("@polkadot/rpc-provider/cjs/packageInfo");
-
 var _packageInfo2 = require("@polkadot/types/cjs/packageInfo");
-
 // Copyright 2017-2022 @polkadot/rpc-core authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 var _default = [_packageInfo.packageInfo, _packageInfo2.packageInfo];

package/cjs/detectPackage.js

@@ -1,14 +1,12 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 var _util = require("@polkadot/util");
-
 var _detectOther = _interopRequireDefault(require("./detectOther"));
-
 var _packageInfo = require("./packageInfo");
-
 // Copyright 2017-2022 @polkadot/rpc-core authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 // Do not edit, auto-generated by @polkadot/dev
+
 (0, _util.detectPackage)(_packageInfo.packageInfo, null, _detectOther.default);

package/cjs/index.js

@@ -3,11 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
 require("./detectPackage");
-
 var _bundle = require("./bundle");
-
 Object.keys(_bundle).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _bundle[key]) return;

package/cjs/packageInfo.js

@@ -6,11 +6,13 @@ Object.defineProperty(exports, "__esModule", {
 exports.packageInfo = void 0;
 // Copyright 2017-2022 @polkadot/rpc-core authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 // Do not edit, auto-generated by @polkadot/dev
+
 const packageInfo = {
   name: '@polkadot/rpc-core',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '9.5.1'
+  version: '9.6.1'
 };
 exports.packageInfo = packageInfo;

package/cjs/types/index.js

@@ -3,9 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
 var _jsonrpc = require("@polkadot/rpc-core/types/jsonrpc");
-
 Object.keys(_jsonrpc).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _jsonrpc[key]) return;
@@ -16,9 +14,7 @@ Object.keys(_jsonrpc).forEach(function (key) {
     }
   });
 });
-
 var _base = require("./base");
-
 Object.keys(_base).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _base[key]) return;

package/cjs/util/drr.js

@@ -4,15 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.drr = drr;
-
 var _rxjs = require("rxjs");
-
 var _util = require("@polkadot/util");
-
 var _refCountDelay = require("./refCountDelay");
-
 // Copyright 2017-2022 @polkadot/rpc-core authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 function CMP(a, b) {
   return (0, _util.stringify)({
     t: a
@@ -20,21 +17,19 @@ function CMP(a, b) {
     t: b
   });
 }
-
 function ERR(error) {
   throw error;
 }
-
-function NOOP() {// empty
+function NOOP() {
+  // empty
 }
+
 /**
  * Shorthand for distinctUntilChanged(), publishReplay(1) and refCount().
  *
  * @ignore
  * @internal
  */
-
-
 function drr() {
   let {
     delay,

package/cjs/util/index.js

@@ -3,9 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
 var _drr = require("./drr");
-
 Object.keys(_drr).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _drr[key]) return;
@@ -16,9 +14,7 @@ Object.keys(_drr).forEach(function (key) {
     }
   });
 });
-
 var _memo = require("./memo");
-
 Object.keys(_memo).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _memo[key]) return;
@@ -29,9 +25,7 @@ Object.keys(_memo).forEach(function (key) {
     }
   });
 });
-
 var _refCountDelay = require("./refCountDelay");
-
 Object.keys(_refCountDelay).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _refCountDelay[key]) return;

package/cjs/util/memo.js

@@ -4,19 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.memo = memo;
-
 var _rxjs = require("rxjs");
-
 var _util = require("@polkadot/util");
-
 var _drr = require("./drr");
-
 // Copyright 2017-2022 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 // Wraps a derive, doing 2 things to optimize calls -
 //   1. creates a memo of the inner fn -> Observable, removing when unsubscribed
 //   2. wraps the observable in a drr() (which includes an unsub delay)
-
 /** @internal */
 // eslint-disable-next-line @typescript-eslint/ban-types
 function memo(instanceId, inner) {
@@ -27,7 +23,6 @@ function memo(instanceId, inner) {
     for (var _len = arguments.length, params = new Array(_len), _key = 0; _key < _len; _key++) {
       params[_key] = arguments[_key];
     }
-
     return new _rxjs.Observable(observer => {
       const subscription = inner(...params).subscribe(observer);
       return () => {

package/cjs/util/refCountDelay.js

@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.refCountDelay = refCountDelay;
-
 var _rxjs = require("rxjs");
-
 // Copyright 2017-2022 @polkadot/rpc-core authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -18,17 +16,14 @@ function refCountDelay() {
     let [state, refCount, connection, scheduler] = [0, 0, _rxjs.Subscription.EMPTY, _rxjs.Subscription.EMPTY];
     return new _rxjs.Observable(ob => {
       source.subscribe(ob);
-
       if (refCount++ === 0) {
         if (state === 1) {
           scheduler.unsubscribe();
         } else {
           connection = source.connect();
         }
-
         state = 3;
       }
-
       return () => {
         if (--refCount === 0) {
           if (state === 2) {

package/detectOther.js

@@ -1,5 +1,6 @@
 // Copyright 2017-2022 @polkadot/rpc-core authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 import { packageInfo as providerInfo } from '@polkadot/rpc-provider/packageInfo';
 import { packageInfo as typesInfo } from '@polkadot/types/packageInfo';
 export default [providerInfo, typesInfo];

package/detectPackage.js

@@ -1,6 +1,8 @@
 // Copyright 2017-2022 @polkadot/rpc-core authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 // Do not edit, auto-generated by @polkadot/dev
+
 import { detectPackage } from '@polkadot/util';
 import others from "./detectOther.js";
 import { packageInfo } from "./packageInfo.js";

package/index.js

@@ -1,4 +1,5 @@
 // Copyright 2017-2022 @polkadot/rpc-core authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 import "./detectPackage.js";
 export * from "./bundle.js";

package/package.json

@@ -20,7 +20,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "9.5.1",
+  "version": "9.6.1",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -95,11 +95,11 @@
     }
   },
   "dependencies": {
-    "@babel/runtime": "^7.19.0",
-    "@polkadot/rpc-augment": "9.5.1",
-    "@polkadot/rpc-provider": "9.5.1",
-    "@polkadot/types": "9.5.1",
-    "@polkadot/util": "^10.1.10",
+    "@babel/runtime": "^7.19.4",
+    "@polkadot/rpc-augment": "9.6.1",
+    "@polkadot/rpc-provider": "9.6.1",
+    "@polkadot/types": "9.6.1",
+    "@polkadot/util": "^10.1.11",
     "rxjs": "^7.5.7"
   }
 }

package/packageInfo.js

@@ -1,9 +1,11 @@
 // Copyright 2017-2022 @polkadot/rpc-core authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 // Do not edit, auto-generated by @polkadot/dev
+
 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: '9.5.1'
+  version: '9.6.1'
 };

package/types/index.js

@@ -1,6 +1,8 @@
 // Copyright 2017-2022 @polkadot/rpc-core authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 // augmented, do an augmentation export
-export * from '@polkadot/rpc-core/types/jsonrpc'; // normal exports
+export * from '@polkadot/rpc-core/types/jsonrpc';
 
+// normal exports
 export * from "./base.js";

package/util/drr.js

@@ -1,9 +1,9 @@
 // Copyright 2017-2022 @polkadot/rpc-core authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 import { catchError, distinctUntilChanged, publishReplay, refCount, tap } from 'rxjs';
 import { stringify } from '@polkadot/util';
 import { refCountDelay } from "./refCountDelay.js";
-
 function CMP(a, b) {
   return stringify({
     t: a
@@ -11,21 +11,19 @@ function CMP(a, b) {
     t: b
   });
 }
-
 function ERR(error) {
   throw error;
 }
-
-function NOOP() {// empty
+function NOOP() {
+  // empty
 }
+
 /**
  * Shorthand for distinctUntilChanged(), publishReplay(1) and refCount().
  *
  * @ignore
  * @internal
  */
-
-
 export function drr({
   delay,
   skipChange = false,

package/util/index.js

@@ -1,5 +1,6 @@
 // Copyright 2017-2022 @polkadot/rpc-core authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 export * from "./drr.js";
 export * from "./memo.js";
 export * from "./refCountDelay.js";

package/util/memo.js

@@ -1,12 +1,12 @@
 // Copyright 2017-2022 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 import { Observable } from 'rxjs';
 import { memoize } from '@polkadot/util';
 import { drr } from "./drr.js";
 // Wraps a derive, doing 2 things to optimize calls -
 //   1. creates a memo of the inner fn -> Observable, removing when unsubscribed
 //   2. wraps the observable in a drr() (which includes an unsub delay)
-
 /** @internal */
 // eslint-disable-next-line @typescript-eslint/ban-types
 export function memo(instanceId, inner) {

package/util/refCountDelay.js

@@ -1,25 +1,23 @@
 // Copyright 2017-2022 @polkadot/rpc-core authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 import { asapScheduler, Observable, Subscription } from 'rxjs';
-/** @internal */
 
+/** @internal */
 export function refCountDelay(delay = 1750) {
   return source => {
     // state: 0 = disconnected, 1 = disconnecting, 2 = connecting, 3 = connected
     let [state, refCount, connection, scheduler] = [0, 0, Subscription.EMPTY, Subscription.EMPTY];
     return new Observable(ob => {
       source.subscribe(ob);
-
       if (refCount++ === 0) {
         if (state === 1) {
           scheduler.unsubscribe();
         } else {
           connection = source.connect();
         }
-
         state = 3;
       }
-
       return () => {
         if (--refCount === 0) {
           if (state === 2) {