Merge branch 'main' into lowhung/refactor-key-hash-to-stake-address

# Conflicts:
#	common/src/stake_addresses.rs
#	modules/rest_blockfrost/src/handlers/epochs.rs
#	modules/rest_blockfrost/src/handlers/pools.rs
#	modules/rest_blockfrost/src/types.rs
#	modules/tx_unpacker/src/tx_unpacker.rs

Author: lowhung

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

@@ -24,34 +24,7 @@ jobs:
         run: cargo fmt --all -- --check
 
       - name: Run Clippy
-        run: |
-          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_governance_state \
-            --package acropolis_module_historical_accounts_state \
-            --package acropolis_module_mithril_snapshot_fetcher \
-            --package acropolis_module_parameters_state \
-            --package acropolis_module_rest_blockfrost \
-            --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
+        run: cargo clippy --all-targets --all-features -- -D warnings
 
       - name: Run Build
         run: cargo build --verbose

Cargo.lock

@@ -1,14 +1,14 @@
 use acropolis_common::{
-    GenesisDelegate, HeavyDelegate, crypto::keyhash_224, queries::blocks::BlockIssuer,
+    GenesisDelegate, HeavyDelegate, PoolId, crypto::keyhash_224, queries::blocks::BlockIssuer,
 };
 use pallas_primitives::byron::BlockSig::DlgSig;
 use pallas_traverse::MultiEraHeader;
 use std::collections::HashMap;
 
 pub fn map_to_block_issuer(
     header: &MultiEraHeader,
-    byron_heavy_delegates: &HashMap<Vec<u8>, HeavyDelegate>,
-    shelley_genesis_delegates: &HashMap<Vec<u8>, GenesisDelegate>,
+    byron_heavy_delegates: &HashMap<PoolId, HeavyDelegate>,
+    shelley_genesis_delegates: &HashMap<PoolId, GenesisDelegate>,
 ) -> Option<BlockIssuer> {
     match header.issuer_vkey() {
         Some(vkey) => match header {

codec/src/block.rs

@@ -37,8 +37,8 @@ pub fn to_hash<const N: usize>(pallas_hash: &pallas_primitives::Hash<N>) -> Hash
 
 /// Convert a Pallas Hash reference to an Acropolis Hash (owned)
 /// Works for any hash size N
-pub fn genesis_to_hash(pallas_hash: &pallas_primitives::Genesishash) -> GenesisKeyhash {
-    GenesisKeyhash::try_from(pallas_hash.as_ref()).unwrap()
+pub fn genesis_to_hash(pallas_hash: &pallas_primitives::Genesishash) -> Hash<32> {
+    Hash::try_from(pallas_hash.as_ref()).unwrap()
 }
 
 /// Convert a Pallas Hash reference to an Acropolis Hash (owned)
@@ -198,7 +198,7 @@ pub fn map_nullable_gov_action_id(
 fn map_constitution(constitution: &conway::Constitution) -> Constitution {
     Constitution {
         anchor: map_anchor(&constitution.anchor),
-        guardrail_script: map_nullable(|x| to_hash(x), &constitution.guardrail_script),
+        guardrail_script: map_nullable(to_hash, &constitution.guardrail_script),
     }
 }
 

codec/src/map_parameters.rs

@@ -398,8 +398,8 @@ impl StakeAddress {
 
     pub fn get_credential(&self) -> Credential {
         match &self.credential {
-            StakeCredential::AddrKeyHash(hash) => Credential::AddrKeyHash(hash.clone()),
-            StakeCredential::ScriptHash(hash) => Credential::ScriptHash(hash.clone()),
+            StakeCredential::AddrKeyHash(hash) => Credential::AddrKeyHash(*hash),
+            StakeCredential::ScriptHash(hash) => Credential::ScriptHash(*hash),
         }
     }
 
@@ -411,7 +411,7 @@ impl StakeAddress {
         };
 
         let data = self.to_binary();
-        Ok(bech32::encode::<bech32::Bech32>(hrp, &data.as_slice())?)
+        Ok(bech32::encode::<bech32::Bech32>(hrp, data.as_slice())?)
     }
 
     /// Read from a string format ("stake1xxx...")
@@ -520,7 +520,7 @@ impl<C> minicbor::Encode<C> for StakeAddress {
         _ctx: &mut C,
     ) -> Result<(), minicbor::encode::Error<W::Error>> {
         let data = self.to_binary();
-        e.bytes(&data.as_slice())?;
+        e.bytes(data.as_slice())?;
         Ok(())
     }
 }
@@ -902,7 +902,7 @@ mod tests {
         assert_eq!(sa.network, NetworkId::Mainnet);
         assert_eq!(
             match sa.credential {
-                StakeCredential::AddrKeyHash(key) => hex::encode(&key),
+                StakeCredential::AddrKeyHash(key) => hex::encode(key),
                 _ => "SCRIPT".to_string(),
             },
             "558f3ee09b26d88fac2eddc772a9eda94cce6dbadbe9fee439bd6001"
@@ -918,7 +918,7 @@ mod tests {
         assert_eq!(sa.network, NetworkId::Mainnet);
         assert_eq!(
             match sa.credential {
-                StakeCredential::ScriptHash(key) => hex::encode(&key),
+                StakeCredential::ScriptHash(key) => hex::encode(key),
                 _ => "STAKE".to_string(),
             },
             "558f3ee09b26d88fac2eddc772a9eda94cce6dbadbe9fee439bd6001"
@@ -934,7 +934,7 @@ mod tests {
         assert_eq!(sa.network, NetworkId::Testnet);
         assert_eq!(
             match sa.credential {
-                StakeCredential::AddrKeyHash(key) => hex::encode(&key),
+                StakeCredential::AddrKeyHash(key) => hex::encode(key),
                 _ => "SCRIPT".to_string(),
             },
             "558f3ee09b26d88fac2eddc772a9eda94cce6dbadbe9fee439bd6001"
@@ -963,7 +963,7 @@ mod tests {
         // - 0x1d: Length of 29 bytes (the stake address data)
         // - [29 bytes]: The actual stake address (network header + 28-byte hash)
         // Total: 31 bytes (2-byte CBOR framing + 29-byte payload)
-        let expected = [[0x58, 0x1d].as_slice(), &binary.as_slice()].concat();
+        let expected = [[0x58, 0x1d].as_slice(), binary.as_slice()].concat();
 
         let mut actual = Vec::new();
         let mut encoder = minicbor::Encoder::new(&mut actual);
@@ -977,7 +977,7 @@ mod tests {
     fn stake_addresses_decode_mainnet_stake() {
         let binary = {
             let mut v = vec![0x58, 0x1d];
-            v.extend_from_slice(&mainnet_stake_address().to_binary().as_slice());
+            v.extend_from_slice(mainnet_stake_address().to_binary().as_slice());
             v
         };
 
@@ -987,7 +987,7 @@ mod tests {
         assert_eq!(decoded.network, NetworkId::Mainnet);
         assert_eq!(
             match decoded.credential {
-                StakeCredential::AddrKeyHash(key) => hex::encode(&key),
+                StakeCredential::AddrKeyHash(key) => hex::encode(key),
                 _ => "STAKE".to_string(),
             },
             "558f3ee09b26d88fac2eddc772a9eda94cce6dbadbe9fee439bd6001"
@@ -1010,7 +1010,7 @@ mod tests {
         assert_eq!(decoded.network, NetworkId::Mainnet);
         assert_eq!(
             match decoded.credential {
-                StakeCredential::ScriptHash(key) => hex::encode(&key),
+                StakeCredential::ScriptHash(key) => hex::encode(key),
                 _ => "STAKE".to_string(),
             },
             "558f3ee09b26d88fac2eddc772a9eda94cce6dbadbe9fee439bd6001"
@@ -1031,7 +1031,7 @@ mod tests {
         assert_eq!(decoded.network, NetworkId::Testnet);
         assert_eq!(
             match decoded.credential {
-                StakeCredential::ScriptHash(key) => hex::encode(&key),
+                StakeCredential::ScriptHash(key) => hex::encode(key),
                 _ => "SCRIPT".to_string(),
             },
             "558f3ee09b26d88fac2eddc772a9eda94cce6dbadbe9fee439bd6001"

common/src/address.rs

@@ -9,7 +9,7 @@ use cryptoxide::hashing::blake2b::Blake2b;
 pub fn keyhash_256(key: &[u8]) -> Hash<32> {
     let mut context = Blake2b::<256>::new();
     context.update_mut(key);
-    Hash::new(context.finalize().into())
+    Hash::new(context.finalize())
 }
 
 /// Get a Blake2b-224 hash of a key
@@ -18,5 +18,5 @@ pub fn keyhash_256(key: &[u8]) -> Hash<32> {
 pub fn keyhash_224(key: &[u8]) -> Hash<28> {
     let mut context = Blake2b::<224>::new();
     context.update_mut(key);
-    Hash::new(context.finalize().into())
+    Hash::new(context.finalize())
 }

common/src/crypto.rs

@@ -312,10 +312,10 @@ macro_rules! declare_hash_type_with_bech32 {
             }
         }
 
-        impl crate::serialization::Bech32Conversion for $name {
+        impl $crate::serialization::Bech32Conversion for $name {
             fn to_bech32(&self) -> Result<String, anyhow::Error> {
-                use crate::serialization::Bech32WithHrp;
                 use anyhow::Context;
+                use $crate::serialization::Bech32WithHrp;
 
                 self.as_ref().to_bech32_with_hrp($hrp).with_context(|| {
                     format!(
@@ -327,8 +327,8 @@ macro_rules! declare_hash_type_with_bech32 {
             }
 
             fn from_bech32(s: &str) -> Result<Self, anyhow::Error> {
-                use crate::serialization::Bech32WithHrp;
                 use anyhow::Context;
+                use $crate::serialization::Bech32WithHrp;
 
                 let v = Vec::<u8>::from_bech32_with_hrp(s, $hrp).with_context(|| {
                     format!("Failed to decode {} from bech32", stringify!($name))

common/src/hash.rs

@@ -2,7 +2,7 @@ use crate::{
     genesis_values::GenesisValues,
     rational_number::{ChameleonFraction, RationalNumber},
     BlockHash, BlockVersionData, Committee, Constitution, CostModel, DRepVotingThresholds, Era,
-    ExUnitPrices, ExUnits, GenesisDelegate, HeavyDelegate, NetworkId, PoolVotingThresholds,
+    ExUnitPrices, ExUnits, GenesisDelegate, HeavyDelegate, NetworkId, PoolId, PoolVotingThresholds,
     ProtocolConsts,
 };
 use anyhow::{bail, Result};
@@ -34,7 +34,7 @@ pub struct ByronParams {
     pub start_time: u64,
 
     #[serde_as(as = "Vec<(_, _)>")]
-    pub heavy_delegation: HashMap<Vec<u8>, HeavyDelegate>,
+    pub heavy_delegation: HashMap<PoolId, HeavyDelegate>,
 }
 
 //
@@ -131,7 +131,7 @@ pub struct ShelleyParams {
     pub update_quorum: u32,
 
     #[serde_as(as = "HashMap<Hex, _>")]
-    pub gen_delegs: HashMap<Vec<u8>, GenesisDelegate>,
+    pub gen_delegs: HashMap<PoolId, GenesisDelegate>,
 }
 
 #[serde_as]

common/src/protocol_params.rs

@@ -1,6 +1,8 @@
 use std::collections::HashMap;
 
-use crate::{DRepChoice, KeyHash, PoolId, PoolLiveStakeInfo, StakeAddress, TxIdentifier};
+use crate::{
+    DRepChoice, KeyHash, PoolId, PoolLiveStakeInfo, RewardType, StakeAddress, TxIdentifier,
+};
 
 pub const DEFAULT_ACCOUNTS_QUERY_TOPIC: (&str, &str) =
     ("accounts-state-query-topic", "cardano.query.accounts");
@@ -12,8 +14,8 @@ pub const DEFAULT_HISTORICAL_ACCOUNTS_QUERY_TOPIC: (&str, &str) = (
 
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub enum AccountsStateQuery {
-    GetAccountInfo { stake_address: StakeAddress },
-    GetAccountRewardHistory { stake_key: Vec<u8> },
+    GetAccountInfo { account: StakeAddress },
+    GetAccountRewardHistory { account: StakeAddress },
     GetAccountHistory { stake_key: Vec<u8> },
     GetAccountRegistrationHistory { account: StakeAddress },
     GetAccountDelegationHistory { account: StakeAddress },
@@ -47,7 +49,7 @@ pub enum AccountsStateQuery {
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub enum AccountsStateQueryResponse {
     AccountInfo(AccountInfo),
-    AccountRewardHistory(AccountRewardHistory),
+    AccountRewardHistory(Vec<AccountReward>),
     AccountHistory(AccountHistory),
     AccountRegistrationHistory(Vec<RegistrationUpdate>),
     AccountDelegationHistory(Vec<DelegationUpdate>),
@@ -91,9 +93,6 @@ pub struct AccountInfo {
     pub delegated_drep: Option<DRepChoice>,
 }
 
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-pub struct AccountRewardHistory {}
-
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub struct AccountHistory {}
 
@@ -150,6 +149,20 @@ pub struct AccountWithdrawal {
     pub amount: u64,
 }
 
+#[derive(
+    Debug, Clone, minicbor::Decode, minicbor::Encode, serde::Serialize, serde::Deserialize,
+)]
+pub struct AccountReward {
+    #[n(0)]
+    pub epoch: u32,
+    #[n(1)]
+    pub amount: u64,
+    #[n(2)]
+    pub pool: PoolId,
+    #[n(3)]
+    pub reward_type: RewardType,
+}
+
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub struct AccountWithdrawalHistory {}
 

common/src/queries/accounts.rs

@@ -157,7 +157,7 @@ impl Serialize for BlockInfo {
             "block_vrf",
             &self.block_vrf.and_then(|vkey| vkey.to_bech32().ok()),
         )?;
-        state.serialize_field("op_cert", &self.op_cert.clone().map(hex::encode))?;
+        state.serialize_field("op_cert", &self.op_cert.map(hex::encode))?;
         state.serialize_field("op_cert_counter", &self.op_cert_counter)?;
         state.serialize_field("previous_block", &self.previous_block)?;
         state.serialize_field("next_block", &self.next_block)?;