From fc6e9d21d5beb125970e595e9a530cedf7c7fc58 Mon Sep 17 00:00:00 2001
From: katelyn martin <katelyn@penumbralabs.xyz>
Date: Fri, 1 Mar 2024 10:32:35 -0500
Subject: [PATCH] =?UTF-8?q?staking:=20=F0=9F=94=8A=20log=20genesis=20valid?=
 =?UTF-8?q?ators=20after=20parsing=20(#3916)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

cherry-picked from #3902.
---
 Cargo.lock                                     |  1 +
 crates/core/component/stake/Cargo.toml         |  1 +
 .../component/stake/src/component/stake.rs     | 18 +++++++++++++-----
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 81fea3c7e7..4f89d61475 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5529,6 +5529,7 @@ dependencies = [
  "serde_unit_struct",
  "serde_with",
  "sha2 0.10.8",
+ "tap",
  "tendermint",
  "tokio",
  "tonic",
diff --git a/crates/core/component/stake/Cargo.toml b/crates/core/component/stake/Cargo.toml
index 71b20e7a9c..e33ba6cd2c 100644
--- a/crates/core/component/stake/Cargo.toml
+++ b/crates/core/component/stake/Cargo.toml
@@ -73,6 +73,7 @@ serde = {workspace = true, features = ["derive"]}
 serde_unit_struct = {workspace = true}
 serde_with = {workspace = true}
 sha2 = {workspace = true}
+tap = {workspace = true}
 tendermint = {workspace = true, default-features = true}
 tokio = {workspace = true, features = ["full", "tracing"], optional = true}
 tonic = {workspace = true, optional = true}
diff --git a/crates/core/component/stake/src/component/stake.rs b/crates/core/component/stake/src/component/stake.rs
index 94815e67de..58790d635a 100644
--- a/crates/core/component/stake/src/component/stake.rs
+++ b/crates/core/component/stake/src/component/stake.rs
@@ -19,10 +19,11 @@ use sha2::{Digest, Sha256};
 use std::pin::Pin;
 use std::str::FromStr;
 use std::{collections::BTreeMap, sync::Arc};
+use tap::Tap;
 use tendermint::v0_37::abci;
 use tendermint::validator::Update;
 use tendermint::{block, PublicKey};
-use tracing::instrument;
+use tracing::{instrument, trace};
 
 use crate::component::epoch_handler::EpochHandler;
 use crate::component::validator_handler::{ValidatorDataRead, ValidatorManager};
@@ -48,11 +49,13 @@ impl Component for Staking {
                 let starting_height = state
                     .get_block_height()
                     .await
-                    .expect("should be able to get initial block height");
+                    .expect("should be able to get initial block height")
+                    .tap(|height| trace!(%height,"found initial block height"));
                 let starting_epoch = state
                     .get_epoch_by_height(starting_height)
                     .await
-                    .expect("should be able to get initial epoch");
+                    .expect("should be able to get initial epoch")
+                    .tap(|epoch| trace!(?epoch, "found initial epoch"));
                 let epoch_index = starting_epoch.index;
 
                 let genesis_base_rate = BaseRateData {
@@ -61,6 +64,7 @@ impl Component for Staking {
                     base_exchange_rate: 1_0000_0000u128.into(),
                 };
                 state.set_base_rate(genesis_base_rate.clone());
+                trace!(?genesis_base_rate, "set base rate");
 
                 let mut genesis_allocations = BTreeMap::<_, Amount>::new();
                 for allocation in &sp_genesis.allocations {
@@ -68,10 +72,14 @@ impl Component for Staking {
                     *genesis_allocations.entry(value.asset_id).or_default() += value.amount;
                 }
 
-                for validator in &staking_genesis.validators {
+                trace!("parsing genesis validators");
+                for (i, validator) in staking_genesis.validators.iter().enumerate() {
                     // Parse the proto into a domain type.
                     let validator = Validator::try_from(validator.clone())
-                        .expect("should be able to parse genesis validator");
+                        .expect("should be able to parse genesis validator")
+                        .tap(|Validator { name, enabled, .. }|
+                             trace!(%i, %name, %enabled, "parsed genesis validator")
+                        );
 
                     state
                         .add_genesis_validator(&genesis_allocations, &genesis_base_rate, validator)