support runtime log level

executor/src/task.rs

@@ -14,6 +14,7 @@ use smoldot::{
         calculate_root::{root_merkle_value, RootMerkleValueCalculation},
         nibbles_to_bytes_suffix_extend, HashFunction, TrieEntryVersion,
     },
+    verify::body_only::LogEmitInfo,
 };
 use std::collections::BTreeMap;
 
@@ -68,13 +69,21 @@ pub struct TaskCall {
     runtime_log_level: u32,
 }
 
+#[derive(Serialize, Deserialize, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct LogInfo {
+    message: String,
+    level: Option<u32>,
+    target: Option<String>,
+}
+
 #[derive(Serialize, Deserialize, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct CallResponse {
     result: HexString,
     storage_diff: Vec<(HexString, Option<HexString>)>,
     offchain_storage_diff: Vec<(HexString, Option<HexString>)>,
-    runtime_logs: Vec<String>,
+    runtime_logs: Vec<LogInfo>,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -123,7 +132,7 @@ pub async fn run_task(task: TaskCall, js: crate::JsCallback) -> Result<TaskRespo
     })
     .unwrap();
     let mut ret: Result<Vec<u8>, String> = Ok(Vec::new());
-    let mut runtime_logs: Vec<String> = vec![];
+    let mut runtime_logs: Vec<LogInfo> = vec![];
 
     for (call, params) in task.calls {
         let mut vm = runtime_host::run(runtime_host::Config {
@@ -287,6 +296,40 @@ pub async fn run_task(task: TaskCall, js: crate::JsCallback) -> Result<TaskRespo
                         req.resume(success)
                     }
                 },
+
+                RuntimeHostVm::LogEmit(req) => {
+                    {
+                        let info = req.info();
+                        let log = match info {
+                            LogEmitInfo::Num(v) => LogInfo {
+                                message: v.to_string(),
+                                level: None,
+                                target: None,
+                            },
+                            LogEmitInfo::Utf8(v) => LogInfo {
+                                message: v.to_string(),
+                                level: None,
+                                target: None,
+                            },
+                            LogEmitInfo::Hex(v) => LogInfo {
+                                message: v.to_string(),
+                                level: None,
+                                target: None,
+                            },
+                            LogEmitInfo::Log {
+                                log_level,
+                                target,
+                                message,
+                            } => LogInfo {
+                                message: message.to_string(),
+                                level: Some(log_level),
+                                target: Some(target.to_string()),
+                            },
+                        };
+                        runtime_logs.push(log);
+                    }
+                    req.resume()
+                }
             }
         };
 
@@ -312,10 +355,6 @@ pub async fn run_task(task: TaskCall, js: crate::JsCallback) -> Result<TaskRespo
                     });
 
                 storage_main_trie_changes = success.storage_changes.into_main_trie_diff();
-
-                if !success.logs.is_empty() {
-                    runtime_logs.push(success.logs);
-                }
             }
             Err(err) => {
                 ret = Err(err.to_string());

packages/chopsticks/src/plugins/run-block/index.ts

@@ -9,6 +9,7 @@ import type yargs from 'yargs'
 import {
   Block,
   Context,
+  RuntimeLog,
   compactHex,
   decodeKeyValue,
   printRuntimeLogs,
@@ -167,7 +168,7 @@ export interface RunBlockResponse {
     /**
      * Runtime logs.
      */
-    logs?: string[]
+    logs?: RuntimeLog[]
   }[]
   /**
    * Block details. Only available when `includeBlockDetails` is true.

packages/chopsticks/src/utils/generate-html-diff.ts

@@ -7,7 +7,7 @@ import path from 'node:path'
 
 export const generateHtmlDiff = async (block: Block, diff: [HexString, HexString | null][]) => {
   const { oldState, delta } = await decodeStorageDiff(block, diff)
-  const htmlTemplate = readFileSync(path.join(__dirname, '../../../template/diff.html'), 'utf-8')
+  const htmlTemplate = readFileSync(path.join(__dirname, '../../template/diff.html'), 'utf-8')
   return template(htmlTemplate)({ left: JSON.stringify(oldState), delta: JSON.stringify(delta) })
 }
 

packages/core/src/blockchain/block-builder.ts

@@ -6,10 +6,11 @@ import {
   RawBabePreDigest,
   TransactionValidityError,
 } from '@polkadot/types/interfaces'
-import { Block, TaskCallResponse } from './block'
+import { Block } from './block'
 import { GenericExtrinsic } from '@polkadot/types'
 import { HexString } from '@polkadot/util/types'
 import { StorageLayer, StorageValueKind } from './storage-layer'
+import { TaskCallResponse } from '../wasm-executor'
 import { compactAddLength, hexToU8a, stringToHex, u8aConcat } from '@polkadot/util'
 import { compactHex } from '../utils'
 import { defaultLogger, truncate } from '../logger'

packages/core/src/blockchain/block.ts

@@ -12,14 +12,7 @@ import { Blockchain } from '.'
 import { RemoteStorageLayer, StorageLayer, StorageLayerProvider, StorageValue, StorageValueKind } from './storage-layer'
 import { compactHex, printRuntimeLogs } from '../utils'
 import { getRuntimeVersion, runTask, taskHandler } from '../wasm-executor'
-import type { RuntimeVersion } from '../wasm-executor'
-
-export type TaskCallResponse = {
-  result: HexString
-  storageDiff: [HexString, HexString | null][]
-  offchainStorageDiff: [HexString, HexString | null][]
-  runtimeLogs: string[]
-}
+import type { RuntimeVersion, TaskCallResponse } from '../wasm-executor'
 
 /**
  * Block class.

packages/core/src/utils/index.ts

@@ -4,6 +4,7 @@ import { compactStripLength, u8aToHex } from '@polkadot/util'
 import { hexAddPrefix, hexStripPrefix } from '@polkadot/util/hex'
 
 import { Blockchain } from '../blockchain'
+import { RuntimeLog } from '../wasm-executor'
 
 export * from './set-storage'
 export * from './time-travel'
@@ -108,12 +109,26 @@ export const stripChildPrefix = (key: HexString) => {
   return storageKey
 }
 
-export const printRuntimeLogs = (logs: string[]) => {
+const logLevels = ['OFF', 'ERROR', 'WARN', 'INFO', 'DEBUG', 'TRACE']
+
+export const formatRuntimeLog = (log: RuntimeLog) => {
+  let msg = ''
+  if (log.level != null) {
+    msg += `${logLevels[log.level]}\t `
+  }
+  if (log.target) {
+    msg += `[${log.target}]:\t `
+  }
+  msg += log.message
+  return msg
+}
+
+export const printRuntimeLogs = (logs: RuntimeLog[]) => {
   if (!logs.length) return
 
   console.group('RuntimeLogs:')
   for (const log of logs) {
-    console.log(log)
+    console.log(formatRuntimeLog(log))
   }
   console.groupEnd()
 }

packages/core/src/wasm-executor/index.ts

@@ -24,14 +24,22 @@ export type RuntimeVersion = {
   stateVersion: number
 }
 
+export type RuntimeLog = {
+  message: string
+  level?: number
+  target?: string
+}
+
+export type TaskCallResponse = {
+  result: HexString
+  storageDiff: [HexString, HexString | null][]
+  offchainStorageDiff: [HexString, HexString | null][]
+  runtimeLogs: RuntimeLog[]
+}
+
 export type TaskResponse =
   | {
-      Call: {
-        result: HexString
-        storageDiff: [HexString, HexString | null][]
-        offchainStorageDiff: [HexString, HexString | null][]
-        runtimeLogs: string[]
-      }
+      Call: TaskCallResponse
     }
   | {
       Error: string