Skip to content

Commit 4a23561

Browse files
committed
Merge remote-tracking branch 'origin/master' into eip-7702
2 parents 5a8d163 + d4f05a3 commit 4a23561

32 files changed

Lines changed: 815 additions & 630 deletions

.github/workflows/update-version.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
branches:
55
- '_update-deps/runtimeverification/blockchain-k-plugin'
66
- '_update-deps/runtimeverification/k'
7+
- '_update-deps/runtimeverification/rv-nix-tools'
78
workflow_dispatch:
89
# Stop in progress workflows on the same branch and same workflow to use latest committed code
910
concurrency:
@@ -52,8 +53,10 @@ jobs:
5253
run: |
5354
K_VERSION=v$(cat deps/k_release)
5455
BKP_VERSION=$(cat deps/blockchain-k-plugin_release)
56+
RV_NIX_TOOLS_VERSION=$(cat deps/rv-nix-tools)
5557
sed -i 's! k-framework.url = "github:runtimeverification/k/[v0-9\.]*"! k-framework.url = "github:runtimeverification/k/'"${K_VERSION}"'"!' flake.nix
5658
sed -i 's! "github:runtimeverification/blockchain-k-plugin/[0-9a-f]*"! "github:runtimeverification/blockchain-k-plugin/'"${BKP_VERSION}"'"!' flake.nix
59+
sed -i 's! rv-nix-tools.url = "github:runtimeverification/rv-nix-tools/[a-z0-9\.]*"! rv-nix-tools.url = "github:runtimeverification/rv-nix-tools/'"${RV_NIX_TOOLS_VERSION}"'"!' flake.nix
5760
nix run .#update-from-submodules
5861
nix flake update
5962
git add flake.nix flake.lock && git commit -m 'flake.{nix,lock}: update Nix derivations' || true

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ These may be useful for learning KEVM and K (newest to oldest):
2626

2727
To get support for KEVM, please join our [Discord Channel](https://discord.com/invite/CurfmXNtbN).
2828

29-
If you want to start proving with KEVM, refer to [VERIFICATION.md].
29+
If you want to start proving with KEVM, refer to [tests/specs/examples/README.md].
3030

3131
Repository Structure
3232
--------------------
@@ -355,4 +355,4 @@ For more information about the [K Framework], refer to these sources:
355355
[eDSL]: <https://github.com/runtimeverification/verified-smart-contracts/blob/master/resources/edsl.md>
356356
[kup package manager]: <https://github.com/runtimeverification/kup>
357357
[Makefile]: <./Makefile>
358-
[VERIFICATION.md]: <./VERIFICATION.md>
358+
[tests/specs/examples/README.md]: <./tests/specs/examples/README.md>

deps/blockchain-k-plugin_release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1fda07d61df64ef9ae2ea87e6f767a02d30d4599
1+
f159396d0f16b88c86c557c47f7ae36ffc59dc53

deps/k_release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.1.262
1+
7.1.273

deps/rv-nix-tools

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
854d4f05ea78547d46e807b414faad64cea10ae4

0 commit comments

Comments
 (0)