Add MastForest::advice_map for the data required in the advice provider before execution
#1574
Conversation
This file contains 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
greenhat
force-pushed
the
greenhat/i1547-mastforest-add-advicemap
branch
from
f1fd68b to
a36a9af
Compare
greenhat
force-pushed
the
greenhat/i1547-mastforest-add-advicemap
branch
from
d890a6a to
fe7a7da
Compare
greenhat
force-pushed
the
greenhat/i1547-mastforest-add-advicemap
branch
4 times, most recently
from
c9860b6 to
eda4a01
Compare
greenhat
commented
Nov 19, 2024
greenhat
changed the title
MastForest::advice_map for the data required in the advice provider before executionMastForest::advice_map for the data required in the advice provider before execution
greenhat
force-pushed
the
greenhat/i1547-mastforest-add-advicemap
branch
from
eda4a01 to
006e03a
Compare
greenhat
changed the title
MastForest::advice_map for the data required in the advice provider before executionMastForest::advice_map for the data required in the advice provider before execution
plafer
requested changes
Nov 19, 2024
core/src/mast/merger/mod.rs
Outdated
| @@ -163,6 +167,17 @@ impl MastForestMerger { | |||
| Ok(()) | |||
| } | |||
|
|
|||
| fn merge_advice_map(&mut self, other_forest: &MastForest) -> Result<(), MastForestError> { | |||
| for (key, value) in other_forest.advice_map.clone().into_iter() { | |||
| if self.mast_forest.advice_map().get(&key).is_some() { | |||
There was a problem hiding this comment.
It would be a bit more forgiving to only return an error if the advice maps have different values at the same key
There was a problem hiding this comment.
Good point! Done.
My line of thinking was that keys in the advice map are expected to be so unique (hashes) that any collision would mean that something is off and we better fail early. I suppose we can cut some slack when values are the same (user sets the values twice?).
processor/src/lib.rs
Outdated
| @@ -253,6 +253,18 @@ where | |||
| return Err(ExecutionError::ProgramAlreadyExecuted); | |||
| } | |||
|
|
|||
| // Load the program's advice data into the advice provider | |||
| for (digest, values) in program.mast_forest().advice_map().clone().into_iter() { | |||
| if self.host.borrow().advice_provider().get_mapped_values(&digest).is_some() { | |||
There was a problem hiding this comment.
Similarly here, could be return an error only if the values are different at the same key?
Since the behavior if the key is already present is to replace the value with the new one there is no other error that can possibly arise in this method.
greenhat
force-pushed
the
greenhat/i1547-mastforest-add-advicemap
branch
2 times, most recently
from
92f3309 to
6dcac60
Compare
|
@plafer Thank you for the review! I addressed all the comments. Please do another round. |
greenhat
force-pushed
the
greenhat/i1547-mastforest-add-advicemap
branch
from
6dcac60 to
2f8f3fe
Compare
When merging forests, merge their advice maps and return error on key collision.
greenhat
force-pushed
the
greenhat/i1547-mastforest-add-advicemap
branch
from
2f8f3fe to
93869ef
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR implements VM-facing part of #1547 and adds advice map to the
MastForestthat is loaded in the advice provider when theMastForestexecuted.This PR contains changes exposing
AdviceProviderinHost(see commit) introduced in #1572 (see comment)