Merge remote-tracking branch 'upstream/main' into feat/build-optimize

Author: BlaineHeffron

.github/workflows/binaries.yml

@@ -56,7 +56,7 @@ jobs:
 
     - name: Build
       run: |
-        cargo build --package ${{ matrix.crate.name }} --features opt,additional-libs --release --target ${{ matrix.sys.target }}
+        cargo build --package ${{ matrix.crate.name }} --release --target ${{ matrix.sys.target }}
     - name: Build provenance for binary attestation (release only)
       if: github.event_name == 'release'
       uses: actions/attest-build-provenance@v2

.github/workflows/rust.yml

@@ -148,10 +148,10 @@ jobs:
         # [2]: https://github.com/brson/wasm-opt-rs/issues/116
         - os: windows-latest-8-cores
           target: x86_64-pc-windows-msvc
-          cargo-hack-feature-options: ''
+          cargo-hack-feature-options: --no-default-features
         - os: windows-latest-8-cores
           target: x86_64-pc-windows-msvc
-          cargo-hack-feature-options: --features opt --ignore-unknown-features
+          cargo-hack-feature-options: --features additional-libs --ignore-unknown-features
 
     uses: stellar/actions/.github/workflows/rust-publish-dry-run-v2.yml@main
     with:

Cargo.toml

@@ -21,7 +21,7 @@ exclude = [
 
 [workspace.package]
 version = "22.8.1"
-rust-version = "1.84.0"
+rust-version = "1.85.0"
 
 # Dependencies located in this repo:
 [workspace.dependencies.soroban-cli]

README.md

@@ -34,7 +34,12 @@ brew install stellar-cli
 
 Install the latest version from source:
 ```
-cargo install --locked stellar-cli --features opt
+cargo install --locked stellar-cli
+```
+
+Install without features that depend on additional libraries:
+```
+cargo install --locked stellar-cli --no-default-features
 ```
 
 Install or run the unreleased main branch with nix:

cmd/soroban-cli/Cargo.toml

@@ -34,12 +34,11 @@ path = "src/lib.rs"
 doctest = false
 
 [features]
-default = []
+default = ["additional-libs"]
+additional-libs = ["dep:wasm-opt", "dep:keyring", "dep:stellar-ledger"]
 version_lt_23 = []
 version_gte_23 = []
-opt = ["dep:wasm-opt"]
 emulator-tests = ["stellar-ledger/emulator-tests"]
-additional-libs = ["dep:keyring", "dep:stellar-ledger"]
 
 [dependencies]
 stellar-xdr = { workspace = true, features = ["cli"] }

cmd/soroban-cli/README.md

@@ -10,10 +10,10 @@ Docs: https://developers.stellar.org
 cargo install --locked stellar-cli
 ```
 
-To install with the `opt` feature, which includes a WASM optimization feature and wasm-opt built in:
+To install without features that depend on additional libraries:
 
 ```
-cargo install --locked stellar-cli --features opt
+cargo install --locked stellar-cli --no-default-features
 ```
 
 ## Usage

cmd/soroban-cli/src/commands/contract/optimize.rs

@@ -1,5 +1,7 @@
 use clap::{arg, command, Parser};
 use std::fmt::Debug;
+#[cfg(feature = "additional-libs")]
+use wasm_opt::{Feature, OptimizationError, OptimizationOptions};
 
 use crate::wasm;
 
@@ -17,18 +19,21 @@ pub struct Cmd {
 pub enum Error {
     #[error(transparent)]
     Wasm(#[from] wasm::Error),
-    #[cfg(not(feature = "opt"))]
-    #[error("Must install with \"opt\" feature, e.g. `cargo install --locked soroban-cli --features opt")]
+    #[cfg(feature = "additional-libs")]
+    #[error("optimization error: {0}")]
+    OptimizationError(OptimizationError),
+    #[cfg(not(feature = "additional-libs"))]
+    #[error("must install with \"additional-libs\" feature.")]
     Install,
 }
 
 impl Cmd {
-    #[cfg(not(feature = "opt"))]
+    #[cfg(not(feature = "additional-libs"))]
     pub fn run(&self) -> Result<(), Error> {
         Err(Error::Install)
     }
 
-    #[cfg(feature = "opt")]
+    #[cfg(feature = "additional-libs")]
     pub fn run(&self) -> Result<(), Error> {
         let wasm_size = self.wasm.len()?;
 

cmd/soroban-cli/src/signer/ledger.rs

@@ -1,4 +1,4 @@
-use crate::xdr::{self, DecoratedSignature, Transaction};
+use crate::xdr;
 
 pub use ledger_impl::*;
 
@@ -20,8 +20,8 @@ pub enum Error {
 
 #[cfg(feature = "additional-libs")]
 mod ledger_impl {
-    use super::*;
-    use crate::xdr::{Hash, Signature, SignatureHint};
+    use super::Error;
+    use crate::xdr::{DecoratedSignature, Hash, Signature, SignatureHint, Transaction};
     use sha2::{Digest, Sha256};
     use stellar_ledger::{Blob as _, Exchange, LedgerSigner};
 
@@ -36,6 +36,7 @@ mod ledger_impl {
     }
 
     #[cfg(not(feature = "emulator-tests"))]
+    #[allow(clippy::unused_async)]
     pub async fn new(hd_path: u32) -> Result<Ledger<stellar_ledger::TransportNativeHID>, Error> {
         let signer = stellar_ledger::native()?;
         Ok(Ledger {

cmd/stellar-cli/Cargo.toml

@@ -21,10 +21,9 @@ pkg-url = "{ repo }/releases/download/v{ version }/{ name }-{ version }-{ target
 bin-dir = "{ bin }{ binary-ext }"
 
 [features]
-default = []
-opt = ["soroban-cli/opt"]
-emulator-tests = ["soroban-cli/emulator-tests"]
+default = ["additional-libs"]
 additional-libs = ["soroban-cli/additional-libs"]
+emulator-tests = ["soroban-cli/emulator-tests"]
 
 [dependencies]
 soroban-cli = { workspace = true }

cmd/stellar-cli/README.md

@@ -12,9 +12,10 @@ Install with Homebrew (macOS, Linux):
 brew install stellar-cli
 ```
 
-Install the latest version from source:
+To install without features that depend on additional libraries:
+
 ```
-cargo install --locked stellar-cli --features opt
+cargo install --locked stellar-cli --no-default-features
 ```
 
 ## Usage