Merge upstream develop

Author: github-actions[bot]

.cirrus.yml

@@ -8,9 +8,9 @@ build_ios_device_task:
     - cd packages/rs-core
     - brew install just protobuf llvm
     - just build-ffi-ios
-    - cp target/aarch64-apple-ios/release/librs_core.a ../../librs_core-ios-device.a
+    - cp ../../target/aarch64-apple-ios/release/libpolycentric_core.a ../../libpolycentric_core-ios-device.a
   binary_artifacts:
-    path: 'librs_core-ios-device.a'
+    path: 'libpolycentric_core-ios-device.a'
 
 build_ios_sim_arm64_task:
   name: buildRsCoreIOSSimArm64
@@ -22,9 +22,9 @@ build_ios_sim_arm64_task:
     - cd packages/rs-core
     - brew install just protobuf llvm
     - just build-ffi-ios-sim
-    - cp target/aarch64-apple-ios/release/librs_core.a ../../librs_core-ios-sim-arm64.a
+    - cp ../../target/aarch64-apple-ios-sim/release/libpolycentric_core.a ../../libpolycentric_core-ios-sim-arm64.a
   binary_artifacts:
-    path: 'librs_core-ios-sim-arm64.a'
+    path: 'libpolycentric_core-ios-sim-arm64.a'
 
 build_ios_sim_x86_task:
   name: buildRsCoreIOSSimX86
@@ -36,6 +36,6 @@ build_ios_sim_x86_task:
     - cd packages/rs-core
     - brew install just protobuf llvm
     - just build-ffi-ios-sim-x86
-    - cp target/x86_64-apple-ios/release/librs_core.a ../../librs_core-ios-sim-x86_64.a
+    - cp ../../target/x86_64-apple-ios/release/libpolycentric_core.a ../../libpolycentric_core-ios-sim-x86_64.a
   binary_artifacts:
-    path: 'librs_core-ios-sim-x86_64.a'
+    path: 'libpolycentric_core-ios-sim-x86_64.a'

.gitignore

@@ -19,6 +19,7 @@ junit-server.xml
 
 # production
 /build
+/target
 
 # misc
 .DS_Store

.gitlab/ci/build_rs_core.yml

@@ -138,31 +138,19 @@ rs-sdk-build-ios-sim-arm64:
   script:
     - |
       cirrus run buildRsCoreIOSSimArm64 \
-        --artifacts-dir . \
+        --artifacts-dir ./ \
         --env-file .cienv
   artifacts:
     paths:
       - buildRsCoreIOSSimArm64/binary/*.a
 
-rs-sdk-build-ios-sim-x86_64:
-  stage: build
-  extends: .rs-sdk-ios-build
-  script:
-    - |
-      cirrus run buildRsCoreIOSSimX86 \
-      --artifacts-dir . \
-      --env-file .cienv
-  artifacts:
-    paths:
-      - buildRsCoreIOSSimX86/binary/*.a
-
 rs-sdk-build-android-arm64:
   extends: .rs-sdk-build-android
   script:
     - just build-ffi-android-arm64
   artifacts:
     paths:
-      - $RUST_CORE_PATH/target/aarch64-linux-android/release
+      - target/aarch64-linux-android/release
     expire_in: 1 week
 
 rs-sdk-build-android-armv7:
@@ -171,7 +159,7 @@ rs-sdk-build-android-armv7:
     - just build-ffi-android-armv7
   artifacts:
     paths:
-      - $RUST_CORE_PATH/target/armv7-linux-androideabi/release
+      - target/armv7-linux-androideabi/release
     expire_in: 1 week
 
 rs-sdk-build-android-x86:
@@ -180,7 +168,7 @@ rs-sdk-build-android-x86:
     - just build-ffi-android-x86
   artifacts:
     paths:
-      - $RUST_CORE_PATH/target/i686-linux-android/release
+      - target/i686-linux-android/release
     expire_in: 1 week
 
 rs-sdk-build-android-x86_64:
@@ -189,7 +177,7 @@ rs-sdk-build-android-x86_64:
     - just build-ffi-android-x86_64
   artifacts:
     paths:
-      - $RUST_CORE_PATH/target/x86_64-linux-android/release
+      - target/x86_64-linux-android/release
     expire_in: 1 week
 
 rs-sdk-publish:
@@ -203,8 +191,6 @@ rs-sdk-publish:
       artifacts: true
     - job: rs-sdk-build-ios-sim-arm64
       artifacts: true
-    - job: rs-sdk-build-ios-sim-x86_64
-      artifacts: true
     - job: rs-sdk-build-android-arm64
       artifacts: true
     - job: rs-sdk-build-android-armv7
@@ -217,13 +203,12 @@ rs-sdk-publish:
     - |
       VERSION=${CI_COMMIT_TAG#rs-sdk-}
       REGISTRY_URL="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/rs-core/${VERSION}"
-      curl --fail --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file ../../buildRsCoreIOSDevice/binary/librs_core-ios-device.a "${REGISTRY_URL}/librs_core-ios-device.a"
-      curl --fail --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file ../../buildRsCoreIOSSimArm64/binary/librs_core-ios-sim-arm64.a "${REGISTRY_URL}/librs_core-ios-sim-arm64.a"
-      curl --fail --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file ../../buildRsCoreIOSSimX86/binary/librs_core-ios-sim-x86_64.a "${REGISTRY_URL}/librs_core-ios-sim-x86_64.a"
-      curl --fail --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file target/aarch64-linux-android/release/librs_core.a "${REGISTRY_URL}/librs_core-android-arm64.a"
-      curl --fail --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file target/armv7-linux-androideabi/release/librs_core.a "${REGISTRY_URL}/librs_core-android-armv7.a"
-      curl --fail --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file target/i686-linux-android/release/librs_core.a "${REGISTRY_URL}/librs_core-android-x86.a"
-      curl --fail --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file target/x86_64-linux-android/release/librs_core.a "${REGISTRY_URL}/librs_core-android-x86_64.a"
+      curl --fail --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file ../../buildRsCoreIOSDevice/binary/libpolycentric_core-ios-device.a "${REGISTRY_URL}/libpolycentric_core-ios-device.a"
+      curl --fail --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file ../../buildRsCoreIOSSimArm64/binary/libpolycentric_core-ios-sim-arm64.a "${REGISTRY_URL}/libpolycentric_core-ios-sim-arm64.a"
+      curl --fail --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file ../../target/aarch64-linux-android/release/libpolycentric_core.a "${REGISTRY_URL}/libpolycentric_core-android-arm64.a"
+      curl --fail --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file ../../target/armv7-linux-androideabi/release/libpolycentric_core.a "${REGISTRY_URL}/libpolycentric_core-android-armv7.a"
+      curl --fail --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file ../../target/i686-linux-android/release/libpolycentric_core.a "${REGISTRY_URL}/libpolycentric_core-android-x86.a"
+      curl --fail --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file ../../target/x86_64-linux-android/release/libpolycentric_core.a "${REGISTRY_URL}/libpolycentric_core-android-x86_64.a"
 
 .rs-sdk-publish-npm:
   rules:
@@ -242,7 +227,7 @@ rs-sdk-publish-npm-browser:
   script:
     - |
       VERSION=${CI_COMMIT_TAG#rs-sdk-}
-      cd ../rs-core-wasm-browser
+      cd packages/rs-core-wasm-browser
       sed -i "s/\"version\": \".*\"/\"version\": \"${VERSION}\"/" package.json
       echo "@polycentric:registry=https://${CI_SERVER_HOST}/api/v4/projects/${CI_PROJECT_ID}/packages/npm/" > .npmrc
       echo "//${CI_SERVER_HOST}/api/v4/projects/${CI_PROJECT_ID}/packages/npm/:_authToken=${CI_JOB_TOKEN}" >> .npmrc
@@ -256,7 +241,7 @@ rs-sdk-publish-npm-node:
   script:
     - |
       VERSION=${CI_COMMIT_TAG#rs-sdk-}
-      cd ../rs-core-wasm-node
+      cd packages/rs-core-wasm-node
       sed -i "s/\"version\": \".*\"/\"version\": \"${VERSION}\"/" package.json
       echo "@polycentric:registry=https://${CI_SERVER_HOST}/api/v4/projects/${CI_PROJECT_ID}/packages/npm/" > .npmrc
       echo "//${CI_SERVER_HOST}/api/v4/projects/${CI_PROJECT_ID}/packages/npm/:_authToken=${CI_JOB_TOKEN}" >> .npmrc

.prettierignore

@@ -13,6 +13,8 @@ packages/react-native/android
 packages/react-native/ios
 packages/react-native/lib
 packages/rs-core
+packages/rs-core-wasm-browser
+packages/rs-core-wasm-node
 legacy
 services/polycentric-server
-services/verifiers-server
+services/verifiers-server