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

Jump to bottom

chore: add missing pc maps to vyper_json output #3333

Merged
merged 18 commits into from
Apr 7, 2023
Merged

chore: add missing pc maps to vyper_json output #3333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
a096ac3
check for breakpoint opcode
tserg Apr 4, 2023
43a709e
add missing pc maps
tserg Apr 4, 2023
df2b446
update test
tserg Apr 4, 2023
9bf60ae
fix lint
tserg Apr 4, 2023
150b9ae
update test
tserg Apr 5, 2023
bf6a35e
sort breakpoints
tserg Apr 5, 2023
cbfc57e
fix mypy lint
tserg Apr 5, 2023
b2c111b
add breakpoint assertion
tserg Apr 5, 2023
81d7a7f
add original pc_pos_map
tserg Apr 6, 2023
a3f981e
rename to source_map_full
tserg Apr 6, 2023
ad426bb
consolidate under sourceMapFull
tserg Apr 6, 2023
640020c
remove source map full creator
tserg Apr 6, 2023
ac79e2c
remove dead code
tserg Apr 6, 2023
f1f55b0
add comment
tserg Apr 6, 2023
c231ac5
fix tests; skip vyper_json only outputs
tserg Apr 7, 2023
6dc505d
Revert "fix tests; skip vyper_json only outputs"
tserg Apr 7, 2023
a7499e0
add full source map output
tserg Apr 7, 2023
f2b43af
undo breakpoints change
tserg Apr 7, 2023
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
1 change: 1 addition & 0 deletions tests/cli/vyper_json/test_output_dict.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ def test_keys():
"object": data["bytecode_runtime"],
"opcodes": data["opcodes_runtime"],
"sourceMap": data["source_map"]["pc_pos_map_compressed"],
"sourceMapFull": data["source_map_full"],
},
"methodIdentifiers": data["method_identifiers"],
},
Expand Down
6 changes: 5 additions & 1 deletion vyper/cli/vyper_json.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"evm.deployedBytecode.object": "bytecode_runtime",
"evm.deployedBytecode.opcodes": "opcodes_runtime",
"evm.deployedBytecode.sourceMap": "source_map",
"evm.deployedBytecode.sourceMapFull": "source_map_full",
"interface": "interface",
"ir": "ir_dict",
"ir_runtime": "ir_runtime_dict",
Expand Down Expand Up @@ -418,14 +419,17 @@ def format_to_output_dict(compiler_data: Dict) -> Dict:
if "opcodes" in data:
evm["opcodes"] = data["opcodes"]

if any(i + "_runtime" in data for i in evm_keys) or "source_map" in data:
pc_maps_keys = ("source_map", "source_map_full")
if any(i + "_runtime" in data for i in evm_keys) or any(i in data for i in pc_maps_keys):
evm = output_contracts.setdefault("evm", {}).setdefault("deployedBytecode", {})
if "bytecode_runtime" in data:
evm["object"] = data["bytecode_runtime"]
if "opcodes_runtime" in data:
evm["opcodes"] = data["opcodes_runtime"]
if "source_map" in data:
evm["sourceMap"] = data["source_map"]["pc_pos_map_compressed"]
if "source_map_full" in data:
evm["sourceMapFull"] = data["source_map"]

return output_dict

Expand Down
1 change: 1 addition & 0 deletions vyper/compiler/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
"abi": output.build_abi_output,
"asm": output.build_asm_output,
"source_map": output.build_source_map_output,
"source_map_full": output.build_source_map_output,
charles-cooper marked this conversation as resolved.
Show resolved Hide resolved
# requires bytecode
"bytecode": output.build_bytecode_output,
"bytecode_runtime": output.build_bytecode_runtime_output,
Expand Down