Merge branch 'main' into sanitize-js-bindings-output-dir

Author: fnando

.github/workflows/docker.yml

@@ -0,0 +1,16 @@
+---
+name: Docker
+
+on:
+  workflow_dispatch:
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    permissions: {}
+    steps:
+      - run: echo "Building and pushing Docker image..."

.github/workflows/test-install.yml

@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-      - uses: ruby/setup-ruby@09a7688d3b55cf0e976497ff046b70949eeaccfd # v1.288.0
+      - uses: ruby/setup-ruby@6ca151fd1bfcfd6fe0c4eb6837eb0584d0134a0c # v1.290.0
         with:
           ruby-version: ruby
       - name: Run install tests

.github/workflows/test-with-openzeppelin-contracts.yml

@@ -24,7 +24,7 @@ jobs:
       - run: rustup update
       - run: sudo apt update && sudo apt install -y libudev-dev libdbus-1-dev
       - run: make install
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: stellar-cli
           path: ~/.cargo/bin/stellar
@@ -52,27 +52,50 @@ jobs:
       fail-fast: false
       matrix:
         dir: ${{ fromJSON(needs.collect-crates.outputs.dirs) }}
+        experimental_spec_shaking_v2: [true, false]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
         with:
           repository: OpenZeppelin/stellar-contracts
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v8
         with:
           name: stellar-cli
           path: stellar-cli
       - run: chmod +x stellar-cli/stellar
       - run: echo "${{ github.workspace }}/stellar-cli" >> $GITHUB_PATH
       - run: rustup update
       - run: rustup target add wasm32v1-none
+      - name: Enable experimental_spec_shaking_v2 feature
+        if: matrix.experimental_spec_shaking_v2
+        run: |
+          find . -name Cargo.toml | while read -r file; do
+            # Add feature to entries with existing features
+            sed -i '/soroban-sdk = {/s|features = \[|features = ["experimental_spec_shaking_v2", |' "$file"
+            # Add features field to entries without features
+            sed -i '/soroban-sdk = {/{/features/!s| }|, features = ["experimental_spec_shaking_v2"] }|}' "$file"
+          done
+          cargo update -p soroban-sdk
+      - name: Diff
+        run: git diff
       - name: Build ${{ matrix.dir }}
         run: stellar contract build --manifest-path ${{ matrix.dir }}/Cargo.toml
       - name: Find wasm
         id: find-wasm
         run: |
-          wasm=$(find . -name '*.wasm' -path '*/wasm32v1-none/*' | head -1)
+          wasm=$(find . -name '*.wasm' -path '*/wasm32v1-none/release/*' -not -path '*/deps/*' | head -1)
           echo "wasm=$wasm" | tee -a $GITHUB_OUTPUT
+      - name: Set artifact name
+        id: artifact-name
+        run: echo "name=wasm-$(echo ${{ matrix.dir }} | sed 's/\//-/g')${{ matrix.experimental_spec_shaking_v2 && '-spec-shaking-v2' || '' }}" | tee -a $GITHUB_OUTPUT
+      - name: Upload WASM artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ steps.artifact-name.outputs.name }}
+          path: ${{ steps.find-wasm.outputs.wasm }}
+          retention-days: 3
       - name: Verify interface
+        if: ${{ startsWith(matrix.dir, 'examples/') }}
         run: |
           output=$(stellar contract info interface --wasm ${{ steps.find-wasm.outputs.wasm }} --output json)
           echo "$output"
@@ -82,6 +105,7 @@ jobs:
             exit 1
           fi
       - name: Verify env-meta
+        if: ${{ startsWith(matrix.dir, 'examples/') }}
         run: |
           output=$(stellar contract info env-meta --wasm ${{ steps.find-wasm.outputs.wasm }} --output json)
           echo "$output"
@@ -90,6 +114,7 @@ jobs:
             exit 1
           fi
       - name: Verify meta
+        if: ${{ startsWith(matrix.dir, 'examples/') }}
         run: |
           output=$(stellar contract info meta --wasm ${{ steps.find-wasm.outputs.wasm }} --output json)
           echo "$output"
@@ -98,4 +123,7 @@ jobs:
             exit 1
           fi
       - name: Verify spec
+        if: ${{ startsWith(matrix.dir, 'examples/') }}
         run: stellar contract spec-verify --wasm ${{ steps.find-wasm.outputs.wasm }}
+      - name: Diff
+        run: git add -N . && git diff HEAD

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

@@ -24,7 +24,7 @@ jobs:
       - run: rustup update
       - run: sudo apt update && sudo apt install -y libudev-dev libdbus-1-dev
       - run: make install
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: stellar-cli
           path: ~/.cargo/bin/stellar
@@ -59,27 +59,49 @@ jobs:
       fail-fast: false
       matrix:
         dir: ${{ fromJSON(needs.collect-examples.outputs.dirs) }}
+        experimental_spec_shaking_v2: [true, false]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
         with:
           repository: stellar/soroban-examples
           ref: main
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v8
         with:
           name: stellar-cli
           path: stellar-cli
       - run: chmod +x stellar-cli/stellar
       - run: echo "${{ github.workspace }}/stellar-cli" >> $GITHUB_PATH
       - run: rustup update
       - run: rustup target add wasm32v1-none
+      - name: Enable experimental_spec_shaking_v2 feature
+        if: matrix.experimental_spec_shaking_v2
+        run: |
+          find . -name Cargo.toml | while read -r file; do
+            # Add feature to entries with existing features
+            sed -i '/soroban-sdk = {/s|features = \[|features = ["experimental_spec_shaking_v2", |' "$file"
+            # Add features field to entries without features
+            sed -i '/soroban-sdk = {/{/features/!s| }|, features = ["experimental_spec_shaking_v2"] }|}' "$file"
+            (cd "$(dirname "$file")" && cargo update -p soroban-sdk 2>/dev/null || true)
+          done
+      - name: Diff
+        run: git diff
       - name: Build ${{ matrix.dir }}
         run: make -C ${{ matrix.dir }} build
       - name: Find wasm
         id: find-wasm
         run: |
-          wasm=$(find ${{ matrix.dir }}/target -name '*.wasm' -path '*/wasm32v1-none/*' | head -1)
+          wasm=$(find ${{ matrix.dir }}/target -name '*.wasm' -path '*/wasm32v1-none/release/*' -not -path '*/deps/*' | head -1)
           echo "wasm=$wasm" | tee -a $GITHUB_OUTPUT
+      - name: Set artifact name
+        id: artifact-name
+        run: echo "name=wasm-$(echo ${{ matrix.dir }} | sed 's/\//-/g')${{ matrix.experimental_spec_shaking_v2 && '-spec-shaking-v2' || '' }}" | tee -a $GITHUB_OUTPUT
+      - name: Upload WASM artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ steps.artifact-name.outputs.name }}
+          path: ${{ steps.find-wasm.outputs.wasm }}
+          retention-days: 3
       - name: Verify interface
         run: |
           output=$(stellar contract info interface --wasm ${{ steps.find-wasm.outputs.wasm }} --output json)
@@ -107,3 +129,5 @@ jobs:
           fi
       - name: Verify spec
         run: stellar contract spec-verify --wasm ${{ steps.find-wasm.outputs.wasm }}
+      - name: Diff
+        run: git add -N . && git diff HEAD