Skip to content

Commit 641ac35

Browse files
rv-jenkinsrv-auditorPetar Maksimovic
authored
Update dependency: deps/kontrol_release (#48)
* deps/kontrol_release: Set Version 1.0.2 * deps/kontrol_release: Set Version 1.0.3 * deps/kontrol_release: Set Version 1.0.4 * deps/kontrol_release: Set Version 1.0.5 * deps/kontrol_release: Set Version 1.0.6 * deps/kontrol_release: Set Version 1.0.7 * deps/kontrol_release: Set Version 1.0.8 * deps/kontrol_release: Set Version 1.0.9 * deps/kontrol_release: Set Version 1.0.10 * deps/kontrol_release: Set Version 1.0.11 * deps/kontrol_release: Set Version 1.0.12 * deps/kontrol_release: Set Version 1.0.17 * deps/kontrol_release: Set Version 1.0.18 * deps/kontrol_release: Set Version 1.0.19 * deps/kontrol_release: Set Version 1.0.21 * deps/kontrol_release: Set Version 1.0.22 * deps/kontrol_release: Set Version 1.0.23 * deps/kontrol_release: Set Version 1.0.24 * deps/kontrol_release: Set Version 1.0.25 * deps/kontrol_release: Set Version 1.0.26 * deps/kontrol_release: Set Version 1.0.27 * deps/kontrol_release: Set Version 1.0.28 * deps/kontrol_release: Set Version 1.0.29 * deps/kontrol_release: Set Version 1.0.30 * deps/kontrol_release: Set Version 1.0.31 * deps/kontrol_release: Set Version 1.0.32 * adapting lemmas * increasing parallelisation * deps/kontrol_release: Set Version 1.0.33 * deps/kontrol_release: Set Version 1.0.34 --------- Co-authored-by: devops <[email protected]> Co-authored-by: Petar Maksimovic <[email protected]>
1 parent 1087635 commit 641ac35

File tree

6 files changed

+59
-190
lines changed

6 files changed

+59
-190
lines changed

.github/workflows/test-pr.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
with:
2121
token: ${{ secrets.JENKINS_GITHUB_PAT }}
2222
fetch-depth: 0
23-
23+
2424
- name: 'Get Kontrol Version'
2525
run: |
2626
set -euo pipefail
@@ -43,7 +43,7 @@ jobs:
4343
- name: 'Run Kontrol'
4444
run: |
4545
# Run the following in the running docker container
46-
docker exec -u user ${{ env.repository_basename }}-ci bash -c './test/run-kevm.sh'
46+
docker exec -u user ${{ env.repository_basename }}-ci bash -c 'kontrol build; kontrol prove --maintenance-rate 128'
4747
4848
- name: 'Stop Docker Container'
4949
if: always()

deps/kontrol_release

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0.1
1+
1.0.34

kontrol.toml

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
[build.default]
2+
foundry-project-root = '.'
3+
regen = true
4+
rekompile = true
5+
verbose = false
6+
debug = false
7+
require = 'test/solady-lemmas.k'
8+
module-import = 'FixedPointMathLibVerification:SOLADY-LEMMAS'
9+
ast = true
10+
auxiliary-lemmas = true
11+
12+
[prove.default]
13+
foundry-project-root = '.'
14+
verbose = false
15+
debug = false
16+
max-depth = 100000
17+
max-iterations = 10000
18+
reinit = false
19+
cse = false
20+
workers = 1
21+
max-frontier-parallel = 16
22+
maintenance-rate = 128
23+
assume-defined = true
24+
no-log-rewrites = true
25+
kore-rpc-command = 'kore-rpc-booster --no-post-exec-simplify'
26+
failure-information = true
27+
counterexample-information = true
28+
minimize-proofs = false
29+
fail-fast = true
30+
smt-timeout = 16000
31+
smt-retry-limit = 0
32+
break-every-step = false
33+
break-on-jumpi = false
34+
break-on-calls = false
35+
break-on-storage = false
36+
break-on-basic-blocks = false
37+
break-on-cheatcodes = false
38+
auto_abstract = true
39+
run-constructor = false
40+
match-test = [
41+
"FixedPointMathLibVerification.testMulWad(uint256,uint256)",
42+
"FixedPointMathLibVerification.testMulWadUp",
43+
"FixedPointMathLibVerification.testLog2"
44+
]
45+
ast = true
46+
47+
[show.default]
48+
foundry-project-root = '.'
49+
verbose = true
50+
debug = false

test/run-kevm.sh

-104
This file was deleted.

test/run-kontrol.sh

-77
This file was deleted.

test/solady-lemmas.k

+6-6
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,11 @@ module SOLADY-LEMMAS
9696
requires 0 <=Int A andBool A <Int B
9797
[simplification]
9898

99-
rule A *Int B <Int C => A <Int C /Int B
99+
rule B *Int A <Int C => A <Int C /Int B
100100
requires C modInt B ==Int 0
101101
[simplification, concrete(B, C)]
102102

103-
rule A <=Int B *Int C => A /Int C <=Int B
103+
rule A <=Int C *Int B => A /Int C <=Int B
104104
requires A modInt C ==Int 0
105105
[simplification, concrete(A, C)]
106106

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

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

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

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

132-
rule ( cachedBytesConstant >>Int ( ( maxUInt5 -Int Y ) *Int 8 ) ) modInt 256 => 3
132+
rule ( cachedBytesConstant >>Int ( 8 *Int ( maxUInt5 -Int Y ) ) ) modInt 256 => 3
133133
requires 0 <=Int Y andBool Y <Int 32
134134
andBool 7 <Int Y andBool Y <=Int 15
135135
[simplification]

0 commit comments

Comments
 (0)