Skip to content

Commit

Permalink
Merge branch 'master' into conf-test-booster-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
ehildenb authored Jun 6, 2024
2 parents 76c983f + f0684a5 commit 962c73f
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 29 deletions.
2 changes: 1 addition & 1 deletion deps/k_release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.0.114
7.0.119
24 changes: 12 additions & 12 deletions flake.lock

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

4 changes: 2 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
description = "A flake for the KEVM Semantics";

inputs = {
k-framework.url = "github:runtimeverification/k/v7.0.114";
k-framework.url = "github:runtimeverification/k/v7.0.119";
nixpkgs.follows = "k-framework/nixpkgs";
flake-utils.follows = "k-framework/flake-utils";
rv-utils.follows = "k-framework/rv-utils";
pyk.url = "github:runtimeverification/k/v7.0.114?dir=pyk";
pyk.url = "github:runtimeverification/k/v7.0.119?dir=pyk";
nixpkgs-pyk.follows = "pyk/nixpkgs";
poetry2nix.follows = "pyk/poetry2nix";
blockchain-k-plugin = {
Expand Down
8 changes: 4 additions & 4 deletions kevm-pyk/poetry.lock

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

2 changes: 1 addition & 1 deletion kevm-pyk/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ authors = [
[tool.poetry.dependencies]
python = "^3.10"
pathos = "*"
pyk = { git = "https://github.com/runtimeverification/k.git", tag="v7.0.114", subdirectory = "pyk" }
pyk = { git = "https://github.com/runtimeverification/k.git", tag="v7.0.119", subdirectory = "pyk" }
tomlkit = "^0.11.6"

[tool.poetry.group.dev.dependencies]
Expand Down
4 changes: 1 addition & 3 deletions kevm-pyk/src/kevm_pyk/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -340,9 +340,7 @@ def create_kcfg_explore() -> KCFGExplore:
bug_report_id=claim.label,
dispatch=dispatch,
)
cterm_symbolic = CTermSymbolic(
client, kevm.definition, kevm.kompiled_kore, trace_rewrites=options.trace_rewrites
)
cterm_symbolic = CTermSymbolic(client, kevm.definition, trace_rewrites=options.trace_rewrites)
return KCFGExplore(
cterm_symbolic,
kcfg_semantics=KEVMSemantics(auto_abstract_gas=options.auto_abstract_gas),
Expand Down
8 changes: 2 additions & 6 deletions kevm-pyk/src/kevm_pyk/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -438,9 +438,7 @@ def legacy_explore(
no_post_exec_simplify=no_post_exec_simplify,
) as server:
with KoreClient('localhost', server.port, bug_report=bug_report, bug_report_id=id) as client:
cterm_symbolic = CTermSymbolic(
client, kprint.definition, kprint.kompiled_kore, trace_rewrites=trace_rewrites
)
cterm_symbolic = CTermSymbolic(client, kprint.definition, trace_rewrites=trace_rewrites)
yield KCFGExplore(cterm_symbolic, kcfg_semantics=kcfg_semantics, id=id)
else:
if port is None:
Expand All @@ -457,7 +455,5 @@ def legacy_explore(
],
}
with KoreClient('localhost', port, bug_report=bug_report, bug_report_id=id, dispatch=dispatch) as client:
cterm_symbolic = CTermSymbolic(
client, kprint.definition, kprint.kompiled_kore, trace_rewrites=trace_rewrites
)
cterm_symbolic = CTermSymbolic(client, kprint.definition, trace_rewrites=trace_rewrites)
yield KCFGExplore(cterm_symbolic, kcfg_semantics=kcfg_semantics, id=id)

0 comments on commit 962c73f

Please sign in to comment.