Update for Capella

Author: macladson

watch/migrations/2022-01-01-000020_capella/down.sql

@@ -0,0 +1,2 @@
+ALTER TABLE beacon_blocks
+DROP COLUMN withdrawal_count;

watch/migrations/2022-01-01-000020_capella/up.sql

@@ -0,0 +1,3 @@
+ALTER TABLE beacon_blocks
+ADD COLUMN withdrawal_count integer;
+

watch/src/blockprint/server.rs

@@ -28,5 +28,4 @@ pub async fn get_blockprint(
 
 pub fn blockprint_routes() -> Router {
     Router::new().route("/v1/blocks/:block/blockprint", get(get_blockprint))
-    //.route("/v1/blockprint/test/:slot", get(get_all_validators))
 }

watch/src/config.rs

@@ -42,7 +42,7 @@ impl Default for Config {
 impl Config {
     pub fn load_from_file(path_to_file: String) -> Result<Config, String> {
         let file =
-            File::open(&path_to_file).map_err(|e| format!("Error reading config file: {:?}", e))?;
+            File::open(path_to_file).map_err(|e| format!("Error reading config file: {:?}", e))?;
         let config: Config = serde_yaml::from_reader(file)
             .map_err(|e| format!("Error parsing config file: {:?}", e))?;
         Ok(config)

watch/src/database/mod.rs

@@ -138,18 +138,32 @@ pub fn insert_beacon_block<T: EthSpec>(
     let proposer_index = block_message.proposer_index() as i32;
     let graffiti = block_message.body().graffiti().as_utf8_lossy();
     let attestation_count = block_message.body().attestations().len() as i32;
-    let transaction_count = block_message
-        .execution_payload()
-        .ok()
-        .map(|payload| payload.execution_payload.transactions.len() as i32);
+
+    let full_payload = block_message.execution_payload().ok();
+
+    let transaction_count: Option<i32> = if let Some(bellatrix_payload) =
+        full_payload.and_then(|payload| payload.execution_payload_merge().ok())
+    {
+        Some(bellatrix_payload.transactions.len() as i32)
+    } else {
+        full_payload
+            .and_then(|payload| payload.execution_payload_capella().ok())
+            .map(|payload| payload.transactions.len() as i32)
+    };
+
+    let withdrawal_count: Option<i32> = full_payload
+        .and_then(|payload| payload.execution_payload_capella().ok())
+        .map(|payload| payload.withdrawals.len() as i32);
 
     let block_to_add = WatchBeaconBlock {
         slot,
         root,
         parent_root,
         attestation_count,
         transaction_count,
+        withdrawal_count,
     };
+
     let proposer_info_to_add = WatchProposerInfo {
         slot,
         proposer_index,

watch/src/database/models.rs

@@ -25,6 +25,7 @@ pub struct WatchBeaconBlock {
     pub parent_root: WatchHash,
     pub attestation_count: i32,
     pub transaction_count: Option<i32>,
+    pub withdrawal_count: Option<i32>,
 }
 
 #[derive(Clone, Debug, Queryable, Insertable, Serialize, Deserialize)]

watch/src/database/schema.rs

@@ -15,6 +15,7 @@ diesel::table! {
         parent_root -> Bytea,
         attestation_count -> Int4,
         transaction_count -> Nullable<Int4>,
+        withdrawal_count -> Nullable<Int4>,
     }
 }
 

watch/src/main.rs

@@ -25,4 +25,6 @@ async fn main() {
 }
 
 #[cfg(windows)]
-fn main() {}
+fn main() {
+    eprintln!("Windows is not supported. Exiting.");
+}

watch/src/server/error.rs

@@ -1,5 +1,4 @@
 use crate::database::Error as DbError;
-//use warp::{http::Error as HttpError, Error as WarpError};
 use axum::Error as AxumError;
 use axum::{http::StatusCode, response::IntoResponse, Json};
 use hyper::Error as HyperError;

watch/src/server/handler.rs

@@ -207,11 +207,18 @@ pub async fn get_validator_latest_proposal(
     let mut conn = database::get_connection(&pool).map_err(Error::Database)?;
     if validator_query.starts_with("0x") {
         let pubkey = WatchPK::from_str(&validator_query).map_err(|_| Error::BadRequest)?;
-        let validator = database::get_validator_by_public_key(&mut conn, pubkey)?.ok_or(Error::NotFound)?;
-        Ok(Json(database::get_validators_latest_proposer_info(&mut conn, vec![validator.index])?))
+        let validator =
+            database::get_validator_by_public_key(&mut conn, pubkey)?.ok_or(Error::NotFound)?;
+        Ok(Json(database::get_validators_latest_proposer_info(
+            &mut conn,
+            vec![validator.index],
+        )?))
     } else {
         let index = i32::from_str(&validator_query).map_err(|_| Error::BadRequest)?;
-        Ok(Json(database::get_validators_latest_proposer_info(&mut conn, vec![index])?))
+        Ok(Json(database::get_validators_latest_proposer_info(
+            &mut conn,
+            vec![index],
+        )?))
     }
 }