refactor: modify ethereum rpc trait for hoku support

modified EthRpc to be ChainInclusion and only return timestamp and root cid from chain. this required moving a decent amount of logic around parsing chain info/validation from service to validation crate.
ceramicnetwork · Oct 21, 2024 · b5c388b · b5c388b
1 parent f704ef4
commit b5c388b
Show file tree

Hide file tree

Showing 9 changed files with 506 additions and 291 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,4 +11,5 @@ sync_test.sh
 
 openapi-generator-cli.jar
 .env
-ceramic_cicddb.sqlite*
+ceramic_cicddb.sqlite*
+event-svc/model_error_counts.csv
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/event-svc/Cargo.toml b/event-svc/Cargo.toml
@@ -29,7 +29,6 @@ itertools.workspace = true
 multihash-codetable.workspace = true
 multihash-derive.workspace = true
 multihash.workspace = true
-once_cell.workspace = true
 prometheus-client.workspace = true
 recon.workspace = true
 serde.workspace = true

diff --git a/event-svc/src/event/validator/event.rs b/event-svc/src/event/validator/event.rs
@@ -2,6 +2,7 @@ use std::sync::Arc;
 
 use ceramic_core::{Cid, EventId, NodeId};
 use ceramic_event::unvalidated;
+use ceramic_validation::eth_rpc;
 use ipld_core::ipld::Ipld;
 use recon::ReconItem;
 use tokio::try_join;
@@ -14,7 +15,7 @@ use crate::{
         validator::{
             grouped::{GroupedEvents, SignedValidationBatch, TimeValidationBatch},
             signed::SignedEventValidator,
-            time::{ChainInclusionError, TimeEventValidator},
+            time::TimeEventValidator,
         },
     },
     store::EventInsertable,
@@ -226,37 +227,49 @@ impl EventValidator {
     }
 
     /// Transforms the [`ChainInclusionError`] into a [`ValidationError`] with an appropriate message
-    fn convert_inclusion_error(err: ChainInclusionError, order_key: &EventId) -> ValidationError {
+    fn convert_inclusion_error(err: eth_rpc::Error, order_key: &EventId) -> ValidationError {
         match err {
-            ChainInclusionError::TxNotFound { chain_id, tx_hash } => {
+            eth_rpc::Error::TxNotFound { chain_id, tx_hash } => {
                 // we have an RPC provider so the transaction missing means it's invalid/unproveable
                 ValidationError::InvalidTimeProof {
                     key: order_key.to_owned(),
                     reason: format!(
                         "Transaction on chain '{chain_id}' with hash '{tx_hash}' not found."
                     ),
                 }
-            }
-            ChainInclusionError::TxNotMined { chain_id, tx_hash } => {
+            },
+           eth_rpc::Error::TxNotMined { chain_id, tx_hash } => {
                     ValidationError::InvalidTimeProof {
                         key: order_key.to_owned(),
                         reason: format!("Transaction on chain '{chain_id}' with hash '{tx_hash}' has not been mined in a block yet."),
                     }
-            }
-            ChainInclusionError::InvalidProof(reason) => ValidationError::InvalidTimeProof {
+            },
+            eth_rpc::Error::InvalidProof(reason) => ValidationError::InvalidTimeProof {
                 key: order_key.to_owned(),
                 reason,
             },
-            ChainInclusionError::NoChainProvider(chain_id) => {
+            eth_rpc::Error::NoChainProvider(chain_id) => {
                     ValidationError::InvalidTimeProof {
                         key: order_key.to_owned(),
                     reason: format!("No RPC provider for chain '{chain_id}'. Transaction for event cannot be verified."),
                 }
-            }
-            ChainInclusionError::Error(error) => ValidationError::InvalidTimeProof {
+            },
+            eth_rpc::Error::InvalidArgument(e) =>  ValidationError::InvalidTimeProof {
                 key: order_key.to_owned(),
-                reason: error.to_string(),
+            reason: format!("Invalid argument: {}", e),
             },
+            eth_rpc::Error::BlockNotFound { chain_id, block_hash } => ValidationError::InvalidTimeProof {
+                key: order_key.to_owned(),
+            reason: format!("Block not found  on chain {} with hash: {}", chain_id, block_hash)
+            },
+            eth_rpc::Error::Transient(error) => ValidationError::InvalidTimeProof {
+                key: order_key.to_owned(),
+            reason: format!("transient error encountered talking to eth rpc: {error}")
+            },
+            eth_rpc::Error::Application(error) => ValidationError::InvalidTimeProof {
+                key: order_key.to_owned(),
+            reason: format!("application error encountered: {error}")
+            }
         }
     }
 }