Merge remote-tracking branch 'origin/master' into eip-4895

.github/workflows/test-pr.yml

@@ -12,6 +12,10 @@ jobs:
     name: 'Code Quality Checks'
     runs-on: ubuntu-latest
     steps:
+      - name: 'Setup Python 3.10'
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
       - name: 'Check out code'
         uses: actions/checkout@v4
       - name: 'Install Poetry'

.github/workflows/update-version.yml

@@ -54,7 +54,6 @@ jobs:
           BKP_VERSION=$(cat deps/blockchain-k-plugin_release)
           sed -i 's!    k-framework.url = "github:runtimeverification/k/[v0-9\.]*"!    k-framework.url = "github:runtimeverification/k/'"${K_VERSION}"'"!' flake.nix
           sed -i 's!        "github:runtimeverification/blockchain-k-plugin/[0-9a-f]*"!        "github:runtimeverification/blockchain-k-plugin/'"${BKP_VERSION}"'"!' flake.nix
-          sed -i 's!    pyk.url = "github:runtimeverification/k/[v0-9\.]*?dir=pyk"!    pyk.url = "github:runtimeverification/k/'"${K_VERSION}"'?dir=pyk"!' flake.nix
           nix run .#update-from-submodules
           nix flake update
           git add flake.nix flake.lock && git commit -m 'flake.{nix,lock}: update Nix derivations' || true

.gitignore

@@ -18,3 +18,6 @@
 /tests/specs/**/*.prove.out
 /tests/specs/**/*.sol.json
 /tests/vm/*.out
+.DS_Store
+.idea/
+.vscode/

Makefile

@@ -4,15 +4,20 @@ all: poetry
 # Building
 # --------
 
-PYTHON_BIN   := python3.10
+ifeq ($(shell command -v k-which-python),)
+    PYTHON_BIN := python3.10
+else
+    PYTHON_BIN := $(shell k-which-python)
+endif
+
 KEVM_PYK_DIR := ./kevm-pyk
 POETRY       := poetry -C $(KEVM_PYK_DIR)
 POETRY_RUN   := $(POETRY) run --
 
 
 .PHONY: poetry-env
 poetry-env:
-	$(POETRY) env use $(PYTHON_BIN)
+	$(POETRY) env use --no-cache $(PYTHON_BIN)
 
 poetry: poetry-env
 	$(POETRY) install

README.md

@@ -140,7 +140,7 @@ poetry -C kevm-pyk run kdist --verbose build evm-semantics.plugin
 To change the default compiler:
 
 ```sh
-CXX=clang++-14 poetry -C kevm-pyk run kdist --verbose build evm-semantics.plugin
+CXX=clang++-15 poetry -C kevm-pyk run kdist --verbose build evm-semantics.plugin
 ```
 
 On Apple silicon:

deps/blockchain-k-plugin_release

@@ -1 +1 @@
-44d875a9a36b14529c0bf40e7f36dc4f23429153
+c9264b240c00d1f6cc20e22aac83c94d1a499138

deps/k_release

@@ -1 +1 @@
-7.1.120
+7.1.196

deps/z3

@@ -1 +1 @@
-4.13.0
+4.13.4