diff --git a/.github/dependabot.yml b/.github/dependabot.yml index d69e05329..c5b6638f4 100644 --- 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 deleted file mode 100644 index 50256ed20..000000000 --- a/.github/workflows/combine-prs.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: Combine PRs - -on: - schedule: - - cron: "0 1 * * MON" - workflow_dispatch: # allows to manually trigger the workflow - -# The minimum permissions required to run this Action -permissions: - contents: write - pull-requests: write - checks: read - -jobs: - combine-prs: - runs-on: ubuntu-latest - - steps: - - name: combine-prs - id: combine-prs - uses: github/combine-prs@v5.2.0 - with: - github_token: ${{ github.token }} - labels: "dependabot,combined-pr" diff --git a/Cargo.lock b/Cargo.lock index a2ef9689e..fdaeb07c5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1557,7 +1557,7 @@ dependencies = [ "rcgen 0.13.1", "redis 0.25.4", "rkyv", - "rustls 0.23.16", + "rustls 0.23.18", "rustls-pki-types", "sqlx", "thiserror", @@ -1591,7 +1591,7 @@ dependencies = [ "rcgen 0.13.1", "redis 0.26.1", "rkyv", - "rustls 0.23.16", + "rustls 0.23.18", "rustls-pki-types", "sqlx", "thiserror", @@ -3536,7 +3536,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f2f12607f92c69b12ed746fabf9ca4f5c482cba46679c1a75b874ed7c26adb" dependencies = [ "futures-io", - "rustls 0.23.16", + "rustls 0.23.18", "rustls-pki-types", ] @@ -4693,7 +4693,7 @@ dependencies = [ "http 1.1.0", "hyper 1.5.0", "hyper-util", - "rustls 0.23.16", + "rustls 0.23.18", "rustls-pki-types", "tokio", "tokio-rustls 0.26.0", @@ -5922,7 +5922,7 @@ dependencies = [ "quinn", "rand 0.8.5", "ring 0.17.8", - "rustls 0.23.16", + "rustls 0.23.18", "socket2 0.5.7", "thiserror", "tokio", @@ -6016,7 +6016,7 @@ dependencies = [ "libp2p-identity", "rcgen 0.11.3", "ring 0.17.8", - "rustls 0.23.16", + "rustls 0.23.18", "rustls-webpki 0.101.7", "thiserror", "x509-parser", @@ -7690,7 +7690,7 @@ dependencies = [ "quinn-proto", "quinn-udp", "rustc-hash", - "rustls 0.23.16", + "rustls 0.23.18", "socket2 0.5.7", "thiserror", "tokio", @@ -7707,7 +7707,7 @@ dependencies = [ "rand 0.8.5", "ring 0.17.8", "rustc-hash", - "rustls 0.23.16", + "rustls 0.23.18", "slab", "thiserror", "tinyvec", @@ -8408,9 +8408,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.16" +version = "0.23.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e" +checksum = "9c9cc1d47e243d655ace55ed38201c19ae02c148ae56412ab8750e8f0166ab7f" dependencies = [ "log", "once_cell", @@ -10227,7 +10227,7 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.16", + "rustls 0.23.18", "rustls-pki-types", "tokio", ] @@ -10663,7 +10663,7 @@ dependencies = [ "flate2", "log", "once_cell", - "rustls 0.23.16", + "rustls 0.23.18", "rustls-pki-types", "url", "webpki-roots 0.26.6", diff --git a/Audits/README.md b/audits/README.md similarity index 100% rename from Audits/README.md rename to audits/README.md diff --git a/Audits/external-reviews/EspressoHotshotLightClient-2024.pdf b/audits/external-reviews/EspressoHotshotLightClient-2024.pdf similarity index 94% rename from Audits/external-reviews/EspressoHotshotLightClient-2024.pdf rename to audits/external-reviews/EspressoHotshotLightClient-2024.pdf index 6e304c4ae..79969e74d 100644 Binary files a/Audits/external-reviews/EspressoHotshotLightClient-2024.pdf and b/audits/external-reviews/EspressoHotshotLightClient-2024.pdf differ diff --git a/Audits/external-reviews/EspressoPlonk-2024.pdf b/audits/external-reviews/EspressoPlonk-2024.pdf similarity index 100% rename from Audits/external-reviews/EspressoPlonk-2024.pdf rename to audits/external-reviews/EspressoPlonk-2024.pdf diff --git a/Audits/internal-reviews/EspressoFeeContract-2024internal.pdf b/audits/internal-reviews/EspressoFeeContract-2024internal.pdf similarity index 100% rename from Audits/internal-reviews/EspressoFeeContract-2024internal.pdf rename to audits/internal-reviews/EspressoFeeContract-2024internal.pdf diff --git a/Audits/internal-reviews/EspressoSequencer-2024internal.pdf b/audits/internal-reviews/EspressoSequencer-2024internal.pdf similarity index 100% rename from Audits/internal-reviews/EspressoSequencer-2024internal.pdf rename to audits/internal-reviews/EspressoSequencer-2024internal.pdf