diff --git a/src/engine/engine/risk.rs b/src/engine/engine/risk.rs index e3b56d8..ba45dcc 100644 --- a/src/engine/engine/risk.rs +++ b/src/engine/engine/risk.rs @@ -61,12 +61,12 @@ impl RiskEngine { } pub async fn day_tick(&self) -> anyhow::Result<()> { - println!("TICK"); - let engine = self.get_engine(); let client = hypercore::mainnet(); + let mut state = self.state.lock().await; + if let Some(acc) = engine.accounts.lock().await.get_active() { self.state.lock().await.starting_equity = client .user_vault_equities(acc.address) @@ -74,9 +74,11 @@ impl RiskEngine { .into_iter() .map(|v| v.equity) .sum(); + + engine.status.lock().await.equity = state.starting_equity; } - self.state.lock().await.pnl = 0.into(); + state.pnl = 0.into(); Ok(()) } diff --git a/src/terminal/formatting.rs b/src/terminal/formatting.rs index 623e386..3ca77ca 100644 --- a/src/terminal/formatting.rs +++ b/src/terminal/formatting.rs @@ -199,14 +199,14 @@ impl Formatted for EngineStatus { fn get_formatted(&self) -> Vec { vec![ Triple( + "\x1b[2mTrading Equity\x1b[0m", "\x1b[2mState\x1b[0m", "\x1b[2mMode\x1b[0m", - "\x1b[2m..\x1b[0m", ), Triple( + &format_usd(self.equity.as_f64()), &self.strategy_state.to_string(), &self.strategy_mode.to_string(), - "..", ), ] .get_formatted()