fix(forge): set script verification retries at 5 with a 5 second delay (

#2739)

* 5 retries with 5s delay for forge script verification

* set default on RetryArgs instead

cli/src/cmd/forge/create.rs

@@ -24,7 +24,7 @@ use serde_json::json;
 use std::{path::PathBuf, sync::Arc};
 use tracing::log::trace;
 
-pub const RETRY_VERIFY_ON_CREATE: RetryArgs = RetryArgs { retries: 15, delay: Some(3) };
+pub const RETRY_VERIFY_ON_CREATE: RetryArgs = RetryArgs { retries: 15, delay: 3 };
 
 #[derive(Debug, Clone, Parser)]
 pub struct CreateArgs {

cli/src/cmd/forge/verify.rs

@@ -37,7 +37,7 @@ use tracing::{trace, warn};
 pub static RE_BUILD_COMMIT: Lazy<Regex> =
     Lazy::new(|| Regex::new(r#"(?P<commit>commit\.[0-9,a-f]{8})"#).unwrap());
 
-pub const RETRY_CHECK_ON_VERIFY: RetryArgs = RetryArgs { retries: 6, delay: Some(10) };
+pub const RETRY_CHECK_ON_VERIFY: RetryArgs = RetryArgs { retries: 6, delay: 10 };
 
 /// Verification arguments
 #[derive(Debug, Clone, Parser)]

cli/src/cmd/utils.rs

@@ -118,7 +118,7 @@ pub struct RetryArgs {
     #[clap(
         long,
         help = "Number of attempts for retrying verification",
-        default_value = "1",
+        default_value = "5",
         validator = u32_validator(1, 10),
         value_name = "RETRIES"
     )]
@@ -127,10 +127,11 @@ pub struct RetryArgs {
     #[clap(
         long,
         help = "Optional delay to apply inbetween verification attempts in seconds.",
+        default_value = "5",
         validator = u32_validator(0, 30),
         value_name = "DELAY"
     )]
-    pub delay: Option<u32>,
+    pub delay: u32,
 }
 
 fn u32_validator(min: u32, max: u32) -> impl FnMut(&str) -> eyre::Result<()> {
@@ -146,7 +147,7 @@ fn u32_validator(min: u32, max: u32) -> impl FnMut(&str) -> eyre::Result<()> {
 
 impl From<RetryArgs> for Retry {
     fn from(r: RetryArgs) -> Self {
-        Retry::new(r.retries, r.delay)
+        Retry::new(r.retries, Some(r.delay))
     }
 }