Merge branch 'main' into patch-1

.config/nextest.toml

@@ -4,6 +4,22 @@ slow-timeout = { period = "2m", terminate-after = 3 }
 default-filter = 'not (test(slow_) | package(tests))'
 retries = 2
 
+# More flaky tests
+[[profile.default.overrides]]
+filter = """
+test(tests_2::catchup::test_all_restart) |
+test(tests_4::test_marketplace) |
+test(tests_6::test_epochs)
+"""
+retries = 10
+
+# Sometimes fails persistently in CI
+[[profile.default.overrides]]
+filter = """
+test(tests_4::test_with_builder_failures::test_with_builder_failures)
+"""
+threads-required = 2
+
 [[profile.default.overrides]]
 # These tests are fast if they work (usually about 150ms) but sometimes they
 # hang, especially when running Concurrently with other tests. Kill after a
@@ -34,3 +50,14 @@ retries = 2
 slow-timeout = "2m"
 default-filter = 'package(tests)'
 retries = 2
+
+# Serial required
+# TRY 3 FAIL [   2.790s] hotshot-testing::tests_4 tests_4::test_marketplace::test_marketplace_builders_down::testtypes_::memoryimpl_::test_marketplace_builders_down
+# TRY 3 FAIL [   4.446s] hotshot-testing::tests_4 tests_4::test_marketplace::test_marketplace_fallback_builder_down::testtypes_::memoryimpl_::test_marketplace_fallback_builder_down
+# TRY 3 FAIL [   5.119s] hotshot-testing::tests_4 tests_4::test_marketplace::test_marketplace_upgrade::testtypes_::memoryimpl_::test_marketplace_upgrade
+#
+# FLAKY 2/3 [  12.037s] hotshot-testing::tests_2 tests_2::catchup::test_all_restart::testtypes_::pushcdnimpl_::test_all_restart
+# FLAKY 2/3 [  49.943s] hotshot-testing::tests_6 tests_6::test_epochs::test_combined_network_cdn_crash_with_epochs::testtypes_::combinedimpl_::test_combined_network_cdn_crash_with_epochs
+# FLAKY 2/3 [   6.968s] hotshot-testing::tests_6 tests_6::test_epochs::test_epoch_end::testtwostaketablestypes_::pushcdnimpl_::test_epoch_end
+# FLAKY 2/3 [ 125.353s] sequencer api::test::test_fee_upgrade_view_based
+# FLAKY 2/3 [   2.870s] sequencer api::test::test_hotshot_event_streaming

.github/workflows/build-without-lockfile.yml

@@ -32,4 +32,4 @@ jobs:
       - name: Build without committed Cargo.lock
         run: |
           cargo generate-lockfile
-          cargo check --all-features --all-targets
+          cargo check --all-targets

.github/workflows/cargo-features.yml

@@ -35,8 +35,8 @@ jobs:
       # as each individual feature enabled.
       - name: Check compilation for feature combinations
         run: |
-          cargo hack check --feature-powerset --exclude hotshot-query-service
+          cargo hack check --feature-powerset --exclude hotshot --exclude hotshot-builder-api --exclude hotshot-task-impls --exclude hotshot-macros --exclude hotshot-events-service --exclude hotshot-utils --exclude hotshot-orchestrator --exclude hotshot-query-service --exclude hotshot-stake-table --exclude hotshot-state-prover --exclude hotshot-task --exclude hotshot-testing --exclude hotshot-types --exclude hotshot-libp2p-networking --exclude hotshot-contract-adapter --exclude hotshot-example-types
 
       - name: Check compilation for feature combinations (--tests)
         run: |
-          cargo hack check --feature-powerset --tests --exclude hotshot-query-service
+          cargo hack check --feature-powerset --tests --exclude hotshot --exclude hotshot-builder-api --exclude hotshot-task-impls --exclude hotshot-macros --exclude hotshot-events-service --exclude hotshot-utils --exclude hotshot-orchestrator --exclude hotshot-query-service --exclude hotshot-stake-table --exclude hotshot-state-prover --exclude hotshot-task --exclude hotshot-testing --exclude hotshot-types --exclude hotshot-libp2p-networking --exclude hotshot-contract-adapter --exclude hotshot-example-types

.github/workflows/test.yml

@@ -129,6 +129,9 @@ jobs:
   test-postgres:
     needs: build-test-artifacts-postgres
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        partition: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
     steps:
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
@@ -145,12 +148,16 @@ jobs:
       - name: Test
         run: |
           cargo nextest run --archive-file nextest-archive-postgres.tar.zst  --verbose --no-fail-fast \
-          --workspace-remap $PWD
+          --workspace-remap $PWD \
+          --partition hash:${{ matrix.partition }}/10
         timeout-minutes: 20
 
   test-sqlite:
     needs: build-test-artifacts-sqlite
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        partition: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
     steps:
       - name: Fix submodule permissions check
         run: |
@@ -175,7 +182,8 @@ jobs:
       - name: Test
         run: |
           cargo nextest run --archive-file nextest-archive-sqlite.tar.zst  --verbose --no-fail-fast \
-          --workspace-remap $PWD
+          --workspace-remap $PWD \
+          --partition hash:${{ matrix.partition }}/10
         timeout-minutes: 20
 
   test-integration:
@@ -186,7 +194,7 @@ jobs:
         include:
           - version: 02
             compose: "-f process-compose.yaml -D"
-            
+
           - version: 99
             compose: "-f process-compose.yaml -f process-compose-mp.yml -D"
     runs-on: ubuntu-latest

.typos.toml

@@ -11,4 +11,5 @@ extend-exclude = [
   "contract-bindings-alloy",
   "contract-bindings-ethers",
   "node-metrics/src/api/node_validator/v0/example_prometheus_metrics_output.txt",
+  "hotshot-orchestrator/run-config.toml"
 ]