Merge branch 'angelo/claim-digest' into ec2/bitvm

Author: ec2

contracts/snapshots/BoundlessMarketBasicTest.json

@@ -1,42 +1,43 @@
 {
   "ERC20 approve: required for depositStake": "45966",
-  "bytecode size implementation": "24381",
+  "bytecode size implementation": "24287",
   "bytecode size proxy": "89",
   "deposit: first ever deposit": "50920",
   "deposit: second deposit": "33820",
-  "depositStake: 1 HP (tops up market account)": "59400",
-  "depositStake: full (drains testProver account)": "49800",
-  "depositStakeWithPermit: 1 HP (tops up market account)": "72272",
-  "depositStakeWithPermit: full (drains testProver account)": "72262",
-  "fulfill: a batch of 8": "402078",
-  "fulfill: a locked request": "90511",
-  "fulfill: a locked request (locked via prover signature)": "90511",
-  "fulfill: a locked request with 10kB journal": "427539",
-  "fulfill: another prover fulfills without payment": "85473",
-  "fulfill: fulfilled by the locked prover for payment (request already fulfilled by another prover)": "80772",
-  "fulfillAndWithdraw: a batch of 8": "414256",
-  "fulfillAndWithdraw: a locked request": "102689",
-  "lockinRequest: base case": "146877",
-  "lockinRequest: with prover signature": "156522",
-  "priceAndFulfill: a single request": "108760",
-  "priceAndFulfill: a single request (smart contract signature)": "118938",
-  "priceAndFulfill: a single request (with selector)": "111059",
-  "priceAndFulfill: a single request that was not locked": "108760",
-  "priceAndFulfill: a single request that was not locked fulfilled by prover not in allow-list": "108760",
-  "priceAndFulfill: fulfill already fulfilled was locked request": "102475",
+  "depositStake: 1 HP (tops up market account)": "59378",
+  "depositStake: full (drains testProver account)": "49778",
+  "depositStakeWithPermit: 1 HP (tops up market account)": "72254",
+  "depositStakeWithPermit: full (drains testProver account)": "72244",
+  "fulfill (no journal): a batch of 8": "386163",
+  "fulfill: a batch of 8": "414107",
+  "fulfill: a locked request": "92348",
+  "fulfill: a locked request (locked via prover signature)": "92348",
+  "fulfill: a locked request with 10kB journal": "429399",
+  "fulfill: another prover fulfills without payment": "87299",
+  "fulfill: fulfilled by the locked prover for payment (request already fulfilled by another prover)": "82252",
+  "fulfillAndWithdraw: a batch of 8": "426461",
+  "fulfillAndWithdraw: a locked request": "104702",
+  "lockinRequest: base case": "146921",
+  "lockinRequest: with prover signature": "156628",
+  "priceAndFulfill: a single request": "110408",
+  "priceAndFulfill: a single request (smart contract signature)": "120598",
+  "priceAndFulfill: a single request (with selector)": "112710",
+  "priceAndFulfill: a single request that was not locked": "110408",
+  "priceAndFulfill: a single request that was not locked fulfilled by prover not in allow-list": "110408",
+  "priceAndFulfill: fulfill already fulfilled was locked request": "103766",
   "slash: base case": "100967",
   "slash: fulfilled request after lock deadline": "80532",
-  "submitRequest: with maxPrice ether": "51904",
-  "submitRequest: without ether": "45061",
-  "submitRootAndFulfill: a batch of 2 requests": "168676",
-  "submitRootAndFulfill: a locked request": "124555",
-  "submitRootAndFulfill: a locked request (locked via prover signature)": "124555",
-  "submitRootAndFulfillAndWithdraw: a locked request": "136476",
-  "submitRootAndPriceAndFulfill: a single request": "141098",
-  "submitRootAndPriceAndFulfill: a single request that was not locked": "141110",
-  "submitRootAndPriceAndFulfill: a single request that was not locked fulfilled by prover not in allow-list": "141110",
-  "withdraw: 1 ether": "40314",
-  "withdraw: full balance": "40326",
-  "withdrawStake: 1 HP balance": "68743",
-  "withdrawStake: full balance": "51739"
+  "submitRequest: with maxPrice ether": "51888",
+  "submitRequest: without ether": "45045",
+  "submitRootAndFulfill: a batch of 2 requests": "171268",
+  "submitRootAndFulfill: a locked request": "126392",
+  "submitRootAndFulfill: a locked request (locked via prover signature)": "126392",
+  "submitRootAndFulfillAndWithdraw: a locked request": "138702",
+  "submitRootAndPriceAndFulfill: a single request": "142990",
+  "submitRootAndPriceAndFulfill: a single request that was not locked": "142990",
+  "submitRootAndPriceAndFulfill: a single request that was not locked fulfilled by prover not in allow-list": "142990",
+  "withdraw: 1 ether": "40336",
+  "withdraw: full balance": "40348",
+  "withdrawStake: 1 HP balance": "68765",
+  "withdrawStake: full balance": "51761"
 }

contracts/snapshots/BoundlessMarketBench.json

@@ -1,22 +1,22 @@
 {
-  "fulfill (with callback): batch of 001": "132142",
-  "fulfill (with callback): batch of 002": "218443",
-  "fulfill (with callback): batch of 004": "392147",
-  "fulfill (with callback): batch of 008": "739579",
-  "fulfill (with callback): batch of 016": "1272464",
-  "fulfill (with callback): batch of 032": "2373148",
-  "fulfill (with selector): batch of 001": "92745",
-  "fulfill (with selector): batch of 002": "139726",
-  "fulfill (with selector): batch of 004": "236258",
-  "fulfill (with selector): batch of 008": "420231",
-  "fulfill (with selector): batch of 016": "790425",
-  "fulfill (with selector): batch of 032": "1558877",
-  "fulfill: batch of 001": "90487",
-  "fulfill: batch of 002": "135232",
-  "fulfill: batch of 004": "227181",
-  "fulfill: batch of 008": "402117",
-  "fulfill: batch of 016": "754179",
-  "fulfill: batch of 032": "1485129",
-  "fulfill: batch of 064": "3014348",
-  "fulfill: batch of 128": "6255291"
+  "fulfill (with callback): batch of 001": "133995",
+  "fulfill (with callback): batch of 002": "221718",
+  "fulfill (with callback): batch of 004": "398391",
+  "fulfill (with callback): batch of 008": "751743",
+  "fulfill (with callback): batch of 016": "1295941",
+  "fulfill (with callback): batch of 032": "2421367",
+  "fulfill (with selector): batch of 001": "94586",
+  "fulfill (with selector): batch of 002": "143005",
+  "fulfill (with selector): batch of 004": "242410",
+  "fulfill (with selector): batch of 008": "432298",
+  "fulfill (with selector): batch of 016": "814329",
+  "fulfill (with selector): batch of 032": "1606225",
+  "fulfill: batch of 001": "92324",
+  "fulfill: batch of 002": "138490",
+  "fulfill: batch of 004": "233365",
+  "fulfill: batch of 008": "414155",
+  "fulfill: batch of 016": "777861",
+  "fulfill: batch of 032": "1532332",
+  "fulfill: batch of 064": "3109582",
+  "fulfill: batch of 128": "6452336"
 }

contracts/src/BoundlessMarket.sol

@@ -26,6 +26,7 @@ import {AssessorCallback} from "./types/AssessorCallback.sol";
 import {AssessorCommitment} from "./types/AssessorCommitment.sol";
 import {Fulfillment} from "./types/Fulfillment.sol";
 import {AssessorReceipt} from "./types/AssessorReceipt.sol";
+import {PredicateType} from "./types/Predicate.sol";
 import {ProofRequest} from "./types/ProofRequest.sol";
 import {LockRequest, LockRequestLibrary} from "./types/LockRequest.sol";
 import {RequestId} from "./types/RequestId.sol";
@@ -239,6 +240,7 @@ contract BoundlessMarket is
         }
         bytes32[] memory leaves = new bytes32[](fills.length);
         bool[] memory hasSelector = new bool[](fills.length);
+        PredicateType[] memory predicateTypes = new PredicateType[](fills.length);
 
         // Check the selector constraints.
         // NOTE: The assessor guest adds non-zero selector values to the list.
@@ -255,9 +257,14 @@ contract BoundlessMarket is
         // Verify the application receipts.
         for (uint256 i = 0; i < fills.length; i++) {
             Fulfillment calldata fill = fills[i];
-            bytes32 claimDigest = fill.imageId;
-            if (!fill.isClaimDigest) {
-                claimDigest = ReceiptClaimLib.ok(fill.imageId, sha256(fill.journal)).digest();
+            predicateTypes[i] = fill.predicateType;
+
+            bytes32 claimDigest;
+            if (fill.predicateType == PredicateType.ClaimDigestMatch) {
+                claimDigest = fill.imageIdOrClaimDigest;
+            } else {
+                // The requestor requested a journal, so we compute the claim digest from the journal.
+                claimDigest = ReceiptClaimLib.ok(fill.imageIdOrClaimDigest, sha256(fill.journal)).digest();
             }
             leaves[i] = AssessorCommitment(i, fill.id, fill.requestDigest, claimDigest).eip712Digest();
 
@@ -280,6 +287,7 @@ contract BoundlessMarket is
                     root: batchRoot,
                     callbacks: assessorReceipt.callbacks,
                     selectors: assessorReceipt.selectors,
+                    predicateTypes: predicateTypes,
                     prover: assessorReceipt.prover
                 })
             )
@@ -335,9 +343,9 @@ contract BoundlessMarket is
             }
 
             uint256 callbackIndexPlusOne = fillToCallbackIndexPlusOne[i];
-            if (callbackIndexPlusOne > 0) {
+            if ((fill.predicateType != PredicateType.ClaimDigestMatch) && (callbackIndexPlusOne > 0)) {
                 AssessorCallback calldata callback = assessorReceipt.callbacks[callbackIndexPlusOne - 1];
-                _executeCallback(fill.id, callback.addr, callback.gasLimit, fill.imageId, fill.journal, fill.seal);
+                _executeCallback(fill.id, callback.addr, callback.gasLimit, fill.imageIdOrClaimDigest, fill.journal, fill.seal);
             }
         }
     }

contracts/src/types/AssessorJournal.sol

@@ -5,6 +5,7 @@
 pragma solidity ^0.8.20;
 
 import {AssessorCallback} from "./AssessorCallback.sol";
+import {PredicateType} from "./Predicate.sol";
 import {Selector} from "./Selector.sol";
 
 /// @title Assessor Journal Struct
@@ -17,6 +18,8 @@ struct AssessorJournal {
     /// @notice The (optional) selectors for the requests committed by the assessor.
     /// @dev This is used to verify the fulfillment of the request against its selector's seal.
     Selector[] selectors;
+    /// @notice The list of `PredicateType` for each request.
+    PredicateType[] predicateTypes;
     /// @notice Root of the Merkle tree committing to the set of proven claims.
     /// @dev In the case of a batch of size one, this may simply be the eip712Digest of the `AssessorCommitment`.
     bytes32 root;

contracts/src/types/Fulfillment.sol

@@ -5,6 +5,7 @@
 pragma solidity ^0.8.20;
 
 import {RequestId} from "./RequestId.sol";
+import {PredicateType} from "./Predicate.sol";
 
 using FulfillmentLibrary for Fulfillment global;
 
@@ -15,22 +16,21 @@ struct Fulfillment {
     RequestId id;
     /// @notice EIP-712 digest of request struct.
     bytes32 requestDigest;
-    /// @notice Image ID of the guest that was verifiably executed to satisfy the request.
-    /// @dev Must match the value in the request's requirements.
-    bytes32 imageId;
-    // TODO: Add a flag in the request to decide whether to post the journal. Note that
-    // if the journal and journal digest do not need to be delivered to the client, imageId will
-    // be replaced with claim digest, since it is captured in the requirements on the request,
-    // checked by the Assessor guest.
+    /// @notice The `PredicateType` of the request that is being fulfilled.
+    /// @dev When the `PredicateType` is `ClaimDigestMatch`, the imageIdOrClaimDigest field is the claim digest,
+    /// and otherwise it is the image ID of the guest that was executed.
+    PredicateType predicateType;
+    /// @notice Image ID of the guest that was verifiably executed to satisfy the request or claim digest.
+    /// @dev Must match the value in the request's requirements. If the journal and journal digest do not need
+    /// to be delivered to the client, imageId is replaced with claim digest, since it is captured in the
+    /// requirements on the request, checked by the Assessor guest.
+    bytes32 imageIdOrClaimDigest;
     /// @notice Journal committed by the guest program execution.
     /// @dev The journal is checked to satisfy the predicate specified on the request's requirements.
     bytes journal;
     /// @notice Cryptographic proof for the validity of the execution results.
     /// @dev This will be sent to the `IRiscZeroVerifier` associated with this contract.
     bytes seal;
-    /// @notice Flag to indicate that the imageID is a claim digest.
-    /// @dev If true, the imageId is a claim digest instead of an image ID.
-    bool isClaimDigest;
 }
 
 library FulfillmentLibrary {}

contracts/src/types/Predicate.sol

@@ -5,7 +5,10 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.24;
 
+import {ReceiptClaim, ReceiptClaimLib} from "risc0/IRiscZeroVerifier.sol";
+
 using PredicateLibrary for Predicate global;
+using ReceiptClaimLib for ReceiptClaim;
 
 /// @title Predicate Struct and Library
 /// @notice Represents a predicate and provides functions to create and evaluate predicates.
@@ -16,7 +19,8 @@ struct Predicate {
 
 enum PredicateType {
     DigestMatch,
-    PrefixMatch
+    PrefixMatch,
+    ClaimDigestMatch
 }
 
 library PredicateLibrary {
@@ -37,12 +41,19 @@ library PredicateLibrary {
         return Predicate({predicateType: PredicateType.PrefixMatch, data: prefix});
     }
 
+    /// @notice Creates a claim digest match predicate.
+    /// @param claimDigest The claimDigest to match.
+    /// @return A Predicate struct with type ClaimDigestMatch and the provided claimDigest.
+    function createClaimDigestMatchPredicate(bytes32 claimDigest) internal pure returns (Predicate memory) {
+        return Predicate({predicateType: PredicateType.ClaimDigestMatch, data: abi.encode(claimDigest)});
+    }
+
     /// @notice Evaluates the predicate against the given journal and journal digest.
     /// @param predicate The predicate to evaluate.
     /// @param journal The journal to evaluate against.
     /// @param journalDigest The digest of the journal.
     /// @return True if the predicate is satisfied, false otherwise.
-    function eval(Predicate memory predicate, bytes memory journal, bytes32 journalDigest)
+    function eval(Predicate memory predicate, bytes32 imageId, bytes memory journal, bytes32 journalDigest)
         internal
         pure
         returns (bool)
@@ -51,6 +62,8 @@ library PredicateLibrary {
             return bytes32(predicate.data) == journalDigest;
         } else if (predicate.predicateType == PredicateType.PrefixMatch) {
             return startsWith(journal, predicate.data);
+        } else if (predicate.predicateType == PredicateType.ClaimDigestMatch) {
+            return bytes32(predicate.data) == ReceiptClaimLib.ok(imageId, journalDigest).digest();
         } else {
             revert("Unreachable code");
         }