fix: replace EVM reconnect loop with provider lifecycle

crates/ciphernode-builder/src/ciphernode_builder.rs

@@ -18,7 +18,7 @@ use e3_events::{
     AggregateConfig, AggregateId, BusHandle, EnclaveEvent, EventBus, EventBusConfig, EvmEventConfig,
 };
 use e3_evm::{BondingRegistrySolReader, CiphernodeRegistrySolReader, EnclaveSolWriter};
-use e3_evm::{CiphernodeRegistrySol, EnclaveSolReader};
+use e3_evm::{CiphernodeRegistrySol, EnclaveSolReader, ProviderConfig};
 use e3_fhe::ext::FheExtension;
 use e3_fhe_params::BfvPreset;
 use e3_keyshare::ext::ThresholdKeyshareExtension;
@@ -613,7 +613,13 @@ async fn setup_evm_system(
         let provider = provider_cache.ensure_read_provider(chain).await?;
         let chain_id = provider.chain_id();
         evm_config.insert(chain_id, chain.try_into()?);
+
+        let rpc_url = chain.rpc_url()?;
+        let provider_factory =
+            ProviderConfig::new(rpc_url, chain.rpc_auth.clone()).into_read_provider_factory();
+
         let mut system = EvmSystemChainBuilder::new(&bus, &provider);
+        system.with_provider_factory(provider_factory);
 
         if contract_components.enclave {
             let write_provider = provider_cache.ensure_write_provider(chain).await?;

crates/ciphernode-builder/src/evm_system.rs

@@ -11,7 +11,7 @@ use alloy::{primitives::Address, providers::Provider};
 use e3_events::{run_once, BusHandle, EventSubscriber, EventType, HistoricalEvmSyncStart};
 use e3_evm::{
     EthProvider, EvmChainGateway, EvmEventProcessor, EvmReadInterface, EvmRouter, Filters,
-    FixHistoricalOrder,
+    FixHistoricalOrder, ProviderFactory,
 };
 
 pub trait RouteFn: FnOnce(EvmEventProcessor) -> EvmEventProcessor + Send {}
@@ -22,6 +22,7 @@ type RouteFactory = Box<dyn RouteFn>;
 // Build the event system for a single chain
 pub struct EvmSystemChainBuilder<P> {
     provider: EthProvider<P>,
+    provider_factory: Option<ProviderFactory<P>>,
     bus: BusHandle,
     chain_id: u64,
     route_factories: Vec<(Address, RouteFactory)>,
@@ -33,11 +34,17 @@ impl<P: Provider + Clone + 'static> EvmSystemChainBuilder<P> {
         Self {
             bus: bus.clone(),
             provider: provider.clone(),
+            provider_factory: None,
             chain_id,
             route_factories: Vec::new(),
         }
     }
 
+    pub fn with_provider_factory(&mut self, factory: ProviderFactory<P>) -> &mut Self {
+        self.provider_factory = Some(factory);
+        self
+    }
+
     pub fn with_contract<F: RouteFn + 'static>(
         &mut self,
         address: Address,
@@ -61,6 +68,7 @@ impl<P: Provider + Clone + 'static> EvmSystemChainBuilder<P> {
             // Clone self refs for closure
             let bus = self.bus.clone();
             let provider = self.provider.clone();
+            let provider_factory = self.provider_factory.clone();
             let chain_id = self.chain_id;
 
             // Only gets consumed once so fine to use replace to clean out route_factories
@@ -78,7 +86,13 @@ impl<P: Provider + Clone + 'static> EvmSystemChainBuilder<P> {
                 let filters = filters_from_router(&router, deploy_block);
 
                 // Setup and start the read interface and the router
-                EvmReadInterface::setup(&provider, router.start(), &bus, filters);
+                EvmReadInterface::setup_with_factory(
+                    &provider,
+                    provider_factory,
+                    router.start(),
+                    &bus,
+                    filters,
+                );
                 Ok(())
             }
         });

crates/evm/src/evm_parser.rs

@@ -5,15 +5,18 @@
 // or FITNESS FOR A PARTICULAR PURPOSE.
 
 use actix::{Actor, Handler};
+use alloy::primitives::{LogData, B256};
 use e3_events::{hlc::HlcTimestamp, EnclaveEventData};
 use e3_utils::MAILBOX_LIMIT;
 use tracing::debug;
 
 use crate::{
     events::{EnclaveEvmEvent, EvmEventProcessor, EvmLog},
-    EvmEvent, ExtractorFn,
+    EvmEvent,
 };
 
+pub type ExtractorFn<E> = fn(&LogData, Option<&B256>, u64) -> Option<E>;
+
 pub struct EvmParser {
     next: EvmEventProcessor,
     extractor: ExtractorFn<EnclaveEventData>,