cannon: Autodetect VM type from state #11803
Merged
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
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## develop #11803 +/- ##
===========================================
+ Coverage 78.13% 78.47% +0.34%
===========================================
Files 40 41 +1
Lines 3179 3206 +27
===========================================
+ Hits 2484 2516 +32
+ Misses 533 529 -4
+ Partials 162 161 -1
Flags with carried forward coverage won't be shown. Click here to find out more.
|
ajsutton
force-pushed
the
aj/cannon-autodetect-state-type
branch
from
83a6cfc
to
dd797d1
Compare
mbaxter
approved these changes
Sep 9, 2024
github-merge-queue
bot
removed this pull request from the merge queue due to a conflict with the base branch
…nd forbid serializing multithreaded states to JSON
Test read/write/create for VersionedState
Multithreaded states always use binary serialization.
ajsutton
force-pushed
the
aj/cannon-autodetect-state-type
branch
from
297e9c1
to
1dd1668
Compare
samlaf
pushed a commit
to samlaf/optimism
that referenced
this pull request
Nov 10, 2024
* cannon: Autodetect VM type from state in run command * cannon: Autodetect VM type from state in witness command * cannon: Remove vm type flag from run and witness * cannon: Only peek the version byte * cannon: Move all version handling to VersionedState, simplify a lot and forbid serializing multithreaded states to JSON * cannon: Rename method * op-challenger: Update cannon state parsing to use version detecting methods * cannon: Move CreateVM to FPVMState for simplicity Test read/write/create for VersionedState * cannon: Readd detect_test * cannon: Remove json names from multithreaded.State. Multithreaded states always use binary serialization. * cannon: Move vmtype to load_elf since it is no longer shared. * cannon: Ensure metadata is available and sleepCheck used even if debug is disabled. * op-challenger: Update canon state loading test to cover multiple state versions.
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.
Description
Modifies cannon to automatically detect the VM type from the supplied state.
VersionedStatestruct which wraps the vm type specific state.VersionedStatereturns an error when attempting to serialise a multithreaded state as JSON since JSON states are always assumed to be single threaded.FPVMStatenow exposes aCreateVMmethod so it can create the appropriate VM (akaInstrumentedState) for the type of state. Theruncommand uses this so its implementation is now completely agnostic to the type of state.InitDebugto accept the metadata as an arg rather than requiring it in theInstrumentedStateconstructor so it matches the multithreaded versionMetadatato avoid introducing package cyclesTests
Added unit tests for the new code that detects versions.
Metadata