From fd9fb7231420a9f0b8709ac542c2703b85a104b0 Mon Sep 17 00:00:00 2001
From: Elizabeth Engelman <4752801+elizabethengelman@users.noreply.github.com>
Date: Wed, 17 Jul 2024 14:39:10 -0400
Subject: [PATCH 1/2] Add tests to ensure that init creates a well-formed
 workspace Cargo.toml

---
 cmd/soroban-cli/src/commands/contract/init.rs | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/cmd/soroban-cli/src/commands/contract/init.rs b/cmd/soroban-cli/src/commands/contract/init.rs
index 21b9d48bb6..d77a087171 100644
--- a/cmd/soroban-cli/src/commands/contract/init.rs
+++ b/cmd/soroban-cli/src/commands/contract/init.rs
@@ -461,6 +461,7 @@ mod tests {
         init(project_dir.as_path(), "", &with_examples).unwrap();
 
         assert_base_template_files_exist(&project_dir);
+        assert_workspace_cargo_file_is_well_formed(&project_dir);
         assert_default_hello_world_contract_files_exist(&project_dir);
         assert_excluded_paths_do_not_exist(&project_dir);
 
@@ -479,6 +480,7 @@ mod tests {
         init(project_dir.as_path(), "", &with_examples).unwrap();
 
         assert_base_template_files_exist(&project_dir);
+        assert_workspace_cargo_file_is_well_formed(&project_dir);
         assert_default_hello_world_contract_files_exist(&project_dir);
         assert_excluded_paths_do_not_exist(&project_dir);
 
@@ -502,6 +504,7 @@ mod tests {
         init(project_dir.as_path(), "", &with_examples).unwrap();
 
         assert_base_template_files_exist(&project_dir);
+        assert_workspace_cargo_file_is_well_formed(&project_dir);
         assert_default_hello_world_contract_files_exist(&project_dir);
         assert_excluded_paths_do_not_exist(&project_dir);
 
@@ -541,6 +544,7 @@ mod tests {
         .unwrap();
 
         assert_base_template_files_exist(&project_dir);
+        assert_workspace_cargo_file_is_well_formed(&project_dir);
         assert_default_hello_world_contract_files_exist(&project_dir);
         assert_excluded_paths_do_not_exist(&project_dir);
 
@@ -569,6 +573,7 @@ mod tests {
         .unwrap();
 
         assert_base_template_files_exist(&project_dir);
+        assert_workspace_cargo_file_is_well_formed(&project_dir);
         assert_default_hello_world_contract_files_exist(&project_dir);
         assert_excluded_paths_do_not_exist(&project_dir);
 
@@ -607,6 +612,7 @@ mod tests {
         .unwrap();
 
         assert_base_template_files_exist(&project_dir);
+        assert_workspace_cargo_file_is_well_formed(&project_dir);
         assert_default_hello_world_contract_files_exist(&project_dir);
         assert_excluded_paths_do_not_exist(&project_dir);
 
@@ -646,6 +652,22 @@ mod tests {
         assert!(contract_dir.as_path().join("src").join("test.rs").exists());
     }
 
+    fn assert_workspace_cargo_file_is_well_formed(project_dir: &Path) {
+        let cargo_toml_path = project_dir.join("Cargo.toml");
+        let cargo_toml_str = read_to_string(cargo_toml_path.clone()).unwrap();
+        let doc = cargo_toml_str.parse::<toml_edit::Document>().unwrap();
+        println!("{cargo_toml_path:?} contents:\n{cargo_toml_str}");
+        assert!(
+            doc.get("workspace")
+                .unwrap()
+                .get("dependencies")
+                .unwrap()
+                .get("soroban-sdk")
+                .is_some(),
+            "expected [workspace.dependencies] to include soroban-sdk"
+        );
+    }
+
     fn assert_contract_cargo_file_is_well_formed(project_dir: &Path, contract_name: &str) {
         let contract_dir = project_dir.join("contracts").join(contract_name);
         let cargo_toml_path = contract_dir.as_path().join("Cargo.toml");

From 2729210074580d6be08fff91c702a54e05b25056 Mon Sep 17 00:00:00 2001
From: Elizabeth Engelman <4752801+elizabethengelman@users.noreply.github.com>
Date: Wed, 17 Jul 2024 14:40:44 -0400
Subject: [PATCH 2/2] Overwrite existing workspace Cargo.toml in favor of FE
 template one

---
 cmd/soroban-cli/src/commands/contract/init.rs | 26 +++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/cmd/soroban-cli/src/commands/contract/init.rs b/cmd/soroban-cli/src/commands/contract/init.rs
index d77a087171..7a8ebeb3e0 100644
--- a/cmd/soroban-cli/src/commands/contract/init.rs
+++ b/cmd/soroban-cli/src/commands/contract/init.rs
@@ -14,7 +14,7 @@ use std::{
     },
     io::{self, Read, Write},
     num::NonZeroU32,
-    path::Path,
+    path::{Path, PathBuf},
     str,
     sync::atomic::AtomicBool,
 };
@@ -232,10 +232,13 @@ fn copy_contents(from: &Path, to: &Path) -> Result<(), Error> {
                 if new_path.to_string_lossy().contains("README.md") {
                     append_contents(&path, &new_path)?;
                 }
+                if new_path.to_string_lossy() == to.join("Cargo.toml").to_string_lossy() {
+                    handle_existing_workspace_cargo_toml_file(path, new_path.clone())?;
+                }
 
                 println!(
                     "ℹ️  Skipped creating {} as it already exists",
-                    &new_path.to_string_lossy()
+                    new_path.to_string_lossy()
                 );
                 continue;
             }
@@ -255,6 +258,25 @@ fn copy_contents(from: &Path, to: &Path) -> Result<(), Error> {
     Ok(())
 }
 
+fn handle_existing_workspace_cargo_toml_file(
+    path: PathBuf,
+    new_path: PathBuf,
+) -> Result<(), Error> {
+    println!(
+        "ℹ️  Overwriting existing workspace Cargo.toml with frontend template's Cargo.toml: {}",
+        &new_path.to_string_lossy()
+    );
+    copy(&path, &new_path).map_err(|e| {
+        eprintln!(
+            "Error copying from {:?} to {:?}",
+            path.to_string_lossy(),
+            new_path
+        );
+        e
+    })?;
+    Ok(())
+}
+
 fn file_exists(file_path: &Path) -> bool {
     metadata(file_path)
         .as_ref()