chore: update to [email protected]

- adds init4 metrics
- updates provider types to account for alloy changes

Author: dylanlott

Cargo.toml

@@ -24,9 +24,9 @@ path = "bin/submit_transaction.rs"
 [dependencies]
 init4-bin-base = "0.1.0"
 
-zenith-types = "0.13"
+zenith-types = "0.15"
 
-alloy = { version = "0.7.3", features = ["full", "json-rpc", "signer-aws", "rpc-types-mev", "rlp"] }
+alloy = { version = "=0.11.1", features = ["full", "json-rpc", "signer-aws", "rpc-types-mev", "rlp", "node-bindings"] }
 
 aws-config = "1.1.7"
 aws-sdk-kms = "1.15.0"
@@ -48,3 +48,5 @@ tokio = { version = "1.36.0", features = ["full", "macros", "rt-multi-thread"] }
 
 async-trait = "0.1.80"
 oauth2 = "4.4.2"
+metrics = "0.24.1"
+metrics-exporter-prometheus = "0.16.0"

bin/submit_transaction.rs

@@ -82,7 +82,6 @@ async fn connect_from_config() -> (Provider, Address, u64) {
     let signer = AwsSigner::new(client, kms_key_id.to_string(), Some(chain_id)).await.unwrap();
 
     let provider = ProviderBuilder::new()
-        .with_recommended_fillers()
         .wallet(EthereumWallet::from(signer))
         .on_builtin(&rpc_url)
         .await

src/config.rs

@@ -9,9 +9,9 @@ use alloy::{
         },
         Identity, ProviderBuilder, RootProvider,
     },
-    transports::BoxTransport,
 };
 use std::{borrow::Cow, env, num, str::FromStr};
+
 use zenith_types::Zenith;
 
 // Keys for .env variables that need to be set to configure the builder.
@@ -125,7 +125,7 @@ impl ConfigError {
     }
 }
 
-/// Provider type used to read & write.
+/// Defines a full provider
 pub type Provider = FillProvider<
     JoinFill<
         JoinFill<
@@ -134,26 +134,22 @@ pub type Provider = FillProvider<
         >,
         WalletFiller<EthereumWallet>,
     >,
-    RootProvider<BoxTransport>,
-    BoxTransport,
+    RootProvider,
     Ethereum,
 >;
 
-/// Provider type used to read-only.
+/// Defines a read-only wallet
 pub type WalletlessProvider = FillProvider<
     JoinFill<
         Identity,
         JoinFill<GasFiller, JoinFill<BlobGasFiller, JoinFill<NonceFiller, ChainIdFiller>>>,
     >,
-    RootProvider<BoxTransport>,
-    BoxTransport,
+    RootProvider,
     Ethereum,
 >;
 
-/// A Zenith contract instance, using some provider `P` (defaults to
-/// [`Provider`]).
-pub type ZenithInstance<P = Provider> =
-    Zenith::ZenithInstance<BoxTransport, P, alloy::network::Ethereum>;
+/// Defines a [`Zenith`] instance that is generic over [`Provider`]
+pub type ZenithInstance = Zenith::ZenithInstance<(), Provider, alloy::network::Ethereum>;
 
 impl BuilderConfig {
     /// Load the builder configuration from environment variables.
@@ -210,32 +206,33 @@ impl BuilderConfig {
 
     /// Connect to the Rollup rpc provider.
     pub async fn connect_ru_provider(&self) -> Result<WalletlessProvider, ConfigError> {
-        ProviderBuilder::new()
-            .with_recommended_fillers()
+        let provider = ProviderBuilder::new()
             .on_builtin(&self.ru_rpc_url)
             .await
-            .map_err(Into::into)
+            .map_err(ConfigError::Provider)?;
+
+        Ok(provider)
     }
 
     /// Connect to the Host rpc provider.
     pub async fn connect_host_provider(&self) -> Result<Provider, ConfigError> {
         let builder_signer = self.connect_builder_signer().await?;
-        ProviderBuilder::new()
-            .with_recommended_fillers()
+        let provider = ProviderBuilder::new()
             .wallet(EthereumWallet::from(builder_signer))
             .on_builtin(&self.host_rpc_url)
             .await
-            .map_err(Into::into)
+            .map_err(ConfigError::Provider)?;
+
+        Ok(provider)
     }
 
-    /// Connect additional broadcast providers.
-    pub async fn connect_additional_broadcast(
-        &self,
-    ) -> Result<Vec<RootProvider<BoxTransport>>, ConfigError> {
-        let mut providers = Vec::with_capacity(self.tx_broadcast_urls.len());
+    /// Connect additionally configured non-host providers to broadcast transactions to.
+    pub async fn connect_additional_broadcast(&self) -> Result<Vec<WalletlessProvider>, ConfigError> {
+        let mut providers: Vec<WalletlessProvider> = Vec::with_capacity(self.tx_broadcast_urls.len());
         for url in self.tx_broadcast_urls.iter() {
             let provider =
-                ProviderBuilder::new().on_builtin(url).await.map_err(Into::<ConfigError>::into)?;
+                ProviderBuilder::new().on_builtin(url).await.map_err(ConfigError::Provider)?;
+
             providers.push(provider);
         }
         Ok(providers)
@@ -278,5 +275,6 @@ pub fn load_url(key: &str) -> Result<Cow<'static, str>, ConfigError> {
 /// Load an address from an environment variable.
 pub fn load_address(key: &str) -> Result<Address, ConfigError> {
     let address = load_string(key)?;
-    Address::from_str(&address).map_err(Into::into)
+    Address::from_str(&address)
+        .map_err(|_| ConfigError::Var(format!("Invalid address format for {}", key)))
 }

src/lib.rs

@@ -27,4 +27,7 @@ pub mod tasks;
 /// Utilities.
 pub mod utils;
 
+/// Anonymous crate dependency imports.
+use metrics as _;
+use metrics_exporter_prometheus as _;
 use openssl as _;