Merge in main

Author: lowhung

.github/workflows/run-tests-on-push-to-main.yml

@@ -25,22 +25,26 @@ jobs:
 
       - name: Run Clippy
         run: |
-          cargo clippy \
+          cargo clippy --all-targets --all-features \
             --package acropolis_common \
             --package acropolis_codec \
+            --package acropolis_module_accounts_state \
             --package acropolis_module_address_state \
             --package acropolis_module_assets_state \
             --package acropolis_module_block_unpacker \
             --package acropolis_module_chain_store \
             --package acropolis_module_consensus \
             --package acropolis_module_drdd_state \
+            --package acropolis_module_drep_state \
             --package acropolis_module_epochs_state \
             --package acropolis_module_genesis_bootstrapper \
             --package acropolis_module_mithril_snapshot_fetcher \
             --package acropolis_module_snapshot_bootstrapper \
             --package acropolis_module_spdd_state \
+            --package acropolis_module_spo_state \
             --package acropolis_module_stake_delta_filter \
             --package acropolis_module_tx_submitter \
+            --package acropolis_module_tx_unpacker \
             --package acropolis_module_upstream_chain_fetcher \
             --package acropolis_module_utxo_state \
             --package acropolis_process_tx_submitter_cli

codec/src/map_parameters.rs

@@ -12,6 +12,7 @@ use std::env;
 use std::time::Instant;
 
 // Simple counter callback that doesn't store data in memory
+#[derive(Default)]
 struct CountingCallbacks {
     metadata: Option<SnapshotMetadata>,
     utxo_count: u64,
@@ -26,24 +27,6 @@ struct CountingCallbacks {
     sample_proposals: Vec<GovernanceProposal>,
 }
 
-impl Default for CountingCallbacks {
-    fn default() -> Self {
-        Self {
-            metadata: None,
-            utxo_count: 0,
-            pool_count: 0,
-            account_count: 0,
-            drep_count: 0,
-            proposal_count: 0,
-            sample_utxos: Vec::new(),
-            sample_pools: Vec::new(),
-            sample_accounts: Vec::new(),
-            sample_dreps: Vec::new(),
-            sample_proposals: Vec::new(),
-        }
-    }
-}
-
 impl UtxoCallback for CountingCallbacks {
     fn on_utxo(&mut self, utxo: UtxoEntry) -> Result<()> {
         self.utxo_count += 1;
@@ -62,7 +45,7 @@ impl UtxoCallback for CountingCallbacks {
             self.sample_utxos.push(utxo);
         }
         // Progress reporting every million UTXOs
-        if self.utxo_count > 0 && self.utxo_count % 1000000 == 0 {
+        if self.utxo_count > 0 && self.utxo_count.is_multiple_of(1000000) {
             eprintln!("  Parsed {} UTXOs...", self.utxo_count);
         }
         Ok(())
@@ -95,7 +78,7 @@ impl PoolCallback for CountingCallbacks {
 impl StakeCallback for CountingCallbacks {
     fn on_accounts(&mut self, accounts: Vec<AccountState>) -> Result<()> {
         self.account_count = accounts.len();
-        if accounts.len() > 0 {
+        if !accounts.is_empty() {
             eprintln!("✓ Parsed {} stake accounts", accounts.len());
 
             // Show first 10 accounts
@@ -152,7 +135,7 @@ impl DRepCallback for CountingCallbacks {
 impl ProposalCallback for CountingCallbacks {
     fn on_proposals(&mut self, proposals: Vec<GovernanceProposal>) -> Result<()> {
         self.proposal_count = proposals.len();
-        if proposals.len() > 0 {
+        if !proposals.is_empty() {
             eprintln!("✓ Parsed {} governance proposals", proposals.len());
 
             // Show first 10 proposals

common/examples/test_streaming_parser.rs

@@ -495,7 +495,7 @@ impl StakeAddress {
 
 impl Display for StakeAddress {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", hex::encode(self.get_credential().get_hash()))
+        write!(f, "{}", hex::encode(self.to_binary()))
     }
 }
 

common/src/address.rs

@@ -90,7 +90,7 @@ pub struct AssetDeltasMessage {
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub struct TxCertificatesMessage {
     /// Ordered set of certificates
-    pub certificates: Vec<TxCertificate>,
+    pub certificates: Vec<TxCertificateWithPos>,
 }
 
 /// Address deltas message

common/src/messages.rs

@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use crate::{DRepChoice, KeyHash, PoolId, PoolLiveStakeInfo, StakeAddress};
+use crate::{DRepChoice, KeyHash, PoolId, PoolLiveStakeInfo, StakeAddress, TxIdentifier};
 
 pub const DEFAULT_ACCOUNTS_QUERY_TOPIC: (&str, &str) =
     ("accounts-state-query-topic", "cardano.query.accounts");
@@ -15,10 +15,10 @@ pub enum AccountsStateQuery {
     GetAccountInfo { stake_address: StakeAddress },
     GetAccountRewardHistory { stake_key: Vec<u8> },
     GetAccountHistory { stake_key: Vec<u8> },
-    GetAccountDelegationHistory { stake_key: Vec<u8> },
-    GetAccountRegistrationHistory { stake_key: Vec<u8> },
+    GetAccountRegistrationHistory { account: StakeAddress },
+    GetAccountDelegationHistory { account: StakeAddress },
+    GetAccountMIRHistory { account: StakeAddress },
     GetAccountWithdrawalHistory { stake_key: Vec<u8> },
-    GetAccountMIRHistory { stake_key: Vec<u8> },
     GetAccountAssociatedAddresses { stake_key: Vec<u8> },
     GetAccountAssets { stake_key: Vec<u8> },
     GetAccountAssetsTotals { stake_key: Vec<u8> },
@@ -49,10 +49,10 @@ pub enum AccountsStateQueryResponse {
     AccountInfo(AccountInfo),
     AccountRewardHistory(AccountRewardHistory),
     AccountHistory(AccountHistory),
-    AccountDelegationHistory(AccountDelegationHistory),
-    AccountRegistrationHistory(AccountRegistrationHistory),
+    AccountRegistrationHistory(Vec<RegistrationUpdate>),
+    AccountDelegationHistory(Vec<DelegationUpdate>),
+    AccountMIRHistory(Vec<AccountWithdrawal>),
     AccountWithdrawalHistory(AccountWithdrawalHistory),
-    AccountMIRHistory(AccountMIRHistory),
     AccountAssociatedAddresses(AccountAssociatedAddresses),
     AccountAssets(AccountAssets),
     AccountAssetsTotals(AccountAssetsTotals),
@@ -97,17 +97,52 @@ pub struct AccountRewardHistory {}
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub struct AccountHistory {}
 
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-pub struct AccountDelegationHistory {}
+#[derive(
+    Debug, Clone, serde::Serialize, serde::Deserialize, minicbor::Decode, minicbor::Encode,
+)]
+pub struct DelegationUpdate {
+    #[n(0)]
+    pub active_epoch: u32,
+    #[n(1)]
+    pub tx_identifier: TxIdentifier,
+    #[n(2)]
+    pub amount: u64,
+    #[n(3)]
+    pub pool: PoolId,
+}
 
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-pub struct AccountRegistrationHistory {}
+#[derive(
+    Debug, Clone, serde::Serialize, serde::Deserialize, minicbor::Decode, minicbor::Encode,
+)]
+pub struct RegistrationUpdate {
+    #[n(0)]
+    pub tx_identifier: TxIdentifier,
+    #[n(1)]
+    pub status: RegistrationStatus,
+}
 
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-pub struct AccountWithdrawalHistory {}
+#[derive(
+    Debug, Clone, serde::Serialize, serde::Deserialize, minicbor::Decode, minicbor::Encode,
+)]
+pub enum RegistrationStatus {
+    #[n(0)]
+    Registered,
+    #[n(1)]
+    Deregistered,
+}
+
+#[derive(
+    Debug, Clone, serde::Serialize, serde::Deserialize, minicbor::Decode, minicbor::Encode,
+)]
+pub struct AccountWithdrawal {
+    #[n(0)]
+    pub tx_identifier: TxIdentifier,
+    #[n(1)]
+    pub amount: u64,
+}
 
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-pub struct AccountMIRHistory {}
+pub struct AccountWithdrawalHistory {}
 
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub struct AccountAssociatedAddresses {}

common/src/queries/accounts.rs

@@ -1,8 +1,8 @@
 use std::collections::HashMap;
 
 use crate::{
-    Anchor, DRepCredential, GovActionId, Lovelace, ProposalProcedure, StakeAddress, TxHash, Vote,
-    Voter, VotingProcedure,
+    Anchor, DRepCredential, GovActionId, Lovelace, ProposalProcedure, StakeAddress, TxHash,
+    TxIdentifier, Vote, Voter, VotingProcedure,
 };
 
 pub const DEFAULT_DREPS_QUERY_TOPIC: (&str, &str) =
@@ -77,7 +77,7 @@ pub struct DRepUpdates {
 
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub struct DRepUpdateEvent {
-    pub tx_hash: TxHash,
+    pub tx_identifier: TxIdentifier,
     pub cert_index: u64,
     pub action: DRepActionUpdate,
 }

common/src/queries/governance.rs

@@ -188,6 +188,7 @@ impl StakeAddressMap {
 
     /// Get DRep Delegators with live_stakes
     pub fn get_drep_delegators(&self, drep: &DRepChoice) -> Vec<(KeyHash, u64)> {
+        // Find stake addresses delegated to drep
         let delegators: Vec<(KeyHash, u64)> = self
             .inner
             .iter()
@@ -324,7 +325,7 @@ impl StakeAddressMap {
     }
 
     /// Dump current Stake Pool Delegation Distribution State
-    /// <KeyHash -> (Stake Key, Active Stakes Amount)>
+    /// <PoolId -> (Stake Key, Active Stakes Amount)>
     pub fn dump_spdd_state(&self) -> HashMap<PoolId, Vec<(KeyHash, u64)>> {
         let entries: Vec<_> = self
             .inner