Merge remote-tracking branch 'upstream/main' into mina

Author: xqft

.github/workflows/build.yml

@@ -6,7 +6,8 @@ on:
     branches: [main]
   pull_request:
     branches: ["*"]
-
+env:
+  FFI_FOR_RELEASE: false
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -25,9 +26,9 @@ jobs:
         run: make build_halo2_kzg_linux
       - name: Build Halo2-IPA bindings
         run: make build_halo2_ipa_linux
+      - name: Build Merkle Tree bindings
+        run: make build_merkle_tree_linux
       - name: Build operator
         run: go build operator/cmd/main.go
       - name: Build aggregator
         run: go build aggregator/cmd/main.go
-      - name: Build task sender
-        run: go build task_sender/cmd/main.go

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: Build and Release Rust Project
+name: Build and Release Aligned Client
 
 on:
   push:
@@ -7,16 +7,27 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-latest
+            artifact_name: aligned-x86
+          - os: macos-latest
+            artifact_name: aligned-arm64
+
+    runs-on: ${{ matrix.os }}
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
 
       - name: Build batcher client
         run: make build_batcher_client
+      
+      - name: Rename binary
+        run: mv batcher/target/release/aligned ${{ matrix.artifact_name }}
 
       - name: Release
         uses: softprops/action-gh-release@v2
         with:
-          files: batcher/client/target/release/aligned
+          files: ${{ matrix.artifact_name }}

.gitignore

@@ -6,7 +6,9 @@ out
 cache
 **/build
 **/target
-task_sender/test_examples/gnark_groth16_bn254_infinite_script/infinite_proofs/**
+scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/**
 batcher/aligned/batch_inclusion_responses/*
 **/aligned_verification_data
 **/broadcast
+
+nonce_*.bin

.gitmodules

@@ -7,3 +7,9 @@
 [submodule "examples/verify/lib/forge-std"]
 	path = examples/verify/lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
+[submodule "examples/zkquiz/contracts/lib/forge-std"]
+	path = examples/zkquiz/contracts/lib/forge-std
+	url = https://github.com/foundry-rs/forge-std
+[submodule "examples/zkquiz/contracts/lib/openzeppelin-contracts"]
+	path = examples/zkquiz/contracts/lib/openzeppelin-contracts
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts