@polkadot/rpc-core 16.4.8 → 16.4.9

package/bundle.js

@@ -1,6 +1,7 @@
 import { Observable, publishReplay, refCount } from 'rxjs';
 import { LRUCache } from '@polkadot/rpc-provider';
 import { rpcDefinitions } from '@polkadot/types';
+import { unwrapStorageSi } from '@polkadot/types/util';
 import { hexToU8a, isFunction, isNull, isUndefined, lazyMethod, logger, memoize, objectSpread, u8aConcat, u8aToU8a } from '@polkadot/util';
 import { drr, refCountDelay } from './util/index.js';
 export { packageInfo } from './packageInfo.js';
@@ -384,7 +385,7 @@ export class RpcCore {
     _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 type = key.meta ? registry.createLookupType(unwrapStorageSi(key.meta.type)) : (key.outputType || 'Raw');
         const meta = key.meta || EMPTY_META;
         const entryNum = entryIndex === -1
             ? ''

package/cjs/bundle.js

@@ -5,12 +5,13 @@ const tslib_1 = require("tslib");
 const rxjs_1 = require("rxjs");
 const rpc_provider_1 = require("@polkadot/rpc-provider");
 const types_1 = require("@polkadot/types");
-const util_1 = require("@polkadot/util");
+const util_1 = require("@polkadot/types/util");
+const util_2 = require("@polkadot/util");
 const index_js_1 = require("./util/index.js");
 var packageInfo_js_1 = require("./packageInfo.js");
 Object.defineProperty(exports, "packageInfo", { enumerable: true, get: function () { return packageInfo_js_1.packageInfo; } });
 tslib_1.__exportStar(require("./util/index.js"), exports);
-const l = (0, util_1.logger)('rpc-core');
+const l = (0, util_2.logger)('rpc-core');
 const EMPTY_META = {
     fallback: undefined,
     modifier: { isOptional: true },
@@ -74,7 +75,7 @@ class RpcCore {
      * @param {number} [options.rpcCacheCapacity] Custom size of the rpc LRUCache capacity. Defaults to `RPC_CORE_DEFAULT_CAPACITY` (1024 * 10 * 10)
      */
     constructor(instanceId, registry, { isPedantic = true, provider, rpcCacheCapacity, ttl, userRpc = {} }) {
-        if (!provider || !(0, util_1.isFunction)(provider.send)) {
+        if (!provider || !(0, util_2.isFunction)(provider.send)) {
             throw new Error('Expected Provider to API create');
         }
         this.#instanceId = instanceId;
@@ -125,7 +126,7 @@ class RpcCore {
      * @description Sets a registry swap (typically from Api)
      */
     setRegistrySwap(registrySwap) {
-        this.#getBlockRegistry = (0, util_1.memoize)(registrySwap, {
+        this.#getBlockRegistry = (0, util_2.memoize)(registrySwap, {
             getInstanceId: () => this.#instanceId
         });
     }
@@ -133,7 +134,7 @@ class RpcCore {
      * @description Sets a function to resolve block hash from block number
      */
     setResolveBlockHash(resolveBlockHash) {
-        this.#getBlockHash = (0, util_1.memoize)(resolveBlockHash, {
+        this.#getBlockHash = (0, util_2.memoize)(resolveBlockHash, {
             getInstanceId: () => this.#instanceId
         });
     }
@@ -142,7 +143,7 @@ class RpcCore {
         this.sections.push(...Object.keys(userRpc).filter((k) => !this.sections.includes(k)));
         for (let s = 0, scount = this.sections.length; s < scount; s++) {
             const section = this.sections[s];
-            const defs = (0, util_1.objectSpread)({}, types_1.rpcDefinitions[section], userRpc[section]);
+            const defs = (0, util_2.objectSpread)({}, types_1.rpcDefinitions[section], userRpc[section]);
             const methods = Object.keys(defs);
             for (let m = 0, mcount = methods.length; m < mcount; m++) {
                 const method = methods[m];
@@ -153,8 +154,8 @@ class RpcCore {
                     if (!this[section]) {
                         this[section] = {};
                     }
-                    this.mapping.set(jsonrpc, (0, util_1.objectSpread)({}, def, { isSubscription, jsonrpc, method, section }));
-                    (0, util_1.lazyMethod)(this[section], method, () => isSubscription
+                    this.mapping.set(jsonrpc, (0, util_2.objectSpread)({}, def, { isSubscription, jsonrpc, method, section }));
+                    (0, util_2.lazyMethod)(this[section], method, () => isSubscription
                         ? this._createMethodSubscribe(section, method, def)
                         : this._createMethodSend(section, method, def));
                 }
@@ -163,8 +164,8 @@ class RpcCore {
     }
     _memomize(creator, def) {
         const memoOpts = { getInstanceId: () => this.#instanceId };
-        const memoized = (0, util_1.memoize)(creator(true), memoOpts);
-        memoized.raw = (0, util_1.memoize)(creator(false), memoOpts);
+        const memoized = (0, util_2.memoize)(creator(true), memoOpts);
+        memoized.raw = (0, util_2.memoize)(creator(false), memoOpts);
         memoized.meta = def;
         return memoized;
     }
@@ -186,7 +187,7 @@ class RpcCore {
                 ? await this.#getBlockHash?.(blockId)
                 : blockId;
             const { registry } = isScale && blockHash && this.#getBlockRegistry
-                ? await this.#getBlockRegistry((0, util_1.u8aToU8a)(blockHash))
+                ? await this.#getBlockRegistry((0, util_2.u8aToU8a)(blockHash))
                 : { registry: this.#registryDefault };
             const params = this._formatParams(registry, null, def, values);
             // only cache .at(<blockHash>) queries, e.g. where valid blockHash was supplied
@@ -283,7 +284,7 @@ class RpcCore {
                     }
                     // Unsubscribe from provider
                     subscriptionPromise
-                        .then((subscriptionId) => (0, util_1.isNull)(subscriptionId)
+                        .then((subscriptionId) => (0, util_2.isNull)(subscriptionId)
                         ? Promise.resolve(false)
                         : this.provider.unsubscribe(subType, unsubName, subscriptionId))
                         .catch((error) => logErrorMessage(method, def, error));
@@ -335,14 +336,14 @@ class RpcCore {
         return registry.createTypeUnsafe(rpc.type, [result], { blockHash });
     }
     _formatStorageData(registry, blockHash, key, value) {
-        const isEmpty = (0, util_1.isNull)(value);
+        const isEmpty = (0, util_2.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_1.u8aToU8a)(value);
+                : (0, util_2.u8aToU8a)(value);
         return this._newType(registry, blockHash, key, input, isEmpty);
     }
     _formatStorageSet(registry, blockHash, keys, changes) {
@@ -360,7 +361,7 @@ class RpcCore {
     _formatStorageSetEntry(registry, blockHash, key, changes, withCache, entryIndex) {
         const hexKey = key.toHex();
         const found = changes.find(([key]) => key === hexKey);
-        const isNotFound = (0, util_1.isUndefined)(found);
+        const isNotFound = (0, util_2.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
@@ -375,10 +376,10 @@ class RpcCore {
         const value = isNotFound
             ? null
             : found[1];
-        const isEmpty = (0, util_1.isNull)(value);
+        const isEmpty = (0, util_2.isNull)(value);
         const input = isEmpty || isTreatAsHex(key)
             ? value
-            : (0, util_1.u8aToU8a)(value);
+            : (0, util_2.u8aToU8a)(value);
         const codec = this._newType(registry, blockHash, key, input, isEmpty, entryIndex);
         this._setToCache(hexKey, codec);
         return codec;
@@ -389,7 +390,7 @@ class RpcCore {
     _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 type = key.meta ? registry.createLookupType((0, util_1.unwrapStorageSi)(key.meta.type)) : (key.outputType || 'Raw');
         const meta = key.meta || EMPTY_META;
         const entryNum = entryIndex === -1
             ? ''
@@ -400,8 +401,8 @@ class RpcCore {
                     ? meta.fallback
                         // For old-style Linkage, we add an empty linkage at the end
                         ? type.includes('Linkage<')
-                            ? (0, util_1.u8aConcat)((0, util_1.hexToU8a)(meta.fallback.toHex()), new Uint8Array(2))
-                            : (0, util_1.hexToU8a)(meta.fallback.toHex())
+                            ? (0, util_2.u8aConcat)((0, util_2.hexToU8a)(meta.fallback.toHex()), new Uint8Array(2))
+                            : (0, util_2.hexToU8a)(meta.fallback.toHex())
                         : undefined
                     : meta.modifier.isOptional
                         ? registry.createTypeUnsafe(type, [input], { blockHash, isPedantic: this.#isPedantic })

package/cjs/packageInfo.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.packageInfo = void 0;
-exports.packageInfo = { name: '@polkadot/rpc-core', path: typeof __dirname === 'string' ? __dirname : 'auto', type: 'cjs', version: '16.4.8' };
+exports.packageInfo = { name: '@polkadot/rpc-core', path: typeof __dirname === 'string' ? __dirname : 'auto', type: 'cjs', version: '16.4.9' };

package/package.json

@@ -18,7 +18,7 @@
     "./cjs/packageDetect.js"
   ],
   "type": "module",
-  "version": "16.4.8",
+  "version": "16.4.9",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -199,10 +199,10 @@
     }
   },
   "dependencies": {
-    "@polkadot/rpc-augment": "16.4.8",
-    "@polkadot/rpc-provider": "16.4.8",
-    "@polkadot/types": "16.4.8",
-    "@polkadot/util": "^13.5.6",
+    "@polkadot/rpc-augment": "16.4.9",
+    "@polkadot/rpc-provider": "16.4.9",
+    "@polkadot/types": "16.4.9",
+    "@polkadot/util": "^13.5.7",
     "rxjs": "^7.8.1",
     "tslib": "^2.8.1"
   }

package/packageInfo.js

@@ -1 +1 @@
-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: '16.4.8' };
+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: '16.4.9' };