diff --git a/CHANGELOG.md b/CHANGELOG.md index af5b8137d75f..b32b2429c329 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project does not yet adhere to [Semantic Versioning](https://semver.org/spec/v2.0.0.html) for setuptools_scm/PEP 440 reasons. +## Next Release + +## What's Changed + +### Changed + +- Updated ChiaLisp dependency from 'clvm_tools_rs' to new repo 'chialisp' + ## 2.5.6 Chia blockchain 2025-9-24 ## What's Changed diff --git a/chia/_tests/clvm/test_clvm_step.py b/chia/_tests/clvm/test_clvm_step.py index d63f4848ed3b..c2df92a1c2bd 100644 --- a/chia/_tests/clvm/test_clvm_step.py +++ b/chia/_tests/clvm/test_clvm_step.py @@ -2,7 +2,7 @@ from typing import Any, Optional -from clvm_tools_rs import start_clvm_program +from chialisp import start_clvm_program factorial = ( "ff02ffff01ff02ff02ffff04ff02ffff04ff05ff80808080ffff04ffff01ff02" diff --git a/chia/wallet/puzzles/load_clvm.py b/chia/wallet/puzzles/load_clvm.py index 310cf2ab02c3..853fc05d944d 100644 --- a/chia/wallet/puzzles/load_clvm.py +++ b/chia/wallet/puzzles/load_clvm.py @@ -8,7 +8,7 @@ import tempfile import importlib_resources -from clvm_tools_rs import compile_clvm as compile_clvm_rust +from chialisp import compile_clvm as compile_clvm_rust from chia.types.blockchain_format.program import Program from chia.types.blockchain_format.serialized_program import SerializedProgram diff --git a/mypy.ini.template b/mypy.ini.template index c7ad4d79d939..3e02f5e50292 100644 --- a/mypy.ini.template +++ b/mypy.ini.template @@ -50,7 +50,7 @@ ignore_missing_imports = True [mypy-chiavdf.*] ignore_missing_imports = True -[mypy-clvm_tools_rs.*] +[mypy-chialisp.*] ignore_missing_imports = True [mypy-colorama.*] diff --git a/poetry.lock b/poetry.lock index c002a585e236..67fad979719f 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 2.2.0 and should not be changed by hand. +# This file is automatically @generated by Poetry 2.1.4 and should not be changed by hand. [[package]] name = "aiofiles" @@ -898,6 +898,23 @@ files = [ {file = "chiabip158-1.5.3.tar.gz", hash = "sha256:d33833e0f9f1c15828a5a2467f06a19d1766c366183403ada45b03a438ca24e9"}, ] +[[package]] +name = "chialisp" +version = "0.4.1" +description = "tools for working with chialisp language; compiler, repl, python and wasm bindings" +optional = false +python-versions = "*" +groups = ["main"] +files = [ + {file = "chialisp-0.4.1-cp39-abi3-macosx_13_0_arm64.whl", hash = "sha256:8f5847359869218053cdc2a326acd43b122e657bfa50de15af3a6b690f791444"}, + {file = "chialisp-0.4.1-cp39-abi3-macosx_13_0_x86_64.whl", hash = "sha256:c5a94ab4124d2d03416d9692d8e0542f547f8d27c3171811a90de6815db1f2f3"}, + {file = "chialisp-0.4.1-cp39-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:ffb0e4627d64d160b6a49bdce356d2af16dae5c6eec818eba551aeb39525c830"}, + {file = "chialisp-0.4.1-cp39-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:eae1724a6dde700b0e9e604d89712ebe62cbc1561099cc73b862037f99a3bc1d"}, + {file = "chialisp-0.4.1-cp39-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:c750be324fbdc6fa8fb2aee575114bba5f7cea4dbcc856ce14e63c681e0bfaa7"}, + {file = "chialisp-0.4.1-cp39-abi3-win_amd64.whl", hash = "sha256:c3acc38e52edb0e36193194fd47b3f3c6cde9b84e2575cb20cc130f21f42c4fe"}, + {file = "chialisp-0.4.1.tar.gz", hash = "sha256:aeeea3ceea0c909424aed8fa34d091a1d04e14ecd49449d1bbf4dad38695e36d"}, +] + [[package]] name = "chialisp-loader" version = "0.1.2" @@ -3891,4 +3908,4 @@ upnp = ["miniupnpc"] [metadata] lock-version = "2.1" python-versions = ">=3.10, <4" -content-hash = "ba6edf6f808031df930df35a9a40c46896e9a78aab96b896e1fc4150cf7a59f4" +content-hash = "593d5a538eed9036f2a2a58bfbf9069cb973bb34a54eb13ef1382cf4c92a0a1b" diff --git a/pyproject.toml b/pyproject.toml index 426c69435d8b..9cb63f2e5143 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -58,7 +58,7 @@ chiavdf = ">=1.1.10" # timelord and vdf verification click = ">=8.1.7" # For the CLI clvm = ">=0.9.14" clvm_tools = ">=0.4.9" # Currying Program.to other conveniences -clvm_tools_rs = ">=0.1.45" # Rust implementation of clvm_tools' compiler +chialisp = ">=0.4.1" # Rust implementation of ChiaLisp compiler colorama = ">=0.4.6" # Colorizes terminal output colorlog = ">=6.9.0" # Adds color to logs concurrent_log_handler = ">=0.9.25" # Concurrently log and rotate logs diff --git a/tools/manage_clvm.py b/tools/manage_clvm.py index 7c36d84e03c7..5514190f2b53 100644 --- a/tools/manage_clvm.py +++ b/tools/manage_clvm.py @@ -26,7 +26,7 @@ # accessible via entry points. sys.path = [path for path in sys.path if path != os.fspath(here)] -from clvm_tools_rs import compile_clvm # noqa: E402 +from chialisp import compile_clvm # noqa: E402 from chia.types.blockchain_format.serialized_program import SerializedProgram # noqa: E402