make timestamp u64

ralexstokes · Sep 11, 2023 · 5cbb1ac · 5cbb1ac
1 parent bbefdba
commit 5cbb1ac
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 8 deletions.
diff --git a/mev-build-rs/src/mempool_builder.rs b/mev-build-rs/src/mempool_builder.rs
@@ -207,7 +207,10 @@ impl BlindedBlockProvider for Builder {
         &self,
         registrations: &mut [SignedValidatorRegistration],
     ) -> Result<(), Error> {
-        let current_time = get_current_unix_time_in_nanos();
+        let current_time = match get_current_unix_time_in_nanos().try_into() {
+            Ok(time) => time,
+            Err(_) => return Err(Error::OverflowError),
+        };
         self.validator_registry.validate_registrations(
             registrations,
             current_time,

diff --git a/mev-relay-rs/src/relay.rs b/mev-relay-rs/src/relay.rs
@@ -155,7 +155,11 @@ impl BlindedBlockProvider for Relay {
         &self,
         registrations: &mut [SignedValidatorRegistration],
     ) -> Result<(), Error> {
-        let current_time = get_current_unix_time_in_nanos();
+        let current_time = match get_current_unix_time_in_nanos().try_into() {
+            Ok(time) => time,
+            Err(_) => return Err(Error::OverflowError),
+        };
+
         self.validator_registry.validate_registrations(
             registrations,
             current_time,

diff --git a/mev-relay-rs/src/service.rs b/mev-relay-rs/src/service.rs
@@ -1,6 +1,6 @@
 use crate::relay::Relay;
 use beacon_api_client::mainnet::Client;
-use ethereum_consensus::{crypto::SecretKey, state_transition::Context};
+use ethereum_consensus::{crypto::SecretKey, networks, state_transition::Context};
 use futures::StreamExt;
 use mev_rs::{blinded_block_provider::Server as BlindedBlockProviderServer, Error, Network};
 use serde::Deserialize;
@@ -58,7 +58,10 @@ impl Service {
 
         let context =
             if let Some(context) = context { context } else { Context::try_from(&network)? };
-        let clock = context.clock().unwrap();
+        let clock = context.clock().unwrap_or_else(|| {
+            let genesis_time = networks::typical_genesis_time(&context);
+            context.clock_at(genesis_time)
+        });
         let context = Arc::new(context);
         let genesis_details = beacon_node.get_genesis_details().await?;
         let genesis_validators_root = genesis_details.genesis_validators_root;

diff --git a/mev-rs/src/error.rs b/mev-rs/src/error.rs
@@ -45,6 +45,8 @@ pub enum Error {
     #[cfg(feature = "engine-proxy")]
     #[error("{0}")]
     EngineApi(#[from] crate::engine_api_proxy::Error),
+    #[error("Overflow error, value too large")]
+    OverflowError,
 }
 
 #[cfg(feature = "api")]

diff --git a/mev-rs/src/validator_registry.rs b/mev-rs/src/validator_registry.rs
@@ -29,9 +29,9 @@ pub enum Error {
 
 fn validate_registration_is_not_from_future(
     timestamp: u64,
-    current_timestamp: u128,
+    current_timestamp: u64,
 ) -> Result<(), Error> {
-    if u128::from(timestamp) > current_timestamp + 10 {
+    if timestamp > current_timestamp + 10 {
         Err(Error::InvalidTimestamp)
     } else {
         Ok(())
@@ -125,7 +125,7 @@ impl ValidatorRegistry {
     pub fn validate_registrations(
         &self,
         registrations: &mut [SignedValidatorRegistration],
-        current_timestamp: u128,
+        current_timestamp: u64,
         context: &Context,
     ) -> Result<(), Error> {
         for registration in registrations.iter_mut() {
@@ -138,7 +138,7 @@ impl ValidatorRegistry {
     fn validate_registration(
         &self,
         registration: &mut SignedValidatorRegistration,
-        current_timestamp: u128,
+        current_timestamp: u64,
         context: &Context,
     ) -> Result<(), Error> {
         let mut state = self.state.lock();