Merge remote-tracking branch 'upstream/main' into whankinsiv/multiassets-in-utxo-deltas

Author: whankinsiv

Cargo.lock

@@ -1,23 +1,18 @@
-use crate::{messages::EpochActivityMessage, protocol_params::ProtocolParams, KeyHash};
-
-pub const DEFAULT_PARAMETERS_QUERY_TOPIC: (&str, &str) =
-    ("parameters-state-query-topic", "cardano.query.parameters");
+use crate::{messages::EpochActivityMessage, KeyHash};
 
 pub const DEFAULT_EPOCHS_QUERY_TOPIC: (&str, &str) =
     ("epochs-state-query-topic", "cardano.query.epochs");
 
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub enum EpochsStateQuery {
     GetLatestEpoch,
-    GetLatestEpochParameters,
     GetEpochInfo { epoch_number: u64 },
     GetNextEpochs { epoch_number: u64 },
     GetPreviousEpochs { epoch_number: u64 },
     GetEpochStakeDistribution { epoch_number: u64 },
     GetEpochStakeDistributionByPool { epoch_number: u64 },
     GetEpochBlockDistribution { epoch_number: u64 },
     GetEpochBlockDistributionByPool { epoch_number: u64 },
-    GetEpochParameters { epoch_number: u64 },
 
     // Pools related queries
     GetBlocksMintedByPools { vrf_key_hashes: Vec<KeyHash> },
@@ -26,15 +21,13 @@ pub enum EpochsStateQuery {
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub enum EpochsStateQueryResponse {
     LatestEpoch(LatestEpoch),
-    LatestEpochParameters(LatestEpochParameters),
     EpochInfo(EpochInfo),
     NextEpochs(NextEpochs),
     PreviousEpochs(PreviousEpochs),
     EpochStakeDistribution(EpochStakeDistribution),
     EpochStakeDistributionByPool(EpochStakeDistributionByPool),
     EpochBlockDistribution(EpochBlockDistribution),
     EpochBlockDistributionByPool(EpochBlockDistributionByPool),
-    EpochParameters(EpochParameters),
 
     // Pools related responses
     BlocksMintedByPools(BlocksMintedByPools),
@@ -48,11 +41,6 @@ pub struct LatestEpoch {
     pub epoch: EpochActivityMessage,
 }
 
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-pub struct LatestEpochParameters {
-    pub parameters: ProtocolParams,
-}
-
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub struct EpochInfo {}
 
@@ -74,9 +62,6 @@ pub struct EpochBlockDistribution {}
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub struct EpochBlockDistributionByPool {}
 
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-pub struct EpochParameters {}
-
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub struct BlocksMintedByPools {
     // this is in same order of vrf_key_hashes from EpochsStateQuery::BlocksMintedByPools

common/src/queries/epochs.rs

@@ -5,13 +5,14 @@ pub const DEFAULT_PARAMETERS_QUERY_TOPIC: (&str, &str) =
 
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub enum ParametersStateQuery {
-    GetLatestParameters,
+    GetLatestEpochParameters,
+    GetEpochParameters { epoch_number: u64 },
 }
 
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub enum ParametersStateQueryResponse {
-    LatestParameters(LatestParameters),
-
+    LatestEpochParameters(ProtocolParams),
+    EpochParameters(ProtocolParams),
     NotFound,
     Error(String),
 }

common/src/queries/parameters.rs

@@ -1,4 +1,4 @@
-use crate::{KeyHash, PoolEpochState, PoolMetadata, PoolRegistration, PoolRetirement};
+use crate::{KeyHash, PoolEpochState, PoolMetadata, PoolRegistration, PoolRetirement, Relay};
 
 pub const DEFAULT_POOLS_QUERY_TOPIC: (&str, &str) =
     ("pools-state-query-topic", "cardano.query.pools");
@@ -107,8 +107,9 @@ pub struct PoolHistory {
 }
 
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-pub struct PoolRelays {}
-
+pub struct PoolRelays {
+    pub relays: Vec<Relay>,
+}
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub struct PoolDelegators {}
 

common/src/queries/pools.rs

@@ -482,7 +482,7 @@ pub struct MultiHostName {
     pub dns_name: String,
 }
 
-/// Pool relay
+/// Pool Relay
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Eq, PartialEq)]
 pub enum Relay {
     SingleHostAddr(SingleHostAddr),
@@ -580,6 +580,21 @@ pub struct PoolRetirement {
     pub epoch: u64,
 }
 
+/// Pool Update Action
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub enum PoolUpdateAction {
+    Registered,
+    Deregistered,
+}
+
+/// Pool Update Event
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct PoolUpdateEvent {
+    pub tx_hash: TxHash,
+    pub cert_index: u64,
+    pub action: PoolUpdateAction,
+}
+
 /// Pool Epoch History Data
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub struct PoolEpochState {

common/src/types.rs

@@ -4,10 +4,8 @@
 use acropolis_common::{
     messages::{CardanoMessage, Message, ProtocolParamsMessage, StateQuery, StateQueryResponse},
     queries::parameters::{
-        LatestParameters, ParametersStateQuery, ParametersStateQueryResponse,
-        DEFAULT_PARAMETERS_QUERY_TOPIC,
+        ParametersStateQuery, ParametersStateQueryResponse, DEFAULT_PARAMETERS_QUERY_TOPIC,
     },
-    rest_helper::handle_rest,
     state_history::{StateHistory, StateHistoryStore},
     BlockInfo, BlockStatus,
 };
@@ -17,20 +15,14 @@ use config::Config;
 use std::sync::Arc;
 use tokio::sync::Mutex;
 use tracing::{error, info, info_span, Instrument};
-
 mod alonzo_genesis;
 mod genesis_params;
 mod parameters_updater;
-mod rest;
 mod state;
-
 use parameters_updater::ParametersUpdater;
-use rest::handle_current;
 use state::State;
 
 const DEFAULT_ENACT_STATE_TOPIC: (&str, &str) = ("enact-state-topic", "cardano.enact.state");
-const DEFAULT_HANDLE_CURRENT_TOPIC: (&str, &str) =
-    ("handle-current-params-topic", "rest.get.epoch.parameters");
 const DEFAULT_PROTOCOL_PARAMETERS_TOPIC: (&str, &str) =
     ("publish-parameters-topic", "cardano.protocol.parameters");
 const DEFAULT_NETWORK_NAME: (&str, &str) = ("network-name", "mainnet");
@@ -48,7 +40,6 @@ struct ParametersStateConfig {
     pub context: Arc<Context<Message>>,
     pub network_name: String,
     pub enact_state_topic: String,
-    pub handle_current_topic: String,
     pub protocol_parameters_topic: String,
     pub parameters_query_topic: String,
     pub store_history: bool,
@@ -72,7 +63,6 @@ impl ParametersStateConfig {
             context,
             network_name: Self::conf(config, DEFAULT_NETWORK_NAME),
             enact_state_topic: Self::conf(config, DEFAULT_ENACT_STATE_TOPIC),
-            handle_current_topic: Self::conf(config, DEFAULT_HANDLE_CURRENT_TOPIC),
             protocol_parameters_topic: Self::conf(config, DEFAULT_PROTOCOL_PARAMETERS_TOPIC),
             parameters_query_topic: Self::conf(config, DEFAULT_PARAMETERS_QUERY_TOPIC),
             store_history: Self::conf_bool(config, DEFAULT_STORE_HISTORY),
@@ -155,9 +145,10 @@ impl ParametersState {
     pub async fn init(&self, context: Arc<Context<Message>>, config: Arc<Config>) -> Result<()> {
         let cfg = ParametersStateConfig::new(context.clone(), &config);
         let enact = cfg.context.subscribe(&cfg.enact_state_topic).await?;
+        let store_history = cfg.store_history;
 
         // Initalize state history
-        let history = if cfg.store_history {
+        let history = if store_history {
             Arc::new(Mutex::new(StateHistory::<State>::new(
                 "ParameterState",
                 StateHistoryStore::Unbounded,
@@ -171,11 +162,6 @@ impl ParametersState {
 
         let query_state = history.clone();
 
-        let state_rest = history.clone();
-        handle_rest(cfg.context.clone(), &cfg.handle_current_topic, move || {
-            handle_current(state_rest.clone())
-        });
-
         // Handle parameters queries
         context.handle(&cfg.parameters_query_topic, move |message| {
             let history = query_state.clone();
@@ -188,12 +174,27 @@ impl ParametersState {
                     )));
                 };
 
-                let state = history.lock().await.get_current_state();
+                let lock = history.lock().await;
                 let response = match query {
-                    ParametersStateQuery::GetLatestParameters => {
-                        ParametersStateQueryResponse::LatestParameters(LatestParameters {
-                            parameters: state.current_params.get_params(),
-                        })
+                    ParametersStateQuery::GetLatestEpochParameters => {
+                        ParametersStateQueryResponse::LatestEpochParameters(
+                            lock.get_current_state().current_params.get_params(),
+                        )
+                    }
+                    ParametersStateQuery::GetEpochParameters { epoch_number } => {
+                        if !store_history {
+                            ParametersStateQueryResponse::Error(
+                                "Historical protocol parameter storage disabled by config"
+                                    .to_string(),
+                            )
+                        } else {
+                            match lock.get_at_or_before(*epoch_number) {
+                                Some(state) => ParametersStateQueryResponse::EpochParameters(
+                                    state.current_params.get_params(),
+                                ),
+                                None => ParametersStateQueryResponse::NotFound,
+                            }
+                        }
                     }
                 };
                 Arc::new(Message::StateQueryResponse(StateQueryResponse::Parameters(