BM-1469: Integrate Bltvm2 compatible blake3 compression type

.vscode/settings.json

@@ -14,10 +14,10 @@
 	"rust-analyzer.linkedProjects": [
 		"./Cargo.toml",
 		"./crates/distributor/Cargo.toml",
-		// "./crates/guest/assessor/assessor-guest/Cargo.toml",
+		"./crates/guest/assessor/assessor-guest/Cargo.toml",
 		// "./crates/guest/util/echo/Cargo.toml",
 		// "./crates/guest/util/identity/Cargo.toml",
-		// "./examples/counter/Cargo.toml",
+		"./examples/counter/Cargo.toml",
 		// "./examples/smart-contract-requestor/Cargo.toml",
 		// "./examples/counter-with-callback/Cargo.toml"
 	],

Cargo.toml

@@ -14,7 +14,7 @@ members = [
     "crates/indexer",
     "crates/ops-lambdas/indexer-monitor",
     "crates/order-generator",
-    "crates/order-stream",
+    "crates/order-stream", "crates/shrink_bitvm2",
     "crates/slasher",
     "documentation/doc-test",
 ]
@@ -34,6 +34,7 @@ distributor = { path = "crates/distributor" }
 guest-assessor = { path = "crates/guest/assessor" }
 guest-util = { path = "crates/guest/util" }
 order-stream = { path = "crates/order-stream" }
+shrink_bitvm2 = { path = "crates/shrink_bitvm2" }
 
 async-stream = "0.3"
 alloy = { version = "1.0.24", default-features = false }
@@ -47,7 +48,7 @@ aws-sdk-s3 = "1.34" # used for minio for max compatibility
 axum = "0.8"
 axum-extra = { version = "0.10" }
 bincode = "1.3"
-bonsai-sdk = { version = "1.4", features = ["non_blocking"] }
+bonsai-sdk = { git = "https://github.com/risc0/risc0", branch = "flaub/shrink-bitvm2", features = ["non_blocking", "shrink_bitvm2"] }
 bs58 = "0.5"
 bytemuck = "1.16"
 clap = { version = "4.5", features = ["derive", "env"] }
@@ -97,3 +98,6 @@ lto = true
 # [profile.release]
 # lto = "fat"
 # codegen-units = 1
+
+[patch.crates-io]
+risc0-ethereum-contracts = { path = "/home/etu/risc0-ethereum/contracts" }

contracts/deployment-test/Deploymnet.t.sol

@@ -22,7 +22,7 @@ import {Input, InputType} from "../src/types/Input.sol";
 import {Requirements} from "../src/types/Requirements.sol";
 import {Offer} from "../src/types/Offer.sol";
 import {ProofRequest} from "../src/types/ProofRequest.sol";
-import {Predicate, PredicateType} from "../src/types/Predicate.sol";
+import {PredicateLibrary} from "../src/types/Predicate.sol";
 import {RequestId, RequestIdLibrary} from "../src/types/RequestId.sol";
 import {RequestLock} from "../src/types/RequestLock.sol";
 
@@ -105,7 +105,10 @@ contract DeploymentTest is Test {
     function testRouterIsDeployed() external view {
         require(address(verifier) != address(0), "no verifier (router) address is set");
         require(keccak256(address(verifier).code) != keccak256(bytes("")), "verifier code is empty");
-        require(address(verifier) == address(BoundlessMarket(address(boundlessMarket)).VERIFIER()), "verifier address does not match boundless market");
+        require(
+            address(verifier) == address(BoundlessMarket(address(boundlessMarket)).VERIFIER()),
+            "verifier address does not match boundless market"
+        );
     }
 
     function testSetVerifierIsDeployed() external view {
@@ -191,9 +194,7 @@ contract DeploymentTest is Test {
         vm.expectEmit(true, true, true, false);
         emit IBoundlessMarket.ProofDelivered(request.id, address(testProver), result.fills[0]);
 
-        boundlessMarket.priceAndFulfill(
-            requests, clientSignatures, result.fills, result.assessorReceipt
-        );
+        boundlessMarket.priceAndFulfill(requests, clientSignatures, result.fills, result.assessorReceipt);
         Fulfillment memory fill = result.fills[0];
         assertTrue(boundlessMarket.requestIsFulfilled(fill.id), "Request should have fulfilled status");
     }
@@ -230,8 +231,7 @@ contract Client {
 
     function defaultRequirements() public pure returns (Requirements memory) {
         return Requirements({
-            imageId: bytes32(APP_IMAGE_ID),
-            predicate: Predicate({predicateType: PredicateType.PrefixMatch, data: hex"53797374"}),
+            predicate: PredicateLibrary.createPrefixMatchPredicate(bytes32(APP_IMAGE_ID), hex"53797374"),
             callback: Callback({gasLimit: 0, addr: address(0)}),
             selector: bytes4(0)
         });

contracts/scripts/Deploy.s.sol

@@ -10,6 +10,7 @@ import "forge-std/Test.sol";
 import {IRiscZeroSelectable} from "risc0/IRiscZeroSelectable.sol";
 import {IRiscZeroVerifier} from "risc0/IRiscZeroVerifier.sol";
 import {ControlID, RiscZeroGroth16Verifier} from "risc0/groth16/RiscZeroGroth16Verifier.sol";
+import {RiscZeroBitvm2Groth16Verifier} from "risc0/bitvm/RiscZeroBitvm2Groth16Verifier.sol";
 import {RiscZeroSetVerifier} from "risc0/RiscZeroSetVerifier.sol";
 import {RiscZeroVerifierRouter} from "risc0/RiscZeroVerifierRouter.sol";
 import {RiscZeroCheats} from "risc0/test/RiscZeroCheats.sol";
@@ -66,6 +67,16 @@ contract Deploy is Script, RiscZeroCheats {
             IRiscZeroSelectable selectable = IRiscZeroSelectable(address(_verifier));
             bytes4 selector = selectable.SELECTOR();
             verifierRouter.addVerifier(selector, _verifier);
+            console2.log("Added Groth16 verifier to router with selector");
+            console2.logBytes4(selector);
+
+
+            IRiscZeroVerifier _bitvm2_verifier = deployRiscZeroBitvm2Verifier();
+            IRiscZeroSelectable bitvm2_selectable = IRiscZeroSelectable(address(_bitvm2_verifier));
+            bytes4 bitvm_selector = bitvm2_selectable.SELECTOR();
+            verifierRouter.addVerifier(bitvm_selector, _bitvm2_verifier);
+            console2.log("Added BitVM2 verifier to router with selector");
+            console2.logBytes4(bitvm_selector);
 
             // TODO: Create a more robust way of getting a URI for guests, and ensure that it is
             // in-sync with the configured image ID.