feat: batched updates (in audit)

.github/actionlint.yaml

@@ -4,6 +4,7 @@ self-hosted-runner:
     - buildjet-2vcpu-ubuntu-2204
     - buildjet-4vcpu-ubuntu-2204
     - buildjet-8vcpu-ubuntu-2204
+    - buildjet-16vcpu-ubuntu-2204
 # Configuration variables in array of strings defined in your repository or
 # organization. `null` means disabling configuration variables check.
 # Empty array means no configuration variable is allowed.

.github/workflows/forester-build-and-push-to-docr.yml

@@ -3,7 +3,7 @@ name: Docker Build and Push to DOCR
 on:
   push:
     branches:
-      - main
+      - "*"
   pull_request:
     branches:
       - "**"

.github/workflows/forester-tests.yml

@@ -1,7 +1,8 @@
 on:
   push:
     branches:
-      - main
+      - "*"
+      - jorrit/feat-bloomfilter-queues
     paths:
       - "forester/**"
       - "photon-api/**"

.github/workflows/js.yml

@@ -1,7 +1,8 @@
 on:
   push:
     branches:
-      - main
+      - "*"
+      - jorrit/feat-bloomfilter-queues
   pull_request:
     branches:
       - "*"

.github/workflows/light-examples-tests.yml

@@ -1,7 +1,7 @@
 on:
   push:
     branches:
-      - main
+      - "*"
     paths:
       - "examples/**"
       - "macros/light-sdk-macros/**"

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

@@ -1,7 +1,7 @@
 on:
   push:
     branches:
-      - main
+      - "*"
     paths:
       - "programs/**"
       - "test-programs/**"

.github/workflows/lint.yml

@@ -1,7 +1,8 @@
 on:
   push:
     branches:
-      - main
+      - "*"
+      - jorrit/feat-bloomfilter-queues
   pull_request:
     branches:
       - "*"

.github/workflows/prover-test.yml

@@ -2,7 +2,7 @@ name: Test gnark prover
 on:
   push:
     branches:
-      - main
+      - "*"
       - 'release/**'
     paths:
       - "light-prover/**"

.github/workflows/release.yml

@@ -3,7 +3,7 @@ name: Release
 on:
   push:
     branches:
-      - main
+      - "*"
 
 jobs:
   release:

.github/workflows/rust.yml

@@ -1,7 +1,7 @@
 on:
   push:
     branches:
-      - main
+      - "*"
     paths:
       - ".cargo/**"
       - "**/*.rs"

Cargo.toml

@@ -102,6 +102,9 @@ num-traits = "0.2.19"
 # HTTP client
 reqwest = "0.11.26"
 
+# Testing
+serial_test = "3.1.1"
+
 [patch.crates-io]
 "solana-account-decoder" = { git = "https://github.com/lightprotocol/agave", branch = "v1.18.22-enforce-cpi-tracking" }
 "solana-accounts-db" = { git = "https://github.com/lightprotocol/agave", branch = "v1.18.22-enforce-cpi-tracking" }

circuit-lib/light-prover-client/Cargo.toml

@@ -53,4 +53,4 @@ sysinfo = "0.31"
 borsh = ">=0.9, <0.11"
 [dev-dependencies]
 duct = "0.13.7"
-serial_test = "3.1.1"
+serial_test = "3.1.1"

circuit-lib/light-prover-client/src/batch_append_with_subtrees.rs

@@ -47,7 +47,7 @@ pub fn get_batch_append_with_subtrees_inputs<const HEIGHT: usize>(
     let mut bigint_leaves = vec![];
     let old_subtrees = sub_trees;
     let old_subtree_hashchain = calculate_hash_chain(&old_subtrees);
-    let mut merkle_tree = SparseMerkleTree::<Poseidon, HEIGHT>::new(sub_trees);
+    let mut merkle_tree = SparseMerkleTree::<Poseidon, HEIGHT>::new(sub_trees, next_index);
     let start_index =
         bigint_to_be_bytes_array::<32>(&BigUint::from_usize(next_index).unwrap()).unwrap();
     for leaf in leaves.iter() {

circuit-lib/light-prover-client/src/gnark/helpers.rs

@@ -45,7 +45,8 @@ pub enum ProofType {
     Inclusion,
     NonInclusion,
     Combined,
-    BatchAppend,
+    BatchAppendWithSubtrees,
+    BatchAppendWithProofs,
     BatchUpdate,
     BatchAppendWithSubtreesTest,
     BatchUpdateTest,
@@ -61,7 +62,8 @@ impl Display for ProofType {
                 ProofType::Inclusion => "inclusion",
                 ProofType::NonInclusion => "non-inclusion",
                 ProofType::Combined => "combined",
-                ProofType::BatchAppend => "append",
+                ProofType::BatchAppendWithSubtrees => "append-with-subtrees",
+                ProofType::BatchAppendWithProofs => "append-with-proofs",
                 ProofType::BatchUpdate => "update",
                 ProofType::BatchAppendWithSubtreesTest => "append-with-subtrees-test",
                 ProofType::BatchUpdateTest => "update-test",
@@ -113,7 +115,7 @@ pub async fn spawn_prover(restart: bool, config: ProverConfig) {
 
             let _ = command.spawn().expect("Failed to start prover process");
 
-            let health_result = health_check(20, 5).await;
+            let health_result = health_check(20, 30).await;
             if health_result {
                 info!("Prover started successfully");
             } else {

circuit-lib/light-prover-client/src/lib.rs

@@ -9,5 +9,6 @@ pub mod groth16_solana_verifier;
 pub mod helpers;
 pub mod inclusion;
 pub mod init_merkle_tree;
+pub mod mock_batched_forester;
 pub mod non_inclusion;
 pub mod prove_utils;