Revive provider methods on ParentChain.

Author: twittner

Cargo.lock

@@ -18,6 +18,7 @@ secp256k1 = { workspace = true }
 serde = { workspace = true }
 thiserror = { workspace = true }
 timeboost-crypto = { path = "../timeboost-crypto" }
+timeboost-types = { path = "../timeboost-types" }
 tokio = { workspace = true }
 toml = { workspace = true }
 tracing = { workspace = true }

timeboost-config/Cargo.toml

@@ -1,7 +1,9 @@
-use alloy::eips::BlockNumberOrTag;
 use alloy::primitives::Address;
+use alloy::providers::ProviderBuilder;
+use alloy::{eips::BlockNumberOrTag, network::EthereumWallet};
 use bon::Builder;
 use serde::{Deserialize, Serialize};
+use timeboost_types::{HttpProvider, HttpProviderWithWallet};
 use url::Url;
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Builder)]
@@ -18,3 +20,15 @@ pub struct ParentChain {
     pub block_tag: BlockNumberOrTag,
     pub key_manager_contract: Address,
 }
+
+impl ParentChain {
+    pub fn provider(&self) -> HttpProvider {
+        ProviderBuilder::new().connect_http(self.rpc_url.clone())
+    }
+
+    pub fn provider_with_wallet(&self, wallet: EthereumWallet) -> HttpProviderWithWallet {
+        ProviderBuilder::new()
+            .wallet(wallet)
+            .connect_http(self.rpc_url.clone())
+    }
+}

timeboost-config/src/chain.rs

@@ -1,7 +1,7 @@
 use std::{iter::repeat_with, path::PathBuf, sync::Arc, time::Duration};
 
 use ::metrics::prometheus::PrometheusMetrics;
-use alloy::providers::{Provider, ProviderBuilder};
+use alloy::providers::Provider;
 use anyhow::{Context, Result};
 use cliquenet::{Network, NetworkMetrics, Overlay};
 use committable::{Commitment, Committable, RawCommitmentBuilder};
@@ -91,7 +91,7 @@ async fn main() -> Result<()> {
     let dh_keypair = x25519::Keypair::from(config.keys.dh.secret.clone());
 
     // syncing with contract to get peers keys and network addresses
-    let provider = ProviderBuilder::new().connect_http(config.chain.parent.rpc_url);
+    let provider = config.chain.parent.provider();
     assert_eq!(
         provider.get_chain_id().await?,
         config.chain.parent.id,

timeboost/src/binaries/sailfish.rs

@@ -1,6 +1,6 @@
 use std::path::PathBuf;
 
-use alloy::providers::{Provider, ProviderBuilder};
+use alloy::providers::Provider;
 use anyhow::{Context, Result, bail};
 use cliquenet::AddressableCommittee;
 use multisig::CommitteeId;
@@ -108,7 +108,7 @@ async fn main() -> Result<()> {
     let dh_keypair = x25519::Keypair::from(node_config.keys.dh.secret.clone());
 
     // syncing with contract to get peers keys and network addresses
-    let provider = ProviderBuilder::new().connect_http(node_config.chain.parent.rpc_url.clone());
+    let provider = node_config.chain.parent.provider();
     assert_eq!(
         provider.get_chain_id().await?,
         node_config.chain.parent.id,