Browse Source

use solc without version & remove send_only

Hadrien Croubois 3 years ago
parent
commit
3252e54f2b

+ 1 - 1
certora/scripts/Round1/Governor.sh

@@ -2,7 +2,7 @@ make -C certora munged
 
 certoraRun certora/harnesses/ERC20VotesHarness.sol certora/harnesses/GovernorHarness.sol \
     --verify GovernorHarness:certora/specs/GovernorBase.spec \
-    --solc solc8.0 \
+    --solc solc \
     --staging shelly/forSasha \
     --optimistic_loop \
     --settings -copyLoopUnroll=4 \

+ 1 - 1
certora/scripts/Round1/GovernorCountingSimple-counting.sh

@@ -2,7 +2,7 @@ make -C certora munged
 
 certoraRun  certora/harnesses/ERC20VotesHarness.sol certora/harnesses/GovernorBasicHarness.sol \
     --verify GovernorBasicHarness:certora/specs/GovernorCountingSimple.spec \
-    --solc solc8.2 \
+    --solc solc \
     --optimistic_loop \
     --settings -copyLoopUnroll=4 \
     --msg "$1"

+ 1 - 1
certora/scripts/Round1/WizardControlFirstPriority.sh

@@ -3,7 +3,7 @@ make -C certora munged
 certoraRun certora/harnesses/ERC20VotesHarness.sol certora/harnesses/WizardControlFirstPriority.sol \
     --link WizardControlFirstPriority:token=ERC20VotesHarness \
     --verify WizardControlFirstPriority:certora/specs/GovernorBase.spec \
-    --solc solc8.2 \
+    --solc solc \
     --disableLocalTypeChecking \
     --staging shelly/forSasha \
     --optimistic_loop \

+ 1 - 1
certora/scripts/Round1/WizardFirstTry.sh

@@ -2,7 +2,7 @@ make -C certora munged
 
 certoraRun certora/harnesses/ERC20VotesHarness.sol certora/harnesses/WizardFirstTry.sol \
     --verify WizardFirstTry:certora/specs/GovernorBase.spec \
-    --solc solc8.2 \
+    --solc solc \
     --staging shelly/forSasha \
     --optimistic_loop \
     --disableLocalTypeChecking \

+ 3 - 4
certora/scripts/Round1/sanity.sh

@@ -7,7 +7,7 @@
 #     echo ${file%.*}
 #     certoraRun certora/harnesses/$file \
 #     --verify ${file%.*}:certora/specs/sanity.spec "$@" \
-#     --solc solc8.2 --staging shelly/forSasha \
+#     --solc solc --staging shelly/forSasha \
 #     --optimistic_loop \
 #     --msg "checking sanity on ${file%.*}"
 #     --settings -copyLoopUnroll=4
@@ -17,7 +17,7 @@
 certoraRun \
     certora/harnesses/TimelockControllerHarness.sol \
     --verify TimelockControllerHarness:certora/specs/sanity.spec \
-    --solc solc8.2 \
+    --solc solc \
     --optimistic_loop \
     --cloud \
     --msg "sanity and keccak check"
@@ -27,9 +27,8 @@ certoraRun \
 # certoraRun \
 #     certora/harnesses/VotesHarness.sol \
 #     --verify VotesHarness:certora/specs/sanity.spec \
-#     --solc solc8.2 \
+#     --solc solc \
 #     --optimistic_loop \
 #     --cloud \
 #     --settings -strictDecompiler=false,-assumeUnwindCond \
 #     --msg "sanityVotes"
-

+ 1 - 1
certora/scripts/Round1/sanityGovernor.sh

@@ -7,7 +7,7 @@ do
     echo ${file%.*}
     certoraRun certora/harnesses/$file \
     --verify ${file%.*}:certora/specs/sanity.spec "$@" \
-    --solc solc8.2 --staging shelly/forSasha \
+    --solc solc --staging shelly/forSasha \
     --optimistic_loop \
     --msg "checking sanity on ${file%.*}"
     --settings -copyLoopUnroll=4

+ 2 - 3
certora/scripts/Round1/sanityTokens.sh

@@ -9,9 +9,8 @@ do
     echo ${file%.*}
     certoraRun certora/harnesses/$file \
         --verify ${file%.*}:certora/specs/sanity.spec "$@" \
-        --solc solc8.2 --staging \
+        --solc solc --staging \
         --optimistic_loop \
         --msg "checking sanity on ${file%.*}" \
-        --settings -copyLoopUnroll=4,-strictDecompiler=false \
-        --send_only
+        --settings -copyLoopUnroll=4,-strictDecompiler=false
 done

+ 1 - 4
certora/scripts/Round1/verifyAll.sh

@@ -7,7 +7,7 @@ make -C certora munged
 for contract in certora/harnesses/Wizard*.sol;
 do
     for spec in certora/specs/*.spec;
-    do      
+    do
         contractFile=$(basename $contract)
         specFile=$(basename $spec)
         if [[ "${specFile%.*}" != "RulesInProgress" ]];
@@ -23,7 +23,6 @@ do
                 --disableLocalTypeChecking \
                 --optimistic_loop \
                 --settings -copyLoopUnroll=4 \
-                --send_only \
                 --msg "checking $specFile on ${contractFile%.*}"
             else
                 certoraRun certora/harnesses/ERC20VotesHarness.sol certora/harnesses/$contractFile \
@@ -33,10 +32,8 @@ do
                 --disableLocalTypeChecking \
                 --optimistic_loop \
                 --settings -copyLoopUnroll=4 \
-                --send_only \
                 --msg "checking $specFile on ${contractFile%.*}"
             fi
         fi
     done
 done
-

+ 3 - 5
certora/scripts/Round1/verifyGovernor.sh

@@ -5,7 +5,7 @@ make -C certora munged
 for contract in certora/harnesses/Wizard*.sol;
 do
     for spec in certora/specs/governor*.spec;
-    do      
+    do
         contractFile=$(basename $contract)
         specFile=$(basename $spec)
         if [[ "${specFile%.*}" != "RulesInProgress" ]];
@@ -16,22 +16,20 @@ do
                 certoraRun certora/harnesses/ERC20VotesHarness.sol certora/harnesses/$contractFile \
                 --link ${contractFile%.*}:token=ERC20VotesHarness \
                 --verify ${contractFile%.*}:certora/specs/$specFile "$@" \
-                --solc solc8.2 \
+                --solc solc \
                 --staging shelly/forSasha \
                 --disableLocalTypeChecking \
                 --optimistic_loop \
                 --settings -copyLoopUnroll=4 \
-                --send_only \
                 --msg "checking $specFile on ${contractFile%.*}"
             else
                 certoraRun certora/harnesses/ERC20VotesHarness.sol certora/harnesses/$contractFile \
                 --verify ${contractFile%.*}:certora/specs/$specFile "$@" \
-                --solc solc8.2 \
+                --solc solc \
                 --staging shelly/forSasha \
                 --disableLocalTypeChecking \
                 --optimistic_loop \
                 --settings -copyLoopUnroll=4 \
-                --send_only \
                 --msg "checking $specFile on ${contractFile%.*}"
             fi
         fi

+ 2 - 4
certora/scripts/Round2/verifyAccessControl.sh

@@ -1,9 +1,7 @@
 certoraRun \
     certora/harnesses/AccessControlHarness.sol \
     --verify AccessControlHarness:certora/specs/AccessControl.spec \
-    --solc solc8.2 \
+    --solc solc \
     --optimistic_loop \
     --cloud \
-    --msg "AccessControl verification" \
-    --send_only
-    
+    --msg "AccessControl verification"

+ 0 - 11
certora/scripts/Round2/verifyAll2.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-make -C certora munged
-
-sh certora/scripts/Round2/verifyAccessControl.sh
-sh certora/scripts/Round2/verifyERC20FlashMint.sh
-sh certora/scripts/Round2/verifyERC20Votes.sh
-sh certora/scripts/Round2/verifyERC20Wrapper.sh
-sh certora/scripts/Round2/verifyERC721Votes.sh
-sh certora/scripts/Round2/verifyERC1155.sh
-sh certora/scripts/Round2/verifyTimelock.sh

+ 1 - 3
certora/scripts/Round2/verifyERC1155.sh

@@ -1,10 +1,8 @@
 certoraRun \
     certora/harnesses/ERC1155/ERC1155Harness.sol \
     --verify ERC1155Harness:certora/specs/ERC1155.spec \
-    --solc solc8.2 \
+    --solc solc \
     --optimistic_loop \
     --loop_iter 3 \
-    --send_only \
     --cloud \
     --msg "ERC1155"
-    

+ 2 - 4
certora/scripts/Round2/verifyERC20FlashMint.sh

@@ -2,9 +2,7 @@ certoraRun \
     certora/harnesses/ERC20FlashMintHarness.sol certora/harnesses/IERC3156FlashBorrowerHarness.sol \
     certora/munged/token/ERC20/ERC20.sol certora/helpers/DummyERC20A.sol certora/helpers/DummyERC20B.sol \
     --verify ERC20FlashMintHarness:certora/specs/ERC20FlashMint.spec \
-    --solc solc8.2 \
+    --solc solc \
     --optimistic_loop \
     --cloud \
-    --msg "ERC20FlashMint verification" \
-    --send_only
-    
+    --msg "ERC20FlashMint verification"

+ 1 - 2
certora/scripts/Round2/verifyERC20Votes.sh

@@ -1,11 +1,10 @@
 certoraRun \
     certora/harnesses/ERC20VotesHarness.sol \
     --verify ERC20VotesHarness:certora/specs/ERC20Votes.spec \
-    --solc solc8.2 \
+    --solc solc \
     --optimistic_loop \
     --settings -copyLoopUnroll=4 \
     --cloud \
-    --send_only \
     --msg "ERC20Votes $1" \
 
     # --disableLocalTypeChecking \

+ 2 - 4
certora/scripts/Round2/verifyERC20Wrapper.sh

@@ -2,9 +2,7 @@ certoraRun \
     certora/harnesses/ERC20WrapperHarness.sol \
     certora/helpers/DummyERC20A.sol certora/helpers/DummyERC20B.sol \
     --verify ERC20WrapperHarness:certora/specs/ERC20Wrapper.spec \
-    --solc solc8.2 \
+    --solc solc \
     --optimistic_loop \
     --cloud \
-    --msg "ERC20Wrapper verification" \
-    --send_only
-    
+    --msg "ERC20Wrapper verification"

+ 1 - 3
certora/scripts/Round2/verifyERC721Votes.sh

@@ -2,13 +2,11 @@ certoraRun \
     certora/harnesses/ERC721VotesHarness.sol \
     certora/munged/utils/Checkpoints.sol \
     --verify ERC721VotesHarness:certora/specs/ERC721Votes.spec \
-    --solc solc8.2 \
+    --solc solc \
     --disableLocalTypeChecking \
     --optimistic_loop \
     --settings -copyLoopUnroll=4 \
     --cloud \
-    --send_only \
     --msg "ERC721Votes"
 
     # --staging "alex/new-dt-hashing-alpha" \
-

+ 2 - 4
certora/scripts/Round2/verifyTimelock.sh

@@ -1,13 +1,11 @@
 certoraRun \
     certora/harnesses/TimelockControllerHarness.sol certora/harnesses/AccessControlHarness.sol \
     --verify TimelockControllerHarness:certora/specs/TimelockController.spec \
-    --solc solc8.2 \
+    --solc solc \
     --optimistic_loop \
     --loop_iter 3 \
     --cloud \
     --settings -byteMapHashingPrecision=32 \
-    --msg "TimelockController verification" \
-    --send_only \
+    --msg "TimelockController verification"
 
     #  --staging alex/new-dt-hashing-alpha \
-      

+ 0 - 4
certora/scripts/Round3/round3.sh

@@ -1,4 +0,0 @@
-for script in ./certora/scripts/Round3/verify*.sh
-do
-    sh $script
-done

+ 1 - 2
certora/scripts/Round3/verifyERC1155Burnable.sh

@@ -1,8 +1,7 @@
 certoraRun \
     certora/harnesses/ERC1155/ERC1155BurnableHarness.sol \
     --verify ERC1155BurnableHarness:certora/specs/ERC1155Burnable.spec \
-    --solc solc8.4 \
+    --solc solc \
     --optimistic_loop \
     --loop_iter 3 \
     --msg "ERC1155 Burnable verification all rules"
-    

+ 1 - 1
certora/scripts/Round3/verifyERC1155Pausable.sh

@@ -1,7 +1,7 @@
 certoraRun \
     certora/harnesses/ERC1155/ERC1155PausableHarness.sol \
     --verify ERC1155PausableHarness:certora/specs/ERC1155Pausable.spec \
-    --solc solc8.4 \
+    --solc solc \
     --optimistic_loop \
     --loop_iter 3 \
     --msg "ERC1155 Pausable verification all rules"

+ 1 - 1
certora/scripts/Round3/verifyERC1155Supply.sh

@@ -1,7 +1,7 @@
 certoraRun \
     certora/harnesses/ERC1155/ERC1155SupplyHarness.sol \
     --verify ERC1155SupplyHarness:certora/specs/ERC1155Supply.spec \
-    --solc solc8.4 \
+    --solc solc \
     --optimistic_loop \
     --loop_iter 3 \
     --msg "ERC1155 Supply verification all rules"

+ 1 - 4
certora/scripts/Round3/verifyGovernorPreventLateQuorum.sh

@@ -1,10 +1,7 @@
 certoraRun \
     certora/harnesses/ERC721VotesHarness.sol certora/munged/governance/TimelockController.sol certora/harnesses/GovernorPreventLateQuorumHarness.sol \
     --verify GovernorPreventLateQuorumHarness:certora/specs/GovernorPreventLateQuorum.spec \
-    --solc solc8.4 \
+    --solc solc \
     --optimistic_loop \
     --loop_iter 1 \
     --msg "GovernorPreventLateQuorum verification all rules" \
-
-
-

+ 1 - 4
certora/scripts/Round3/verifyInitializable.sh

@@ -1,10 +1,7 @@
 certoraRun \
     certora/harnesses/InitializableComplexHarness.sol \
     --verify InitializableComplexHarness:certora/specs/Initializable.spec \
-    --solc solc8.4 \
+    --solc solc \
     --optimistic_loop \
     --loop_iter 3 \
     --msg "Initializable verificaiton all rules on complex harness" \
-
-
-