Merge pull request #11 from gattaca-com/audit-fixes

Audit refactors + demotion fixes

Dockerfile

@@ -13,6 +13,8 @@ ARG AWS_ACCESS_KEY_ID
 ARG AWS_SECRET_ACCESS_KEY
 ARG REPO_NAME
 
+RUN echo "REPO_NAME: $REPO_NAME"
+
 # Test to make sure that aws access is set correctly
 RUN test -n "$AWS_ACCESS_KEY_ID" || (echo "AWS_ACCESS_KEY_ID  not set" && false)
 RUN test -n "$AWS_SECRET_ACCESS_KEY" || (echo "AWS_SECRET_ACCESS_KEY  not set" && false)
@@ -24,6 +26,9 @@ ENV SCCACHE_S3_USE_SSL=true
 # Copy necessary contents into the container at /app
 ADD ./repos /app/
 
+RUN ls -lah /app
+RUN ls -lah /app/${REPO_NAME}
+
 # Set the working directory to /app
 WORKDIR /app/${REPO_NAME}
 

crates/api/src/builder/api.rs

@@ -53,7 +53,7 @@ use crate::{
     gossiper::{traits::GossipClientTrait, types::{BroadcastHeaderParams, BroadcastPayloadParams, GossipedMessage}},
 };
 
-pub const MAX_PAYLOAD_LENGTH: usize = 1024 * 1024 * 4;
+pub(crate) const MAX_PAYLOAD_LENGTH: usize = 1024 * 1024 * 4;
 
 #[derive(Clone)]
 pub struct BuilderApi<A, DB, S, G>

crates/api/src/builder/simulator/optimistic_simulator.rs

@@ -64,14 +64,24 @@ impl<A: Auctioneer + 'static, DB: DatabaseService + 'static> OptimisticSimulator
         {
             if let BlockSimError::BlockValidationFailed(_) = err {
                 if builder_info.is_optimistic {
-                    warn!(
-                        request_id=%request_id,
-                        builder=%request.message.builder_public_key,
-                        block_hash=%request.execution_payload.block_hash(),
-                        err=%err,
-                        "Block simulation resulted in an error. Demoting builder...",
-                    );
-                    //self.demote_builder_due_to_error(&request.message.builder_public_key, request.execution_payload.block_hash(), err.to_string()).await;
+                    if err.is_severe() {
+                        warn!(
+                            request_id=%request_id,
+                            builder=%request.message.builder_public_key,
+                            block_hash=%request.execution_payload.block_hash(),
+                            err=%err,
+                            "Block simulation resulted in an error. Demoting builder...",
+                        );
+                        self.demote_builder_due_to_error(&request.message.builder_public_key, request.execution_payload.block_hash(), err.to_string()).await;
+                    } else {
+                        warn!(
+                            request_id=%request_id,
+                            builder=%request.message.builder_public_key,
+                            block_hash=%request.execution_payload.block_hash(),
+                            err=%err,
+                            "Block simulation resulted in a non-severe error. NOT demoting builder...",
+                        );
+                    }
                 }
             }
             return Err(err);
@@ -162,8 +172,7 @@ impl<A: Auctioneer, DB: DatabaseService> BlockSimulator for OptimisticSimulator<
     ) -> Result<bool, BlockSimError> {
         let builder_info = self.fetch_builder_info(&request).await;
 
-        // if self.should_process_optimistically(&request, &builder_info).await {
-        if true {
+        if self.should_process_optimistically(&request, &builder_info).await {
             debug!(
                 request_id=%request_id,
                 block_hash=%request.execution_payload.block_hash(),

crates/api/src/builder/types.rs

@@ -3,12 +3,12 @@ use std::{sync::Arc, time::SystemTime};
 use ethereum_consensus::primitives::BlsPublicKey;
 use helix_common::{bellatrix::ByteVector, bid_submission::{SignedBidSubmission, v2::header_submission::SignedHeaderSubmission}, simulator::BlockSimError, GossipedHeaderTrace, GossipedPayloadTrace, HeaderSubmissionTrace, SubmissionTrace};
 
-pub const PATH_BUILDER_API: &str = "/relay/v1/builder";
+pub(crate) const PATH_BUILDER_API: &str = "/relay/v1/builder";
 
-pub const PATH_GET_VALIDATORS: &str = "/validators";
-pub const PATH_SUBMIT_BLOCK: &str = "/blocks";
-pub const PATH_SUBMIT_BLOCK_OPTIMISTIC: &str = "/blocks_optimistic";
-pub const PATH_SUBMIT_HEADER: &str = "/headers";
+pub(crate) const PATH_GET_VALIDATORS: &str = "/validators";
+pub(crate) const PATH_SUBMIT_BLOCK: &str = "/blocks";
+pub(crate) const PATH_SUBMIT_BLOCK_OPTIMISTIC: &str = "/blocks_optimistic";
+pub(crate) const PATH_SUBMIT_HEADER: &str = "/headers";
 
 
 #[derive(Clone)]

crates/api/src/proposer/api.rs

@@ -113,7 +113,7 @@ where
         // Spin up the housekeep task
         let api_clone = api.clone();
         tokio::spawn(async move {
-            if let Err(err) = api_clone.housekeep(slot_update_subscription.clone()).await {
+            if let Err(err) = api_clone.housekeep(slot_update_subscription).await {
                 error!(
                     error = %err,
                     "ProposerApi. housekeep task encountered an error",

crates/api/src/proposer/types.rs

@@ -8,14 +8,14 @@ use serde::Deserialize;
 
 use crate::proposer::error::ProposerApiError;
 
-pub const PATH_PROPOSER_API: &str = "/eth/v1/builder";
+pub(crate) const PATH_PROPOSER_API: &str = "/eth/v1/builder";
 
-pub const PATH_STATUS: &str = "/status";
-pub const PATH_REGISTER_VALIDATORS: &str = "/validators";
-pub const PATH_GET_HEADER: &str = "/header/:slot/:parent_hash/:pubkey";
-pub const PATH_GET_PAYLOAD: &str = "/blinded_blocks";
+pub(crate) const PATH_STATUS: &str = "/status";
+pub(crate) const PATH_REGISTER_VALIDATORS: &str = "/validators";
+pub(crate) const PATH_GET_HEADER: &str = "/header/:slot/:parent_hash/:pubkey";
+pub(crate) const PATH_GET_PAYLOAD: &str = "/blinded_blocks";
 
-pub const GET_HEADER_REQUEST_CUTOFF_MS: i64 = 3000;
+pub(crate) const GET_HEADER_REQUEST_CUTOFF_MS: i64 = 3000;
 
 #[derive(Debug, Deserialize)]
 pub struct GetHeaderParams {

crates/api/src/relay_data/api.rs

@@ -15,11 +15,11 @@ use helix_common::api::data_api::{
 
 use crate::relay_data::error::DataApiError;
 
-pub const PATH_DATA_API: &str = "/relay/v1/data";
+pub(crate) const PATH_DATA_API: &str = "/relay/v1/data";
 
-pub const PATH_PROPOSER_PAYLOAD_DELIVERED: &str = "/bidtraces/proposer_payload_delivered";
-pub const PATH_BUILDER_BIDS_RECEIVED: &str = "/bidtraces/builder_blocks_received";
-pub const PATH_VALIDATOR_REGISTRATION: &str = "/validator_registration";
+pub(crate) const PATH_PROPOSER_PAYLOAD_DELIVERED: &str = "/bidtraces/proposer_payload_delivered";
+pub(crate) const PATH_BUILDER_BIDS_RECEIVED: &str = "/bidtraces/builder_blocks_received";
+pub(crate) const PATH_VALIDATOR_REGISTRATION: &str = "/validator_registration";
 
 #[derive(Clone)]
 pub struct DataApi<DB: DatabaseService> {
@@ -31,7 +31,7 @@ impl<DB: DatabaseService + 'static> DataApi<DB> {
         Self { db }
     }
 
-    /// Implements this API: https://flashbots.github.io/relay-specs/#/Data/getDeliveredPayloads
+    /// Implements this API: <https://flashbots.github.io/relay-specs/#/Data/getDeliveredPayloads>
     pub async fn proposer_payload_delivered(
         Extension(data_api): Extension<Arc<DataApi<DB>>>,
         Query(params): Query<ProposerPayloadDeliveredParams>,
@@ -56,7 +56,7 @@ impl<DB: DatabaseService + 'static> DataApi<DB> {
         }
     }
 
-    /// Implements this API: https://flashbots.github.io/relay-specs/#/Data/getReceivedBids
+    /// Implements this API: <https://flashbots.github.io/relay-specs/#/Data/getReceivedBids>
     pub async fn builder_bids_received(
         Extension(data_api): Extension<Arc<DataApi<DB>>>,
         Query(params): Query<BuilderBlocksReceivedParams>,
@@ -87,7 +87,7 @@ impl<DB: DatabaseService + 'static> DataApi<DB> {
         }
     }
 
-    /// Implements this API: https://flashbots.github.io/relay-specs/#/Data/getValidatorRegistration
+    /// Implements this API: <https://flashbots.github.io/relay-specs/#/Data/getValidatorRegistration>
     pub async fn validator_registration(
         Extension(data_api): Extension<Arc<DataApi<DB>>>,
         Query(params): Query<ValidatorRegistrationParams>,

crates/api/src/service.rs

@@ -82,7 +82,7 @@ impl ApiService {
         );
 
         let (mut chain_event_updater, slot_update_sender) =
-            ChainEventUpdater::new_with_channel(db.clone());
+            ChainEventUpdater::new(db.clone());
 
         let mbc_clone = multi_beacon_client.clone();
         tokio::spawn(async move {