Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependency: deps/kontrol_release #48

Merged
merged 31 commits into from
Sep 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
cf2e203
deps/kontrol_release: Set Version 1.0.2
Aug 24, 2024
5e9837c
deps/kontrol_release: Set Version 1.0.3
Aug 25, 2024
c71e11f
deps/kontrol_release: Set Version 1.0.4
Aug 26, 2024
592d05d
deps/kontrol_release: Set Version 1.0.5
Aug 27, 2024
fd5eb32
deps/kontrol_release: Set Version 1.0.6
Aug 27, 2024
e8eda9a
deps/kontrol_release: Set Version 1.0.7
Aug 28, 2024
c11d02d
deps/kontrol_release: Set Version 1.0.8
Aug 28, 2024
e566e6f
deps/kontrol_release: Set Version 1.0.9
Aug 28, 2024
82c0cb2
deps/kontrol_release: Set Version 1.0.10
Aug 29, 2024
458fcfb
deps/kontrol_release: Set Version 1.0.11
Aug 29, 2024
80c59f9
deps/kontrol_release: Set Version 1.0.12
Aug 29, 2024
96aac41
deps/kontrol_release: Set Version 1.0.17
Sep 4, 2024
5eea9bb
Merge remote-tracking branch 'origin/master' into _update-deps/runtim…
Sep 5, 2024
17cafda
deps/kontrol_release: Set Version 1.0.18
Sep 5, 2024
8c9cf74
deps/kontrol_release: Set Version 1.0.19
Sep 6, 2024
5ce4f7f
deps/kontrol_release: Set Version 1.0.21
Sep 10, 2024
22fad90
deps/kontrol_release: Set Version 1.0.22
Sep 11, 2024
58fb5a9
deps/kontrol_release: Set Version 1.0.23
Sep 11, 2024
49fe3db
deps/kontrol_release: Set Version 1.0.24
Sep 14, 2024
5274a52
deps/kontrol_release: Set Version 1.0.25
Sep 17, 2024
55d902b
deps/kontrol_release: Set Version 1.0.26
Sep 19, 2024
ca39910
deps/kontrol_release: Set Version 1.0.27
Sep 19, 2024
a502fb4
deps/kontrol_release: Set Version 1.0.28
Sep 23, 2024
9a945da
deps/kontrol_release: Set Version 1.0.29
Sep 23, 2024
d9e3eb5
deps/kontrol_release: Set Version 1.0.30
Sep 25, 2024
3475ba0
deps/kontrol_release: Set Version 1.0.31
Sep 25, 2024
2822d5b
deps/kontrol_release: Set Version 1.0.32
Sep 25, 2024
435a8da
adapting lemmas
PetarMax Sep 25, 2024
0d19bac
increasing parallelisation
PetarMax Sep 25, 2024
65437fd
deps/kontrol_release: Set Version 1.0.33
Sep 25, 2024
f21b4a9
deps/kontrol_release: Set Version 1.0.34
Sep 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/test-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
with:
token: ${{ secrets.JENKINS_GITHUB_PAT }}
fetch-depth: 0

- name: 'Get Kontrol Version'
run: |
set -euo pipefail
Expand All @@ -43,7 +43,7 @@ jobs:
- name: 'Run Kontrol'
run: |
# Run the following in the running docker container
docker exec -u user ${{ env.repository_basename }}-ci bash -c './test/run-kevm.sh'
docker exec -u user ${{ env.repository_basename }}-ci bash -c 'kontrol build; kontrol prove --maintenance-rate 128'

- name: 'Stop Docker Container'
if: always()
Expand Down
2 changes: 1 addition & 1 deletion deps/kontrol_release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.1
1.0.34
50 changes: 50 additions & 0 deletions kontrol.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
[build.default]
foundry-project-root = '.'
regen = true
rekompile = true
verbose = false
debug = false
require = 'test/solady-lemmas.k'
module-import = 'FixedPointMathLibVerification:SOLADY-LEMMAS'
ast = true
auxiliary-lemmas = true

[prove.default]
foundry-project-root = '.'
verbose = false
debug = false
max-depth = 100000
max-iterations = 10000
reinit = false
cse = false
workers = 1
max-frontier-parallel = 16
maintenance-rate = 128
assume-defined = true
no-log-rewrites = true
kore-rpc-command = 'kore-rpc-booster --no-post-exec-simplify'
failure-information = true
counterexample-information = true
minimize-proofs = false
fail-fast = true
smt-timeout = 16000
smt-retry-limit = 0
break-every-step = false
break-on-jumpi = false
break-on-calls = false
break-on-storage = false
break-on-basic-blocks = false
break-on-cheatcodes = false
auto_abstract = true
run-constructor = false
match-test = [
"FixedPointMathLibVerification.testMulWad(uint256,uint256)",
"FixedPointMathLibVerification.testMulWadUp",
"FixedPointMathLibVerification.testLog2"
]
ast = true

[show.default]
foundry-project-root = '.'
verbose = true
debug = false
104 changes: 0 additions & 104 deletions test/run-kevm.sh

This file was deleted.

77 changes: 0 additions & 77 deletions test/run-kontrol.sh

This file was deleted.

12 changes: 6 additions & 6 deletions test/solady-lemmas.k
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,11 @@ module SOLADY-LEMMAS
requires 0 <=Int A andBool A <Int B
[simplification]

rule A *Int B <Int C => A <Int C /Int B
rule B *Int A <Int C => A <Int C /Int B
requires C modInt B ==Int 0
[simplification, concrete(B, C)]

rule A <=Int B *Int C => A /Int C <=Int B
rule A <=Int C *Int B => A /Int C <=Int B
requires A modInt C ==Int 0
[simplification, concrete(A, C)]

Expand All @@ -114,22 +114,22 @@ module SOLADY-LEMMAS
syntax Int ::= "cachedBytesConstant" [alias]
rule cachedBytesConstant => 6928917744019834342450304135053993530982274426945361611473370484834304

rule ( cachedBytesConstant >>Int ( ( maxUInt5 -Int Y ) *Int 8 ) ) modInt 256 => 0
rule ( cachedBytesConstant >>Int ( 8 *Int ( maxUInt5 -Int Y ) ) ) modInt 256 => 0
requires 0 <=Int Y andBool Y <Int 32
andBool ( Y <=Int 1 orBool Y >=Int 16 )
[simplification]

rule ( cachedBytesConstant >>Int ( ( maxUInt5 -Int Y ) *Int 8 ) ) modInt 256 => 1
rule ( cachedBytesConstant >>Int ( 8 *Int ( maxUInt5 -Int Y ) ) ) modInt 256 => 1
requires 0 <=Int Y andBool Y <Int 32
andBool 1 <Int Y andBool Y <=Int 3
[simplification]

rule ( cachedBytesConstant >>Int ( ( maxUInt5 -Int Y ) *Int 8 ) ) modInt 256 => 2
rule ( cachedBytesConstant >>Int ( 8 *Int ( maxUInt5 -Int Y ) ) ) modInt 256 => 2
requires 0 <=Int Y andBool Y <Int 32
andBool 3 <Int Y andBool Y <=Int 7
[simplification]

rule ( cachedBytesConstant >>Int ( ( maxUInt5 -Int Y ) *Int 8 ) ) modInt 256 => 3
rule ( cachedBytesConstant >>Int ( 8 *Int ( maxUInt5 -Int Y ) ) ) modInt 256 => 3
requires 0 <=Int Y andBool Y <Int 32
andBool 7 <Int Y andBool Y <=Int 15
[simplification]
Expand Down
Loading