feat(era-cheatcodes): expectRevert cheatcode
#200
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
Karrq
force-pushed
the
karrq/feat/cheatcode-expectrevert
branch
from
d93045e to
2ff4e5a
Compare
nbaztec
reviewed
Dec 18, 2023
Co-authored-by: Nisheeth Barthwal <[email protected]>
fix(era:cc:expectRevert): offset expected depth fix(era:cc:expectRevert): check only shallower than expected
feat(era:cheatcodes): delay action by n statements refactor(era:cc): recurring actions
Karrq
force-pushed
the
karrq/feat/cheatcode-expectrevert
branch
from
2a2b999 to
3af1a58
Compare
Karrq
force-pushed
the
karrq/feat/cheatcode-expectrevert
branch
from
6c54bb5 to
5606e38
Compare
Signed-off-by: Danil <[email protected]>
Signed-off-by: Danil <[email protected]>
Signed-off-by: Danil <[email protected]>
Signed-off-by: Danil <[email protected]>
Signed-off-by: Danil <[email protected]>
Signed-off-by: Danil <[email protected]>
Deniallugo
force-pushed
the
karrq/feat/cheatcode-expectrevert
branch
from
9323302 to
c6da906
Compare
Karrq
changed the title
expectRevert cheatcodeexpectRevert cheatcode
Signed-off-by: Danil <[email protected]>
Deniallugo
changed the title
expectRevert cheatcodeexpectRevert cheatcode
Signed-off-by: Danil <[email protected]>
Signed-off-by: Danil <[email protected]>
Deniallugo
force-pushed
the
karrq/feat/cheatcode-expectrevert
branch
4 times, most recently
from
05ed383 to
39b750a
Compare
Signed-off-by: Danil <[email protected]>
Deniallugo
force-pushed
the
karrq/feat/cheatcode-expectrevert
branch
from
39b750a to
7a282c1
Compare
Signed-off-by: Danil <[email protected]>
Deniallugo
force-pushed
the
karrq/feat/cheatcode-expectrevert
branch
from
0449a36 to
243d072
Compare
nbaztec
reviewed
Jan 5, 2024
Comment on lines
+148
to
+153
| // function testExpectRevertCallsThenReverts() public { | ||
| // Reverter reverter = new Reverter(); | ||
| // Dummy dummy = new Dummy(); | ||
| // cheatcodes.expectRevert("called a function and then reverted"); | ||
| // reverter.callThenRevert(dummy, "called a function and then reverted"); | ||
| // } |
There was a problem hiding this comment.
Are these cases not yet supported?
There was a problem hiding this comment.
I assume @Karrq copypasted them from the cheatcodes and we will activate it, once we are supporting cheat codes calls directly
There was a problem hiding this comment.
@Karrq Can these be enabled (using the the long form call syntax)?
There was a problem hiding this comment.
Yes I did copy paste, and I simply had these removed for now not for the direct calls but to simplify a bit the tests honestly. These should be enabled (and fixed)
nbaztec
reviewed
Jan 5, 2024
nbaztec
reviewed
Jan 5, 2024
nbaztec
reviewed
Jan 5, 2024
nbaztec
approved these changes
Jan 5, 2024
Signed-off-by: Danil <[email protected]>
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.
What 💻
expectRevertimplementations and testexpectRevertworks with general messagesexpectRevertworks with CustomErrorsexpectRevertworks with low level callsHow
Once the cheatcode expectRevert set, we have to check the next call, is it success or revert.
To do it, after cheatcode installation, we check returns on a certain depth for reverting or correct execution. Unfortunately, after setting this cheatcode we have at least one return on this depth, it's a return from cheatcode contract, and after we probably have one another return 0x..8002 address (ACCOUNT_CODE_STORAGE_ADDRESS), it's a system contract, that returns correct bytecode, based on address. So we have to skip either 1 or 2 returns before the necessary return.
Once we found the necessary return, we have to check it and probably change the execution path. E.g. convert revert to ok.
And it's the place where magic starts. We have
pcand it represents the next command to execute.So, we have 2 possible paths:
The exception handler is placed in the
currentdepth of the callstack, because it's a property of return, but the continue pc is placed in the desired depth, depth - 1.So for proper jump to the necessary path we have to grab two pc. and later on jump to one of them.
Evidence 📷