Main into v25 (#1647)

### What

Merge main into v25-preview

---------

Co-authored-by: Leigh <351529+leighmcculloch@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: 4 people

.github/workflows/rust.yml

@@ -264,6 +264,7 @@ jobs:
         msrv="$(make msrv)"
         rustup install $msrv
         rustup target add --toolchain $msrv wasm32v1-none
+        rustup component add rustfmt
     - uses: stellar/binaries@v45
       with:
         name: cargo-hack

.github/workflows/test-with-soroban-examples.yml

@@ -75,7 +75,14 @@ jobs:
       run: |
         # TODO: Update this patch logic to use `cargo add` once this issue is resolved: https://github.com/rust-lang/cargo/issues/16101
         crates=$(cd ${{ github.workspace }}/rs-soroban-sdk && cargo metadata --format-version 1 --no-deps | jq -r '.packages[] | select(.publish != []) | .name')
-        find . -name Cargo.toml | while read file; do
+
+        # Find Cargo.toml files to patch
+        local_files=$(find . -name Cargo.toml)
+        workspace_root=$(cargo metadata --format-version 1 --no-deps | jq -r '.workspace_root')
+        files=$(echo "$local_files"; echo "$workspace_root/Cargo.toml")
+
+        # Patch local files and workspace root (sort -u to deduplicate)
+        echo "$files" | sort -u | while read -r file; do
           echo Patching "$file" ...
           dir=$(dirname "$file")
           for crate in $crates; do