Skip to content

Commit

Permalink
Update dependency: deps/kevm_release (#99)
Browse files Browse the repository at this point in the history
* deps/kevm_release: Set Version 1.0.317

* Sync Poetry files: kevm-pyk version 1.0.317

* flake.{nix,lock}: update Nix derivations

* Use `kdist.get`

* Set Version: 0.1.30

---------

Co-authored-by: devops <devops@runtimeverification.com>
Co-authored-by: Tamás Tóth <tothtamas28@users.noreply.github.com>
  • Loading branch information
3 people authored Oct 18, 2023
1 parent bf4f567 commit ec83f45
Show file tree
Hide file tree
Showing 10 changed files with 94 additions and 96 deletions.
2 changes: 1 addition & 1 deletion deps/kevm_release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.315
1.0.317
8 changes: 4 additions & 4 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.315";
kevm.url = "github:runtimeverification/evm-semantics/v1.0.317";
nixpkgs.follows = "kevm/nixpkgs";
k-framework.follows = "kevm/k-framework";
k-framework.inputs.nixpkgs.follows = "nixpkgs";
Expand Down
2 changes: 1 addition & 1 deletion package/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.29
0.1.30
152 changes: 75 additions & 77 deletions poetry.lock

Large diffs are not rendered by default.

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

[tool.poetry]
name = "kontrol"
version = "0.1.29"
version = "0.1.30"
description = "Foundry integration for KEVM"
authors = [
"Runtime Verification, Inc. <contact@runtimeverification.com>",
Expand All @@ -15,7 +15,7 @@ kontrol = "kontrol.__main__:main"

[tool.poetry.dependencies]
python = "^3.10"
kevm-pyk = { git = "https://github.com/runtimeverification/evm-semantics.git", tag = "v1.0.315", subdirectory = "kevm-pyk" }
kevm-pyk = { git = "https://github.com/runtimeverification/evm-semantics.git", tag = "v1.0.317", subdirectory = "kevm-pyk" }

[tool.poetry.group.dev.dependencies]
autoflake = "*"
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.29'
VERSION: Final = '0.1.30'
8 changes: 4 additions & 4 deletions src/kontrol/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
from argparse import ArgumentParser
from typing import TYPE_CHECKING

from kevm_pyk import kdist
from kevm_pyk.cli import node_id_like
from kevm_pyk.dist import DistTarget
from kevm_pyk.utils import arg_pair_of
from pyk.cli.utils import file_path
from pyk.proof.tui import APRProofViewer
Expand Down Expand Up @@ -87,14 +87,14 @@ def exec_solc_to_k(
main_module: str | None,
requires: list[str],
imports: list[str],
target: DistTarget | None = None,
target: str | None = None,
**kwargs: Any,
) -> None:
if target is None:
target = DistTarget.HASKELL
target = 'haskell'

k_text = solc_to_k(
definition_dir=target.get(),
definition_dir=kdist.get(target),
contract_file=contract_file,
contract_name=contract_name,
main_module=main_module,
Expand Down
6 changes: 3 additions & 3 deletions src/kontrol/kompile.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from pathlib import Path
from typing import TYPE_CHECKING

from kevm_pyk.dist import DistTarget
from kevm_pyk import kdist
from kevm_pyk.kevm import KEVM
from kevm_pyk.kompile import KompileTarget, kevm_kompile
from pyk.kast.outer import KDefinition, KFlatModule, KImport, KRequire
Expand Down Expand Up @@ -82,7 +82,7 @@ def foundry_kompile(
copied_requires = []
copied_requires += [f'requires/{name}' for name in list(requires_paths.keys())]
imports = ['FOUNDRY']
kevm = KEVM(DistTarget.FOUNDRY.get())
kevm = KEVM(kdist.get('foundry'))
empty_config = kevm.definition.empty_config(Foundry.Sorts.FOUNDRY_CELL)
bin_runtime_definition = _foundry_to_contract_def(
empty_config=empty_config,
Expand All @@ -99,7 +99,7 @@ def foundry_kompile(
)

kevm = KEVM(
DistTarget.FOUNDRY.get(),
kdist.get('foundry'),
extra_unparsing_modules=(bin_runtime_definition.all_modules + contract_main_definition.all_modules),
)
foundry_contracts_file.write_text(kevm.pretty_print(bin_runtime_definition, unalias=False) + '\n')
Expand Down
4 changes: 2 additions & 2 deletions src/tests/integration/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from pathlib import Path
from typing import TYPE_CHECKING

from kevm_pyk.dist import DistTarget
from kevm_pyk import kdist
from pyk.utils import check_dir_path

from kontrol.solc_to_k import solc_to_k
Expand All @@ -23,7 +23,7 @@ def gen_bin_runtime(contract_file: Path, output_dir: Path) -> tuple[Path, str]:
main_file = output_dir / f'{contract_name.lower()}-bin-runtime.k'

k_text = solc_to_k(
definition_dir=DistTarget.HASKELL.get(),
definition_dir=kdist.get('haskell'),
contract_file=contract_file,
contract_name=contract_name,
main_module=main_module_name,
Expand Down

0 comments on commit ec83f45

Please sign in to comment.