fix: removing executed task from skip list.

fix: small updates. fix: simulate enabled in ci. fix: removed libs fix: added submodules back in.
ethereum-optimism · Jan 14, 2025 · 288697a · 288697a
1 parent 91049d3
commit 288697a
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 18 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -306,4 +306,8 @@ workflows:
       - just_simulate_sc_rehearsal_2
       - just_simulate_sc_rehearsal_4
       - just_simulate_ink_respected_game_type
-      - simulate_non_terminal_tasks
+      # Simulate non-terminal tasks. 
+      # This process finds all non-terminal tasks that currently
+      # exist in the task list and simulates them to ensure that
+      # they are still valid.
+      - simulate_non_terminal_tasks
diff --git a/lib/base-contracts b/lib/base-contracts
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/lib/solady b/lib/solady
diff --git a/lib/superchain-registry b/lib/superchain-registry
diff --git a/script/utils/simulate-tasks.sh b/script/utils/simulate-tasks.sh
@@ -33,19 +33,23 @@ search_non_terminal_tasks() {
   done
 }
 
-# Define directories to skip - you should add reasons why it's being skipped.
-directories_to_skip=(
-  "tasks/sep/base-003-fp-granite-prestate" # investigating why this simulation breaks.
-  "tasks/sep/013-fp-granite-prestate" # investigating why this simulation breaks.
-)
+# Define directories to skip. If you're adding to this list, please add a comment explaining why.
+directories_to_skip=()
 
 should_skip_directory() {
   local dir="$1"
   for skip_dir in "${directories_to_skip[@]}"; do
     if [[ "$dir" == *"$skip_dir"* ]]; then
+      echo "Skipping task: $(basename "$task") because it's been marked as a directory to skip."
       return 0
     fi
   done
+  # Check if 'justfile' exists in the current directory. If it exists then it's either an old task
+  # or a template task that we can skip.
+  if [ -f "$dir/justfile" ]; then
+    echo "Skipping task: $(basename "$task") because it contains a 'justfile'."
+    return 0
+  fi
   return 1
 }
 
@@ -63,11 +67,7 @@ else
     current_dir=$(pwd)
     cd "$task" || exit 1
 
-    # Check if 'justfile' exists in the current directory it's either an old task
-    # that we can skip or a template task which we should also skip.
-    if [ -f "justfile" ] || should_skip_directory "$task"; then
-      echo "Skipping task: $(basename "$task") - please see simultate-tasks.sh for more information."
-    else
+    if ! should_skip_directory "$task"; then
       just --dotenv-path "$PWD/.env" --justfile "$ROOT_DIR/single.just" simulate 0
     fi
 
@@ -87,9 +87,7 @@ else
     current_dir=$(pwd)
     cd "$task" || exit 1
 
-    if [ -f "justfile" ] || should_skip_directory "$task"; then
-      echo "Skipping task: $(basename "$task") - please see simultate-tasks.sh to see why."
-    else
+    if ! should_skip_directory "$task"; then
       just --dotenv-path "$PWD/.env" --justfile "$ROOT_DIR/nested.just" simulate council
       just --dotenv-path "$PWD/.env" --justfile "$ROOT_DIR/nested.just" approve council
       just --dotenv-path "$PWD/.env" --justfile "$ROOT_DIR/nested.just" simulate foundation
+14 −6		script/universal/MultisigBase.sol
+2 −4		script/universal/MultisigBuilder.sol
+2 −6		script/universal/NestedMultisigBuilder.sol
+32 −12		script/universal/Signatures.sol
+8 −4		script/universal/Simulation.sol
+1 −1		test/universal/NestedMultisigBuilder.t.sol
+193 −0		CONTRIBUTING.md
+17 −1		README.md
+1 −1		package.json
+12 −1		scripts/vm.py
+14 −1		src/StdChains.sol
+5 −5		src/StdCheats.sol
+18 −3		src/StdInvariant.sol
+104 −0		src/StdJson.sol
+1 −1		src/StdStorage.sol
+104 −0		src/StdToml.sol
+581 −74		src/Vm.sol
+635 −608		src/console.sol
+1 −1,555		src/console2.sol
+2 −2		src/interfaces/IERC4626.sol
+1 −5		src/mocks/MockERC721.sol
+693 −4		src/safeconsole.sol
+1 −1		test/StdAssertions.t.sol
+21 −15		test/StdChains.t.sol
+10 −10		test/StdCheats.t.sol
+12 −12		test/StdError.t.sol
+1 −1		test/StdJson.t.sol
+4 −14		test/StdMath.t.sol
+13 −5		test/StdStorage.t.sol
+1 −1		test/StdStyle.t.sol
+1 −1		test/StdToml.t.sol
+12 −12		test/StdUtils.t.sol
+9 −6		test/Vm.t.sol