reorganized scripts

certora/scripts/Round2/verifyAccessControl.sh

@@ -4,5 +4,6 @@ certoraRun \
     --solc solc8.2 \
     --optimistic_loop \
     --cloud \
-    --msg "AccessControl verification"
+    --msg "AccessControl verification" \
+    --send_only
     

certora/scripts/Round2/verifyAll2.sh

@@ -0,0 +1,11 @@
+#!/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

certora/scripts/Round2/verifyERC1155.sh

@@ -5,5 +5,6 @@ certoraRun \
     --optimistic_loop \
     --loop_iter 3 \
     --send_only \
+    --cloud \
     --msg "ERC1155"
     

certora/scripts/Round2/verifyERC20FlashMint.sh

@@ -5,5 +5,6 @@ certoraRun \
     --solc solc8.2 \
     --optimistic_loop \
     --cloud \
-    --msg "ERC20FlashMint verification"
+    --msg "ERC20FlashMint verification" \
+    --send_only
     

certora/scripts/Round2/verifyERC20Votes.sh

@@ -0,0 +1,13 @@
+certoraRun \
+    certora/harnesses/ERC20VotesHarness.sol \
+    --verify ERC20VotesHarness:certora/specs/ERC20Votes.spec \
+    --solc solc8.2 \
+    --disableLocalTypeChecking \
+    --optimistic_loop \
+    --settings -copyLoopUnroll=4 \
+    --cloud \
+    --send_only \
+    --msg "ERC20Votes" \
+
+
+  # --staging "alex/new-dt-hashing-alpha" \

certora/scripts/Round2/verifyERC20Wrapper.sh

@@ -5,5 +5,6 @@ certoraRun \
     --solc solc8.2 \
     --optimistic_loop \
     --cloud \
-    --msg "ERC20Wrapper verification"
+    --msg "ERC20Wrapper verification" \
+    --send_only
     

certora/scripts/Round2/verifyERC721Votes.sh

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

certora/scripts/Round2/verifyTimelock.sh

@@ -4,7 +4,10 @@ certoraRun \
     --solc solc8.2 \
     --optimistic_loop \
     --loop_iter 3 \
-    --staging alex/new-dt-hashing-alpha \
+    --cloud \
     --settings -byteMapHashingPrecision=32 \
-    --msg "TimelockController verification"
+    --msg "TimelockController verification" \
+    --send_only \
+
+    #  --staging alex/new-dt-hashing-alpha \
       

certora/scripts/old/ERC20VotesRule.sh

@@ -1,23 +0,0 @@
-if [ -z "$2" ]
-  then
-    echo "Incorrect number of arguments"
-    echo ""
-    echo "Usage: (from git root)"
-    echo "  ./certora/scripts/`basename $0` [message describing the run] [rule or invariant]"
-    echo ""
-    exit 1
-fi
-
-rule=$1
-msg=$2
-shift 2
-
-certoraRun \
-    certora/harnesses/ERC20VotesHarness.sol \
-    --verify ERC20VotesHarness:certora/specs/ERC20Votes.spec \
-    --solc solc8.2 \
-    --optimistic_loop \
-    --rule ${rule} \
-    --msg "${msg}" \
-    --staging "alex/new-dt-hashing-alpha" \
-    # --rule_sanity \

certora/scripts/old/verifyAll2.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-make -C certora munged
-
-sh certora/scripts/verifyAllSasha
-sh certora/scripts/verifyERC20Votes.sh "checking ERC20Votes.spec on ERC20Votes.sol"
-sh certora/scripts/verifyERC721Votes.sh "checking ERC721Votes.spec on draft-ERC721Votes.sol and Votes.sol"

certora/scripts/old/verifyERC20Votes.sh

@@ -1,25 +0,0 @@
-make -C certora munged
-
-if [ -z "$1" ]
-  then
-    echo "Incorrect number of arguments"
-    echo ""
-    echo "Usage: (from git root)"
-    echo "  ./certora/scripts/`basename $0` [message describing the run]"
-    echo ""
-    exit 1
-fi
-
-msg=$1
-shift 1
-
-certoraRun \
-    certora/harnesses/ERC20VotesHarness.sol \
-    --verify ERC20VotesHarness:certora/specs/ERC20Votes.spec \
-    --solc solc8.2 \
-    --disableLocalTypeChecking \
-    --optimistic_loop \
-    --settings -copyLoopUnroll=4 \
-    --send_only \
-    --staging "alex/new-dt-hashing-alpha" \
-    --msg "${msg}" \

certora/scripts/old/verifyERC721Votes.sh

@@ -1,26 +0,0 @@
-make -C certora munged
-
-if [ -z "$1" ]
-  then
-    echo "Incorrect number of arguments"
-    echo ""
-    echo "Usage: (from git root)"
-    echo "  ./certora/scripts/`basename $0` [message describing the run]"
-    echo ""
-    exit 1
-fi
-
-msg=$1
-shift 1
-
-certoraRun \
-    certora/harnesses/ERC721VotesHarness.sol \
-    certora/munged/utils/Checkpoints.sol \
-    --verify ERC721VotesHarness:certora/specs/ERC721Votes.spec \
-    --solc solc8.2 \
-    --disableLocalTypeChecking \
-    --optimistic_loop \
-    --settings -copyLoopUnroll=4 \
-    --send_only \
-    --staging "alex/new-dt-hashing-alpha" \
-    --msg "${msg}"