MTCannon: Fix AssertEVMReverts to correctly construct data
#12200
+29
−10
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
mbaxter
requested changes
Sep 30, 2024
Comment on lines
+59
to
+60
| // EncodeProof returns the proof for the current state | ||
| EncodeProof() []byte |
There was a problem hiding this comment.
I probably wouldn't modify the main interface for this - in particular because the tests here need an "initial"/incomplete proof without the memory proofs that are generated by running FPVM.step().
I'd suggest adding a helper function in the test utils here.
| @@ -182,11 +182,11 @@ func ValidateEVM(t *testing.T, stepWitness *mipsevm.StepWitness, step uint64, go | |||
|
|
|||
| // AssertEVMReverts runs a single evm step from an FPVM prestate and asserts that the VM panics | |||
| func AssertEVMReverts(t *testing.T, state mipsevm.FPVMState, contracts *ContractMetadata, tracer *tracing.Hooks) { | |||
| insnProof := state.GetMemory().MerkleProof(state.GetPC()) | |||
There was a problem hiding this comment.
I'd suggest accepting an expected revert message here. Then you can check it with:
retVal, _, err := env.Call(vm.AccountRef(sender), contracts.Addresses.MIPS, input, startingGas, common.U2560)
require.Contains(t, string(retVal), expectedRevertMsg)
Comment on lines
+192
to
+194
| //Fake SecondMemoryProof | ||
| proofData = append(proofData, insnProof[:]...) | ||
| return proofData |
There was a problem hiding this comment.
We can't generate fake data in production code - if necessary, this should be a test utility.
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.
First part of #12198
Modify
AssertEVMRevertsto ensure it passes complete proofdata when invoking the EVM.