Merge branch 'refs/heads/staging' into 1978-choremakefile-unify-naming-conventions-in-targets

# Conflicts:
#	Makefile

Author: JuArce

.github/pull_request_template.md

@@ -6,7 +6,7 @@ on:
   pull_request:
     branches: ["*"]
     paths:
-      - "batcher/**"
+      - "crates/**"
       - "aggregation_mode/**"
       - ".github/workflows/build-and-test-rust.yml"
 
@@ -43,24 +43,24 @@ jobs:
           path: |
             ~/.cargo/registry
             ~/.cargo/git
-            batcher/target
+            crates/target
           key: ${{ runner.os }}-rust-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: |
             ${{ runner.os }}-rust-
 
-      - name: Check formatting of Batcher
+      - name: Check formatting
         run: |
-          cd batcher
+          cd crates
           cargo fmt --all -- --check
 
-      - name: Run Clippy on Batcher
+      - name: Run Clippy
         run: |
-          cd batcher
+          cd crates
           cargo clippy --all -- -D warnings
 
       - name: Build Batcher
         run: |
-          cd batcher
+          cd crates
           cargo build --all
 
       - name: Check formatting of AggregationMode
@@ -108,14 +108,14 @@ jobs:
           path: |
             ~/.cargo/registry
             ~/.cargo/git
-            batcher/target
+            crates/target
           key: ${{ runner.os }}-rust-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: |
             ${{ runner.os }}-rust-
 
       - name: Run Batcher tests
         run: |
-          cd batcher
+          cd crates
           cargo test --all
 
       - name: Run AggregationMode tests

.github/workflows/build-and-test-rust.yml

@@ -25,7 +25,7 @@ jobs:
         run: make build_batcher_client
 
       - name: Rename binary
-        run: mv batcher/target/release/aligned ${{ matrix.artifact_name }}
+        run: mv crates/target/release/aligned ${{ matrix.artifact_name }}
 
       - name: Release
         uses: softprops/action-gh-release@v2

.github/workflows/release.yml

@@ -7,7 +7,7 @@ cache
 **/build
 **/target
 scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/**
-batcher/aligned/batch_inclusion_responses/*
+crates/cli/batch_inclusion_responses/*
 **/aligned_verification_data
 **/broadcast
 volume

.gitignore

@@ -19,7 +19,7 @@ ciborium = "=0.2.2"
 lambdaworks-crypto = { git = "https://github.com/lambdaclass/lambdaworks.git", rev = "5f8f2cfcc8a1a22f77e8dff2d581f1166eefb80b", features = ["serde"]}
 rayon = "1.10.0"
 # Necessary for the VerificationData type
-aligned-sdk = { path = "../batcher/aligned-sdk" }
+aligned-sdk = { path = "../crates/sdk/" }
 # zkvms
 sp1-sdk = "5.0.0"
 sp1_aggregation_program = { path = "./aggregation_programs/sp1" }

Makefile

@@ -29,7 +29,7 @@ impl Risc0ImageIdAndPubInputs {
 // All 3 implementations should match
 // The definition on aggregator/mod.rs supports taking proofs from both Risc0 and SP1,
 // Additionally, a version that takes the leaves as already hashed data is defined on:
-// - batcher/aligned-sdk/src/sdk/aggregation.rs
+// - crates/sdk/src/aggregation_layer/types.rs
 // This one is used in the SDK since,
 // the user may not have access to the proofs that he didn't submit
 impl IsMerkleTreeBackend for Risc0ImageIdAndPubInputs {

aggregation_mode/Cargo.toml

@@ -26,7 +26,7 @@ impl SP1VkAndPubInputs {
 // All 3 implementations should match
 // The definition on aggregator/mod.rs supports taking proofs from both Risc0 and SP1,
 // Additionally, a version that takes the leaves as already hashed data is defined on:
-// - batcher/aligned-sdk/src/sdk/aggregation.rs
+// - crates/sdk/src/aggregation_layer/types.rs
 // This one is used in the SDK since
 // the user may not have access to the proofs that they didn't submit
 impl IsMerkleTreeBackend for SP1VkAndPubInputs {

aggregation_mode/aggregation_programs/risc0/src/lib.rs

@@ -181,7 +181,7 @@ impl AlignedProof {
 // All 3 implementations should match
 // The definition on aggregator/mod.rs supports taking proofs from both Risc0 and SP1,
 // Additionally, a version that takes the leaves as already hashed data is defined on:
-// - batcher/aligned-sdk/src/sdk/aggregation.rs
+// - crates/sdk/src/aggregation_layer/types.rs
 // This one is used in the SDK since,
 // the user may not have access to the proofs that he didn't submit
 impl IsMerkleTreeBackend for AlignedProof {