BM-1466: Ec2/claim digest #1004
+1,286
−658
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,42 +1,43 @@ | ||
| { | ||
| "ERC20 approve: required for depositStake": "45966", | ||
| "bytecode size implementation": "24341", | ||
| "bytecode size proxy": "89", | ||
| "deposit: first ever deposit": "50876", | ||
| "deposit: second deposit": "33776", | ||
| "depositStake: 1 HP (tops up market account)": "59378", | ||
| "depositStake: full (drains testProver account)": "49778", | ||
| "depositStakeWithPermit: 1 HP (tops up market account)": "72236", | ||
| "depositStakeWithPermit: full (drains testProver account)": "72227", | ||
| "fulfill (no journal): a batch of 8": "385299", | ||
| "fulfill: a batch of 8": "438335", | ||
| "fulfill: a locked request": "95167", | ||
| "fulfill: a locked request (locked via prover signature)": "95167", | ||
| "fulfill: a locked request with 10kB journal": "432569", | ||
| "fulfill: another prover fulfills without payment": "90165", | ||
| "fulfill: fulfilled by the locked prover for payment (request already fulfilled by another prover)": "84071", | ||
| "fulfillAndWithdraw: a batch of 8": "451307", | ||
| "fulfillAndWithdraw: a locked request": "108139", | ||
| "lockinRequest: base case": "147332", | ||
| "lockinRequest: with prover signature": "157039", | ||
| "priceAndFulfill: a single request": "113970", | ||
| "priceAndFulfill: a single request (smart contract signature)": "124159", | ||
| "priceAndFulfill: a single request (with selector)": "116270", | ||
| "priceAndFulfill: a single request that was not locked": "113934", | ||
| "priceAndFulfill: a single request that was not locked fulfilled by prover not in allow-list": "113934", | ||
| "priceAndFulfill: fulfill already fulfilled was locked request": "106280", | ||
| "slash: base case": "100898", | ||
| "slash: fulfilled request after lock deadline": "80465", | ||
| "submitRequest: with maxPrice ether": "52227", | ||
| "submitRequest: without ether": "45384", | ||
| "submitRootAndFulfill: a batch of 2 requests": "177800", | ||
| "submitRootAndFulfill: a locked request": "129534", | ||
| "submitRootAndFulfill: a locked request (locked via prover signature)": "129534", | ||
| "submitRootAndFulfillAndWithdraw: a locked request": "141954", | ||
| "submitRootAndPriceAndFulfill: a single request": "146462", | ||
| "submitRootAndPriceAndFulfill: a single request that was not locked": "146426", | ||
| "submitRootAndPriceAndFulfill: a single request that was not locked fulfilled by prover not in allow-list": "146426", | ||
| "withdraw: 1 ether": "40331", | ||
| "withdraw: full balance": "40343", | ||
| "withdrawStake: 1 HP balance": "68755", | ||
| "withdrawStake: full balance": "51751" | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,22 @@ | ||
| { | ||
| "fulfill (with callback): batch of 001": "136946", | ||
| "fulfill (with callback): batch of 002": "227879", | ||
| "fulfill (with callback): batch of 004": "410896", | ||
| "fulfill (with callback): batch of 008": "776960", | ||
| "fulfill (with callback): batch of 016": "1346098", | ||
| "fulfill (with callback): batch of 032": "2522586", | ||
| "fulfill (with selector): batch of 001": "97441", | ||
| "fulfill (with selector): batch of 002": "148905", | ||
| "fulfill (with selector): batch of 004": "254383", | ||
| "fulfill (with selector): batch of 008": "456439", | ||
| "fulfill (with selector): batch of 016": "862953", | ||
| "fulfill (with selector): batch of 032": "1704151", | ||
| "fulfill: batch of 001": "95191", | ||
| "fulfill: batch of 002": "144387", | ||
| "fulfill: batch of 004": "245394", | ||
| "fulfill: batch of 008": "438338", | ||
| "fulfill: batch of 016": "826511", | ||
| "fulfill: batch of 032": "1630160", | ||
| "fulfill: batch of 064": "3306156", | ||
| "fulfill: batch of 128": "6849269" | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,11 +4,15 @@ | |
| // as found in the LICENSE-BSL file. | ||
| pragma solidity ^0.8.20; | ||
|
|
||
| import {CallbackType} from "./CallbackType.sol"; | ||
|
|
||
| struct AssessorCallback { | ||
| /// @notice The index of the fill in the request | ||
| uint16 index; | ||
| /// @notice The address of the contract to call back | ||
| address addr; | ||
| /// @notice Maximum gas to use for the callback | ||
| uint96 gasLimit; | ||
| /// @notice The type of callback | ||
| CallbackType callbackType; | ||
|
Comment on lines
+16
to
+17
There was a problem hiding this comment. Instead of just the callback type, we should encode the full callback data here, and ensure it is committed in the assessor journal. This both allows us to skip the recomputation of the receipt claim onchain when we go to send the callback, because it will now be part of what the assessor constructs, and allows for more flexibility in the future in how we evolve the system. There was a problem hiding this comment. Related to my comments below, I am kind of thinking we should just embed the |
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| // Copyright 2025 RISC Zero, Inc. | ||
| // | ||
| // Use of this source code is governed by the Business Source License | ||
| // as found in the LICENSE-BSL file. | ||
| pragma solidity ^0.8.24; | ||
|
|
||
| using CallbackDataLibrary for CallbackData global; | ||
|
|
||
| /// @title Callback Struct and Library | ||
| /// @notice Represents a callback configuration for proof delivery | ||
| struct CallbackData { | ||
| /// @notice Image ID of the guest that was verifiably executed to satisfy the request. | ||
| bytes32 imageId; | ||
| /// @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; | ||
| } | ||
|
|
||
| library CallbackDataLibrary {} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| // Copyright 2025 RISC Zero, Inc. | ||
| // | ||
| // Use of this source code is governed by the Business Source License | ||
| // as found in the LICENSE-BSL file. | ||
| pragma solidity ^0.8.20; | ||
|
|
||
| enum CallbackType { | ||
| None, | ||
| JournalRequired | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
By placing the callback data into the
AssessorCallback, we can mostly eliminate the new validation here, and simply decode and execute the callback (reverting if decode fails). If we directly embed theCallbackDataintoAssessorCallback, we can avoid the extra decode step as well.