Merge branch 'main' into golddydev/pool-delegators

Author: golddydev

common/src/messages.rs

@@ -4,6 +4,7 @@
 #![allow(dead_code)]
 
 use crate::ledger_state::SPOState;
+use crate::protocol_params::ProtocolParams;
 use crate::queries::parameters::{ParametersStateQuery, ParametersStateQueryResponse};
 use crate::queries::{
     accounts::{AccountsStateQuery, AccountsStateQueryResponse},

common/src/protocol_params.rs

@@ -1,32 +1,52 @@
-use crate::rational_number::{ChameleonFraction, RationalNumber};
+use crate::{
+    rational_number::{ChameleonFraction, RationalNumber},
+    BlockVersionData, Committee, Constitution, CostModel, DRepVotingThresholds, ExUnitPrices,
+    ExUnits, PoolVotingThresholds, ProtocolConsts,
+};
 use chrono::{DateTime, Utc};
 use serde_with::serde_as;
 
+#[derive(Debug, Default, PartialEq, Clone, serde::Serialize, serde::Deserialize)]
+pub struct ProtocolParams {
+    pub byron: Option<ByronParams>,
+    pub alonzo: Option<AlonzoParams>,
+    pub shelley: Option<ShelleyParams>,
+    pub babbage: Option<BabbageParams>,
+    pub conway: Option<ConwayParams>,
+}
+
 //
-// Shelley protocol parameters
+// Byron protocol parameters
 //
 
-#[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ProtocolVersion {
-    pub minor: u64,
-    pub major: u64,
+#[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)]
+pub struct ByronParams {
+    pub block_version_data: BlockVersionData,
+    pub fts_seed: Option<Vec<u8>>,
+    pub protocol_consts: ProtocolConsts,
+    pub start_time: u64,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "PascalCase")]
-pub enum NonceVariant {
-    NeutralNonce,
-    Nonce,
-}
+//
+// Alonzo protocol parameters
+//
 
-#[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Nonce {
-    pub tag: NonceVariant,
-    pub hash: Option<Vec<u8>>,
+#[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)]
+pub struct AlonzoParams {
+    pub lovelace_per_utxo_word: u64, // Deprecated after transition to Babbage
+    pub execution_prices: ExUnitPrices,
+    pub max_tx_ex_units: ExUnits,
+    pub max_block_ex_units: ExUnits,
+    pub max_value_size: u32,
+    pub collateral_percentage: u32,
+    pub max_collateral_inputs: u32,
+    pub plutus_v1_cost_model: Option<CostModel>,
 }
 
+//
+// Shelley protocol parameters
+//
+
 #[serde_as]
 #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -106,3 +126,54 @@ pub struct ShelleyParams {
     pub system_start: DateTime<Utc>,
     pub update_quorum: u32,
 }
+
+//
+// Babbage protocol parameters
+//
+
+#[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)]
+pub struct BabbageParams {
+    pub coins_per_utxo_byte: u64,
+    pub plutus_v2_cost_model: Option<CostModel>,
+}
+
+//
+// Conway protocol parameters
+//
+
+#[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)]
+pub struct ConwayParams {
+    pub pool_voting_thresholds: PoolVotingThresholds,
+    pub d_rep_voting_thresholds: DRepVotingThresholds,
+    pub committee_min_size: u64,
+    pub committee_max_term_length: u32,
+    pub gov_action_lifetime: u32,
+    pub gov_action_deposit: u64,
+    pub d_rep_deposit: u64,
+    pub d_rep_activity: u32,
+    pub min_fee_ref_script_cost_per_byte: RationalNumber,
+    pub plutus_v3_cost_model: CostModel,
+    pub constitution: Constitution,
+    pub committee: Committee,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ProtocolVersion {
+    pub minor: u64,
+    pub major: u64,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "PascalCase")]
+pub enum NonceVariant {
+    NeutralNonce,
+    Nonce,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct Nonce {
+    pub tag: NonceVariant,
+    pub hash: Option<Vec<u8>>,
+}

common/src/queries/epochs.rs

@@ -1,4 +1,7 @@
-use crate::{messages::EpochActivityMessage, KeyHash, ProtocolParams};
+use crate::{messages::EpochActivityMessage, protocol_params::ProtocolParams, KeyHash};
+
+pub const DEFAULT_PARAMETERS_QUERY_TOPIC: (&str, &str) =
+    ("parameters-state-query-topic", "cardano.query.parameters");
 
 pub const DEFAULT_EPOCHS_QUERY_TOPIC: (&str, &str) =
     ("epochs-state-query-topic", "cardano.query.epochs");

common/src/queries/parameters.rs

@@ -1,4 +1,4 @@
-use crate::ProtocolParams;
+use crate::protocol_params::ProtocolParams;
 
 pub const DEFAULT_PARAMETERS_QUERY_TOPIC: (&str, &str) =
     ("parameters-state-query-topic", "cardano.query.parameters");

common/src/queries/pools.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/state_history.rs

@@ -16,6 +16,9 @@ impl StateHistoryStore {
     pub fn default_block_store() -> Self {
         Self::Bounded(SECURITY_PARAMETER_K)
     }
+    pub fn default_epoch_store() -> Self {
+        Self::Bounded(2)
+    }
 }
 
 struct HistoryEntry<S> {
@@ -82,6 +85,11 @@ impl<S: Clone + Default> StateHistory<S> {
         self.history.iter().find(|entry| entry.index == index).map(|entry| &entry.state)
     }
 
+    /// Get the most recently stored state at or beore a given index, direct ref
+    pub fn get_at_or_before(&self, index: u64) -> Option<&S> {
+        self.history.iter().rev().find(|entry| entry.index <= index).map(|entry| &entry.state)
+    }
+
     /// Return a reference to the state at the given block number, if it exists
     pub fn get_by_index_reverse(&self, index: u64) -> Option<&S> {
         self.history.iter().rev().find(|entry| entry.index == index).map(|entry| &entry.state)

common/src/types.rs

@@ -18,7 +18,9 @@ use std::collections::{HashMap, HashSet};
 use std::fmt::{Display, Formatter};
 
 /// Protocol era
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize)]
+#[derive(
+    Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize,
+)]
 pub enum Era {
     Byron,
     Shelley,
@@ -397,7 +399,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),
@@ -945,51 +947,6 @@ pub struct ProtocolConsts {
     pub vss_min_ttl: Option<u32>,
 }
 
-#[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)]
-pub struct AlonzoParams {
-    pub lovelace_per_utxo_word: u64,
-    pub execution_prices: ExUnitPrices,
-    pub max_tx_ex_units: ExUnits,
-    pub max_block_ex_units: ExUnits,
-    pub max_value_size: u32,
-    pub collateral_percentage: u32,
-    pub max_collateral_inputs: u32,
-    pub plutus_v1_cost_model: Option<CostModel>,
-    pub plutus_v2_cost_model: Option<CostModel>,
-}
-
-#[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)]
-pub struct ByronParams {
-    pub block_version_data: BlockVersionData,
-    pub fts_seed: Option<Vec<u8>>,
-    pub protocol_consts: ProtocolConsts,
-    pub start_time: u64,
-}
-
-#[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)]
-pub struct ConwayParams {
-    pub pool_voting_thresholds: PoolVotingThresholds,
-    pub d_rep_voting_thresholds: DRepVotingThresholds,
-    pub committee_min_size: u64,
-    pub committee_max_term_length: u32,
-    pub gov_action_lifetime: u32,
-    pub gov_action_deposit: u64,
-    pub d_rep_deposit: u64,
-    pub d_rep_activity: u32,
-    pub min_fee_ref_script_cost_per_byte: RationalNumber,
-    pub plutus_v3_cost_model: CostModel,
-    pub constitution: Constitution,
-    pub committee: Committee,
-}
-
-#[derive(Debug, Default, PartialEq, Clone, serde::Serialize, serde::Deserialize)]
-pub struct ProtocolParams {
-    pub alonzo: Option<AlonzoParams>,
-    pub byron: Option<ByronParams>,
-    pub shelley: Option<protocol_params::ShelleyParams>,
-    pub conway: Option<ConwayParams>,
-}
-
 #[bitmask(u8)]
 #[derive(serde::Serialize, serde::Deserialize)]
 pub enum ProtocolParamType {
@@ -1068,14 +1025,12 @@ pub struct ProtocolParamUpdate {
     #[serde(default)]
     pub min_pool_cost: Option<Lovelace>,
 
-    /// AKA lovelacePerUTxOWord, utxoCostPerWord (Alonzo)
-    /// TODO: was there any moment, when this value had different
-    /// meaning? (words were recounted to bytes)
+    /// Cost per 8-byte word (Alonzo) - DEPRECATED after Babbage
     #[serde(skip_serializing_if = "Option::is_none")]
     #[serde(default)]
-    pub ada_per_utxo_byte: Option<Lovelace>,
+    pub lovelace_per_utxo_word: Option<Lovelace>,
 
-    /// AKA plutus_v1_cost_model, plutus_v2_cost_model (Shelley)
+    /// AKA plutus_v1_cost_model (Shelley), plutus_v2_cost_model (Babbage)
     /// plutus_v3_cost_model (Conway)
     #[serde(skip_serializing_if = "Option::is_none")]
     #[serde(default)]
@@ -1111,6 +1066,11 @@ pub struct ProtocolParamUpdate {
     #[serde(default)]
     pub max_collateral_inputs: Option<u64>,
 
+    // Cost per byte (Babbage)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(default)]
+    pub coins_per_utxo_byte: Option<Lovelace>,
+
     /// (Conway)
     #[serde(skip_serializing_if = "Option::is_none")]
     #[serde(default)]

modules/accounts_state/src/state.rs

@@ -2,6 +2,7 @@
 use crate::monetary::calculate_monetary_change;
 use crate::rewards::{RewardsResult, RewardsState};
 use crate::snapshot::Snapshot;
+use acropolis_common::protocol_params::ProtocolParams;
 use acropolis_common::SPORewards;
 use acropolis_common::{
     messages::{
@@ -10,7 +11,7 @@ use acropolis_common::{
     },
     DRepChoice, DRepCredential, DelegatedStake, InstantaneousRewardSource,
     InstantaneousRewardTarget, KeyHash, Lovelace, MoveInstantaneousReward, PoolRegistration, Pot,
-    ProtocolParams, StakeAddress, StakeCredential, TxCertificate,
+    StakeAddress, StakeCredential, TxCertificate,
 };
 use anyhow::{bail, Result};
 use dashmap::DashMap;
@@ -932,10 +933,10 @@ impl State {
 mod tests {
     use super::*;
     use acropolis_common::{
-        rational_number::RationalNumber, AddressNetwork, Anchor, Committee, Constitution,
-        ConwayParams, CostModel, Credential, DRepVotingThresholds, PoolVotingThresholds, Pot,
-        PotDelta, ProtocolParams, Ratio, Registration, StakeAddress, StakeAddressDelta,
-        StakeAddressPayload, StakeAndVoteDelegation, StakeRegistrationAndStakeAndVoteDelegation,
+        protocol_params::ConwayParams, rational_number::RationalNumber, AddressNetwork, Anchor,
+        Committee, Constitution, CostModel, Credential, DRepVotingThresholds, PoolVotingThresholds,
+        Pot, PotDelta, Ratio, Registration, StakeAddress, StakeAddressDelta, StakeAddressPayload,
+        StakeAndVoteDelegation, StakeRegistrationAndStakeAndVoteDelegation,
         StakeRegistrationAndVoteDelegation, VoteDelegation, Withdrawal,
     };