chore: run tests with zksyncos server

Author: jackpooleyml

.github/workflows/ci-rust.yml

@@ -87,27 +87,110 @@ jobs:
         run: forge build
         working-directory: packages/erc4337-contracts
 
-      - name: Verify ERC-4337 contract ABIs exist
+      - name: Run clippy
+        run: |
+          rustup component add clippy --toolchain stable
+          rustup component add --toolchain 1.91.0-x86_64-unknown-linux-gnu clippy
+          cargo clippy --all-targets -- -D warnings
+        working-directory: packages/sdk-platforms/rust/zksync-sso-erc4337
+
+      - name: Install cargo-nextest
+        uses: taiki-e/install-action@nextest
+
+      - name: Run rust tests with nextest
+        run: cargo nextest run --profile ci --all-features
+        working-directory: packages/sdk-platforms/rust/zksync-sso-erc4337
+
+  rust-sdk-erc4337-zksync-os:
+    name: Rust 4337 SDK (zksync-os)
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        config:
+          - debug
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Run sccache-cache
+        uses: mozilla-actions/sccache-action@v0.0.4
+
+      - name: Install Rust
+        run: |
+          rustup update stable && rustup default stable
+          rustup toolchain install nightly
+
+      - name: Run rustfmt
+        run: |
+          rustup component add rustfmt --toolchain nightly
+          cargo +nightly fmt --all -- --check
+        working-directory: packages/sdk-platforms/rust/zksync-sso-erc4337
+
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1.4.0
+        with:
+          # zksync-os-server's zkos-l1-state.json doesn't work on latest version of anvil
+          version: v1.5.1
+
+      - name: Install dependencies
+        run: forge soldeer install
+        working-directory: packages/erc4337-contracts
+
+      - name: Install Node.js 22 via nvm
+        run: |
+          export NVM_DIR="$HOME/.nvm"
+          mkdir -p "$NVM_DIR"
+          curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash
+          . "$NVM_DIR/nvm.sh"
+          nvm install 22
+          nvm use 22
+          node -v
+          npm install -g yarn
+          # Expose Node.js bin dir to subsequent steps
+          echo "$(dirname $(nvm which 22))" >> $GITHUB_PATH
+
+      - name: Configure pnpm store dir
+        run: echo "PNPM_STORE_DIR=$HOME/.pnpm-store" >> $GITHUB_ENV
+
+      - name: Cache pnpm store
+        uses: actions/cache@v4
+        with:
+          path: ~/.pnpm-store
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('packages/erc4337-contracts/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
+
+      - name: Enable corepack and activate pnpm from contracts package.json
+        run: |
+          corepack enable
+          corepack prepare "$(node -p "require('./package.json').packageManager")" --activate
+          pnpm -v
+        working-directory: packages/erc4337-contracts
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+        working-directory: packages/erc4337-contracts
+
+      - name: Build ERC-4337 contracts
+        run: forge build
+        working-directory: packages/erc4337-contracts
+
+      - name: Clone zksync-os dependencies
         run: |
           set -euo pipefail
-          missing=()
-          files=(
-            "out/IERC7579Account.sol/IERC7579Account.json"
-            "out/EntryPoint.sol/EntryPoint.json"
-          )
-          for f in "${files[@]}"; do
-            if [ ! -f "$f" ]; then
-              missing+=("$f")
-            fi
-          done
-          if [ ${#missing[@]} -gt 0 ]; then
-            echo "Missing expected ABI JSON files:" >&2
-            for m in "${missing[@]}"; do echo " - $m" >&2; done
-            echo "\nAvailable JSON files under out/:" >&2
-            find out -maxdepth 2 -type f -name '*.json' | sort || true
-            exit 1
+          cd packages/sdk-platforms/rust/zksync-sso-erc4337
+          if [ ! -d account-abstraction ]; then
+            git clone https://github.com/eth-infinitism/account-abstraction
           fi
-        working-directory: packages/erc4337-contracts
+          if [ ! -d zksync-os-server ]; then
+            git clone https://github.com/matter-labs/zksync-os-server
+          fi
+
+      - name: Build zksync-os-server
+        run: |
+          cd packages/sdk-platforms/rust/zksync-sso-erc4337/zksync-os-server
+          cargo build --release --bin zksync-os-server
 
       - name: Run clippy
         run: |
@@ -119,7 +202,9 @@ jobs:
       - name: Install cargo-nextest
         uses: taiki-e/install-action@nextest
 
-      - name: Run rust tests with nextest
+      - name: Run rust tests with nextest (zksync-os)
+        env:
+          SSO_TEST_NODE_BACKEND: zksyncos
         run: cargo nextest run --profile ci --all-features
         working-directory: packages/sdk-platforms/rust/zksync-sso-erc4337
 
@@ -153,28 +238,6 @@ jobs:
         run: forge build
         working-directory: packages/erc4337-contracts
 
-      - name: Verify ERC-4337 contract ABIs exist
-        run: |
-          set -euo pipefail
-          missing=()
-          files=(
-            "out/IERC7579Account.sol/IERC7579Account.json"
-            "out/EntryPoint.sol/EntryPoint.json"
-          )
-          for f in "${files[@]}"; do
-            if [ ! -f "$f" ]; then
-              missing+=("$f")
-            fi
-          done
-          if [ ${#missing[@]} -gt 0 ]; then
-            echo "Missing expected ABI JSON files:" >&2
-            for m in "${missing[@]}"; do echo " - $m" >&2; done
-            echo "\nAvailable JSON files under out/:" >&2
-            find out -maxdepth 2 -type f -name '*.json' | sort || true
-            exit 1
-          fi
-        working-directory: packages/erc4337-contracts
-
       - name: Build WASM module (web target)
         run: wasm-pack build --target web
         working-directory: packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-ffi-web

.github/workflows/ci-swift.yml

@@ -5,16 +5,16 @@ permissions:
 on:
   push:
     paths:
-      - 'packages/contracts/**'
-      - 'packages/sdk-platforms/rust/**'
-      - 'packages/sdk-platforms/swift/**'
-      - '.github/workflows/ci-swift.yml'
+      - "packages/contracts/**"
+      - "packages/sdk-platforms/rust/**"
+      - "packages/sdk-platforms/swift/**"
+      - ".github/workflows/ci-swift.yml"
   pull_request:
     paths:
-      - 'packages/contracts/**'
-      - 'packages/sdk-platforms/rust/**'
-      - 'packages/sdk-platforms/swift/**'
-      - '.github/workflows/ci-swift.yml'
+      - "packages/contracts/**"
+      - "packages/sdk-platforms/rust/**"
+      - "packages/sdk-platforms/swift/**"
+      - ".github/workflows/ci-swift.yml"
 
 jobs:
   swift-sdk:
@@ -28,7 +28,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
-        
+
       - name: Run sccache-cache
         uses: mozilla-actions/sccache-action@v0.0.4
 
@@ -83,22 +83,60 @@ jobs:
       - name: Select Xcode 16.3
         run: sudo xcode-select -s /Applications/Xcode_16.3.app
 
-      - name: Select Simulator
+      - name: Create and Select Simulator
         run: |
-          UDID=$(xcrun simctl list devices | awk '/-- iOS 18.4 --/{flag=1; next} /--/{flag=0} flag' | grep "iPhone 16 Pro" | awk -F '[()]' '{print $2}' | head -1)
-          if [ -z "$UDID" ]; then
-            echo "Simulator not found!" >&2
+          # List available runtimes before installation
+          echo "Available runtimes before installation:"
+          xcrun simctl list runtimes
+
+          # Download iOS platform
+          echo "Downloading iOS platform..."
+          xcodebuild -downloadPlatform iOS
+
+          # Wait for download to complete
+          sleep 10
+
+          # List available runtimes after installation
+          echo "Available runtimes after installation:"
+          xcrun simctl list runtimes
+
+          # Get the latest iOS runtime
+          IOS_RUNTIME=$(xcrun simctl list runtimes | grep "iOS" | tail -1 | awk '{for(i=1;i<=NF;i++) if($i ~ /^com\.apple\.CoreSimulator\.SimRuntime/) print $i}' | tr -d ')')
+
+          if [ -z "$IOS_RUNTIME" ]; then
+            echo "ERROR: No iOS runtime found"
+            xcrun simctl list runtimes
             exit 1
           fi
-          echo "Simulator UDID: $UDID"
+
+          echo "Using iOS runtime: $IOS_RUNTIME"
+
+          # List available device types
+          echo "Available device types:"
+          xcrun simctl list devicetypes | grep iPhone
+
+          # Create a new iPhone simulator
+          UDID=$(xcrun simctl create "iPhone-CI" "com.apple.CoreSimulator.SimDeviceType.iPhone-15" "$IOS_RUNTIME")
+          echo "Created simulator with UDID: $UDID"
+
+          # Boot the simulator
+          xcrun simctl boot "$UDID"
+          echo "Booted simulator"
+
+          # Verify simulator is booted
+          xcrun simctl list devices | grep "$UDID"
+
+          # Wait for simulator to be ready
+          sleep 5
+
           echo "SIMULATOR_UDID=$UDID" >> $GITHUB_ENV
-        
+
       - name: Install swiftformat
         run: brew install swiftformat
 
       - name: Build bindings
         run: sh packages/sdk-platforms/rust/zksync-sso/crates/ffi/build-swift-framework-ios-ci.sh
-        
+
       - name: Build & test Swift SDK
         run: |
           xcodebuild test \

packages/sdk-platforms/rust/zksync-sso-erc4337/.gitignore

@@ -1 +1,2 @@
-#Cargo.lock
+zksync-os-server
+account-abstraction