Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add vyper signature to bytecode #2860

Merged
merged 6 commits into from
May 23, 2022
Merged

add vyper signature to bytecode #2860

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
28b1ee4
add vyper signature to bytecode
charles-cooper May 19, 2022
020e3b8
use CBOR encoding for vyper signature
charles-cooper May 20, 2022
ea88a5a
change compiler name in suffix
charles-cooper May 20, 2022
5aa476d
fix different modes
charles-cooper May 22, 2022
dcd997d
lint, fix a flag
charles-cooper May 22, 2022
62e399f
fix sym resolution
charles-cooper May 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions vyper/ir/compile_ir.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from vyper.evm.opcodes import get_opcodes
from vyper.exceptions import CodegenPanic, CompilerPanic
from vyper.utils import MemoryPositions
from vyper.version import version_tuple

PUSH_OFFSET = 0x5F
DUP_OFFSET = 0x7F
Expand Down Expand Up @@ -918,7 +919,7 @@ def _optimize_assembly(assembly):


# Assembles assembly into EVM
def assembly_to_evm(assembly, start_pos=0):
def assembly_to_evm(assembly, start_pos=0, insert_vyper_signature=False):
line_number_map = {
"breakpoints": set(),
"pc_breakpoints": set(),
Expand Down Expand Up @@ -977,7 +978,9 @@ def assembly_to_evm(assembly, start_pos=0):
pos += 0
elif isinstance(item, list):
assert runtime_code is None, "Multiple subcodes"
runtime_code, sub_map = assembly_to_evm(item, start_pos=pos)
runtime_code, sub_map = assembly_to_evm(
item, start_pos=pos, insert_vyper_signature=True
)
assert item[0].startswith("_DEPLOY_MEM_OFST_")
ctor_mem_size = int(item[0][len("_DEPLOY_MEM_OFST_") :])

Expand Down Expand Up @@ -1048,4 +1051,6 @@ def assembly_to_evm(assembly, start_pos=0):
assert len(o) == pos - start_pos, (len(o), pos, start_pos)
line_number_map["breakpoints"] = list(line_number_map["breakpoints"])
line_number_map["pc_breakpoints"] = list(line_number_map["pc_breakpoints"])
if insert_vyper_signature:
o += b"VYPR" + bytes(list(version_tuple))
return o, line_number_map