Merge branch 'main' into ab/sqlite

EspressoSystems · Nov 25, 2024 · d9c22df · d9c22df
2 parents 8bb8aff + 60283a5
commit d9c22df
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 36 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -2,10 +2,20 @@ version: 2
 updates:
   - package-ecosystem: "github-actions"
     directory: "/"
+    # Group all updates together
+    groups:
+      all:
+        patterns:
+        - "*"
     schedule:
       interval: "daily"
 
   - package-ecosystem: "cargo"
     directory: "/"
+    # Group all updates together
+    groups:
+      all:
+        patterns:
+        - "*"
     schedule:
       interval: "daily"
diff --git a/.github/workflows/combine-prs.yml b/.github/workflows/combine-prs.yml
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Audits/README.md → audits/README.md b/Audits/README.md → audits/README.md
diff --git a/...views/EspressoHotshotLightClient-2024.pdf → ...views/EspressoHotshotLightClient-2024.pdf b/...views/EspressoHotshotLightClient-2024.pdf → ...views/EspressoHotshotLightClient-2024.pdf
diff --git a/...s/external-reviews/EspressoPlonk-2024.pdf → ...s/external-reviews/EspressoPlonk-2024.pdf b/...s/external-reviews/EspressoPlonk-2024.pdf → ...s/external-reviews/EspressoPlonk-2024.pdf
diff --git a/...iews/EspressoFeeContract-2024internal.pdf → ...iews/EspressoFeeContract-2024internal.pdf b/...iews/EspressoFeeContract-2024internal.pdf → ...iews/EspressoFeeContract-2024internal.pdf
diff --git a/...eviews/EspressoSequencer-2024internal.pdf → ...eviews/EspressoSequencer-2024internal.pdf b/...eviews/EspressoSequencer-2024internal.pdf → ...eviews/EspressoSequencer-2024internal.pdf