Update combined network

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: Build and Test Workflow
+name: Build, Lint, and Test
 
 on:
   push:
@@ -43,6 +43,10 @@ jobs:
           sudo apt-get install -y protobuf-compiler
           cargo install just
 
+      - name: Run linting
+        run: |
+          just ${{ matrix.just_variants }} lint
+
       - name: Build all crates in workspace
         run: just ${{ matrix.just_variants }} build
 

Cargo.toml

@@ -52,6 +52,11 @@ either = { version = "1.8" }
 espresso-systems-common = { git = "https://github.com/espressosystems/espresso-systems-common", tag = "0.4.1" }
 ethereum-types = { version = "0.14.1", features = ["impl-serde"] }
 futures = "0.3.28"
+
+# TODO generic-array should not be a direct dependency
+# https://github.com/EspressoSystems/HotShot/issues/1850
+generic-array = { version = "0.14.7", features = ["serde"] }
+
 jf-primitives = { git = "https://github.com/EspressoSystems/jellyfish" }
 jf-relation = { git = "https://github.com/EspressoSystems/jellyfish" }
 jf-utils = { git = "https://github.com/espressosystems/jellyfish" }

crates/constants/src/lib.rs

@@ -8,3 +8,12 @@ pub const LOOK_AHEAD: u64 = 5;
 
 /// the default kademlia record republication interval (in seconds)
 pub const KAD_DEFAULT_REPUB_INTERVAL_SEC: u64 = 28800;
+
+/// the number of messages to cache in the combined network
+pub const COMBINED_NETWORK_CACHE_SIZE: usize = 1000;
+
+/// the number of messages to attempt to send over the primary network before switching to prefer the secondary network
+pub const COMBINED_NETWORK_MIN_PRIMARY_FAILURES: u64 = 10;
+
+/// the number of messages to send over the secondary network before re-attempting the (presumed down) primary network
+pub const COMBINED_NETWORK_PRIMARY_CHECK_INTERVAL: u64 = 10;

crates/hotshot-qc/Cargo.toml

@@ -19,7 +19,7 @@ ark-std = { workspace = true }
 bincode = { workspace = true }
 bitvec = { workspace = true }
 ethereum-types = { workspace = true }
-generic-array = "0.14.7"
+generic-array = { workspace = true }
 hotshot-types = { path = "../types" }
 jf-primitives = { workspace = true }
 jf-relation = { workspace = true }

crates/hotshot-stake-table/Cargo.toml

@@ -16,7 +16,7 @@ bitvec = { workspace = true }
 digest = { workspace = true }
 displaydoc = { version = "0.2.3", default-features = false }
 ethereum-types = { workspace = true }
-generic-array = "0.14.7"
+generic-array = { workspace = true }
 hotshot-types = { path = "../types" }
 jf-primitives = { workspace = true }
 jf-relation = { workspace = true }