Skip to content

Commit

Permalink
Merge branch 'master' into set-name
Browse files Browse the repository at this point in the history
  • Loading branch information
anvacaru authored Dec 9, 2024
2 parents 318f6a4 + d8dad9e commit 389843a
Show file tree
Hide file tree
Showing 9 changed files with 39 additions and 30 deletions.
2 changes: 1 addition & 1 deletion deps/k_release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.1.180
7.1.184
2 changes: 1 addition & 1 deletion deps/kevm_release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.757
1.0.759
30 changes: 15 additions & 15 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.757";
kevm.url = "github:runtimeverification/evm-semantics/v1.0.759";
nixpkgs.follows = "kevm/nixpkgs";
k-framework.follows = "kevm/k-framework";
flake-utils.follows = "kevm/flake-utils";
Expand Down
22 changes: 11 additions & 11 deletions 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 pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ authors = [

[tool.poetry.dependencies]
python = "^3.10"
kevm-pyk = { git = "https://github.com/runtimeverification/evm-semantics.git", tag = "v1.0.757", subdirectory = "kevm-pyk" }
kevm-pyk = { git = "https://github.com/runtimeverification/evm-semantics.git", tag = "v1.0.759", subdirectory = "kevm-pyk" }
eth-utils = "^4.1.1"
pycryptodome = "^3.20.0"
pyevmasm = "^0.2.3"
Expand Down
7 changes: 7 additions & 0 deletions src/kontrol/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,13 @@ def parse(s: str) -> list[T]:
config_args.config_args,
],
)
build.add_argument(
'--no-O2',
dest='o2',
default=None,
action='store_false',
help='Do not use optimization level 2.',
)
build.add_argument(
'--regen',
dest='regen',
Expand Down
1 change: 1 addition & 0 deletions src/kontrol/options.py
Original file line number Diff line number Diff line change
Expand Up @@ -858,6 +858,7 @@ class BuildOptions(LoggingOptions, KOptions, KGenOptions, KompileOptions, Foundr
@staticmethod
def default() -> dict[str, Any]:
return {
'o2': True,
'regen': False,
'rekompile': False,
'forge_build': True,
Expand Down
1 change: 1 addition & 0 deletions src/kontrol/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ def kontrol_toml_file_contents() -> str:
require = 'lemmas.k'
module-import = 'TestBase:KONTROL-LEMMAS'
auxiliary-lemmas = true
o2 = true
[prove.default]
foundry-project-root = '.'
Expand Down

0 comments on commit 389843a

Please sign in to comment.