From 46f721463c739836ba9dce65ad9f37326f770494 Mon Sep 17 00:00:00 2001 From: Enrique Ortiz Date: Thu, 10 Aug 2023 14:05:07 -0400 Subject: [PATCH 1/3] chore: add flag to skip interactivity --- cli/src/cmd/forge/script/mod.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cli/src/cmd/forge/script/mod.rs b/cli/src/cmd/forge/script/mod.rs index ba6c6ad113fcf..59ae6c51f1823 100644 --- a/cli/src/cmd/forge/script/mod.rs +++ b/cli/src/cmd/forge/script/mod.rs @@ -175,6 +175,10 @@ pub struct ScriptArgs { #[clap(long)] pub slow: bool, + /// Disables interactive prompts that might appear when deploying big contracts. + #[clap(long)] + pub non_interactive: bool, + /// The Etherscan (or equivalent) API key #[clap(long, env = "ETHERSCAN_API_KEY", value_name = "KEY")] pub etherscan_api_key: Option, @@ -624,7 +628,7 @@ impl ScriptArgs { } } - if prompt_user && + if prompt_user && !self.non_interactive && !Confirm::new().with_prompt("Do you wish to continue?".to_string()).interact()? { eyre::bail!("User canceled the script."); From 629652213bfe2fc3caf795b76e449a09c1aa473d Mon Sep 17 00:00:00 2001 From: Enrique Ortiz Date: Thu, 10 Aug 2023 14:20:10 -0400 Subject: [PATCH 2/3] chore: docs --- cli/src/cmd/forge/script/mod.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cli/src/cmd/forge/script/mod.rs b/cli/src/cmd/forge/script/mod.rs index 59ae6c51f1823..f2c993c0318ce 100644 --- a/cli/src/cmd/forge/script/mod.rs +++ b/cli/src/cmd/forge/script/mod.rs @@ -628,7 +628,9 @@ impl ScriptArgs { } } - if prompt_user && !self.non_interactive && + // Only prompt if we're broadcasting and we've not disabled interactivity. + if prompt_user && + !self.non_interactive && !Confirm::new().with_prompt("Do you wish to continue?".to_string()).interact()? { eyre::bail!("User canceled the script."); From 72ce4d82ced1752c3e554dc893dbd11ccd7a6e22 Mon Sep 17 00:00:00 2001 From: Enrique Ortiz Date: Thu, 10 Aug 2023 14:46:43 -0400 Subject: [PATCH 3/3] chore: add eip-170 size limit info --- cli/src/cmd/forge/script/mod.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cli/src/cmd/forge/script/mod.rs b/cli/src/cmd/forge/script/mod.rs index f2c993c0318ce..6cc8532217856 100644 --- a/cli/src/cmd/forge/script/mod.rs +++ b/cli/src/cmd/forge/script/mod.rs @@ -176,6 +176,8 @@ pub struct ScriptArgs { pub slow: bool, /// Disables interactive prompts that might appear when deploying big contracts. + /// + /// For more info on the contract size limit, see EIP-170: #[clap(long)] pub non_interactive: bool,