temp

Author: m30m

apps/fortuna/Cargo.toml

@@ -41,6 +41,7 @@ url = "2.5.0"
 chrono = { version = "0.4.38", features = [
   "clock",
   "std",
+  "serde"
 ], default-features = false }
 backoff = { version = "0.4.0", features = ["futures", "tokio"] }
 thiserror = "1.0.61"

apps/fortuna/src/api.rs

@@ -1,6 +1,8 @@
 use std::collections::{BTreeMap, VecDeque};
 use chrono::DateTime;
 use ethers::types::TxHash;
+use serde::{Deserialize, Serialize};
+use utoipa::ToSchema;
 use {
     crate::{
         chain::reader::{BlockNumber, BlockStatus, EntropyReader},
@@ -47,7 +49,7 @@ pub struct ApiMetrics {
 
 
 
-#[derive(Clone)]
+#[derive(Clone, Debug, Serialize)]
 enum JournalLog {
     Observed {
         tx_hash: TxHash
@@ -74,13 +76,13 @@ impl JournalLog {
     }
 }
 
-#[derive(Clone)]
+#[derive(Clone, Debug, Serialize)]
 struct TimedJournalLog {
     pub timestamp: DateTime<chrono::Utc>,
     pub log:JournalLog,
 }
 
-#[derive(Clone)]
+#[derive(Clone, Debug, Serialize, ToSchema)]
 struct RequestJournal {
     pub chain_id: ChainId,
     pub sequence: u64,
@@ -90,7 +92,7 @@ struct RequestJournal {
 type RequestKey = (ChainId, u64);
 
 #[derive(Default)]
-struct History {
+pub struct History {
     pub by_hash: HashMap<TxHash, Vec<RequestKey>>,
     pub by_chain_and_time: BTreeMap<(ChainId, DateTime<chrono::Utc>), RequestKey>,
     pub by_time: BTreeMap<DateTime<chrono::Utc>, RequestKey>,
@@ -133,16 +135,16 @@ impl History {
         }
     }
 
-    pub fn get_request_logs(&self, request_key: &RequestKey) -> Option<&RequestJournal> {
-        self.by_request_key.get(request_key)
+    pub fn get_request_logs(&self, request_key: &RequestKey) -> Option<RequestJournal> {
+        self.by_request_key.get(request_key).cloned()
     }
 
-    pub fn get_request_logs_by_tx_hash(&self, tx_hash: TxHash) -> Option<Vec<&RequestJournal>> {
+    pub fn get_request_logs_by_tx_hash(&self, tx_hash: TxHash) -> Vec<RequestJournal> {
         self.by_hash.get(&tx_hash).map(|request_keys| {
             request_keys.iter()
-                .map(|request_key| self.by_request_key.get(request_key).unwrap())
+                .map(|request_key| self.by_request_key.get(request_key).unwrap().clone())
                 .collect()
-        })
+        }).unwrap_or_default()
     }
 
     pub fn get_latest_requests(&self, chain_id: Option<&ChainId>, limit: u64,
@@ -190,6 +192,7 @@ impl ApiState {
     pub async fn new(
         chains: HashMap<ChainId, BlockchainState>,
         metrics_registry: Arc<RwLock<Registry>>,
+        history: Arc<RwLock<History>>
     ) -> ApiState {
         let metrics = ApiMetrics {
             http_requests: Family::default(),
@@ -205,7 +208,7 @@ impl ApiState {
         ApiState {
             chains: Arc::new(chains),
             metrics: Arc::new(metrics),
-            history: Arc::new(RwLock::new(History::new())),
+            history,
             metrics_registry,
         }
     }

apps/fortuna/src/api/explorer.rs

@@ -2,7 +2,7 @@ use axum::extract::{Path, Query, State};
 use axum::Json;
 use ethers::types::TxHash;
 use utoipa::IntoParams;
-use crate::api::{BinaryEncoding, ChainId, GetRandomValueResponse, RestError, RevelationPathParams, RevelationQueryParams};
+use crate::api::{BinaryEncoding, ChainId, GetRandomValueResponse, RequestJournal, RestError, RevelationPathParams, RevelationQueryParams};
 use crate::chain::reader::BlockNumber;
 
 
@@ -40,17 +40,25 @@ pub enum ExplorerQueryParamsMode {
 pub async fn get_requests(
     State(state): State<crate::api::ApiState>,
     Query(query_params): Query<ExplorerQueryParams>,
-) -> anyhow::Result<Json<()>, RestError> {
-    match query_params.mode {
+) -> anyhow::Result<Json<Vec<RequestJournal>>, RestError> {
+    let result = match query_params.mode {
         ExplorerQueryParamsMode::TxHash => {
             let tx_hash = query_params.tx_hash.ok_or(RestError::BadFilterParameters("tx_hash is required when mode=tx-hash".to_string()))?;
-            state.history.read().await.get_request_logs_by_tx_hash(tx_hash);
+            state.history.read().await.get_request_logs_by_tx_hash(tx_hash)
+        }
+        ExplorerQueryParamsMode::ChainAndSequence => {
+            let chain_id = query_params.chain_id.ok_or(RestError::BadFilterParameters("chain_id is required when mode=chain-and-sequence".to_string()))?;
+            let sequence_id = query_params.sequence_id.ok_or(RestError::BadFilterParameters("sequence_id is required when mode=chain-and-sequence".to_string()))?;
+            state.history.read().await.get_request_logs(&(chain_id, sequence_id)).into_iter().collect()
+        }
+        ExplorerQueryParamsMode::ChainAndTimestamp => {
+            vec![]
+        }
+        ExplorerQueryParamsMode::Timestamp => {
+            vec![]
         }
-        ExplorerQueryParamsMode::ChainAndSequence => {}
-        ExplorerQueryParamsMode::ChainAndTimestamp => {}
-        ExplorerQueryParamsMode::Timestamp => {}
     };
     Ok(
-        Json(()),
+        Json(result),
     )
 }

apps/fortuna/src/command/run.rs

@@ -35,6 +35,7 @@ use {
     utoipa::OpenApi,
     utoipa_swagger_ui::SwaggerUi,
 };
+use crate::api::History;
 
 /// Track metrics in this interval
 const TRACK_INTERVAL: Duration = Duration::from_secs(10);
@@ -43,6 +44,7 @@ pub async fn run_api(
     socket_addr: SocketAddr,
     chains: HashMap<String, api::BlockchainState>,
     metrics_registry: Arc<RwLock<Registry>>,
+    history: Arc<RwLock<History>>,
     mut rx_exit: watch::Receiver<bool>,
 ) -> Result<()> {
     #[derive(OpenApi)]
@@ -64,7 +66,7 @@ pub async fn run_api(
     )]
     struct ApiDoc;
 
-    let api_state = api::ApiState::new(chains, metrics_registry).await;
+    let api_state = api::ApiState::new(chains, metrics_registry, history).await;
 
     // Initialize Axum Router. Note the type here is a `Router<State>` due to the use of the
     // `with_state` method which replaces `Body` with `State` in the type signature.
@@ -98,6 +100,7 @@ pub async fn run_keeper(
     config: Config,
     private_key: String,
     metrics_registry: Arc<RwLock<Registry>>,
+    history: Arc<RwLock<History>>,
     rpc_metrics: Arc<RpcMetrics>,
 ) -> Result<()> {
     let mut handles = Vec::new();
@@ -120,13 +123,15 @@ pub async fn run_keeper(
             chain_eth_config,
             chain_config.clone(),
             keeper_metrics.clone(),
+            history.clone(),
             rpc_metrics.clone(),
         )));
     }
 
     Ok(())
 }
 
+
 pub async fn run(opts: &RunOptions) -> Result<()> {
     let config = Config::load(&opts.config.config)?;
     let secret = config.provider.secret.load()?.ok_or(anyhow!(
@@ -187,12 +192,14 @@ pub async fn run(opts: &RunOptions) -> Result<()> {
         Ok::<(), Error>(())
     });
 
+    let history = Arc::new(RwLock::new(History::default()));
     if let Some(keeper_private_key) = config.keeper.private_key.load()? {
         spawn(run_keeper(
             chains.clone(),
             config.clone(),
             keeper_private_key,
             metrics_registry.clone(),
+            history.clone(),
             rpc_metrics.clone(),
         ));
     } else {
@@ -206,7 +213,7 @@ pub async fn run(opts: &RunOptions) -> Result<()> {
         rpc_metrics.clone(),
     ));
 
-    run_api(opts.addr, chains, metrics_registry, rx_exit).await?;
+    run_api(opts.addr, chains, metrics_registry, history, rx_exit).await?;
 
     Ok(())
 }

apps/fortuna/src/keeper.rs

@@ -25,6 +25,7 @@ use {
     },
     tracing::{self, Instrument},
 };
+use crate::api::History;
 
 pub(crate) mod block;
 pub(crate) mod commitment;
@@ -58,6 +59,7 @@ pub async fn run_keeper_threads(
     chain_eth_config: EthereumConfig,
     chain_state: BlockchainState,
     metrics: Arc<KeeperMetrics>,
+    history: Arc<RwLock<History>>,
     rpc_metrics: Arc<RpcMetrics>,
 ) {
     tracing::info!("starting keeper");