BM-196: Prepend 0x to request_id and add verify-proof command in the CLI (github#35)

- Prepend `0x` to request id prints
- Add `verify-proof` subcommand to CLI

Author: capossele

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

@@ -15,7 +15,11 @@ use anyhow::{bail, Context, Result};
 use clap::{Args, Parser, Subcommand};
 use guest_util::ECHO_ELF;
 use hex::FromHex;
-use risc0_zkvm::sha::Digest;
+use risc0_ethereum_contracts::IRiscZeroVerifier;
+use risc0_zkvm::{
+    sha::{Digest, Digestible},
+    Journal,
+};
 use url::Url;
 
 use boundless_market::{
@@ -72,6 +76,14 @@ enum Command {
         #[clap(short, long, default_value = "false")]
         wait: bool,
     },
+    /// Verify the proof of the given request against
+    /// the SetVerifier contract.
+    VerifyProof {
+        /// The proof request identifier
+        request_id: U256,
+        /// The image id of the original request
+        image_id: B256,
+    },
     /// Get the status of a given request
     Status {
         /// The proof request identifier
@@ -138,6 +150,8 @@ struct MainArgs {
     wallet_private_key: PrivateKeySigner,
     #[clap(short, long, env)]
     proof_market_address: Address,
+    #[clap(short, long, env)]
+    set_verifier_address: Address,
     #[command(subcommand)]
     command: Command,
 }
@@ -156,7 +170,7 @@ async fn main() -> Result<()> {
     let provider =
         ProviderBuilder::new().with_recommended_fillers().wallet(wallet).on_http(args.rpc_url);
     let market = ProofMarketService::new(args.proof_market_address, provider.clone(), caller);
-
+    let set_verifier = IRiscZeroVerifier::new(args.set_verifier_address, provider.clone());
     let command = args.command.clone();
     match command {
         Command::Deposit { amount } => {
@@ -182,7 +196,7 @@ async fn main() -> Result<()> {
         }
         Command::Slash { request_id } => {
             market.slash(request_id).await?;
-            tracing::info!("Request slashed: {request_id:x}");
+            tracing::info!("Request slashed: 0x{request_id:x}");
         }
         Command::GetProof { request_id, wait } => {
             let (journal, seal) = if wait {
@@ -198,6 +212,19 @@ async fn main() -> Result<()> {
                 serde_json::to_string_pretty(&seal)?
             );
         }
+        Command::VerifyProof { request_id, image_id } => {
+            let (journal, seal) = market
+                .wait_for_request_fulfillment(request_id, Duration::from_secs(5), None)
+                .await?;
+
+            let journal_digest = <[u8; 32]>::from(Journal::new(journal.to_vec()).digest()).into();
+            set_verifier
+                .verify(seal, image_id, journal_digest)
+                .call()
+                .await
+                .map_err(|_| anyhow::anyhow!("Verification failed"))?;
+            tracing::info!("Proof for request id 0x{request_id:x} verified successfully.");
+        }
         Command::Status { request_id } => {
             let status = market.get_status(request_id).await?;
             tracing::info!("Status: {:?}", status);
@@ -298,7 +325,7 @@ where
 
     let request_id = market.submit_request(&request, &signer).await?;
     tracing::info!(
-        "Submitted request ID {request_id:x}, bidding start at block number {}",
+        "Submitted request ID 0x{request_id:x}, bidding start at block number {}",
         offer.biddingStart
     );
 
@@ -360,7 +387,7 @@ where
 
     let request_id = market.submit_request(&request, &signer).await?;
     tracing::info!(
-        "Proving request ID {request_id:x}, bidding start at block number {}",
+        "Proving request ID 0x{request_id:x}, bidding start at block number {}",
         request.offer.biddingStart
     );
 

docs/src/market/proving_request.md

@@ -77,7 +77,21 @@ The [client-cli](../../../crates/boundless-market/src/bin/cli.rs) allows to:
    2024-09-17T15:14:01.314302Z  INFO cli: Journal: "0x576564204a756c2020332031343a33373a31322050445420323032340a" - Seal: "0x0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000164578a3cc24cf38d1173509a99db4f70d57ff3a6c43cb2e8552a2a5d252968ba"
    ```
 
-4. Send an offer with the requirements specified as command line arguments:
+4. Verify a proof of a request
+
+   With the `verify-proof` subcommand, you can verify a proof for a given request id and image id.
+
+   ```console
+   RUST_LOG=info,boundless_market=debug cargo run --bin cli -- verify-proof 0x466acfc0f27bba9fbb7a8508f576527e81e83bd00000052 257569e11f856439ec3c1e0fe6486fb9af90b1da7324d577f65dd0d45ec12c7d
+   ```
+
+   Should output something like:
+
+   ```console
+   2024-10-07T14:50:54.442260Z  INFO cli: Proof for request id 0x466acfc0f27bba9fbb7a8508f576527e81e83bd00000052 verified successfully.
+   ```
+
+5. Send an offer with the requirements specified as command line arguments:
 
    With the `submit-offer` subcommand, you can specify the requirements and input as command-line options.
    It will upload the image and input, and place public URLs in the request.
@@ -91,7 +105,7 @@ The [client-cli](../../../crates/boundless-market/src/bin/cli.rs) allows to:
    PINATA_JWT="YOUR_PINATA_JWT" RUST_LOG=info,boundless_market=debug cargo run --bin cli -- submit-offer offer.yaml --wait --input "hello" --encode-input --journal-prefix ""
    ```
 
-5. Slash a request and get back funds
+6. Slash a request and get back funds
 
    With the `slash` subcommand, you can slash a given `request ID` and get a refund of your offer: