Merge branch 'main' into dockerfile

Author: fnando

.cargo/config.toml

@@ -2,7 +2,6 @@
 
 [alias] # command aliases
 f = "fmt"
-md-gen = "run --package doc-gen"
 s = "run --quiet --"
 # b = "build"
 # c = "check"

.github/workflows/binaries.yml

@@ -205,7 +205,7 @@ jobs:
         if:
           github.event_name == 'release' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.head_ref, 'release/')
         id: stm-setup
-        uses: digicert/code-signing-software-trust-action@v1.0.1
+        uses: digicert/code-signing-software-trust-action@v1.1.0
         with:
           simple-signing-mode: true
           keypair-alias: key_1412258126

Cargo.toml

@@ -28,6 +28,7 @@ rust-version = "1.89.0"
 [workspace.dependencies.soroban-cli]
 version = "=25.1.0"
 path = "cmd/soroban-cli"
+default-features = false
 
 [workspace.dependencies.soroban-spec-typescript]
 version = "25.1.0"

Makefile

@@ -44,7 +44,7 @@ build-test-wasms:
 build-test: build-test-wasms install
 
 docs:
-	cargo run --package doc-gen
+	cargo run --package doc-gen --features additional-libs
 	./node_modules/.bin/prettier --write --log-level warn FULL_HELP_DOCS.md
 
 test: build-test

cmd/doc-gen/Cargo.toml

@@ -11,6 +11,9 @@ edition = "2021"
 rust-version.workspace = true
 publish = false
 
+[features]
+additional-libs = ["soroban-cli/additional-libs"]
+
 [dependencies]
 soroban-cli = { workspace = true }
 # clap-markdown from https://github.com/ConnorGray/clap-markdown/pull/48

cmd/soroban-cli/src/commands/doctor.rs

@@ -48,6 +48,7 @@ impl Cmd {
         check_version(&print).await?;
         check_rust_version(&print);
         check_wasm_target(&print);
+        check_optional_features(&print);
         show_config_path(&print, &self.config_locator)?;
         show_data_path(&print)?;
         show_xdr_version(&print);
@@ -98,8 +99,8 @@ async fn print_network(
     };
 
     print.globeln(format!("{prefix} {name:?} ({})", network.rpc_url,));
-    print.blankln(format!(" protocol {}", version_info.protocol_version));
-    print.blankln(format!(" rpc {}", version_info.version));
+    print.blankln(format!("protocol {}", version_info.protocol_version));
+    print.blankln(format!("rpc {}", version_info.version));
 
     Ok(())
 }
@@ -200,6 +201,25 @@ fn check_wasm_target(print: &Print) {
     }
 }
 
+fn check_optional_features(print: &Print) {
+    #[cfg(feature = "additional-libs")]
+    {
+        print.checkln("Wasm optimization");
+        print.checkln("Secure store (OS keyring)");
+        print.checkln("Ledger hardware wallet");
+    }
+
+    #[cfg(not(feature = "additional-libs"))]
+    {
+        print.warnln(
+            "The following features are disabled until `--features additional-libs` is used:",
+        );
+        print.blankln("- Wasm optimization");
+        print.blankln("- Secure store (OS keyring)");
+        print.blankln("- Ledger hardware wallet");
+    }
+}
+
 fn get_expected_wasm_target() -> String {
     let Ok(current_version) = version() else {
         return "wasm32v1-none".into();