Run CLI builds and tests on all platforms

.gitattributes

@@ -0,0 +1 @@
+Cargo.lock text -merge eol=lf

.github/workflows/publish.yml

@@ -4,6 +4,10 @@ on:
   release:
     types: [published]
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
 
   publish:
@@ -19,15 +23,13 @@ jobs:
             target: x86_64-unknown-linux-gnu
           - os: ubuntu-latest
             target: aarch64-unknown-linux-gnu
-            apt-install: gcc-aarch64-linux-gnu
           - os: macos-latest
             target: x86_64-apple-darwin
           - os: macos-latest
             target: aarch64-apple-darwin
-          # TODO: Re-enable when this job is updated to support Windows.
-          # - os: windows-latest
-          #   target: x86_64-pc-windows-msvc
-          #   ext: .exe
+          - os: windows-latest
+            target: x86_64-pc-windows-msvc
+            ext: .exe
     runs-on: ${{ matrix.os }}
     env:
       VERSION: '${{ github.event.release.release.name }}'
@@ -36,16 +38,22 @@ jobs:
     - uses: actions/checkout@v3
     - run: rustup update
     - run: rustup target add ${{ matrix.target }}
-    - if: matrix.apt-install
-      run: sudo apt-get -y install ${{ matrix.apt-install }}
+    - if: matrix.target == 'aarch64-unknown-linux-gnu'
+      run: sudo apt-get -y install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
     - name: Package
       run: cargo package --no-verify
     - name: Build
+      env:
+        CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc
       run: |
         cd target/package
         tar xvfz soroban-cli-$VERSION.crate
         cd soroban-cli-$VERSION
         cargo build --target-dir=../.. --release --target ${{ matrix.target }}
+    - uses: actions/upload-artifact@v3
+      with:
+        name: ${{ env.NAME }}
+        path: 'target/${{ matrix.target }}/release/soroban${{ matrix.ext }}'
     - name: Upload
       uses: actions/github-script@v6
       with:

.github/workflows/rust.yml

@@ -2,12 +2,16 @@ name: Rust
 
 on:
   push:
-    branches: [main]
+    branches: [main, release/**]
   pull_request:
 
 env:
   RUSTFLAGS: -Dwarnings -Dclippy::all -Dclippy::pedantic
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
 
   complete:
@@ -38,17 +42,28 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: ubuntu-latest
-            target: x86_64-unknown-linux-gnu
+        - os: ubuntu-latest
+          target: x86_64-unknown-linux-gnu
+        - os: ubuntu-latest
+          target: aarch64-unknown-linux-gnu
+        - os: macos-latest
+          target: x86_64-apple-darwin
+        - os: macos-latest
+          target: aarch64-apple-darwin
+        - os: windows-latest
+          target: x86_64-pc-windows-msvc
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
     - uses: stellar/actions/rust-cache@main
     - run: rustup update
     - run: rustup target add ${{ matrix.target }}
+    - if: matrix.target == 'aarch64-unknown-linux-gnu'
+      run: sudo apt-get -y install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
     - run: cargo clippy --all-targets --target ${{ matrix.target }}
     - run: make build-test-wasms
-    - run: cargo test --workspace --target ${{ matrix.target }}
+    - if: startsWith(matrix.target, 'x86_64')
+      run: cargo test --workspace --target ${{ matrix.target }}
 
   e2e-test:
     strategy:
@@ -71,13 +86,21 @@ jobs:
       - run: cargo test --test it --target ${{ matrix.target }} -- e2e_rpc_server --ignored --test-threads 1
 
   publish-dry-run:
-    if: startsWith(github.head_ref, 'release/')
+    if: github.event_name == 'push' || startsWith(github.head_ref, 'release/')
     strategy:
       matrix:
         include:
         - os: ubuntu-latest
           target: x86_64-unknown-linux-gnu
+        - os: ubuntu-latest
+          target: aarch64-unknown-linux-gnu
+        - os: macos-latest
+          target: x86_64-apple-darwin
+        - os: macos-latest
+          target: aarch64-apple-darwin
+        - os: windows-latest
+          target: x86_64-pc-windows-msvc
     uses: stellar/actions/.github/workflows/rust-publish-dry-run.yml@main
     with:
       runs-on: ${{ matrix.os }}
-      cargo-package-options: --target ${{ matrix.target }}
+      target: ${{ matrix.target }}

Cargo.toml

@@ -59,26 +59,26 @@ members = [
 default-members = ["."]
 
 [workspace.dependencies]
-soroban-env-host = "0.0.6"
-soroban-spec = "0.1.0"
-soroban-token-spec = "0.1.0"
-soroban-auth = "0.1.0"
+soroban-env-host = "0.0.9"
+soroban-spec = "0.2.0"
+soroban-token-spec = "0.2.0"
+soroban-auth = "0.2.0"
 stellar-strkey = "0.0.6"
-soroban-sdk = "0.1.0"
+soroban-sdk = "0.2.0"
 
 [patch.crates-io]
-soroban-spec = { git = "https://github.com/stellar/rs-soroban-sdk", rev = "b66355c4" }
-soroban-token-spec = { git = "https://github.com/stellar/rs-soroban-sdk", rev = "b66355c4" }
-soroban-auth = { git = "https://github.com/stellar/rs-soroban-sdk", rev = "b66355c4" }
-soroban-sdk = { git = "https://github.com/stellar/rs-soroban-sdk", rev = "b66355c4" }
-soroban-sdk-macros = { git = "https://github.com/stellar/rs-soroban-sdk", rev = "b66355c4" }
+soroban-spec = { git = "https://github.com/stellar/rs-soroban-sdk", rev = "3ec51a3d" }
+soroban-token-spec = { git = "https://github.com/stellar/rs-soroban-sdk", rev = "3ec51a3d" }
+soroban-auth = { git = "https://github.com/stellar/rs-soroban-sdk", rev = "3ec51a3d" }
+soroban-sdk = { git = "https://github.com/stellar/rs-soroban-sdk", rev = "3ec51a3d" }
+soroban-sdk-macros = { git = "https://github.com/stellar/rs-soroban-sdk", rev = "3ec51a3d" }
 stellar-strkey = { git = "https://github.com/stellar/rs-stellar-strkey", rev = "d1b68fd1" }
-soroban-env-common = { git = "https://github.com/stellar/rs-soroban-env", rev = "4f2f3a2d" }
-soroban-env-guest = { git = "https://github.com/stellar/rs-soroban-env", rev = "4f2f3a2d" }
-soroban-env-host = { git = "https://github.com/stellar/rs-soroban-env", rev = "4f2f3a2d" }
-soroban-env-macros = { git = "https://github.com/stellar/rs-soroban-env", rev = "4f2f3a2d" }
-soroban-native-sdk-macros = { git = "https://github.com/stellar/rs-soroban-env", rev = "4f2f3a2d" }
-stellar-xdr = { git = "https://github.com/stellar/rs-stellar-xdr", rev = "3ba13687" }
+soroban-env-common = { git = "https://github.com/stellar/rs-soroban-env", rev = "c04c2332" }
+soroban-env-guest = { git = "https://github.com/stellar/rs-soroban-env", rev = "c04c2332" }
+soroban-env-host = { git = "https://github.com/stellar/rs-soroban-env", rev = "c04c2332" }
+soroban-env-macros = { git = "https://github.com/stellar/rs-soroban-env", rev = "c04c2332" }
+soroban-native-sdk-macros = { git = "https://github.com/stellar/rs-soroban-env", rev = "c04c2332" }
+stellar-xdr = { git = "https://github.com/stellar/rs-stellar-xdr", rev = "e88f9fa7" }
 wasmi = { package = "soroban-wasmi", git = "https://github.com/stellar/wasmi", rev = "d1ec0036" }
 
 # soroban-env-common = { path = "../rs-soroban-env/soroban-env-common" }

src/snapshot.rs

@@ -94,7 +94,7 @@ pub fn commit<'a, I>(
     output_file: &std::path::PathBuf,
 ) -> Result<(), Error>
 where
-    I: IntoIterator<Item = (&'a LedgerKey, &'a Option<LedgerEntry>)>,
+    I: IntoIterator<Item = (&'a Box<LedgerKey>, &'a Option<Box<LedgerEntry>>)>,
 {
     //Need to start off with the existing snapshot (new_state) since it's possible the storage_map did not touch every existing entry
     if let Some(dir) = output_file.parent() {
@@ -106,7 +106,7 @@ where
     let file = File::create(output_file)?;
     for (lk, ole) in storage_map {
         if let Some(le) = ole {
-            new_state.insert(lk.clone(), le.clone());
+            new_state.insert(*lk.clone(), *(*le).clone());
         } else {
             new_state.remove(lk);
         }

src/token/create.rs

@@ -266,7 +266,7 @@ impl Cmd {
             )?)
             .await?;
 
-        Ok(hex::encode(&contract_id))
+        Ok(hex::encode(contract_id))
     }
 }