Merge branch 'staging' into update_sp1_4

Author: MauroToscano

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

@@ -20,23 +20,26 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+
       - uses: actions/setup-go@v5
         with:
           go-version: "1.23"
           cache: false
+
       - name: foundry-toolchain
         uses: foundry-rs/[email protected]
+
       - name: Build SP1 bindings
         run: make build_sp1_linux
-      - name: Build Old SP1 bindings
-        run: make build_sp1_linux_old
+
       - name: Build Risc Zero go bindings
         run: make build_risc_zero_linux
-      - name: Build Old Risc Zero go bindings
-        run: make build_risc_zero_linux_old
+
       - 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

.github/workflows/test-risc-zero-old.yml

@@ -344,7 +344,7 @@ contract AlignedLayerServiceManager is
     function checkPublicInput(
         bytes calldata publicInput,
         bytes32 hash
-    ) public pure returns (bool) {
+    ) external pure returns (bool) {
         return keccak256(publicInput) == hash;
     }
 

.github/workflows/test-sp1-old.yml

@@ -78,4 +78,6 @@ interface IAlignedLayerServiceManager {
     function withdraw(uint256 amount) external;
 
     function depositToBatcher(address account) external payable;
+
+    function checkPublicInput(bytes calldata publicInput, bytes32 hash) external pure returns (bool);
 }

contracts/scripts/anvil/state/alignedlayer-deployed-anvil-state.json

@@ -53,18 +53,6 @@ COPY operator/risc_zero/lib/src/ /aligned_layer/operator/risc_zero/lib/src/
 WORKDIR /aligned_layer/operator/risc_zero/lib
 RUN cargo chef prepare --recipe-path /aligned_layer/operator/risc_zero/lib/recipe.json
 
-# build_sp1_linux_old
-COPY operator/sp1_old/lib/Cargo.toml /aligned_layer/operator/sp1_old/lib/Cargo.toml
-COPY operator/sp1_old/lib/src/ /aligned_layer/operator/sp1_old/lib/src/
-WORKDIR /aligned_layer/operator/sp1_old/lib/src/
-RUN cargo chef prepare --recipe-path /aligned_layer/operator/sp1_old/lib/recipe.json
-
-# build_risc_zero_linux_old
-COPY operator/risc_zero_old/lib/Cargo.toml /aligned_layer/operator/risc_zero_old/lib/Cargo.toml
-COPY operator/risc_zero_old/lib/src/ /aligned_layer/operator/risc_zero_old/lib/src/
-WORKDIR /aligned_layer/operator/risc_zero_old/lib/src/
-RUN cargo chef prepare --recipe-path /aligned_layer/operator/risc_zero_old/lib/recipe.json
-
 # build_merkle_tree_linux
 COPY operator/merkle_tree/lib/Cargo.toml /aligned_layer/operator/merkle_tree/lib/Cargo.toml
 COPY operator/merkle_tree/lib/src/ /aligned_layer/operator/merkle_tree/lib/src/
@@ -87,18 +75,6 @@ COPY --from=planner /aligned_layer/operator/risc_zero/lib/recipe.json /aligned_l
 WORKDIR /aligned_layer/operator/risc_zero/lib/
 RUN cargo chef cook --release --recipe-path /aligned_layer/operator/risc_zero/lib/recipe.json
 
-# build_sp1_linux_old
-COPY operator/sp1_old/ /aligned_layer/operator/sp1_old/
-COPY --from=planner /aligned_layer/operator/sp1_old/lib/recipe.json /aligned_layer/operator/sp1_old/lib/recipe.json
-WORKDIR /aligned_layer/operator/sp1_old/lib/
-RUN cargo chef cook --release --recipe-path /aligned_layer/operator/sp1_old/lib/recipe.json
-
-# build_risc_zero_linux_old
-COPY operator/risc_zero_old/ /aligned_layer/operator/risc_zero_old/
-COPY --from=planner /aligned_layer/operator/risc_zero_old/lib/recipe.json /aligned_layer/operator/risc_zero_old/lib/recipe.json
-WORKDIR /aligned_layer/operator/risc_zero_old/lib/
-RUN cargo chef cook --release --recipe-path /aligned_layer/operator/risc_zero_old/lib/recipe.json
-
 # build_merkle_tree_linux
 COPY operator/merkle_tree/ /aligned_layer/operator/merkle_tree/
 COPY --from=planner /aligned_layer/operator/merkle_tree/lib/recipe.json /aligned_layer/operator/merkle_tree/lib/recipe.json
@@ -127,19 +103,6 @@ WORKDIR /aligned_layer/operator/risc_zero/lib
 RUN cargo build ${RELEASE_FLAG}
 RUN cp /aligned_layer/operator/risc_zero/lib/target/${TARGET_REL_PATH}/librisc_zero_verifier_ffi.so /aligned_layer/operator/risc_zero/lib/librisc_zero_verifier_ffi.so
 
-# build_sp1_linux_old
-COPY --from=chef_builder /aligned_layer/operator/sp1_old/lib/target/ /aligned_layer/operator/sp1_old/lib/target/
-WORKDIR /aligned_layer/operator/sp1_old/lib
-RUN cargo build ${RELEASE_FLAG}
-RUN cp /aligned_layer/operator/sp1_old/lib/target/${TARGET_REL_PATH}/libsp1_verifier_old_ffi.so /aligned_layer/operator/sp1_old/lib/libsp1_verifier_old_ffi.so
-
-# build_risc_zero_linux_old
-COPY --from=chef_builder /aligned_layer/operator/risc_zero_old/lib/target/ /aligned_layer/operator/risc_zero_old/lib/target/
-WORKDIR /aligned_layer/operator/risc_zero_old/lib
-RUN cargo build ${RELEASE_FLAG}
-RUN cp /aligned_layer/operator/risc_zero_old/lib/target/${TARGET_REL_PATH}/librisc_zero_verifier_old_ffi.so /aligned_layer/operator/risc_zero_old/lib/librisc_zero_verifier_old_ffi.so
-
-
 # build_merkle_tree_linux
 COPY --from=chef_builder /aligned_layer/operator/merkle_tree/lib/target/ /aligned_layer/operator/merkle_tree/lib/target/
 WORKDIR /aligned_layer/operator/merkle_tree/lib