fixup! feat(truapi-server): add Rust host runtime

pgherveou · pgherveou · commit 2b612dae1601 · 2026-06-30T14:18:43.000+02:00
diff --git a/rust/crates/truapi-server/src/host_logic/sso/pairing.rs b/rust/crates/truapi-server/src/host_logic/sso/pairing.rs
@@ -15,6 +15,8 @@ use schnorrkel::{ExpansionMode, MiniSecretKey};
 use sha2::Sha256;
 use thiserror::Error;
 use truapi_platform::RuntimeConfig;
+#[cfg(test)]
+use truapi_platform::{HostInfo, PlatformInfo};
 
 use crate::host_logic::session::SsoSessionInfo;
 
@@ -408,27 +410,27 @@ pub fn build_pairing_deeplink(
 fn handshake_metadata(config: &RuntimeConfig) -> Vec<HandshakeMetadataEntry> {
     let mut entries = vec![HandshakeMetadataEntry(
         HandshakeMetadataKey::HostName,
-        config.host_name.clone(),
+        config.host_info.name.clone(),
     )];
-    if let Some(value) = &config.host_version {
+    if let Some(value) = &config.host_info.version {
         entries.push(HandshakeMetadataEntry(
             HandshakeMetadataKey::HostVersion,
             value.clone(),
         ));
     }
-    if let Some(value) = &config.host_icon {
+    if let Some(value) = &config.host_info.icon {
         entries.push(HandshakeMetadataEntry(
             HandshakeMetadataKey::HostIcon,
             value.clone(),
         ));
     }
-    if let Some(value) = &config.platform_type {
+    if let Some(value) = &config.platform_info.kind {
         entries.push(HandshakeMetadataEntry(
             HandshakeMetadataKey::PlatformType,
             value.clone(),
         ));
     }
-    if let Some(value) = &config.platform_version {
+    if let Some(value) = &config.platform_info.version {
         entries.push(HandshakeMetadataEntry(
             HandshakeMetadataKey::PlatformVersion,
             value.clone(),
@@ -503,11 +505,15 @@ mod tests {
     fn runtime_config() -> RuntimeConfig {
         RuntimeConfig {
             product_id: "myapp.dot".to_string(),
-            host_name: "Polkadot Web".to_string(),
-            host_icon: Some("https://example.invalid/dotli.png".to_string()),
-            host_version: Some("1.2.3".to_string()),
-            platform_type: Some("Firefox".to_string()),
-            platform_version: Some("192.32".to_string()),
+            host_info: HostInfo {
+                name: "Polkadot Web".to_string(),
+                icon: Some("https://example.invalid/dotli.png".to_string()),
+                version: Some("1.2.3".to_string()),
+            },
+            platform_info: PlatformInfo {
+                kind: Some("Firefox".to_string()),
+                version: Some("192.32".to_string()),
+            },
             people_chain_genesis_hash: [0; 32],
             pairing_deeplink_scheme: "polkadotapp".to_string(),
         }
diff --git a/rust/crates/truapi-server/src/runtime.rs b/rust/crates/truapi-server/src/runtime.rs
@@ -205,11 +205,12 @@ impl<P> PlatformRuntimeHost<P> {
             platform,
             RuntimeConfig {
                 product_id: "unknown.dot".to_string(),
-                host_name: "Polkadot Web".to_string(),
-                host_icon: Some("https://example.invalid/dotli.png".to_string()),
-                host_version: None,
-                platform_type: None,
-                platform_version: None,
+                host_info: truapi_platform::HostInfo {
+                    name: "Polkadot Web".to_string(),
+                    icon: Some("https://example.invalid/dotli.png".to_string()),
+                    version: None,
+                },
+                platform_info: truapi_platform::PlatformInfo::default(),
                 people_chain_genesis_hash: [0; 32],
                 pairing_deeplink_scheme: "polkadotapp".to_string(),
             },
diff --git a/rust/crates/truapi-server/src/test_support.rs b/rust/crates/truapi-server/src/test_support.rs
@@ -29,10 +29,10 @@ use truapi::versioned::account::HostAccountGetAliasRequest;
 use truapi::versioned::resource_allocation::HostRequestResourceAllocationRequest;
 use truapi_platform::{
     AuthPresenter, AuthState, ChainProvider, CoreStorage as PlatformCoreStorage, CoreStorageKey,
-    Features as PlatformFeatures, JsonRpcConnection, Navigation as PlatformNavigation,
-    Notifications as PlatformNotifications, Permissions as PlatformPermissions, PreimageHost,
-    ProductStorage as PlatformProductStorage, RuntimeConfig, ThemeHost, UserConfirmation,
-    UserConfirmationReview,
+    Features as PlatformFeatures, HostInfo, JsonRpcConnection, Navigation as PlatformNavigation,
+    Notifications as PlatformNotifications, Permissions as PlatformPermissions, PlatformInfo,
+    PreimageHost, ProductStorage as PlatformProductStorage, RuntimeConfig, ThemeHost,
+    UserConfirmation, UserConfirmationReview,
 };
 
 /// Test spawner that matches the current target.
@@ -164,11 +164,12 @@ pub(crate) fn stub_platform() -> Arc<StubPlatform> {
 pub(crate) fn runtime_config(product_id: &str) -> RuntimeConfig {
     RuntimeConfig {
         product_id: product_id.to_string(),
-        host_name: "Polkadot Web".to_string(),
-        host_icon: Some("https://example.invalid/dotli.png".to_string()),
-        host_version: None,
-        platform_type: None,
-        platform_version: None,
+        host_info: HostInfo {
+            name: "Polkadot Web".to_string(),
+            icon: Some("https://example.invalid/dotli.png".to_string()),
+            version: None,
+        },
+        platform_info: PlatformInfo::default(),
         people_chain_genesis_hash: [0; 32],
         pairing_deeplink_scheme: "polkadotapp".to_string(),
     }
diff --git a/rust/crates/truapi-server/src/wasm/mod.rs b/rust/crates/truapi-server/src/wasm/mod.rs
@@ -22,10 +22,10 @@ use parity_scale_codec::{Decode, Encode};
 use send_wrapper::SendWrapper;
 use truapi::v01;
 use truapi_platform::{
-    AuthPresenter, AuthState, ChainProvider, CoreStorage, CoreStorageKey, Features,
-    JsonRpcConnection, Navigation, Notifications, Permissions, PreimageHost, ProductStorage,
-    RuntimeConfig, RuntimeConfigValidationError, SessionUiInfo, ThemeHost, UserConfirmation,
-    UserConfirmationReview,
+    AuthPresenter, AuthState, ChainProvider, CoreStorage, CoreStorageKey, Features, HostInfo,
+    JsonRpcConnection, Navigation, Notifications, Permissions, PlatformInfo, PreimageHost,
+    ProductStorage, RuntimeConfig, RuntimeConfigValidationError, SessionUiInfo, ThemeHost,
+    UserConfirmation, UserConfirmationReview,
 };
 use wasm_bindgen::JsCast;
 use wasm_bindgen::prelude::*;
@@ -780,35 +780,45 @@ fn runtime_config_from_js(value: &JsValue) -> Result<RuntimeConfig, JsValue> {
     let people = get_required_object(value, "people", "runtimeConfig.people")?;
     let pairing = get_required_object(value, "pairing", "runtimeConfig.pairing")?;
 
-    RuntimeConfig::new(RuntimeConfig {
-        product_id: get_required_string_at(value, "productId", "runtimeConfig.productId")?,
-        host_name: get_required_string_at(&host, "name", "runtimeConfig.host.name")?,
-        host_icon: get_optional_string_at(&host, "icon", "runtimeConfig.host.icon")?,
-        host_version: get_optional_string_at(&host, "version", "runtimeConfig.host.version")?,
-        platform_type: platform
-            .as_ref()
-            .map(|p| get_optional_string_at(p, "type", "runtimeConfig.platform.type"))
-            .transpose()?
-            .flatten(),
-        platform_version: platform
-            .as_ref()
-            .map(|p| get_optional_string_at(p, "version", "runtimeConfig.platform.version"))
-            .transpose()?
-            .flatten(),
-        people_chain_genesis_hash: get_required_bytes32_at(
-            &people,
-            "genesisHash",
-            "runtimeConfig.people.genesisHash",
-        )?,
-        pairing_deeplink_scheme: get_required_string_at(
+    RuntimeConfig::new(
+        get_required_string_at(value, "productId", "runtimeConfig.productId")?,
+        HostInfo {
+            name: get_required_string_at(&host, "name", "runtimeConfig.host.name")?,
+            icon: get_optional_string_at(&host, "icon", "runtimeConfig.host.icon")?,
+            version: get_optional_string_at(&host, "version", "runtimeConfig.host.version")?,
+        },
+        PlatformInfo {
+            kind: platform
+                .as_ref()
+                .map(|p| get_optional_string_at(p, "type", "runtimeConfig.platform.type"))
+                .transpose()?
+                .flatten(),
+            version: platform
+                .as_ref()
+                .map(|p| get_optional_string_at(p, "version", "runtimeConfig.platform.version"))
+                .transpose()?
+                .flatten(),
+        },
+        get_required_bytes32_at(&people, "genesisHash", "runtimeConfig.people.genesisHash")?,
+        get_required_string_at(
             &pairing,
             "deeplinkScheme",
             "runtimeConfig.pairing.deeplinkScheme",
         )?,
-    })
+    )
     .map_err(runtime_config_validation_to_js)
 }
 
+fn runtime_config_field_to_js(field: &str) -> &str {
+    match field {
+        "product_id" => "productId",
+        "host_info.name" => "host.name",
+        "pairing_deeplink_scheme" => "pairing.deeplinkScheme",
+        "people_chain_genesis_hash" => "people.genesisHash",
+        other => other,
+    }
+}
+
 fn runtime_config_validation_to_js(err: RuntimeConfigValidationError) -> JsValue {
     match err {
         RuntimeConfigValidationError::EmptyField { field } => JsValue::from_str(&format!(
@@ -827,16 +837,6 @@ fn runtime_config_validation_to_js(err: RuntimeConfigValidationError) -> JsValue
     }
 }
 
-fn runtime_config_field_to_js(field: &str) -> &str {
-    match field {
-        "product_id" => "productId",
-        "host_name" => "host.name",
-        "pairing_deeplink_scheme" => "pairing.deeplinkScheme",
-        "people_chain_genesis_hash" => "people.genesisHash",
-        other => other,
-    }
-}
-
 fn get_required_object(value: &JsValue, name: &str, path: &str) -> Result<JsValue, JsValue> {
     let property = Reflect::get(value, &JsValue::from_str(name))?;
     if property.is_null() || property.is_undefined() {
diff --git a/rust/crates/truapi-server/tests/common/mod.rs b/rust/crates/truapi-server/tests/common/mod.rs
@@ -6,9 +6,9 @@ use std::sync::Mutex;
 use futures::stream::{self, BoxStream};
 use truapi::v01;
 use truapi_platform::{
-    AuthPresenter, ChainProvider, CoreStorage, CoreStorageKey, Features, JsonRpcConnection,
-    Navigation, Notifications, Permissions, PreimageHost, ProductStorage, RuntimeConfig, ThemeHost,
-    UserConfirmation, UserConfirmationReview,
+    AuthPresenter, ChainProvider, CoreStorage, CoreStorageKey, Features, HostInfo,
+    JsonRpcConnection, Navigation, Notifications, Permissions, PlatformInfo, PreimageHost,
+    ProductStorage, RuntimeConfig, ThemeHost, UserConfirmation, UserConfirmationReview,
 };
 use truapi_server::frame::ProtocolMessage;
 use truapi_server::transport::Transport;
@@ -49,11 +49,12 @@ pub fn test_spawner() -> truapi_server::subscription::Spawner {
 pub fn test_runtime_config() -> RuntimeConfig {
     RuntimeConfig {
         product_id: "dotli.dot".to_string(),
-        host_name: "Polkadot Web".to_string(),
-        host_icon: Some("https://dot.li/dotli.png".to_string()),
-        host_version: None,
-        platform_type: None,
-        platform_version: None,
+        host_info: HostInfo {
+            name: "Polkadot Web".to_string(),
+            icon: Some("https://dot.li/dotli.png".to_string()),
+            version: None,
+        },
+        platform_info: PlatformInfo::default(),
         people_chain_genesis_hash: [0xa2; 32],
         pairing_deeplink_scheme: "polkadotapp".to_string(),
     }
diff --git a/rust/crates/truapi-server/tests/wasm_crypto_vectors.rs b/rust/crates/truapi-server/tests/wasm_crypto_vectors.rs
@@ -9,7 +9,7 @@ use p256::elliptic_curve::sec1::ToEncodedPoint;
 use parity_scale_codec::{Decode, Encode};
 use schnorrkel::{ExpansionMode, MiniSecretKey};
 use sha2::Sha256;
-use truapi_platform::RuntimeConfig;
+use truapi_platform::{HostInfo, PlatformInfo, RuntimeConfig};
 use truapi_server::host_logic::entropy::derive_product_entropy;
 use truapi_server::host_logic::product_account::{
     derive_product_public_key, product_public_key_to_address,
@@ -52,11 +52,15 @@ fn entropy_secret() -> [u8; 32] {
 fn runtime_config() -> RuntimeConfig {
     RuntimeConfig {
         product_id: "dotli.dot".to_string(),
-        host_name: "Polkadot Web".to_string(),
-        host_icon: Some("https://example.invalid/dotli.png".to_string()),
-        host_version: Some("1.2.3".to_string()),
-        platform_type: Some("Firefox".to_string()),
-        platform_version: Some("192.32".to_string()),
+        host_info: HostInfo {
+            name: "Polkadot Web".to_string(),
+            icon: Some("https://example.invalid/dotli.png".to_string()),
+            version: Some("1.2.3".to_string()),
+        },
+        platform_info: PlatformInfo {
+            kind: Some("Firefox".to_string()),
+            version: Some("192.32".to_string()),
+        },
         people_chain_genesis_hash: [0xa2; 32],
         pairing_deeplink_scheme: "polkadotapp".to_string(),
     }
