v0.2.12-pre.008
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
# file: crates/ksp-app-wallet-desk/Cargo.toml
|
||||
# version: 5
|
||||
# version: 6
|
||||
|
||||
[package]
|
||||
name = "ksp-app-wallet-desk"
|
||||
@@ -27,6 +27,7 @@ fs2.workspace = true
|
||||
ksp-config-lib = { path = "../ksp-config-lib" }
|
||||
ksp-core-lib = { path = "../ksp-core-lib" }
|
||||
ksp-logging-lib = { path = "../ksp-logging-lib" }
|
||||
ksp-offchain-transport-lib = { path = "../ksp-offchain-transport-lib" }
|
||||
ksp-onchain-transport-lib = { path = "../ksp-onchain-transport-lib" }
|
||||
ksp-wallet-lib = { path = "../ksp-wallet-lib" }
|
||||
serde = { workspace = true, features = ["derive"] }
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<!-- file: crates/ksp-app-wallet-desk/frontend/main.html -->
|
||||
<!-- version: 5 -->
|
||||
<!-- version: 6 -->
|
||||
<!DOCTYPE html>
|
||||
<html lang="fr">
|
||||
<head>
|
||||
@@ -97,6 +97,7 @@
|
||||
<dt class="col-5">Alias</dt><dd id="currentWalletAlias" class="col-7 text-break">—</dd>
|
||||
<dt class="col-5">Notes</dt><dd id="currentWalletNotes" class="col-7 text-break">—</dd>
|
||||
<dt class="col-5">Balance SOL</dt><dd id="currentWalletBalanceSol" class="col-7">—</dd>
|
||||
<dt class="col-5">SOL/USD moyen</dt><dd id="currentWalletSolUsdAverage" class="col-7">N.A.</dd>
|
||||
</dl>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// file: crates/ksp-app-wallet-desk/frontend/ts/main.ts
|
||||
// version: 16
|
||||
// version: 17
|
||||
|
||||
import { Modal } from "bootstrap";
|
||||
import DataTable from "datatables.net-bs5";
|
||||
@@ -378,6 +378,7 @@ function clearStrongViewSensitiveInputs(): void {
|
||||
|
||||
function clearBalanceProjection(): void {
|
||||
setText("#currentWalletBalanceSol", "—");
|
||||
setText("#currentWalletSolUsdAverage", "N.A.");
|
||||
setText("#detailsBalanceLamports", "—");
|
||||
setText("#detailsBalanceSol", "—");
|
||||
setText("#detailsBalanceSlot", "—");
|
||||
@@ -1379,13 +1380,14 @@ function renderWalletBalance(balance: WalletBalanceDto): void {
|
||||
return;
|
||||
}
|
||||
setText("#currentWalletBalanceSol", balance.sol);
|
||||
setText("#currentWalletSolUsdAverage", balance.solUsdAverage ? `${balance.solUsdAverage} USD` : "N.A.");
|
||||
setText("#detailsBalanceLamports", balance.lamports);
|
||||
setText("#detailsBalanceSol", balance.sol);
|
||||
setText("#detailsBalanceSlot", balance.slot.toString());
|
||||
setText("#detailsBalanceApiVersion", balance.apiVersion ?? "—");
|
||||
setText("#detailsBalanceTransport", `${balance.transportProfile} / ${balance.transportRole}`);
|
||||
setText("#balanceStatus", "Balance réseau actualisée.");
|
||||
frontendInfo("main", "Wallet balance rendered", { lamports: balance.lamports, slot: balance.slot, walletId: balance.walletId });
|
||||
setText("#balanceStatus", "Balance réseau et prix moyen SOL/USD actualisés.");
|
||||
frontendInfo("main", "Wallet balance rendered", { averageAvailable: balance.solUsdAverage !== null, lamports: balance.lamports, slot: balance.slot, walletId: balance.walletId });
|
||||
}
|
||||
|
||||
async function refreshWalletBalance(): Promise<void> {
|
||||
@@ -1393,8 +1395,8 @@ async function refreshWalletBalance(): Promise<void> {
|
||||
return;
|
||||
}
|
||||
const walletId = activeWalletId;
|
||||
setText("#balanceStatus", "Interrogation getBalance en cours…");
|
||||
frontendDebug("main", "Wallet balance refresh requested", { walletId });
|
||||
setText("#balanceStatus", "Interrogation getBalance et refresh SOL/USD en cours…");
|
||||
frontendDebug("main", "Wallet balance and SOL/USD refresh requested", { walletId });
|
||||
try {
|
||||
const balance = await invokeKsp<WalletBalanceDto>("main", "refresh_wallet_balance");
|
||||
renderWalletBalance(balance);
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "ksp-app-wallet-desk",
|
||||
"private": true,
|
||||
"version": "0.2.6",
|
||||
"version": "0.2.12-pre.8",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// file: crates/ksp-app-wallet-desk/src/app_state.rs
|
||||
// version: 19
|
||||
// version: 20
|
||||
|
||||
//! Shared backend state owned by the Wallet Desk Tauri application.
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
pub(crate) struct AppState {
|
||||
config_management: ksp_config_lib::ConfigManagement,
|
||||
logging_runtime: std::sync::Mutex<LoggingRuntimeState>,
|
||||
offchain_runtime: std::option::Option<crate::OffchainTransportRuntime>,
|
||||
splash_settings: crate::SplashSettings,
|
||||
splash_sequence_started: std::sync::atomic::AtomicBool,
|
||||
transport_runtime: crate::TransportRuntime,
|
||||
@@ -41,6 +42,20 @@ impl AppState {
|
||||
return std::result::Result::Err(error);
|
||||
},
|
||||
};
|
||||
let offchain_runtime = crate::initialize_offchain_transport(&config_management);
|
||||
let offchain_runtime = match offchain_runtime {
|
||||
std::result::Result::Ok(value) => std::option::Option::Some(value),
|
||||
std::result::Result::Err(error) => {
|
||||
ksp_logging_lib::warn!(
|
||||
target: crate::TRACING_TARGET,
|
||||
domain = crate::TRACING_DOMAIN_OFFCHAIN_TRANSPORT,
|
||||
error_domain = error.code().domain(),
|
||||
error_code = error.code().code(),
|
||||
"Wallet Desk Off-chain Transport is unavailable; SOL/USD average will be N.A."
|
||||
);
|
||||
std::option::Option::None
|
||||
},
|
||||
};
|
||||
let wallet_config_startup = crate::initialize_wallet_config(&config_management);
|
||||
let wallet_config_startup = match wallet_config_startup {
|
||||
std::result::Result::Ok(value) => value,
|
||||
@@ -66,6 +81,7 @@ impl AppState {
|
||||
fallback_active: logging_startup.fallback_active,
|
||||
startup_diagnostic: logging_startup.startup_diagnostic,
|
||||
}),
|
||||
offchain_runtime,
|
||||
splash_settings,
|
||||
splash_sequence_started: std::sync::atomic::AtomicBool::new(false),
|
||||
transport_runtime,
|
||||
@@ -1126,8 +1142,10 @@ impl AppState {
|
||||
std::option::Option::Some(ksp_onchain_transport_lib::SolanaCommitment::Confirmed),
|
||||
std::option::Option::None,
|
||||
);
|
||||
ksp_logging_lib::debug!(target: crate::TRACING_TARGET, domain = crate::TRACING_DOMAIN_TRANSPORT, wallet_id = context.wallet_id.as_str(), capability = context.capability, transport_profile = self.transport_runtime.profile_id(), transport_role = self.transport_runtime.role().as_str(), "Wallet balance refresh started");
|
||||
let result = self.transport_runtime.pool().get_balance(self.transport_runtime.role(), &context.pubkey, std::option::Option::Some(&config)).await;
|
||||
ksp_logging_lib::debug!(target: crate::TRACING_TARGET, domain = crate::TRACING_DOMAIN_TRANSPORT, wallet_id = context.wallet_id.as_str(), capability = context.capability, transport_profile = self.transport_runtime.profile_id(), transport_role = self.transport_runtime.role().as_str(), "Wallet balance and auxiliary SOL/USD refresh started");
|
||||
let balance_future = self.transport_runtime.pool().get_balance(self.transport_runtime.role(), &context.pubkey, std::option::Option::Some(&config));
|
||||
let price_future = self.refresh_sol_usd_average();
|
||||
let (result, sol_usd_average) = tokio::join!(balance_future, price_future);
|
||||
let result = match result {
|
||||
std::result::Result::Ok(value) => value,
|
||||
std::result::Result::Err(error) => {
|
||||
@@ -1147,14 +1165,52 @@ impl AppState {
|
||||
lamports: lamports.to_string(),
|
||||
slot: result.context().slot(),
|
||||
sol: crate::format_lamports_as_sol(lamports),
|
||||
sol_usd_average,
|
||||
transport_profile: self.transport_runtime.profile_id().to_owned(),
|
||||
transport_role: self.transport_runtime.role().as_str().to_owned(),
|
||||
wallet_id: context.wallet_id.clone(),
|
||||
};
|
||||
ksp_logging_lib::info!(target: crate::TRACING_TARGET, domain = crate::TRACING_DOMAIN_TRANSPORT, wallet_id = context.wallet_id.as_str(), capability = context.capability, lamports, slot = dto.slot, "Wallet balance refresh succeeded");
|
||||
ksp_logging_lib::info!(target: crate::TRACING_TARGET, domain = crate::TRACING_DOMAIN_TRANSPORT, wallet_id = context.wallet_id.as_str(), capability = context.capability, lamports, slot = dto.slot, sol_usd_average_available = dto.sol_usd_average.is_some(), "Wallet balance refresh succeeded");
|
||||
return std::result::Result::Ok(dto);
|
||||
}
|
||||
|
||||
async fn refresh_sol_usd_average(&self) -> std::option::Option<String> {
|
||||
let runtime = match &self.offchain_runtime {
|
||||
std::option::Option::Some(value) => value,
|
||||
std::option::Option::None => return std::option::Option::None,
|
||||
};
|
||||
let outcomes = runtime.service().refresh_all().await;
|
||||
let outcomes = match outcomes {
|
||||
std::result::Result::Ok(value) => value,
|
||||
std::result::Result::Err(error) => {
|
||||
ksp_logging_lib::warn!(
|
||||
target: crate::TRACING_TARGET,
|
||||
domain = crate::TRACING_DOMAIN_OFFCHAIN_TRANSPORT,
|
||||
offchain_profile = runtime.profile_id(),
|
||||
error_domain = error.code().domain(),
|
||||
error_code = error.code().code(),
|
||||
"Wallet Desk SOL/USD provider refresh failed; average is unavailable"
|
||||
);
|
||||
return std::option::Option::None;
|
||||
},
|
||||
};
|
||||
let prices = outcomes
|
||||
.iter()
|
||||
.filter_map(|outcome| return outcome.observation().map(|observation| return observation.price()))
|
||||
.collect::<std::vec::Vec<_>>();
|
||||
let average = crate::average_sol_usd_prices(prices.as_slice());
|
||||
ksp_logging_lib::debug!(
|
||||
target: crate::TRACING_TARGET,
|
||||
domain = crate::TRACING_DOMAIN_OFFCHAIN_TRANSPORT,
|
||||
offchain_profile = runtime.profile_id(),
|
||||
provider_count = outcomes.len(),
|
||||
observed_provider_count = prices.len(),
|
||||
average_available = average.is_some(),
|
||||
"Wallet Desk SOL/USD refresh completed"
|
||||
);
|
||||
return average;
|
||||
}
|
||||
|
||||
fn authorized_balance_context(&self) -> ksp_core_lib::Result<WalletBalanceContext> {
|
||||
let session = self.wallet_session.lock();
|
||||
let session = match session {
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
// file: crates/ksp-app-wallet-desk/src/constants.rs
|
||||
// version: 8
|
||||
// version: 9
|
||||
|
||||
//! Logging targets, domains and composite component identifiers owned by Wallet Desk.
|
||||
|
||||
/// Composite-local identifier for the Logging standard document.
|
||||
pub(crate) const COMPOSITE_COMPONENT_ID_LOGGING: &str = "logging";
|
||||
/// Composite-local identifier for the Off-chain Transport standard document.
|
||||
pub(crate) const COMPOSITE_COMPONENT_ID_OFFCHAIN_TRANSPORT: &str = "offchain_transport";
|
||||
/// Composite-local identifier for the HTTP Transport standard document.
|
||||
pub(crate) const COMPOSITE_COMPONENT_ID_TRANSPORT: &str = "transport";
|
||||
/// Composite-local identifier for the Wallet standard document.
|
||||
@@ -13,6 +15,8 @@ pub(crate) const COMPOSITE_COMPONENT_ID_WALLET: &str = "wallet";
|
||||
pub(crate) const TRACING_DOMAIN_BOOTSTRAP: &str = "wallet.bootstrap";
|
||||
/// Structured domain used by technical frontend events.
|
||||
pub(crate) const TRACING_DOMAIN_FRONTEND: &str = "frontend";
|
||||
/// Structured domain used by Wallet Desk Off-chain Transport and SOL/USD average operations.
|
||||
pub(crate) const TRACING_DOMAIN_OFFCHAIN_TRANSPORT: &str = "wallet.offchain_transport";
|
||||
/// Structured domain used by the Wallet Desk shell.
|
||||
pub(crate) const TRACING_DOMAIN_SHELL: &str = "wallet.shell";
|
||||
/// Structured domain used by Wallet Desk HTTP Transport and balance operations.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// file: crates/ksp-app-wallet-desk/src/lib.rs
|
||||
// version: 13
|
||||
// version: 14
|
||||
|
||||
//! Tauri desktop application shell for KSP Wallet management and inspection.
|
||||
|
||||
@@ -14,6 +14,7 @@ mod dto_common;
|
||||
mod errors;
|
||||
mod frontend_logging;
|
||||
mod logging_runtime;
|
||||
mod offchain_runtime;
|
||||
mod splash;
|
||||
mod tauri;
|
||||
mod transport_runtime;
|
||||
@@ -47,6 +48,8 @@ pub(crate) use self::bootstrap::load_wallet_desk_composite;
|
||||
pub(crate) use self::bootstrap::required_composite_component_profile;
|
||||
/// Composite-local identifier for the Logging standard document.
|
||||
pub(crate) use self::constants::COMPOSITE_COMPONENT_ID_LOGGING;
|
||||
/// Composite-local identifier for the Off-chain Transport standard document.
|
||||
pub(crate) use self::constants::COMPOSITE_COMPONENT_ID_OFFCHAIN_TRANSPORT;
|
||||
/// Composite-local identifier for the HTTP Transport standard document.
|
||||
pub(crate) use self::constants::COMPOSITE_COMPONENT_ID_TRANSPORT;
|
||||
/// Composite-local identifier for the Wallet standard document.
|
||||
@@ -55,6 +58,8 @@ pub(crate) use self::constants::COMPOSITE_COMPONENT_ID_WALLET;
|
||||
pub(crate) use self::constants::TRACING_DOMAIN_BOOTSTRAP;
|
||||
/// Structured domain used by technical frontend events.
|
||||
pub(crate) use self::constants::TRACING_DOMAIN_FRONTEND;
|
||||
/// Structured domain used by Wallet Desk Off-chain Transport and SOL/USD average operations.
|
||||
pub(crate) use self::constants::TRACING_DOMAIN_OFFCHAIN_TRANSPORT;
|
||||
/// Structured domain used by the Wallet Desk shell.
|
||||
pub(crate) use self::constants::TRACING_DOMAIN_SHELL;
|
||||
/// Structured domain used by Wallet Desk HTTP Transport and balance operations.
|
||||
@@ -137,6 +142,10 @@ pub(crate) use self::frontend_logging::FrontendLogPayloadDto;
|
||||
pub(crate) use self::frontend_logging::emit_frontend_log_event;
|
||||
/// Creates the stable runtime identity for this Wallet Desk process launch.
|
||||
pub(crate) use self::logging_runtime::launch_identity;
|
||||
/// Provider-neutral Off-chain Transport runtime used by the Wallet balance projection.
|
||||
pub(crate) use self::offchain_runtime::OffchainTransportRuntime;
|
||||
/// Resolves the optional composite-selected Off-chain Transport runtime.
|
||||
pub(crate) use self::offchain_runtime::initialize_offchain_transport;
|
||||
/// Command emitted by Rust to the splash frontend.
|
||||
pub(crate) use self::splash::SplashOrderDto;
|
||||
/// Runtime timings used by the common desk splash lifecycle.
|
||||
@@ -155,6 +164,8 @@ pub(crate) use self::tw_splash::require_splash_window;
|
||||
pub(crate) use self::tw_splash::splash_frontend_ready_service;
|
||||
/// Safe balance snapshot for the currently authorized Wallet.
|
||||
pub(crate) use self::wallet_balance::WalletBalanceDto;
|
||||
/// Computes the Wallet Desk SOL/USD arithmetic mean without floating point.
|
||||
pub(crate) use self::wallet_balance::average_sol_usd_prices;
|
||||
/// Formats exact lamports as a decimal SOL string without floating point.
|
||||
pub(crate) use self::wallet_balance::format_lamports_as_sol;
|
||||
/// Resolved Wallet Config and directory preparation status captured during application bootstrap.
|
||||
|
||||
60
crates/ksp-app-wallet-desk/src/offchain_runtime.rs
Normal file
60
crates/ksp-app-wallet-desk/src/offchain_runtime.rs
Normal file
@@ -0,0 +1,60 @@
|
||||
// file: crates/ksp-app-wallet-desk/src/offchain_runtime.rs
|
||||
// version: 1
|
||||
|
||||
//! Optional composite-selected Off-chain Transport runtime used by Wallet Desk SOL/USD presentation.
|
||||
|
||||
/// Safe provider-neutral Off-chain Transport runtime retained by Wallet Desk when Config resolution succeeds.
|
||||
pub(crate) struct OffchainTransportRuntime {
|
||||
resolved: ksp_config_lib::ResolvedOffchainTransportConfig,
|
||||
}
|
||||
|
||||
impl OffchainTransportRuntime {
|
||||
/// Returns the generic market-price service built and owned by Config.
|
||||
#[must_use]
|
||||
pub(crate) const fn service(&self) -> &ksp_offchain_transport_lib::MarketPriceService {
|
||||
return self.resolved.service();
|
||||
}
|
||||
|
||||
/// Returns the composite-selected Off-chain Transport profile identifier.
|
||||
#[must_use]
|
||||
pub(crate) fn profile_id(&self) -> &str {
|
||||
return self.resolved.profile_id();
|
||||
}
|
||||
}
|
||||
|
||||
/// Resolves the Wallet Desk Off-chain Transport component through Config.
|
||||
pub(crate) fn initialize_offchain_transport(management: &ksp_config_lib::ConfigManagement) -> ksp_core_lib::Result<OffchainTransportRuntime> {
|
||||
let environment = ksp_config_lib::ConfigEnvironment::load();
|
||||
let environment = match environment {
|
||||
std::result::Result::Ok(value) => value,
|
||||
std::result::Result::Err(error) => return std::result::Result::Err(error),
|
||||
};
|
||||
let composite = crate::load_wallet_desk_composite(management);
|
||||
let composite = match composite {
|
||||
std::result::Result::Ok(value) => value,
|
||||
std::result::Result::Err(error) => return std::result::Result::Err(error),
|
||||
};
|
||||
let profile = crate::required_composite_component_profile(
|
||||
&composite,
|
||||
crate::COMPOSITE_COMPONENT_ID_OFFCHAIN_TRANSPORT,
|
||||
ksp_config_lib::FILE_ID_STD_OFFCHAIN_TRANSPORT,
|
||||
);
|
||||
let profile = match profile {
|
||||
std::result::Result::Ok(value) => value,
|
||||
std::result::Result::Err(error) => return std::result::Result::Err(error),
|
||||
};
|
||||
let resolved = management.engine().resolve_offchain_transport_config_profile(&profile, &environment);
|
||||
let resolved = match resolved {
|
||||
std::result::Result::Ok(value) => value,
|
||||
std::result::Result::Err(error) => return std::result::Result::Err(error),
|
||||
};
|
||||
let provider_count = resolved.service().registry().len();
|
||||
ksp_logging_lib::info!(
|
||||
target: crate::TRACING_TARGET,
|
||||
domain = crate::TRACING_DOMAIN_OFFCHAIN_TRANSPORT,
|
||||
offchain_profile = resolved.profile_id(),
|
||||
provider_count,
|
||||
"initialized Wallet Desk Off-chain Transport from composite-managed configuration"
|
||||
);
|
||||
return std::result::Result::Ok(OffchainTransportRuntime { resolved });
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
// file: crates/ksp-app-wallet-desk/src/wallet_balance.rs
|
||||
// version: 1
|
||||
// version: 2
|
||||
|
||||
//! Safe Wallet balance projection produced by the typed HTTP Transport path.
|
||||
|
||||
@@ -18,6 +18,8 @@ pub(crate) struct WalletBalanceDto {
|
||||
pub(crate) slot: u64,
|
||||
/// Exact decimal SOL presentation derived from lamports without floating point.
|
||||
pub(crate) sol: String,
|
||||
/// Arithmetic mean of successful SOL/USD observations produced by this refresh, or unavailable when no provider returned one.
|
||||
pub(crate) sol_usd_average: std::option::Option<String>,
|
||||
/// Composite-selected Transport profile used for the RPC.
|
||||
pub(crate) transport_profile: String,
|
||||
/// Logical Transport role used for the RPC.
|
||||
@@ -34,6 +36,98 @@ pub(crate) fn format_lamports_as_sol(lamports: u64) -> String {
|
||||
return format!("{whole}.{fractional:09}");
|
||||
}
|
||||
|
||||
/// Computes a deterministic SOL/USD arithmetic mean without IEEE-754 conversion.
|
||||
///
|
||||
/// The output is rounded half-up to at most eight fractional digits and trailing zeroes are removed. Arithmetic overflow degrades to `None`, which Wallet Desk
|
||||
/// renders as `N.A.` without affecting the authoritative SOL balance.
|
||||
#[must_use]
|
||||
pub(crate) fn average_sol_usd_prices(prices: &[ksp_offchain_transport_lib::MarketPriceDecimal]) -> std::option::Option<String> {
|
||||
const OUTPUT_SCALE: u8 = 8;
|
||||
if prices.is_empty() {
|
||||
return std::option::Option::None;
|
||||
}
|
||||
let max_scale = prices.iter().map(ksp_offchain_transport_lib::MarketPriceDecimal::scale).max();
|
||||
let max_scale = match max_scale {
|
||||
std::option::Option::Some(value) => value,
|
||||
std::option::Option::None => return std::option::Option::None,
|
||||
};
|
||||
let mut sum = 0_u128;
|
||||
for price in prices {
|
||||
let exponent = u32::from(max_scale.saturating_sub(price.scale()));
|
||||
let factor = 10_u128.checked_pow(exponent);
|
||||
let factor = match factor {
|
||||
std::option::Option::Some(value) => value,
|
||||
std::option::Option::None => return std::option::Option::None,
|
||||
};
|
||||
let coefficient = price.coefficient().checked_mul(factor);
|
||||
let coefficient = match coefficient {
|
||||
std::option::Option::Some(value) => value,
|
||||
std::option::Option::None => return std::option::Option::None,
|
||||
};
|
||||
sum = match sum.checked_add(coefficient) {
|
||||
std::option::Option::Some(value) => value,
|
||||
std::option::Option::None => return std::option::Option::None,
|
||||
};
|
||||
}
|
||||
let count = match u128::try_from(prices.len()) {
|
||||
std::result::Result::Ok(value) if value > 0 => value,
|
||||
_ => return std::option::Option::None,
|
||||
};
|
||||
let target_scale = OUTPUT_SCALE;
|
||||
let (numerator, denominator) = if max_scale <= target_scale {
|
||||
let factor = 10_u128.checked_pow(u32::from(target_scale - max_scale));
|
||||
let factor = match factor {
|
||||
std::option::Option::Some(value) => value,
|
||||
std::option::Option::None => return std::option::Option::None,
|
||||
};
|
||||
let numerator = match sum.checked_mul(factor) {
|
||||
std::option::Option::Some(value) => value,
|
||||
std::option::Option::None => return std::option::Option::None,
|
||||
};
|
||||
(numerator, count)
|
||||
} else {
|
||||
let factor = 10_u128.checked_pow(u32::from(max_scale - target_scale));
|
||||
let factor = match factor {
|
||||
std::option::Option::Some(value) => value,
|
||||
std::option::Option::None => return std::option::Option::None,
|
||||
};
|
||||
let denominator = match count.checked_mul(factor) {
|
||||
std::option::Option::Some(value) => value,
|
||||
std::option::Option::None => return std::option::Option::None,
|
||||
};
|
||||
(sum, denominator)
|
||||
};
|
||||
let quotient = numerator / denominator;
|
||||
let remainder = numerator % denominator;
|
||||
let round_up = remainder >= denominator.div_ceil(2);
|
||||
let coefficient = if round_up {
|
||||
match quotient.checked_add(1) {
|
||||
std::option::Option::Some(value) => value,
|
||||
std::option::Option::None => return std::option::Option::None,
|
||||
}
|
||||
} else {
|
||||
quotient
|
||||
};
|
||||
return std::option::Option::Some(format_scaled_decimal(coefficient, target_scale));
|
||||
}
|
||||
|
||||
fn format_scaled_decimal(mut coefficient: u128, mut scale: u8) -> String {
|
||||
while scale > 0 && coefficient % 10 == 0 {
|
||||
coefficient /= 10;
|
||||
scale -= 1;
|
||||
}
|
||||
let digits = coefficient.to_string();
|
||||
if scale == 0 {
|
||||
return digits;
|
||||
}
|
||||
let scale = usize::from(scale);
|
||||
if digits.len() > scale {
|
||||
let split = digits.len() - scale;
|
||||
return format!("{}.{}", &digits[..split], &digits[split..]);
|
||||
}
|
||||
return format!("0.{}{}", "0".repeat(scale - digits.len()), digits);
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
#[path = "../unit_tests/wallet_balance.rs"]
|
||||
mod tests;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"$schema": "https://schema.tauri.app/config/2",
|
||||
"productName": "KSP Wallet Desk",
|
||||
"version": "0.2.6",
|
||||
"version": "0.2.12-pre.8",
|
||||
"identifier": "com.sasedev.ksp-app-wallet-desk",
|
||||
"build": {
|
||||
"beforeDevCommand": {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// file: crates/ksp-app-wallet-desk/tests/config_composition.rs
|
||||
// version: 7
|
||||
// version: 8
|
||||
|
||||
//! Config composition contracts introduced for Wallet Desk pre.003.
|
||||
|
||||
@@ -18,7 +18,7 @@ fn workspace_engine() -> ksp_core_lib::Result<ksp_config_lib::ConfigDocumentEngi
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn wallet_desk_composite_selects_logging_transport_and_wallet_by_file_id() {
|
||||
fn wallet_desk_composite_selects_logging_offchain_transport_transport_and_wallet_by_file_id() {
|
||||
let engine = workspace_engine();
|
||||
assert!(engine.is_ok(), "workspace Config engine should be constructible: {engine:?}");
|
||||
if let std::result::Result::Ok(engine) = engine {
|
||||
@@ -31,6 +31,7 @@ fn wallet_desk_composite_selects_logging_transport_and_wallet_by_file_id() {
|
||||
assert_eq!(composite.profile_id(), "devnet");
|
||||
assert_component(&composite, "logging", ksp_config_lib::FILE_ID_STD_LOGGING, "supertrace");
|
||||
assert_wallet_desk_supertrace_profile(&composite);
|
||||
assert_component(&composite, "offchain_transport", ksp_config_lib::FILE_ID_STD_OFFCHAIN_TRANSPORT, "public_keyless");
|
||||
assert_component(&composite, "transport", ksp_config_lib::FILE_ID_STD_TRANSPORT, "devnet_public");
|
||||
assert_component(&composite, "wallet", ksp_config_lib::FILE_ID_STD_WALLET, "default");
|
||||
}
|
||||
@@ -172,3 +173,42 @@ fn wallet_desk_composite_transport_profile_builds_get_balance_pool() {
|
||||
assert!(selection.is_ok(), "getBalance should route through the composite-selected Transport pool: {selection:?}");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn wallet_desk_composite_offchain_profile_builds_provider_neutral_service() {
|
||||
let engine = workspace_engine();
|
||||
assert!(engine.is_ok(), "workspace Config engine should be constructible: {engine:?}");
|
||||
let engine = match engine {
|
||||
std::result::Result::Ok(value) => value,
|
||||
std::result::Result::Err(_) => return,
|
||||
};
|
||||
let file_id = ksp_config_lib::ConfigFileId::new(ksp_config_lib::FILE_ID_COMPOSITE_KSP_APP_WALLET_DESK);
|
||||
let file_id = match file_id {
|
||||
std::result::Result::Ok(value) => value,
|
||||
std::result::Result::Err(_) => return,
|
||||
};
|
||||
let composite = engine.load_resolved_composite(&file_id, std::option::Option::None);
|
||||
let composite = match composite {
|
||||
std::result::Result::Ok(value) => value,
|
||||
std::result::Result::Err(_) => return,
|
||||
};
|
||||
let component = composite.component("offchain_transport");
|
||||
assert!(component.is_some(), "Wallet Desk composite should expose Off-chain Transport");
|
||||
let component = match component {
|
||||
std::option::Option::Some(value) => value,
|
||||
std::option::Option::None => return,
|
||||
};
|
||||
let environment = ksp_config_lib::ConfigEnvironment::load();
|
||||
assert!(environment.is_ok(), "public Config environment snapshot should load");
|
||||
let environment = match environment {
|
||||
std::result::Result::Ok(value) => value,
|
||||
std::result::Result::Err(_) => return,
|
||||
};
|
||||
let resolved = engine.resolve_offchain_transport_config_profile(component.resolved(), &environment);
|
||||
assert!(resolved.is_ok(), "composite-selected Off-chain Transport should map");
|
||||
if let std::result::Result::Ok(resolved) = resolved {
|
||||
assert_eq!(resolved.profile_id(), "public_keyless");
|
||||
assert_eq!(resolved.selection_source(), ksp_config_lib::ConfigProfileSelectionSource::Composite);
|
||||
assert_eq!(resolved.service().registry().len(), 8);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// file: crates/ksp-app-wallet-desk/tests/desktop_contract.rs
|
||||
// version: 24
|
||||
// version: 25
|
||||
|
||||
//! Desktop build, shell and Config-status contract audits for Wallet Desk.
|
||||
|
||||
@@ -501,3 +501,29 @@ fn pre_018_packaged_runtime_bundles_config_resources_and_keeps_wallet_desk_versi
|
||||
assert!(tauri_source.contains("tauri::utils::platform::resource_dir"));
|
||||
assert!(tauri_source.contains("std::env::set_current_dir(layout.runtime_root())"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn v0_2_12_pre_008_wallet_balance_refresh_adds_one_auxiliary_sol_usd_average_only() {
|
||||
let root = app_root();
|
||||
let manifest = read_text(root.join("Cargo.toml").as_path());
|
||||
let composite = read_text(root.join("../../config/composite.ksp-app-wallet-desk.json").as_path());
|
||||
let state = read_text(root.join("src/app_state.rs").as_path());
|
||||
let balance = read_text(root.join("src/wallet_balance.rs").as_path());
|
||||
let main = read_text(root.join("frontend/ts/main.ts").as_path());
|
||||
let html = read_text(root.join("frontend/main.html").as_path());
|
||||
assert!(manifest.contains("ksp-offchain-transport-lib = { path = "../ksp-offchain-transport-lib" }"));
|
||||
assert!(composite.contains(""component_id": "offchain_transport""));
|
||||
assert!(composite.contains(""profile_id": "public_keyless""));
|
||||
assert!(state.contains("initialize_offchain_transport"));
|
||||
assert!(state.contains("refresh_sol_usd_average"));
|
||||
assert!(state.contains("tokio::join!"));
|
||||
assert!(state.contains("refresh_all().await"));
|
||||
assert!(balance.contains("sol_usd_average"));
|
||||
assert!(balance.contains("average_sol_usd_prices"));
|
||||
assert!(html.contains("id="currentWalletSolUsdAverage""));
|
||||
assert_eq!(html.matches("currentWalletSolUsdAverage").count(), 1);
|
||||
assert!(main.contains("balance.solUsdAverage ? `${balance.solUsdAverage} USD` : "N.A.""));
|
||||
assert!(!main.contains("refresh_market_price"));
|
||||
assert!(!main.contains("refresh_all_market_prices"));
|
||||
assert!(!main.contains("fetch("));
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// file: crates/ksp-app-wallet-desk/tests/desktop_security.rs
|
||||
// version: 14
|
||||
// version: 15
|
||||
|
||||
//! Static desktop security contracts for the Wallet Desk pre.002 shell.
|
||||
|
||||
@@ -122,9 +122,14 @@ fn balance_refresh_never_accepts_pubkey_or_endpoint_url_from_frontend() {
|
||||
let refresh = &main[refresh_start.unwrap_or_default()..refresh_end.unwrap_or(main.len())];
|
||||
assert!(refresh.contains("refresh_wallet_balance"));
|
||||
assert!(!refresh.contains("pubkey"));
|
||||
assert!(!refresh.contains("providerId"));
|
||||
assert!(!refresh.contains("providerIds"));
|
||||
assert!(!main.contains("transportUrl"));
|
||||
assert!(!main.contains("endpointUrl"));
|
||||
assert!(state.contains("wallet.pubkey()"));
|
||||
assert!(state.contains("refresh_all().await"));
|
||||
assert!(state.contains("average_sol_usd_prices"));
|
||||
assert!(!state.contains("parse::<f64>"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// file: crates/ksp-app-wallet-desk/tests/release_compliance.rs
|
||||
// version: 7
|
||||
// version: 8
|
||||
|
||||
//! Release-wide deterministic compliance canaries for Wallet Desk.
|
||||
|
||||
@@ -81,6 +81,7 @@ fn backend_keeps_config_wallet_transport_and_logging_ownership_boundaries() {
|
||||
assert!(source.contains("ksp_config_lib::ConfigEnvironment::load"));
|
||||
assert!(source.contains("ksp_wallet_lib::"));
|
||||
assert!(source.contains("ksp_onchain_transport_lib::"));
|
||||
assert!(source.contains("ksp_offchain_transport_lib::"));
|
||||
assert!(source.contains("ksp_logging_lib::"));
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// file: crates/ksp-app-wallet-desk/unit_tests/wallet_balance.rs
|
||||
// version: 1
|
||||
// version: 2
|
||||
|
||||
//! Unit tests for exact Wallet balance presentation.
|
||||
|
||||
@@ -11,3 +11,23 @@ fn lamports_formatting_is_exact_and_uses_nine_fractional_digits() {
|
||||
assert_eq!(crate::format_lamports_as_sol(1_234_567_890), "1.234567890");
|
||||
assert_eq!(crate::format_lamports_as_sol(u64::MAX), "18446744073.709551615");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn sol_usd_average_is_deterministic_rounded_and_never_uses_f64() {
|
||||
let values = ["103.96", "104.16", "104.07981394241013", "104.07595797523913", "103.92807280061784", "103.9"];
|
||||
let prices = values.iter().filter_map(|value| return ksp_offchain_transport_lib::MarketPriceDecimal::parse(value).ok()).collect::<std::vec::Vec<_>>();
|
||||
assert_eq!(prices.len(), values.len());
|
||||
assert_eq!(crate::average_sol_usd_prices(prices.as_slice()), std::option::Option::Some("104.01730745".to_owned()));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn sol_usd_average_returns_none_without_observation_and_handles_integer_fraction() {
|
||||
assert_eq!(crate::average_sol_usd_prices(&[]), std::option::Option::None);
|
||||
let one = ksp_offchain_transport_lib::MarketPriceDecimal::parse("1");
|
||||
let two = ksp_offchain_transport_lib::MarketPriceDecimal::parse("2");
|
||||
assert!(one.is_ok());
|
||||
assert!(two.is_ok());
|
||||
if let (std::result::Result::Ok(one), std::result::Result::Ok(two)) = (one, two) {
|
||||
assert_eq!(crate::average_sol_usd_prices(&[one, two]), std::option::Option::Some("1.5".to_owned()));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,6 +10,11 @@
|
||||
"file_id": "cfg.std.logging",
|
||||
"profile_id": "local_dev"
|
||||
},
|
||||
{
|
||||
"component_id": "offchain_transport",
|
||||
"file_id": "cfg.std.offchain_transport",
|
||||
"profile_id": "public_keyless"
|
||||
},
|
||||
{
|
||||
"component_id": "transport",
|
||||
"file_id": "cfg.std.transport",
|
||||
@@ -30,6 +35,11 @@
|
||||
"file_id": "cfg.std.logging",
|
||||
"profile_id": "local_dev"
|
||||
},
|
||||
{
|
||||
"component_id": "offchain_transport",
|
||||
"file_id": "cfg.std.offchain_transport",
|
||||
"profile_id": "public_keyless"
|
||||
},
|
||||
{
|
||||
"component_id": "transport",
|
||||
"file_id": "cfg.std.transport",
|
||||
@@ -50,6 +60,11 @@
|
||||
"file_id": "cfg.std.logging",
|
||||
"profile_id": "local_dev"
|
||||
},
|
||||
{
|
||||
"component_id": "offchain_transport",
|
||||
"file_id": "cfg.std.offchain_transport",
|
||||
"profile_id": "public_keyless"
|
||||
},
|
||||
{
|
||||
"component_id": "transport",
|
||||
"file_id": "cfg.std.transport",
|
||||
|
||||
Reference in New Issue
Block a user