change cli parse type

Author: lukeiannucci

tests/Cargo.toml

@@ -6,6 +6,7 @@ edition.workspace = true
 rust-version.workspace = true
 
 [dependencies]
+alloy-eips = { workspace = true }
 alloy-primitives = { workspace = true }
 async-trait = { workspace = true }
 bytes = { workspace = true }

tests/src/tests/timeboost.rs

@@ -6,6 +6,7 @@ mod transaction_order;
 use std::net::Ipv4Addr;
 use std::num::NonZeroUsize;
 
+use alloy_eips::BlockNumberOrTag;
 use cliquenet::{Address, AddressableCommittee};
 use multisig::Keypair;
 use multisig::{Committee, x25519};
@@ -96,19 +97,16 @@ where
             .decrypt_committee(decrypt_committee.clone())
             .recover(recover_index.map(|r| r == i).unwrap_or(false))
             .leash_len(100)
-            .chain_config(
-                ChainConfig::new(
-                    1,
-                    "https://theserversroom.com/ethereum/54cmzzhcj1o/"
-                        .parse::<Url>()
-                        .expect("valid url"),
-                    "0x4dbd4fc535ac27206064b68ffcf827b0a60bab3f"
-                        .parse::<alloy_primitives::Address>()
-                        .expect("valid contract"),
-                    "finalized",
-                )
-                .expect("valid block tag"),
-            )
+            .chain_config(ChainConfig::new(
+                1,
+                "https://theserversroom.com/ethereum/54cmzzhcj1o/"
+                    .parse::<Url>()
+                    .expect("valid url"),
+                "0x4dbd4fc535ac27206064b68ffcf827b0a60bab3f"
+                    .parse::<alloy_primitives::Address>()
+                    .expect("valid contract"),
+                BlockNumberOrTag::Finalized,
+            ))
             .build();
         let pcf = CertifierConfig::builder()
             .sign_keypair(kpair)

tests/src/tests/timeboost/handover.rs

@@ -4,6 +4,7 @@ use std::net::Ipv4Addr;
 use std::num::NonZeroUsize;
 use std::time::Duration;
 
+use alloy_eips::BlockNumberOrTag;
 use cliquenet::{Address, AddressableCommittee, Network, NetworkMetrics, Overlay};
 use futures::FutureExt;
 use futures::stream::{self, StreamExt};
@@ -138,19 +139,16 @@ where
                 )
                 .recover(false)
                 .leash_len(100)
-                .chain_config(
-                    ChainConfig::new(
-                        1,
-                        "https://theserversroom.com/ethereum/54cmzzhcj1o/"
-                            .parse::<Url>()
-                            .expect("valid url"),
-                        "0x4dbd4fc535ac27206064b68ffcf827b0a60bab3f"
-                            .parse::<alloy_primitives::Address>()
-                            .expect("valid contract"),
-                        "finalized",
-                    )
-                    .expect("valid block tag"),
-                )
+                .chain_config(ChainConfig::new(
+                    1,
+                    "https://theserversroom.com/ethereum/54cmzzhcj1o/"
+                        .parse::<Url>()
+                        .expect("valid url"),
+                    "0x4dbd4fc535ac27206064b68ffcf827b0a60bab3f"
+                        .parse::<alloy_primitives::Address>()
+                        .expect("valid contract"),
+                    BlockNumberOrTag::Finalized,
+                ))
                 .build()
         })
 }

timeboost-types/src/chain_config.rs

@@ -1,6 +1,4 @@
-use std::str::FromStr;
-
-use alloy_eips::{BlockNumberOrTag, eip1898::ParseBlockNumberError};
+use alloy_eips::BlockNumberOrTag;
 use alloy_primitives::Address;
 use serde::{Deserialize, Serialize};
 use url::Url;
@@ -18,15 +16,14 @@ impl ChainConfig {
         chain_id: u64,
         rpc_url: Url,
         ibox_addr: Address,
-        parent_block_tag: &str,
-    ) -> Result<Self, ParseBlockNumberError> {
-        let tag = BlockNumberOrTag::from_str(parent_block_tag)?;
-        Ok(Self {
+        parent_block_tag: BlockNumberOrTag,
+    ) -> Self {
+        Self {
             parent_chain_id: chain_id,
             parent_chain_rpc_url: rpc_url.to_string(),
             parent_ibox_contr_addr: ibox_addr,
-            parent_block_tag: tag,
-        })
+            parent_block_tag,
+        }
     }
     pub fn parent_chain_id(&self) -> u64 {
         self.parent_chain_id

timeboost/src/binaries/mkconfig.rs

@@ -2,6 +2,7 @@ use std::net::IpAddr;
 use std::num::NonZeroU8;
 use std::{io, iter};
 
+use alloy_eips::BlockNumberOrTag;
 use anyhow::{Result, bail};
 use ark_std::rand::SeedableRng as _;
 use clap::{Parser, ValueEnum};
@@ -60,9 +61,9 @@ struct Args {
     #[clap(long)]
     parent_ibox_contr_addr: alloy_primitives::Address,
 
-    /// Parent chain inbox contract adddress
+    /// Parent chain inbox block tag
     #[clap(long, default_value = "finalized")]
-    parent_block_tag: String,
+    parent_block_tag: BlockNumberOrTag,
 }
 
 /// How should addresses be updated?
@@ -147,9 +148,8 @@ impl Args {
                     self.parent_chain_id,
                     self.parent_rpc_url.clone(),
                     self.parent_ibox_contr_addr,
-                    &self.parent_block_tag,
-                )
-                .expect("valid block tag"),
+                    self.parent_block_tag,
+                ),
             })
             .collect();
         Ok(KeysetConfig {