Merge branch 'v2.1-dev' into test/dapi-cli

Author: QuantumExplorer

.devcontainer/Dockerfile

@@ -63,7 +63,7 @@ RUN set -ex; \
     rm /tmp/cargo-binstall; \
     cargo binstall -V
 
-RUN cargo binstall wasm-bindgen-cli@0.2.100 --locked \
+RUN cargo binstall wasm-bindgen-cli@0.2.103 --locked \
                                            --no-discover-github-token \
                                            --disable-telemetry \
                                            --no-track \

.github/actions/local-network/action.yaml

@@ -82,8 +82,8 @@ runs:
         docker pull ${{ inputs.image_org }}/dashmate-helper:$SHA_TAG
         docker tag ${{ inputs.image_org }}/dashmate-helper:$SHA_TAG dashpay/dashmate-helper:$VERSION
 
-        # Replace DAPI and Drive images with new org and tag in dashmate config
-        sed -i -E "s/dashpay\/(drive|dapi):[^\"]+/${{ inputs.image_org }}\/\1:${SHA_TAG}/g" ${{ env.HOME }}/.dashmate/config.json
+        # Replace Drive, DAPI, and RS-DAPI images with new org and tag in dashmate config
+        sed -i -E "s/dashpay\/(drive|dapi|rs-dapi):[^\"]+/${{ inputs.image_org }}\/\1:${SHA_TAG}/g" ${{ env.HOME }}/.dashmate/config.json
 
         cat ${{ env.HOME }}/.dashmate/config.json
 

.github/package-filters/rs-packages.yml

@@ -69,6 +69,12 @@ rs-dapi-client: &dapi_client
   - packages/rs-dapi-client/**
   - *dapi_grpc
 
+rs-dapi:
+  - .github/workflows/tests*
+  - packages/rs-dapi/**
+  - *dapi_grpc
+  - *dpp
+
 dash-sdk: &sdk
   - .github/workflows/tests*
   - packages/rs-drive-proof-verifier/**

.github/workflows/pr.yml

@@ -34,6 +34,7 @@ jobs:
           scopes: |
             sdk
             dapi
+            rs-dapi
             platform
             drive
             drive-abci

.github/workflows/release.yml

@@ -70,7 +70,7 @@ jobs:
         if: ${{ steps.check-artifact.outputs.exists != 'true' }}
 
       - name: Install wasm-bindgen-cli
-        run: cargo binstall wasm-bindgen-cli@0.2.100
+        run: cargo binstall wasm-bindgen-cli@0.2.103
         if: ${{ steps.check-artifact.outputs.exists != 'true' }}
 
       - name: Install wasm-pack
@@ -191,6 +191,18 @@ jobs:
       target: dapi
       tag: ${{ inputs.tag || github.event.release.tag_name }}
 
+  release-rs-dapi-image:
+    name: Release RS-DAPI image
+    if: ${{ !inputs.only_drive }}
+    secrets: inherit
+    uses: ./.github/workflows/release-docker-image.yml
+    with:
+      name: RS-DAPI
+      image_org: dashpay
+      image_name: rs-dapi
+      target: rs-dapi
+      tag: ${{ inputs.tag || github.event.release.tag_name }}
+
   release-test-suite-image:
     name: Release Test Suite image
     if: ${{ !inputs.only_drive }}

.github/workflows/swift-sdk-build.yml

@@ -17,18 +17,13 @@ jobs:
   swift-sdk-build:
     name: Swift SDK and Example build (warnings as errors)
     runs-on: [self-hosted, macOS, ARM64]
-    timeout-minutes: 60
+    timeout-minutes: 90
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Select Xcode 16
-        uses: maxim-lobanov/setup-xcode@v1
-        with:
-          xcode-version: '16.*'
-
-      - name: Show Xcode and Swift versions
+      - name: Show Xcode and Swift versions (use default on self-hosted runner)
         run: |
           xcodebuild -version
           swift --version
@@ -98,12 +93,19 @@ jobs:
         shell: bash
         run: |
           set -euo pipefail
-          # Use the same rust-dashcore revision as rs-dpp (parse single-line dep)
-          REV=$(grep -E '^[[:space:]]*dashcore[[:space:]]*=[[:space:]]*\{.*rev[[:space:]]*=' packages/rs-dpp/Cargo.toml \
-                | sed -E 's/.*rev[[:space:]]*=[[:space:]]*"([^"]+)".*/\1/' \
+          # Use the same rust-dashcore revision/tag as rs-dpp
+          # Try to find tag first (preferred format)
+          REV=$(grep -E '^[[:space:]]*dashcore[[:space:]]*=[[:space:]]*\{.*tag[[:space:]]*=' packages/rs-dpp/Cargo.toml \
+                | sed -E 's/.*tag[[:space:]]*=[[:space:]]*"([^"]+)".*/\1/' \
                 | head -n1 || true)
+          # If no tag found, try rev format
+          if [ -z "${REV:-}" ]; then
+            REV=$(grep -E '^[[:space:]]*dashcore[[:space:]]*=[[:space:]]*\{.*rev[[:space:]]*=' packages/rs-dpp/Cargo.toml \
+                  | sed -E 's/.*rev[[:space:]]*=[[:space:]]*"([^"]+)".*/\1/' \
+                  | head -n1 || true)
+          fi
           if [ -z "${REV:-}" ]; then
-            echo "Failed to determine rust-dashcore revision from Cargo.toml" >&2
+            echo "Failed to determine rust-dashcore revision or tag from Cargo.toml" >&2
             exit 1
           fi
           echo "rev=$REV" >> "$GITHUB_OUTPUT"
@@ -119,7 +121,7 @@ jobs:
             cd rust-dashcore
             git fetch --all --tags --prune
           else
-            git clone --no-tags --filter=blob:none https://github.com/dashpay/rust-dashcore.git rust-dashcore
+            git clone --filter=blob:none https://github.com/dashpay/rust-dashcore.git rust-dashcore
             cd rust-dashcore
           fi
           git checkout "${{ steps.dashcore_rev.outputs.rev }}"

.github/workflows/swift-sdk-release.yml

@@ -17,6 +17,7 @@ jobs:
   build-and-release:
     name: Build and release DashSDKFFI
     runs-on: macos-15
+    timeout-minutes: 45
 
     steps:
       - name: Checkout repository

.github/workflows/tests-build-js.yml

@@ -54,7 +54,7 @@ jobs:
         if: ${{ steps.check-artifact.outputs.exists != 'true' }}
 
       - name: Install wasm-bindgen-cli
-        run: cargo binstall wasm-bindgen-cli@0.2.100
+        run: cargo binstall wasm-bindgen-cli@0.2.103
         if: ${{ steps.check-artifact.outputs.exists != 'true' }}
 
       - name: Install wasm-pack

.github/workflows/tests-dashmate.yml

@@ -67,6 +67,11 @@ jobs:
           docker pull $DOCKER_HUB_ORG/dapi:$SHA_TAG
           docker tag $DOCKER_HUB_ORG/dapi:$SHA_TAG $DAPI_IMAGE_AND_VERSION
 
+          # RS-DAPI
+          RS_DAPI_IMAGE_AND_VERSION=$(yarn dashmate config get --config=local platform.dapi.rsDapi.docker.image)
+          docker pull $DOCKER_HUB_ORG/rs-dapi:$SHA_TAG
+          docker tag $DOCKER_HUB_ORG/rs-dapi:$SHA_TAG $RS_DAPI_IMAGE_AND_VERSION
+
           # Dashmate helper image is hardcoded so we replace it with the built one
           VERSION=$(cat package.json | jq -r '.version')
           docker pull $DOCKER_HUB_ORG/dashmate-helper:$SHA_TAG

.github/workflows/tests-rs-sdk-ffi-build.yml

@@ -25,6 +25,7 @@ jobs:
     name: Build rs-sdk-ffi for iOS targets
     # macOS runners are required to access Apple SDKs (no osxcross here)
     runs-on: macos-latest
+    timeout-minutes: 45
     strategy:
       fail-fast: false
       matrix: