script refactoring

Cargo.toml

@@ -119,6 +119,7 @@ forge = { path = "crates/forge" }
 forge-doc = { path = "crates/doc" }
 forge-fmt = { path = "crates/fmt" }
 forge-verify = { path = "crates/verify" }
+forge-script = { path = "crates/script" }
 foundry-cheatcodes = { path = "crates/cheatcodes" }
 foundry-cheatcodes-spec = { path = "crates/cheatcodes/spec" }
 foundry-cli = { path = "crates/cli" }

crates/common/src/contracts.rs

@@ -135,23 +135,6 @@ unsafe fn count_different_bytes(a: &[u8], b: &[u8]) -> usize {
     sum
 }
 
-/// Flattens the contracts into  (`id` -> (`JsonAbi`, `Vec<u8>`)) pairs
-pub fn flatten_contracts(
-    contracts: &BTreeMap<ArtifactId, ContractBytecodeSome>,
-    deployed_code: bool,
-) -> ContractsByArtifact {
-    ContractsByArtifact(
-        contracts
-            .iter()
-            .filter_map(|(id, c)| {
-                let bytecode =
-                    if deployed_code { c.deployed_bytecode.bytes() } else { c.bytecode.bytes() };
-                bytecode.cloned().map(|code| (id.clone(), (c.abi.clone(), code.into())))
-            })
-            .collect(),
-    )
-}
-
 /// Artifact/Contract identifier can take the following form:
 /// `<artifact file name>:<contract name>`, the `artifact file name` is the name of the json file of
 /// the contract's artifact and the contract name is the name of the solidity contract, like

crates/forge/Cargo.toml

@@ -15,7 +15,11 @@ name = "forge"
 path = "bin/main.rs"
 
 [build-dependencies]
-vergen = { workspace = true, default-features = false, features = ["build", "git", "gitcl"] }
+vergen = { workspace = true, default-features = false, features = [
+    "build",
+    "git",
+    "gitcl",
+] }
 
 [dependencies]
 # lib
@@ -47,6 +51,7 @@ yansi = "0.5"
 forge-doc.workspace = true
 forge-fmt.workspace = true
 forge-verify.workspace = true
+forge-script.workspace = true
 foundry-cli.workspace = true
 foundry-debugger.workspace = true
 
@@ -94,14 +99,25 @@ globset = "0.4"
 paste = "1.0"
 path-slash = "0.2"
 pretty_assertions.workspace = true
-svm = { package = "svm-rs", version = "0.3", default-features = false, features = ["rustls"] }
+svm = { package = "svm-rs", version = "0.3", default-features = false, features = [
+    "rustls",
+] }
 tempfile = "3"
 tracing-subscriber = { workspace = true, features = ["env-filter", "fmt"] }
 
 [features]
 default = ["rustls"]
-rustls = ["foundry-cli/rustls", "foundry-wallets/rustls", "reqwest/rustls-tls", "reqwest/rustls-tls-native-roots"]
-openssl = ["foundry-cli/openssl", "reqwest/default-tls", "foundry-wallets/openssl"]
+rustls = [
+    "foundry-cli/rustls",
+    "foundry-wallets/rustls",
+    "reqwest/rustls-tls",
+    "reqwest/rustls-tls-native-roots",
+]
+openssl = [
+    "foundry-cli/openssl",
+    "reqwest/default-tls",
+    "foundry-wallets/openssl",
+]
 asm-keccak = ["alloy-primitives/asm-keccak"]
 
 [[bench]]

crates/forge/bin/cmd/debug.rs

@@ -1,5 +1,5 @@
-use super::{build::BuildArgs, script::ScriptArgs};
 use clap::{Parser, ValueHint};
+use forge_script::ScriptArgs;
 use forge_verify::retry::RETRY_VERIFY_ON_CREATE;
 use foundry_cli::opts::CoreBuildArgs;
 use foundry_common::evm::EvmArgs;
@@ -48,7 +48,7 @@ impl DebugArgs {
             target_contract: self.target_contract,
             sig: self.sig,
             gas_estimate_multiplier: 130,
-            opts: BuildArgs { args: self.opts, ..Default::default() },
+            opts: self.opts,
             evm_opts: self.evm_opts,
             debug: true,
             retry: RETRY_VERIFY_ON_CREATE,

crates/forge/bin/cmd/init.rs

@@ -164,11 +164,6 @@ impl InitArgs {
     }
 }
 
-/// Returns the commit hash of the project if it exists
-pub fn get_commit_hash(root: &Path) -> Option<String> {
-    Git::new(root).commit_hash(true, "HEAD").ok()
-}
-
 /// Initialises `root` as a git repository, if it isn't one already.
 ///
 /// Creates `.gitignore` and `.github/workflows/test.yml`, if they don't exist already.

crates/forge/bin/cmd/mod.rs

@@ -56,7 +56,6 @@ pub mod inspect;
 pub mod install;
 pub mod remappings;
 pub mod remove;
-pub mod script;
 pub mod selectors;
 pub mod snapshot;
 pub mod test;