Add fork resilience for Leader Lock (#3210)

## Linked Issues/PRs
Implements #3209 

## Description
<!-- List of detailed changes -->

## Checklist
- [ ] Breaking changes are clearly marked as such in the PR description
and changelog
- [ ] New behavior is reflected in tests
- [ ] [The specification](https://github.com/FuelLabs/fuel-specs/)
matches the implemented behavior (link update PR if changes are needed)

### Before requesting review
- [ ] I have reviewed the code myself
- [ ] I have created follow-up issues caused by this PR and linked them
here

### After merging, notify other teams

[Add or remove entries as needed]

- [ ] [Rust SDK](https://github.com/FuelLabs/fuels-rs/)
- [ ] [Sway compiler](https://github.com/FuelLabs/sway/)
- [ ] [Platform
documentation](https://github.com/FuelLabs/devrel-requests/issues/new?assignees=&labels=new+request&projects=&template=NEW-REQUEST.yml&title=%5BRequest%5D%3A+)
(for out-of-organization contributors, the person merging the PR will do
this)
- [ ] Someone else?

---------

Co-authored-by: Green Baneling <XgreenX9999@gmail.com>

Author: MitchTurner

.cargo/audit.toml

@@ -4,4 +4,6 @@ ignore = [
     "RUSTSEC-2025-0009", # https://github.com/FuelLabs/fuel-core/issues/2814
     "RUSTSEC-2025-0118", # handled in master
     "RUSTSEC-2026-0006", # handled in master
-]
+    "RUSTSEC-2026-0020", # wasmtime advisory, pending upgrade
+    "RUSTSEC-2026-0021", # wasmtime advisory, pending upgrade
+]

.github/workflows/ci.yml

@@ -236,7 +236,7 @@ jobs:
         run: cargo test -p fuel-core-tests --features aws-kms -- kms
 
   leader-lock-integration-tests:
-    name: Leader Lock Integration Tests (w/Redis)
+    name: Leader Lock Tests (w/Redis)
     needs:
       - lint-toml-files
       - prevent-openssl
@@ -266,6 +266,7 @@ jobs:
           env | sort | grep -Ei 'REDIS|LEADER|LOCK|FUEL' || true
           (timeout 90s redis-cli MONITOR | stdbuf -oL grep -E 'SELECT|SET|PEXPIRE|DEL|leader|lock' || true) &
           cargo test --package fuel-core-tests --test integration_tests leader_lock --features leader_lock -- --test-threads=1 --nocapture
+          cargo test --package fuel-core --lib service::adapters::consensus_module::poa::tests:: --features leader_lock -- --test-threads=1 --nocapture
 
   verifications-complete:
     needs:

Cargo.toml

@@ -59,10 +59,7 @@ version = "0.47.1"
 
 # Common dependencies
 anyhow = "1.0"
-async-graphql = { version = "=7.0.15", features = [
-  "graphiql",
-  "tracing",
-], default-features = false }
+async-graphql = { version = "=7.0.15", features = ["graphiql", "tracing"], default-features = false }
 async-graphql-value = { version = "=7.0.15" }
 async-trait = "0.1"
 
@@ -78,12 +75,7 @@ cynic = { version = "3.1.0", features = ["http-reqwest"] }
 derive_more = { version = "0.99" }
 ed25519 = { version = "2.2.3", default-features = false }
 ed25519-dalek = { version = "2.1.1", default-features = false }
-educe = { version = "0.6", default-features = false, features = [
-  "Eq",
-  "PartialEq",
-  "Hash",
-  "Debug",
-] }
+educe = { version = "0.6", default-features = false, features = ["Eq", "PartialEq", "Hash", "Debug"] }
 enum-iterator = "1.2"
 enum_dispatch = "0.3.13"
 # Workspace members
@@ -143,10 +135,7 @@ proptest = "1.1"
 rand = "0.8"
 rayon = "1.10.0"
 # enable cookie store to support L7 sticky sessions
-reqwest = { version = "0.12.0", default-features = false, features = [
-  "rustls-tls",
-  "cookies",
-] }
+reqwest = { version = "0.12.0", default-features = false, features = ["rustls-tls", "cookies"] }
 serde = "1.0"
 serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
 serde_with = { version = "3.4", default-features = false }

benches/Cargo.toml

@@ -21,35 +21,24 @@ fault-proving = [
 anyhow = { workspace = true }
 async-trait = { workspace = true }
 clap = { workspace = true, features = ["derive"] }
-criterion = { version = "0.5", features = [
-  "html_reports",
-  "async",
-  "async_tokio",
-] }
+criterion = { version = "0.5", features = ["html_reports", "async", "async_tokio"] }
 ctrlc = "3.2.3"
 ed25519-dalek = { workspace = true, features = ["rand_core"] }
 enum-iterator = { workspace = true }
 ethnum = "1.3"
-fuel-core = { path = "../crates/fuel-core", default-features = false, features = [
-  "rocksdb-production",
-] }
+fuel-core = { path = "../crates/fuel-core", default-features = false, features = ["rocksdb-production"] }
 fuel-core-chain-config = { workspace = true }
 fuel-core-database = { path = "./../crates/database" }
 fuel-core-services = { path = "./../crates/services" }
 fuel-core-storage = { path = "./../crates/storage" }
-fuel-core-sync = { path = "./../crates/services/sync", features = [
-  "benchmarking",
-] }
+fuel-core-sync = { path = "./../crates/services/sync", features = ["benchmarking"] }
 fuel-core-trace = { path = "./../crates/trace" }
 fuel-core-types = { path = "./../crates/types", features = ["test-helpers"] }
 futures = { workspace = true }
 hex = "0.4.3"
 itertools = { workspace = true }
 num_enum = { workspace = true }
-p256 = { version = "0.13", default-features = false, features = [
-  "digest",
-  "ecdsa",
-] }
+p256 = { version = "0.13", default-features = false, features = ["digest", "ecdsa"] }
 postcard = { workspace = true }
 primitive-types = { workspace = true, default-features = false }
 quanta = "0.12"

bin/e2e-test-client/Cargo.toml

@@ -35,12 +35,7 @@ toml = { version = "0.5" }
 
 [dev-dependencies]
 assert_cmd = "2.0"
-fuel-core = { workspace = true, features = [
-  "rocksdb",
-  "wasm-executor",
-  "p2p",
-  "test-helpers",
-] }
+fuel-core = { workspace = true, features = ["rocksdb", "wasm-executor", "p2p", "test-helpers"] }
 fuel-core-trace = { path = "../../crates/trace" }
 insta = { workspace = true }
 tempfile = { workspace = true }

bin/fuel-core/Cargo.toml

@@ -46,9 +46,7 @@ fault-proving = [
 
 [dependencies]
 anyhow = { workspace = true }
-aws-config = { workspace = true, features = [
-  "behavior-version-latest",
-], optional = true }
+aws-config = { workspace = true, features = ["behavior-version-latest"], optional = true }
 aws-sdk-kms = { workspace = true, optional = true }
 clap = { workspace = true, features = ["derive", "env", "string"] }
 const_format = { version = "0.2", optional = true }
@@ -69,11 +67,7 @@ serde_json = { workspace = true }
 tikv-jemallocator = { workspace = true }
 tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
 tracing = { workspace = true }
-tracing-subscriber = { workspace = true, features = [
-  "ansi",
-  "env-filter",
-  "json",
-] }
+tracing-subscriber = { workspace = true, features = ["ansi", "env-filter", "json"] }
 url = { workspace = true, optional = true }
 
 [dev-dependencies]

bin/fuel-core/src/cli/run/consensus.rs

@@ -35,6 +35,7 @@ impl PoATriggerArgs {
             retry_delay,
             max_retry_delay_offset,
             max_attempts,
+            stream_max_len,
         } = self.leader_lock.clone();
         if enabled {
             Ok(Some(RedisLeaderLockConfig {
@@ -49,6 +50,7 @@ impl PoATriggerArgs {
                 retry_delay: retry_delay.into(),
                 max_retry_delay_offset: max_retry_delay_offset.into(),
                 max_attempts,
+                stream_max_len,
             }))
         } else {
             Ok(None)
@@ -159,6 +161,9 @@ struct LeaderLock {
     /// Maximum number of acquire attempts per can_produce_block call.
     #[clap(long = "poa-leader-lock-max-attempts", env, default_value_t = 3)]
     max_attempts: u32,
+    /// Maximum approximate number of entries retained in the Redis block stream.
+    #[clap(long = "poa-leader-lock-stream-max-len", env, default_value_t = 1000)]
+    stream_max_len: u32,
 }
 
 #[cfg(test)]
@@ -224,6 +229,7 @@ mod tests {
             StdDuration::from_millis(100)
         );
         assert_eq!(leader_lock.max_attempts, 3);
+        assert_eq!(leader_lock.stream_max_len, 1000);
     }
 
     #[test]

crates/chain-config/Cargo.toml

@@ -37,10 +37,7 @@ anyhow = { workspace = true }
 bech32 = { version = "0.9.0", default-features = false, optional = true }
 educe = { workspace = true }
 fuel-core-storage = { workspace = true, features = ["alloc"] }
-fuel-core-types = { workspace = true, default-features = false, features = [
-  "alloc",
-  "serde",
-] }
+fuel-core-types = { workspace = true, default-features = false, features = ["alloc", "serde"] }
 itertools = { workspace = true, features = ["use_alloc"] }
 parquet = { workspace = true, features = ["zstd"], optional = true }
 postcard = { workspace = true, features = ["alloc"] }
@@ -53,11 +50,7 @@ tracing = { version = "0.1", default-features = false, optional = true }
 [dev-dependencies]
 bytes = { workspace = true }
 fuel-core-chain-config = { path = ".", features = ["parquet", "test-helpers"] }
-fuel-core-types = { workspace = true, default-features = false, features = [
-  "alloc",
-  "random",
-  "serde",
-] }
+fuel-core-types = { workspace = true, default-features = false, features = ["alloc", "random", "serde"] }
 insta = { workspace = true }
 pretty_assertions = { workspace = true }
 rand = { workspace = true }

crates/client/Cargo.toml

@@ -35,9 +35,7 @@ fuel-core-types = { workspace = true, features = ["alloc", "serde"] }
 futures = { workspace = true, optional = true }
 hex = { workspace = true }
 # Included to enable webpki in the eventsource client
-hyper-rustls = { version = "0.24", features = [
-  "webpki-tokio",
-], optional = true }
+hyper-rustls = { version = "0.24", features = ["webpki-tokio"], optional = true }
 itertools = { workspace = true }
 postcard = { workspace = true, optional = true }
 reqwest = { workspace = true }
@@ -53,9 +51,5 @@ schemafy_lib = { version = "0.5" }
 serde_json = { version = "1.0", features = ["raw_value"] }
 
 [dev-dependencies]
-fuel-core-types = { workspace = true, features = [
-  "serde",
-  "std",
-  "test-helpers",
-] }
+fuel-core-types = { workspace = true, features = ["serde", "std", "test-helpers"] }
 insta = { workspace = true }

crates/compression/Cargo.toml

@@ -29,11 +29,7 @@ fault-proving = ["fuel-core-types/fault-proving"]
 [dependencies]
 anyhow = { workspace = true }
 enum_dispatch = { workspace = true }
-fuel-core-types = { workspace = true, features = [
-  "alloc",
-  "serde",
-  "da-compression",
-] }
+fuel-core-types = { workspace = true, features = ["alloc", "serde", "da-compression"] }
 paste = { workspace = true }
 rand = { workspace = true, optional = true }
 serde = { version = "1.0", features = ["derive"] }