feat: add vyper version bytecode check #1578
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
charles-cooper
approved these changes
Jul 12, 2022
| @@ -310,6 +310,10 @@ def _generate_coverage_data( | |||
| revert_pc = len(opcodes) + sum(int(i[4:]) - 1 for i in opcodes if i.startswith("PUSH")) - 5 | |||
|
|
|||
| while opcodes: | |||
| # ignore vyper version bytecode for >= 0.3.4 | |||
| if len(source_map) == 0 and opcodes[0] == "PUSH6" and opcodes[1] == "0x767970657283": | |||
There was a problem hiding this comment.
i think a more general/graceful solution would just be to break if len(source_map) == 0, but i'm not sure what other consequences that would have here
4 tasks
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 I did
Vyper 0.3.4 adds a signature to the bytecode. This causes an error when compiling in Brownie because the source map is empty before the opcodes queue is exhausted in
_generate_coverage_data()inbrownie/project/compiler/vyper.py.Related issue: #1566 and vyperlang/vyper#2955
How I did it
Check for the signature when the source map is empty, and exit the
whileloop.How to verify it
Checklist