BM-1469: Support ClaimDigestMatch predicate and integrate Bltvm2 compatible blake3 compression type

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/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.

contracts/test/BoundlessMarket.t.sol

@@ -19,7 +19,7 @@ import {
     ReceiptClaimLib,
     VerificationFailed
 } from "risc0/IRiscZeroVerifier.sol";
-import {TestReceipt} from "risc0/../test/TestReceipt.sol";
+import {TestReceipt} from "risc0/../test/TestReceiptV2_1.sol";
 import {RiscZeroMockVerifier} from "risc0/test/RiscZeroMockVerifier.sol";
 import {TestUtils} from "./TestUtils.sol";
 import {Client} from "./clients/Client.sol";

crates/boundless-cli/Cargo.toml

@@ -34,7 +34,9 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 serde_yaml = { workspace = true }
 shadow-rs = { version = "1.1", default-features = false }
+shrink_bitvm2 = { workspace = true }
 sqlx = { workspace = true, features = ["postgres", "runtime-tokio", "tls-rustls", "chrono"] }
+tempfile = { workspace = true }
 tokio = { workspace = true, features = ["rt-multi-thread"] }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
@@ -53,9 +55,11 @@ order-stream = { workspace = true }
 sqlx = { workspace = true, features = ["postgres", "runtime-tokio", "tls-rustls", "chrono"] }
 tempfile = { workspace = true }
 tracing-test = { workspace = true }
+test-log = { workspace = true }
+shrink_bitvm2 = { workspace = true }
 
 [features]
 # Enables the prove feature on risc0-zkvm to build the prover directly into this CLI.
 prove = ["risc0-zkvm/prove"]
 # Enables the cuda feature on risc0-zkvm to build the prover directly into this CLI, with CUDA support.
-cuda = ["prove", "risc0-zkvm/cuda"]
+cuda = ["prove", "risc0-zkvm/cuda"]

crates/boundless-cli/src/bin/boundless.rs

@@ -86,7 +86,7 @@ use boundless_market::{
     },
     input::GuestEnv,
     request_builder::{OfferParams, RequirementParams},
-    selector::ProofType,
+    selector::{is_shrink_bitvm2_selector, ProofType},
     storage::{fetch_url, StorageProvider, StorageProviderConfig},
     Client, Deployment, StandardClient,
 };
@@ -1103,6 +1103,7 @@ async fn submit_offer(client: StandardClient, args: &SubmitOfferArgs) -> Result<
         ProofType::Inclusion => requirements.selector(Selector::SetVerifierV0_7 as u32),
         ProofType::Groth16 => requirements.selector(Selector::Groth16V2_2 as u32),
         ProofType::Any => &mut requirements,
+        ProofType::ShrinkBitvm2 => requirements.selector(Selector::ShrinkBitvm2V0_1 as u32),
         ty => bail!("unsupported proof type provided in proof-type flag: {:?}", ty),
     };
     let request = request.with_requirements(requirements);
@@ -1211,6 +1212,14 @@ where
         //     hex::encode(&request.requirements.predicate.data)
         // );
 
+        // TODO(ec2): fixme
+        // if is_shrink_bitvm2_selector(request.requirements.selector) && journal.len() != 32 {
+        //     bail!(
+        //         "Preflight failed: Journal must be exactly 32 bytes for Shrink Bitvm2, got {} bytes",
+        //         journal.len()
+        //     );
+        // }
+
         tracing::info!("Preflight check passed");
     } else {
         tracing::warn!("Skipping preflight check");