From 433748521c2afd0eb703b76078d14cdcf48bfb90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Stuczy=C5=84ski?= Date: Mon, 10 Jun 2024 13:00:24 +0100 Subject: [PATCH] wasm fixes --- common/wasm/client-core/src/config/override.rs | 16 ++++++++++++++++ common/wasm/client-core/src/storage/types.rs | 7 +++++-- wasm/node-tester/src/tester.rs | 2 +- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/common/wasm/client-core/src/config/override.rs b/common/wasm/client-core/src/config/override.rs index ed89174539..91fa4ec20e 100644 --- a/common/wasm/client-core/src/config/override.rs +++ b/common/wasm/client-core/src/config/override.rs @@ -244,6 +244,16 @@ pub struct TopologyWasmOverride { /// Supersedes `topology_refresh_rate_ms`. #[tsify(optional)] pub disable_refreshing: Option, + + /// Specifies a minimum performance of a mixnode that is used on route construction. + /// This setting is only applicable when `NymApi` topology is used. + #[tsify(optional)] + pub minimum_mixnode_performance: Option, + + /// Specifies a minimum performance of a gateway that is used on route construction. + /// This setting is only applicable when `NymApi` topology is used. + #[tsify(optional)] + pub minimum_gateway_performance: Option, } impl From for TopologyWasm { @@ -261,6 +271,12 @@ impl From for TopologyWasm { .max_startup_gateway_waiting_period_ms .unwrap_or(def.max_startup_gateway_waiting_period_ms), disable_refreshing: value.disable_refreshing.unwrap_or(def.disable_refreshing), + minimum_mixnode_performance: value + .minimum_mixnode_performance + .unwrap_or(def.minimum_mixnode_performance), + minimum_gateway_performance: value + .minimum_gateway_performance + .unwrap_or(def.minimum_gateway_performance), } } } diff --git a/common/wasm/client-core/src/storage/types.rs b/common/wasm/client-core/src/storage/types.rs index e0cc790739..499a0a0354 100644 --- a/common/wasm/client-core/src/storage/types.rs +++ b/common/wasm/client-core/src/storage/types.rs @@ -16,7 +16,7 @@ pub struct WasmRawRegisteredGateway { pub derived_aes128_ctr_blake3_hmac_keys_bs58: String, - pub gateway_owner_address: String, + pub gateway_owner_address: Option, pub gateway_listener: String, } @@ -55,7 +55,10 @@ impl<'a> From<&'a GatewayRegistration> for WasmRawRegisteredGateway { derived_aes128_ctr_blake3_hmac_keys_bs58: remote_details .derived_aes128_ctr_blake3_hmac_keys .to_base58_string(), - gateway_owner_address: remote_details.gateway_owner_address.to_string(), + gateway_owner_address: remote_details + .gateway_owner_address + .as_ref() + .map(|a| a.to_string()), gateway_listener: remote_details.gateway_listener.to_string(), } } diff --git a/wasm/node-tester/src/tester.rs b/wasm/node-tester/src/tester.rs index f8b0d5e3d6..852e03ffbe 100644 --- a/wasm/node-tester/src/tester.rs +++ b/wasm/node-tester/src/tester.rs @@ -197,7 +197,7 @@ impl NymNodeTesterBuilder { } else { let cfg = GatewayConfig::new( gateway_info.gateway_id, - Some(gateway_info.gateway_owner_address.to_string()), + gateway_info.gateway_owner_address.map(|a| a.to_string()), gateway_info.gateway_listener.to_string(), ); GatewayClient::new(