Skip to content

Commit 1c29d23

Browse files
committed
fix script path
1 parent e8e9241 commit 1c29d23

File tree

6 files changed

+26
-18
lines changed

6 files changed

+26
-18
lines changed

.github/workflows/certora.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ jobs:
1515
runs-on: ubuntu-latest
1616

1717
steps:
18-
- uses: actions/checkout@v2
18+
- uses: actions/checkout@v3
1919

2020
- name: Install python
21-
uses: actions/setup-python@v2
21+
uses: actions/setup-python@v4
2222
with: { python-version: 3.11 }
2323

2424
- name: Install java
25-
uses: actions/setup-java@v1
26-
with: { java-version: "19", java-package: jre }
25+
uses: actions/setup-java@v3
26+
with: { java-version: "17", java-package: jre, distribution: semeru }
2727

2828
- name: Install certora cli
2929
run: pip install certora-cli
@@ -32,7 +32,7 @@ jobs:
3232
run: |
3333
wget https://github.com/ethereum/solidity/releases/download/v0.7.6/solc-static-linux
3434
chmod +x solc-static-linux
35-
sudo mv solc-static-linux /usr/local/bin/solc8.10
35+
sudo mv solc-static-linux /usr/local/bin/solc7.6
3636
3737
- name: Verify rule ${{ matrix.rule }}
3838
run: |
@@ -41,9 +41,9 @@ jobs:
4141
make munged
4242
cd ..
4343
echo "key length" ${#CERTORAKEY}
44-
sh certora/scripts/${{ matrix.rule }}
44+
./certora/scripts/${{ matrix.rule }}
4545
env:
46-
CERTORAKEY: ${{ secrets.CERTORAKEY }}
46+
CERTORAKEY: ${{ secrets.CERTORA_KEY }}
4747

4848
strategy:
4949
fail-fast: false

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@ yarn-error.log
1515

1616
# Certora Formal Verification related files
1717
.certora_internal
18-
.certora_recent_jobs.json
18+
.certora_recent_jobs.json
19+
.zip-output-url.txt

certora/applyHarness.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
diff -druN Safe.sol Safe.sol
22
--- Safe.sol 2023-04-11 15:01:13
3-
+++ Safe.sol 2023-04-11 15:01:54
3+
+++ Safe.sol 2023-04-11 15:01:55
44
@@ -76,7 +76,7 @@
55
* so we create a Safe with 0 owners and threshold 1.
66
* This is an unusable Safe, perfect for the singleton
77
*/
88
- threshold = 1;
9-
++ // threshold = 1; // MUNGED: remove and add to constructor of the harness
9+
+ // threshold = 1; MUNGED: remove and add to constructor of the harness
1010
}
1111

1212
/**

certora/harnesses/SafeHarness.sol

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
import "../munged/Safe.sol";
33

44
contract SafeHarness is Safe {
5-
6-
constructor(address[] memory _owners,
5+
constructor(
6+
address[] memory _owners,
77
uint256 _threshold,
88
address to,
99
bytes memory data,
@@ -12,11 +12,11 @@ contract SafeHarness is Safe {
1212
uint256 payment,
1313
address payable paymentReceiver
1414
) {
15-
this.setup(_owners, _threshold, to, data, fallbackHandler, paymentToken, payment, paymentReceiver);
15+
this.setup(_owners, _threshold, to, data, fallbackHandler, paymentToken, payment, paymentReceiver);
1616
}
1717

1818
// harnessed getters
1919
function getModule(address module) public view returns (address) {
2020
return modules[module];
2121
}
22-
}
22+
}
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,19 @@
1+
#!/bin/bash
2+
3+
params=("--send_only")
4+
5+
if [[ -n "$CI" ]]; then
6+
params=()
7+
fi
8+
19
certoraRun certora/harnesses/SafeHarness.sol \
210
--verify SafeHarness:certora/specs/Safe.spec \
311
--solc solc7.6 \
412
--optimistic_loop \
513
--settings -optimisticFallback=true \
614
--loop_iter 3 \
715
--optimistic_hashing \
16+
--hashing_length_bound 352 \
817
--rule_sanity \
9-
--send_only \
18+
"${params[@]}" \
1019
--msg "Safe $1 "

certora/specs/Safe.spec

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@ definition reachableOnly(method f) returns bool =
1818
&& f.selector != simulateAndRevert(address,bytes).selector;
1919

2020
/// Nonce must never decrease
21-
rule nonceMonotonicity(method f) filtered {
22-
f -> noHavoc(f)
23-
} {
21+
rule nonceMonotonicity(method f) {
2422
uint256 nonceBefore = nonce();
2523

2624
calldataarg args; env e;

0 commit comments

Comments
 (0)