@polkadot/rpc-core 7.8.2-7 → 7.9.2-0

package/bundle.cjs

@@ -1,7 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -17,10 +15,6 @@ Object.defineProperty(exports, "packageInfo", {
   }
 });
 
-var _classPrivateFieldLooseBase2 = _interopRequireDefault(require("@babel/runtime/helpers/classPrivateFieldLooseBase"));
-
-var _classPrivateFieldLooseKey2 = _interopRequireDefault(require("@babel/runtime/helpers/classPrivateFieldLooseKey"));
-
 var _rxjs = require("rxjs");
 
 var _types = require("@polkadot/types");
@@ -109,45 +103,26 @@ function isTreatAsHex(key) {
  */
 
 
-var _instanceId = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("instanceId");
-
-var _registryDefault = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("registryDefault");
-
-var _getBlockRegistry = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("getBlockRegistry");
-
-var _storageCache = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("storageCache");
-
 class RpcCore {
+  #instanceId;
+  #registryDefault;
+  #getBlockRegistry;
+  #getBlockHash;
+  #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] : {};
-    Object.defineProperty(this, _instanceId, {
-      writable: true,
-      value: void 0
-    });
-    Object.defineProperty(this, _registryDefault, {
-      writable: true,
-      value: void 0
-    });
-    Object.defineProperty(this, _getBlockRegistry, {
-      writable: true,
-      value: void 0
-    });
-    Object.defineProperty(this, _storageCache, {
-      writable: true,
-      value: new Map()
-    });
-    this.mapping = new Map();
-    this.provider = void 0;
-    this.sections = [];
     // eslint-disable-next-line @typescript-eslint/unbound-method
     (0, _util.assert)(provider && (0, _util.isFunction)(provider.send), 'Expected Provider to API create');
-    (0, _classPrivateFieldLooseBase2.default)(this, _instanceId)[_instanceId] = instanceId;
-    (0, _classPrivateFieldLooseBase2.default)(this, _registryDefault)[_registryDefault] = registry;
+    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)
 
@@ -185,8 +160,18 @@ class RpcCore {
 
 
   setRegistrySwap(registrySwap) {
-    (0, _classPrivateFieldLooseBase2.default)(this, _getBlockRegistry)[_getBlockRegistry] = (0, _util.memoize)(registrySwap, {
-      getInstanceId: () => (0, _classPrivateFieldLooseBase2.default)(this, _instanceId)[_instanceId]
+    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
     });
   }
 
@@ -225,7 +210,7 @@ class RpcCore {
 
   _memomize(creator, def) {
     const memoOpts = {
-      getInstanceId: () => (0, _classPrivateFieldLooseBase2.default)(this, _instanceId)[_instanceId]
+      getInstanceId: () => this.#instanceId
     };
     const memoized = (0, _util.memoize)(creator(true), memoOpts);
     memoized.raw = (0, _util.memoize)(creator(false), memoOpts);
@@ -248,11 +233,14 @@ class RpcCore {
     let memoized = null; // execute the RPC call, doing a registry swap for historic as applicable
 
     const callWithRegistry = async (isScale, values) => {
-      const blockHash = hashIndex === -1 ? null : values[hashIndex];
+      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 {
         registry
-      } = isScale && blockHash && (0, _classPrivateFieldLooseBase2.default)(this, _getBlockRegistry)[_getBlockRegistry] ? await (0, _classPrivateFieldLooseBase2.default)(this, _getBlockRegistry)[_getBlockRegistry]((0, _util.u8aToU8a)(blockHash)) : {
-        registry: (0, _classPrivateFieldLooseBase2.default)(this, _registryDefault)[_registryDefault]
+      } = isScale && blockHash && this.#getBlockRegistry ? await this.#getBlockRegistry((0, _util.u8aToU8a)(blockHash)) : {
+        registry: this.#registryDefault
       };
 
       const params = this._formatInputs(registry, null, def, values); // only cache .at(<blockHash>) queries, e.g. where valid blockHash was supplied
@@ -331,8 +319,7 @@ class RpcCore {
       return new _rxjs.Observable(observer => {
         // Have at least an empty promise, as used in the unsubscribe
         let subscriptionPromise = Promise.resolve(null);
-
-        const registry = (0, _classPrivateFieldLooseBase2.default)(_this, _registryDefault)[_registryDefault];
+        const registry = _this.#registryDefault;
 
         const errorHandler = error => {
           logErrorMessage(method, def, error);
@@ -459,14 +446,13 @@ class RpcCore {
     //   - 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 && (0, _classPrivateFieldLooseBase2.default)(this, _storageCache)[_storageCache].get(hexKey) || null : found[1];
+    const value = (0, _util.isUndefined)(found) ? witCache && this.#storageCache.get(hexKey) || 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
     // clearing of it, so very long running processes (not just a couple of hours, longer)
     // will increase memory beyond what is allowed.
 
-    (0, _classPrivateFieldLooseBase2.default)(this, _storageCache)[_storageCache].set(hexKey, value);
-
+    this.#storageCache.set(hexKey, value);
     return this._newType(registry, blockHash, key, input, isEmpty, entryIndex);
   }
 

package/bundle.d.ts

@@ -1,5 +1,5 @@
 import type { ProviderInterface } from '@polkadot/rpc-provider/types';
-import type { DefinitionRpc, DefinitionRpcExt, DefinitionRpcSub, Registry } from '@polkadot/types/types';
+import type { AnyNumber, DefinitionRpc, DefinitionRpcExt, DefinitionRpcSub, Registry } from '@polkadot/types/types';
 export { packageInfo } from './packageInfo';
 export * from './util';
 /**
@@ -54,6 +54,10 @@ export declare class RpcCore {
     setRegistrySwap(registrySwap: (blockHash: Uint8Array) => Promise<{
         registry: Registry;
     }>): void;
+    /**
+     * @description Sets a function to resolve block hash from block number
+     */
+    setResolveBlockHash(resolveBlockHash: (blockNumber: AnyNumber) => Promise<Uint8Array>): void;
     addUserInterfaces(userRpc: Record<string, Record<string, DefinitionRpc | DefinitionRpcSub>>): void;
     private _memomize;
     private _formatResult;

package/bundle.js

@@ -70,6 +70,7 @@ export class RpcCore {
   #instanceId;
   #registryDefault;
   #getBlockRegistry;
+  #getBlockHash;
   #storageCache = new Map();
   mapping = new Map();
   sections = [];
@@ -125,6 +126,16 @@ export class RpcCore {
       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
@@ -181,7 +192,10 @@ export class RpcCore {
     let memoized = null; // execute the RPC call, doing a registry swap for historic as applicable
 
     const callWithRegistry = async (isScale, values) => {
-      const blockHash = hashIndex === -1 ? null : values[hashIndex];
+      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 {
         registry
       } = isScale && blockHash && this.#getBlockRegistry ? await this.#getBlockRegistry(u8aToU8a(blockHash)) : {

package/package.json

@@ -20,7 +20,7 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "7.8.2-7",
+  "version": "7.9.2-0",
   "main": "index.cjs",
   "module": "index.js",
   "types": "index.d.ts",
@@ -91,9 +91,9 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.17.2",
-    "@polkadot/rpc-augment": "7.8.2-7",
-    "@polkadot/rpc-provider": "7.8.2-7",
-    "@polkadot/types": "7.8.2-7",
+    "@polkadot/rpc-augment": "7.9.2-0",
+    "@polkadot/rpc-provider": "7.9.2-0",
+    "@polkadot/types": "7.9.2-0",
     "@polkadot/util": "^8.4.1",
     "rxjs": "^7.5.4"
   }

package/packageInfo.cjs

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

package/packageInfo.js

@@ -5,5 +5,5 @@ export const packageInfo = {
   name: '@polkadot/rpc-core',
   path: new URL('.', import.meta.url).pathname,
   type: 'esm',
-  version: '7.8.2-7'
+  version: '7.9.2-0'
 };