Merge upstream develop

Author: github-actions[bot]

.gitignore

@@ -41,4 +41,3 @@ dist
 # Generated files
 docker-compose.live*
 .env
-state

.gitlab/ci/build_rs_core.yml

@@ -144,6 +144,18 @@ rs-sdk-build-ios-sim-arm64:
     paths:
       - buildRsCoreIOSSimArm64/binary/*.a
 
+rs-sdk-ios-tart-prune:
+  stage: build
+  extends: .rs-sdk-ios-build
+  needs:
+    - job: rs-sdk-build-ios-device
+      artifacts: false
+    - job: rs-sdk-build-ios-sim-arm64
+      artifacts: false
+  before_script: []
+  script:
+    - tart prune --entries vms --older-than 2
+
 rs-sdk-build-android-arm64:
   extends: .rs-sdk-build-android
   script:

.prettierignore

@@ -1,3 +1,4 @@
+LICENSE
 coverage
 public
 dist
@@ -16,5 +17,3 @@ packages/rs-core
 packages/rs-core-wasm-browser
 packages/rs-core-wasm-node
 legacy
-services/polycentric-server
-services/verifiers-server

Cargo.toml

@@ -7,4 +7,5 @@ members = [
     "services/server/migration",
     "services/server/tests",
 ]
+exclude = ["legacy/"]
 resolver = "2"

README.md

@@ -17,15 +17,13 @@
 
 You will need [just](https://github.com/casey/just), Docker, and pnpm.
 
-1. **Run the local server:** `just services/start`
-2. **Build rs-core for all platforms:** `just packages/rs-core/build-all`
-3. **Install dependencies:** `pnpm install`
-4. **Run the app:** `pnpm run:ios` or `pnpm run:android`
+1. **Build rs-core for all platforms:** `just packages/rs-core/build-all`
+2. **Install dependencies:** `pnpm install`
+3. **Run the app:** `pnpm:run web`, `pnpm run:ios`, or `pnpm run:android`
 
 ## Development
 
 - `pnpm dev` builds all SDKs in watch mode.
-- `just legacy/test-core` runs integration test on local server
 
 ## Project Structure
 
@@ -51,5 +49,6 @@ You will need [just](https://github.com/casey/just), Docker, and pnpm.
 
 | Service | Description |
 |---------|-------------|
-| `services/polycentric-server` | Reference server implementation for hosting Polycentric instances |
-| `services/verifiers-server` | Server for verifying claims and signatures in the protocol |
+| `services/server` | Polycentric server |
+| `legacy/services/polycentric-server` | Legacy server  |
+| `legacy/services/verifiers-server` | Legacy Server for verifying claims and signatures in the protocol |

compose.yml

@@ -33,10 +33,10 @@ services:
       retries: 30
       start_period: 15s
 
-  polycentric-server:
+  legacy-server:
     build:
       context: .
-      dockerfile: services/polycentric-server/Dockerfile
+      dockerfile: legacy/services/polycentric-server/Dockerfile
     ports:
       - '127.0.0.1:${POLYCENTRIC_PORT:-8787}:8787'
     environment:
@@ -52,15 +52,15 @@ services:
       opensearch:
         condition: service_healthy
 
-  polycentric-verifiers:
-    build: ./services/verifiers-server
-    working_dir: /app/services/verifiers-server
+  legacy-verifiers:
+    build: ./legacy/services/verifiers-server
+    working_dir: /app/legacy/services/verifiers-server
     volumes:
-      - ../:/app
+      - .:/app
     ports:
       - '127.0.0.1:${VERIFIERS_PORT:-3002}:3002'
     environment:
-      - SERVER_URL=http://polycentric-server:8787
+      - SERVER_URL=http://legacy-server:8787
     command: sh -c "npm install && npx nodemon src/app.ts"
     depends_on:
       postgres:

legacy/packages/polycentric-core/README.md

@@ -2,7 +2,7 @@
 
 Shared client library used by:
 
-- `services/verifiers-server` (backend that verifies platform claims)
+- `legacy/services/verifiers-server` (backend that verifies platform claims)
 - `legacy/packages/polycentric-web` and `legacy/packages/polycentric-react` (the legacy Polycentric web client and its React component layer)
 
 ## Tests

legacy/packages/polycentric-core/scripts/generate-proto.sh

@@ -2,14 +2,14 @@
 set -euo pipefail
 
 DIR="$(cd "$(dirname "$0")/.." && pwd)"
-PROTO_DIR="$DIR/../../../protos"
+PROTO_DIR="$DIR/../../../legacy/protos"
 
 protoc \
   --ts_proto_opt=esModuleInterop=true \
   --ts_proto_opt=forceLong=long \
   --ts_proto_out="$DIR/src" \
   --experimental_allow_proto3_optional \
   -I"$PROTO_DIR" \
-  "$PROTO_DIR/server-polycentric.proto"
+  "$PROTO_DIR/legacy-polycentric.proto"
 
-mv "$DIR/src/server-polycentric.ts" "$DIR/src/protocol.ts"
+mv "$DIR/src/legacy-polycentric.ts" "$DIR/src/protocol.ts"