fix rust side

Author: ec2

crates/boundless-cli/src/lib.rs

@@ -36,8 +36,8 @@ use risc0_zkvm::{
 
 use boundless_market::{
     contracts::{
-        AssessorJournal, AssessorReceipt, EIP712DomainSaltless,
-        Fulfillment as BoundlessFulfillment, PredicateType, RequestInputType,
+        boundless_market_contract::CallbackData, AssessorJournal, AssessorReceipt,
+        EIP712DomainSaltless, Fulfillment as BoundlessFulfillment, PredicateType, RequestInputType,
     },
     input::GuestEnv,
     selector::{is_groth16_selector, SupportedSelectors},
@@ -306,16 +306,25 @@ impl DefaultProver {
             } else {
                 order_inclusion_receipt.abi_encode_seal()?
             };
-            let mut image_id_or_claim_digest = req.requirements.imageId;
-            let mut journal = fills[i].journal.clone();
             let predicate_type = req.requirements.predicate.predicateType;
-            if predicate_type == PredicateType::ClaimDigestMatch {
-                image_id_or_claim_digest = <[u8; 32]>::from(claims[i].digest()).into();
-                journal = vec![];
-            }
+
+            let (claim_digest, callback_data) = match predicate_type {
+                PredicateType::ClaimDigestMatch => (
+                    <[u8; 32]>::try_from(req.requirements.predicate.data.as_ref()).unwrap().into(),
+                    vec![],
+                ),
+                _ => (
+                    <[u8; 32]>::from(claims[i].digest()).into(),
+                    CallbackData {
+                        imageId: req.requirements.imageId,
+                        journal: fills[i].journal.clone().into(),
+                    }
+                    .abi_encode(),
+                ),
+            };
             let fulfillment = BoundlessFulfillment {
-                imageIdOrClaimDigest: image_id_or_claim_digest,
-                journal: journal.into(),
+                claimDigest: claim_digest,
+                callbackData: callback_data.into(),
                 id: req.id,
                 requestDigest: req.eip712_signing_hash(&self.domain.alloy_struct()),
                 seal: order_seal.into(),

crates/boundless-market/src/contracts/boundless_market.rs

@@ -1035,7 +1035,7 @@ impl<P: Provider> BoundlessMarketService<P> {
 
             if let Some((event, _)) = logs.first() {
                 return Ok((
-                    event.fulfillment.journal.clone(),
+                    event.fulfillment.callbackData.clone(), // TODO(ec2)
                     event.fulfillment.seal.clone(),
                     event.prover,
                 ));

crates/boundless-market/test-utils/src/lib.rs

@@ -27,6 +27,7 @@ use anyhow::{Context, Ok, Result};
 use boundless_market::{
     contracts::{
         boundless_market::BoundlessMarketService,
+        boundless_market_contract::CallbackData,
         bytecode::*,
         hit_points::{default_allowance, HitPointsService},
         AssessorCommitment, AssessorJournal, Fulfillment, PredicateType, ProofRequest,
@@ -439,18 +440,23 @@ pub fn mock_singleton(
     .abi_encode_seal()
     .unwrap();
 
-    let mut image_id_or_claim_digest = request.requirements.imageId;
-    let mut journal = app_journal.bytes.into();
     let predicate_type = request.requirements.predicate.predicateType;
-    if predicate_type == PredicateType::ClaimDigestMatch {
-        image_id_or_claim_digest = <[u8; 32]>::from(app_claim_digest).into();
-        journal = vec![].into();
+    let (claim_digest, callback_data) = match predicate_type {
+        PredicateType::ClaimDigestMatch => (<[u8; 32]>::from(app_claim_digest).into(), vec![]),
+        _ => (
+            <[u8; 32]>::from(app_claim_digest).into(),
+            CallbackData {
+                imageId: request.requirements.imageId,
+                journal: app_journal.bytes.into(),
+            }
+            .abi_encode(),
+        ),
     };
     let fulfillment = Fulfillment {
         id: request.id,
         requestDigest: request_digest,
-        imageIdOrClaimDigest: image_id_or_claim_digest,
-        journal,
+        claimDigest: claim_digest,
+        callbackData: callback_data.into(),
         seal: set_inclusion_seal.into(),
         predicateType: predicate_type,
     };

crates/broker/src/submitter.rs

@@ -27,6 +27,7 @@ use anyhow::{anyhow, Context, Result};
 use boundless_market::{
     contracts::{
         boundless_market::{BoundlessMarketService, FulfillmentTx, MarketError, UnlockedRequest},
+        boundless_market_contract::CallbackData,
         encode_seal, AssessorJournal, AssessorReceipt, Fulfillment, PredicateType,
     },
     selector::is_groth16_selector,
@@ -332,17 +333,24 @@ where
                 let request_id = order_request.id;
                 fulfillment_to_order_id.insert(request_id, order_id);
                 let predicate_type = order_request.requirements.predicate.predicateType;
-                let mut image_id_or_claim_digest = order_img_id;
-                let mut journal = order_journal;
-                if predicate_type == PredicateType::ClaimDigestMatch {
-                    image_id_or_claim_digest = <[u8; 32]>::from(order_claim_digest).into();
-                    journal = vec![];
+
+                let (claim_digest, callback_data) = match predicate_type {
+                    PredicateType::ClaimDigestMatch => (
+                        order_request.requirements.predicate.data.0.as_ref().try_into().unwrap(),
+                        vec![],
+                    ),
+                    _ => (
+                        order_claim_digest,
+                        CallbackData { imageId: order_img_id, journal: order_journal.into() }
+                            .abi_encode(),
+                    ),
                 };
+
                 fulfillments.push(Fulfillment {
                     id: request_id,
                     requestDigest: request_digest,
-                    imageIdOrClaimDigest: image_id_or_claim_digest,
-                    journal: journal.into(),
+                    callbackData: callback_data.into(),
+                    claimDigest: <[u8; 32]>::from(claim_digest).into(),
                     seal: seal.into(),
                     predicateType: predicate_type,
                 });

crates/indexer/src/db.rs

@@ -407,8 +407,8 @@ impl IndexerDb for AnyDb {
         .bind(format!("{:x}", fill.requestDigest))
         .bind(format!("{:x}", fill.id))
         .bind(format!("{:x}", prover_address))
-        .bind(format!("{:x}", fill.imageIdOrClaimDigest))
-        .bind(format!("{:x}", fill.journal))
+        .bind(format!("{:x}", fill.callbackData))
+        .bind(format!("{:x}", fill.claimDigest))
         .bind(format!("{:x}", fill.seal))
         .bind(format!("{:x}", metadata.tx_hash))
         .bind(metadata.block_number as i64)