@acala-network/chopsticks-core 0.9.11-2 → 0.9.12

package/dist/cjs/blockchain/head-state.d.ts

@@ -8,8 +8,6 @@ export declare class HeadState {
     unsubscribeHead(id: string): void;
     subscribeStorage(keys: string[], cb: Callback): Promise<string>;
     unsubscribeStorage(id: string): void;
-    subscrubeRuntimeVersion(cb: (block: Block) => void): Promise<string>;
-    unsubscribeRuntimeVersion(id: string): void;
     setHead(head: Block): Promise<void>;
 }
 export {};

package/dist/cjs/blockchain/head-state.js

@@ -16,7 +16,6 @@ _export(exports, {
         return randomId;
     }
 });
-const _util = require("@polkadot/util");
 const _logger = require("../logger.js");
 function _check_private_redeclaration(obj, privateCollection) {
     if (privateCollection.has(obj)) {
@@ -86,21 +85,6 @@ class HeadState {
     unsubscribeStorage(id) {
         delete _class_private_field_get(this, _storageListeners)[id];
     }
-    async subscrubeRuntimeVersion(cb) {
-        const id = randomId();
-        const codeKey = (0, _util.stringToHex)(':code');
-        _class_private_field_get(this, _storageListeners)[id] = [
-            [
-                codeKey
-            ],
-            cb
-        ];
-        _class_private_field_get(this, _oldValues)[codeKey] = await _class_private_field_get(this, _head).get(codeKey).then((val)=>val || null);
-        return id;
-    }
-    unsubscribeRuntimeVersion(id) {
-        delete _class_private_field_get(this, _storageListeners)[id];
-    }
     async setHead(head) {
         _class_private_field_set(this, _head, head);
         for (const cb of Object.values(_class_private_field_get(this, _headListeners))){

package/dist/cjs/rpc/substrate/state.js

@@ -46,6 +46,7 @@ _export(exports, {
         return state_unsubscribeStorage;
     }
 });
+const _util = require("@polkadot/util");
 const _shared = require("../shared.js");
 const _logger = require("../../logger.js");
 const _index = require("../../utils/index.js");
@@ -101,12 +102,14 @@ const state_call = async (context, [method, data, hash])=>{
 };
 const state_subscribeRuntimeVersion = async (context, _params, { subscribe })=>{
     let update = (_block)=>{};
-    const id = await context.chain.headState.subscrubeRuntimeVersion((block)=>update(block));
-    const callback = subscribe('state_runtimeVersion', id);
+    const id = await context.chain.headState.subscribeStorage([
+        (0, _util.stringToHex)(':code')
+    ], (block)=>update(block));
+    const callback = subscribe('state_runtimeVersion', id, ()=>context.chain.headState.unsubscribeStorage(id));
     update = async (block)=>callback(await block.runtimeVersion);
-    setTimeout(()=>{
-        context.chain.head.runtimeVersion.then(callback);
-    }, 50);
+    (async ()=>{
+        update(context.chain.head);
+    })();
     return id;
 };
 const state_unsubscribeRuntimeVersion = async (_context, [subid], { unsubscribe })=>{

package/dist/esm/blockchain/head-state.d.ts

@@ -8,8 +8,6 @@ export declare class HeadState {
     unsubscribeHead(id: string): void;
     subscribeStorage(keys: string[], cb: Callback): Promise<string>;
     unsubscribeStorage(id: string): void;
-    subscrubeRuntimeVersion(cb: (block: Block) => void): Promise<string>;
-    unsubscribeRuntimeVersion(id: string): void;
     setHead(head: Block): Promise<void>;
 }
 export {};

package/dist/esm/blockchain/head-state.js

@@ -1,4 +1,3 @@
-import { stringToHex } from '@polkadot/util';
 import { defaultLogger } from '../logger.js';
 export const randomId = ()=>Math.random().toString(36).substring(2);
 const logger = defaultLogger.child({
@@ -34,21 +33,6 @@ export class HeadState {
     unsubscribeStorage(id) {
         delete this.#storageListeners[id];
     }
-    async subscrubeRuntimeVersion(cb) {
-        const id = randomId();
-        const codeKey = stringToHex(':code');
-        this.#storageListeners[id] = [
-            [
-                codeKey
-            ],
-            cb
-        ];
-        this.#oldValues[codeKey] = await this.#head.get(codeKey).then((val)=>val || null);
-        return id;
-    }
-    unsubscribeRuntimeVersion(id) {
-        delete this.#storageListeners[id];
-    }
     async setHead(head) {
         this.#head = head;
         for (const cb of Object.values(this.#headListeners)){

package/dist/esm/rpc/substrate/state.js

@@ -1,3 +1,4 @@
+import { stringToHex } from '@polkadot/util';
 import { ResponseError } from '../shared.js';
 import { defaultLogger } from '../../logger.js';
 import { isPrefixedChildKey, prefixedChildKey, stripChildPrefix } from '../../utils/index.js';
@@ -85,12 +86,14 @@ const logger = defaultLogger.child({
  * @return subscription id
  */ export const state_subscribeRuntimeVersion = async (context, _params, { subscribe })=>{
     let update = (_block)=>{};
-    const id = await context.chain.headState.subscrubeRuntimeVersion((block)=>update(block));
-    const callback = subscribe('state_runtimeVersion', id);
+    const id = await context.chain.headState.subscribeStorage([
+        stringToHex(':code')
+    ], (block)=>update(block));
+    const callback = subscribe('state_runtimeVersion', id, ()=>context.chain.headState.unsubscribeStorage(id));
     update = async (block)=>callback(await block.runtimeVersion);
-    setTimeout(()=>{
-        context.chain.head.runtimeVersion.then(callback);
-    }, 50);
+    (async ()=>{
+        update(context.chain.head);
+    })();
     return id;
 };
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acala-network/chopsticks-core",
-  "version": "0.9.11-2",
+  "version": "0.9.12",
   "author": "Acala Developers <hello@acala.network>",
   "license": "Apache-2.0",
   "type": "module",
@@ -12,7 +12,7 @@
     "docs:prep": "typedoc"
   },
   "dependencies": {
-    "@acala-network/chopsticks-executor": "0.9.11-2",
+    "@acala-network/chopsticks-executor": "0.9.12",
     "@polkadot/rpc-provider": "^10.11.2",
     "@polkadot/types": "^10.11.2",
     "@polkadot/types-codec": "^10.11.2",