Skip to content

Commit

Permalink
Merge branch 'noah/storage-type-constraints' of https://github.com/ru…
Browse files Browse the repository at this point in the history
…ntimeverification/kontrol into noah/storage-type-constraints
  • Loading branch information
nwatson22 committed Jul 30, 2024
2 parents d5f2048 + 4a252b9 commit 2f40ea1
Show file tree
Hide file tree
Showing 64 changed files with 659 additions and 93 deletions.
2 changes: 1 addition & 1 deletion deps/k_release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.1.64
7.1.88
2 changes: 1 addition & 1 deletion deps/kevm_release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.647
1.0.656
40 changes: 20 additions & 20 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
description = "Kontrol";

inputs = {
kevm.url = "github:runtimeverification/evm-semantics/v1.0.647";
kevm.url = "github:runtimeverification/evm-semantics/v1.0.656";
nixpkgs.follows = "kevm/nixpkgs";
nixpkgs-pyk.follows = "kevm/nixpkgs-pyk";
k-framework.follows = "kevm/k-framework";
Expand Down
2 changes: 1 addition & 1 deletion package/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.367
0.1.377
42 changes: 21 additions & 21 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ build-backend = "poetry.core.masonry.api"

[tool.poetry]
name = "kontrol"
version = "0.1.367"
version = "0.1.377"
description = "Foundry integration for KEVM"
authors = [
"Runtime Verification, Inc. <[email protected]>",
]

[tool.poetry.dependencies]
python = "^3.10"
kevm-pyk = { git = "https://github.com/runtimeverification/evm-semantics.git", tag = "v1.0.647", subdirectory = "kevm-pyk" }
kevm-pyk = { git = "https://github.com/runtimeverification/evm-semantics.git", tag = "v1.0.656", subdirectory = "kevm-pyk" }
eth-utils = "^4.1.1"
pycryptodome = "^3.20.0"

Expand Down
2 changes: 1 addition & 1 deletion src/kontrol/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
if TYPE_CHECKING:
from typing import Final

VERSION: Final = '0.1.367'
VERSION: Final = '0.1.377'
3 changes: 3 additions & 0 deletions src/kontrol/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,15 @@ def _load_foundry(
bug_report: BugReport | None = None,
use_hex_encoding: bool = False,
add_enum_constraints: bool = False,
expand_config: bool = False,
) -> Foundry:
try:
foundry = Foundry(
foundry_root=foundry_root,
bug_report=bug_report,
use_hex_encoding=use_hex_encoding,
add_enum_constraints=add_enum_constraints,
expand_config=expand_config,
)
except FileNotFoundError:
print(
Expand Down Expand Up @@ -271,6 +273,7 @@ def exec_show(options: ShowOptions) -> None:
options.foundry_root,
use_hex_encoding=options.use_hex_encoding,
add_enum_constraints=options.enum_constraints,
expand_config=options.expand_config,
),
options=options,
)
Expand Down
7 changes: 7 additions & 0 deletions src/kontrol/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,13 @@ def parse(s: str) -> list[T]:
action='store_true',
help='Print elements in hexadecimal encoding.',
)
show_args.add_argument(
'--expand-config',
dest='expand_config',
default=None,
action='store_true',
help='When printing nodes, always show full bytecode in code and program cells, and do not hide jumpDests cell.',
)

command_parser.add_parser(
'to-dot',
Expand Down
Loading

0 comments on commit 2f40ea1

Please sign in to comment.