Merge remote-tracking branch 'upstream/main'

.github/dependabot.yml

@@ -0,0 +1,18 @@
+# Please see the documentation for all configuration options:
+# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "cargo"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  # pnpm is handled by the "npm" package ecosystem
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/js.yml

@@ -35,10 +35,16 @@ jobs:
           source ./scripts/devenv.sh
           npx nx build @lightprotocol/zk-compression-cli --skip-nx-cache
 
+      # Commented for breaking changes to Photon
+      - name: Run CLI tests
+        run: |
+          source ./scripts/devenv.sh
+          npx nx test @lightprotocol/zk-compression-cli
+
       - name: Run stateless.js tests
         run: |
           source ./scripts/devenv.sh
-          npx nx test @lightprotocol/stateless.js          
+          npx nx test @lightprotocol/stateless.js
 
       - name: Run compressed-token tests
         run: |

.github/workflows/light-system-programs-tests.yml

@@ -8,6 +8,7 @@ on:
       - "circuit-lib/verifier/**"
       - "merkle-tree/**"
       - ".github/workflows/light-system-programs-tests.yml"
+      - "test-utils/**"
   pull_request:
     branches:
       - "*"
@@ -17,13 +18,14 @@ on:
       - "circuit-lib/verifier/**"
       - "merkle-tree/**"
       - ".github/workflows/light-system-programs-tests.yml"
+      - "test-utils/**"
     types:
       - opened
       - synchronize
       - reopened
       - ready_for_review
 
-name: system-programs-psp-examples-tests
+name: system-programs-examples-tests
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -40,7 +42,7 @@ jobs:
         include:
           - program: account-compression
             sub-tests: '[
-              "cargo-test-sbf -p account-compression-test -- --test-threads=1"
+              "cargo-test-sbf -p account-compression-test"
             ]'
           - program: light-system-program
             sub-tests: '[
@@ -62,6 +64,11 @@ jobs:
             sub-tests: '[
               "RUST_MIN_STACK=8388608 cargo-test-sbf -p e2e-test -- --nocapture --test-threads=1"
             ]'
+          - program: token-escrow-test
+            sub-tests: '[
+              "cargo test-sbf -p token-escrow -- --test-threads=1"
+            ]'
+
 
     steps:
       - name: Checkout sources

.github/workflows/pr.yml

@@ -36,3 +36,5 @@ jobs:
             aligned-sized
             macro-circom
             merkle-tree
+            deps
+            deps-dev

.github/workflows/prover-release.yml

@@ -12,7 +12,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: 1.21
 
@@ -28,7 +28,7 @@ jobs:
           done
 
       - name: Create Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           files: |
             light-prover/prover-darwin-amd64

.github/workflows/prover-test.yml

@@ -30,7 +30,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version-file: "./light-prover/go.mod"
 

.github/workflows/release-pr-rust.yml

@@ -68,7 +68,7 @@ jobs:
           popd
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v2.4.0
+        uses: pnpm/action-setup@v4.0.0
         with:
           run_install: false
 

.github/workflows/release-pr-ts.yml

@@ -8,11 +8,9 @@ on:
         type: choice
         options:
           - all
-          - circuit-lib.js
           - cli
           - compressed-token
           - hasher.rs
-          - prover.js
           - stateless.js
       version:
         description: Version to release
@@ -35,7 +33,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v2.4.0
+        uses: pnpm/action-setup@v4.0.0
         with:
           run_install: false
 

.github/workflows/release.yml

@@ -159,7 +159,7 @@ jobs:
           pnpm publish --access public --no-git-checks
 
       - name: GitHub release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         if: steps.extract-project.outputs.language != ''
         with:
           token: ${{ secrets.PAT_TOKEN }}

.gitignore

@@ -62,8 +62,6 @@
 **/*.iml
 
 /**/dump.rdb
-psp-examples/tmp-test-psp
-psp-examples/tmp-test-circom
 
 /**/package-lock.json
 qodana.yaml

CODEOWNERS

@@ -7,8 +7,7 @@ macros/ @vadorovsky
 merkle-tree/ @ananas-block @vadorovsky
 programs/ @ananas-block @vadorovsky
 prover.js/ @sergeytimoshin
-psp-examples/ @ananas-block @sergeytimoshin
-psp-template/ @ananas-block @sergeytimoshin @vadorovsky
+examples/ @ananas-block @SwenSchaeferjohann
 rpc/ @sergeytimoshin @SwenSchaeferjohann
 scripts/ @vadorovsky
 third-party/ @vadorovsky