@dedot/cli 0.14.1 → 0.15.0

package/commands/chaintypes/utils.d.ts

@@ -2,7 +2,7 @@ import { Metadata, RuntimeVersion } from '@dedot/codecs';
 import { HexString } from '@dedot/utils';
 import { DecodedMetadataInfo, ParsedResult } from './types.js';
 export declare const getRuntimeVersion: (metadata: Metadata) => RuntimeVersion;
-export declare const decodeMetadata: (metadataHex: HexString) => DecodedMetadataInfo;
+export declare const decodeMetadata: (metadata: HexString | Uint8Array) => DecodedMetadataInfo;
 export declare const parseMetadataFromRaw: (metadataFile: string) => Promise<ParsedResult>;
 export declare const parseMetadataFromWasm: (runtimeFile: string) => Promise<ParsedResult>;
 export declare const parseStaticSubstrate: () => Promise<ParsedResult>;

package/commands/chaintypes/utils.js

@@ -3,7 +3,7 @@ import staticSubstrate from '@polkadot/types-support/metadata/v15/substrate-hex'
 import { ConstantExecutor } from '@dedot/api';
 import { $Metadata, PortableRegistry, unwrapOpaqueMetadata } from '@dedot/codecs';
 import * as $ from '@dedot/shape';
-import { hexToU8a, u8aToHex } from '@dedot/utils';
+import { hexToU8a, isHex } from '@dedot/utils';
 import { getMetadataFromRuntime } from '@polkadot-api/wasm-executor';
 import * as fs from 'fs';
 export const getRuntimeVersion = (metadata) => {
@@ -14,15 +14,15 @@ export const getRuntimeVersion = (metadata) => {
     });
     return executor.execute('system', 'version');
 };
-export const decodeMetadata = (metadataHex) => {
-    const metadata = $Metadata.tryDecode(metadataHex);
-    const runtimeVersion = getRuntimeVersion(metadata);
+export const decodeMetadata = (metadata) => {
+    const decodedMetadata = $Metadata.tryDecode(metadata);
+    const runtimeVersion = getRuntimeVersion(decodedMetadata);
     const apis = runtimeVersion.apis.reduce((acc, [name, version]) => {
         acc[name] = version;
         return acc;
     }, {});
     return {
-        metadata,
+        metadata: decodedMetadata,
         runtimeVersion: {
             ...runtimeVersion,
             apis,
@@ -30,8 +30,10 @@ export const decodeMetadata = (metadataHex) => {
     };
 };
 export const parseMetadataFromRaw = async (metadataFile) => {
-    const metadataHex = fs.readFileSync(metadataFile, 'utf-8').trim();
-    const { metadata, runtimeVersion } = decodeMetadata(metadataHex);
+    const fileContent = fs.readFileSync(metadataFile);
+    const contentStr = fileContent.toString('utf-8').trim();
+    const metadataInput = isHex(contentStr) ? contentStr : fileContent;
+    const { metadata, runtimeVersion } = decodeMetadata(metadataInput);
     return {
         metadata,
         runtimeVersion,
@@ -43,8 +45,8 @@ export const parseMetadataFromWasm = async (runtimeFile) => {
     // Because this u8aMetadata has compactInt prefixed for it length, we need to get rid of it.
     const length = $.compactU32.tryDecode(u8aMetadata);
     const offset = $.compactU32.tryEncode(length).length;
-    const metadataHex = u8aToHex(u8aMetadata.subarray(offset));
-    const { metadata, runtimeVersion } = decodeMetadata(metadataHex);
+    const metadataU8a = u8aMetadata.subarray(offset);
+    const { metadata, runtimeVersion } = decodeMetadata(metadataU8a);
     return {
         metadata,
         runtimeVersion,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dedot/cli",
-  "version": "0.14.1",
+  "version": "0.15.0",
   "author": "Thang X. Vu <thang@dedot.dev>",
   "homepage": "https://dedot.dev",
   "repository": {
@@ -22,11 +22,11 @@
     "test": "npx vitest --watch=false"
   },
   "dependencies": {
-    "@dedot/api": "0.14.1",
-    "@dedot/codecs": "0.14.1",
-    "@dedot/codegen": "0.14.1",
+    "@dedot/api": "0.15.0",
+    "@dedot/codecs": "0.15.0",
+    "@dedot/codegen": "0.15.0",
     "@polkadot-api/wasm-executor": "^0.1.2",
-    "@polkadot/types-support": "^16.2.2",
+    "@polkadot/types-support": "^16.4.3",
     "ora": "^8.2.0",
     "yargs": "^17.7.2"
   },
@@ -41,7 +41,7 @@
     "node": ">=18"
   },
   "license": "Apache-2.0",
-  "gitHead": "d5adec49781a6e0b45910055dcaf9bf472a39a6b",
+  "gitHead": "1424a04811083af9026e84b776abbdf4240c1d78",
   "module": "./index.js",
   "types": "./index.d.ts"
 }