From 5928407ce45b539082874ca1f9c5e3e0704f5d85 Mon Sep 17 00:00:00 2001
From: Toki <105550481+gitToki@users.noreply.github.com>
Date: Wed, 17 Sep 2025 06:51:43 +0200
Subject: [PATCH] fix(rate_limiter): add missing prune calls for light client
 protocols (#8058)

Co-Authored-By: Jimmy Chen <jimmy@sigmaprime.io>

Co-Authored-By: gitToki <tokipro@proton.me>
---
 .github/mergify.yml                           |  4 ++
 .../src/rpc/rate_limiter.rs                   | 45 ++++++++++++++-----
 2 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index 4ab73bcf07..0b917b2546 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -105,6 +105,10 @@ queue_rules:
 
 
         {{ body | get_section("## Proposed Changes", "") }}
+      
+      {% for commit in commits | unique(attribute='email_author') %}
+      Co-Authored-By: {{ commit.author }} <{{ commit.email_author }}>
+      {% endfor %}
     queue_conditions:
       - "#approved-reviews-by >= 1"
       - "check-success=license/cla"
diff --git a/beacon_node/lighthouse_network/src/rpc/rate_limiter.rs b/beacon_node/lighthouse_network/src/rpc/rate_limiter.rs
index 65cd1c2e61..8b364f506c 100644
--- a/beacon_node/lighthouse_network/src/rpc/rate_limiter.rs
+++ b/beacon_node/lighthouse_network/src/rpc/rate_limiter.rs
@@ -382,16 +382,41 @@ impl RPCRateLimiter {
 
     pub fn prune(&mut self) {
         let time_since_start = self.init_time.elapsed();
-        self.ping_rl.prune(time_since_start);
-        self.status_rl.prune(time_since_start);
-        self.metadata_rl.prune(time_since_start);
-        self.goodbye_rl.prune(time_since_start);
-        self.bbrange_rl.prune(time_since_start);
-        self.bbroots_rl.prune(time_since_start);
-        self.blbrange_rl.prune(time_since_start);
-        self.blbroot_rl.prune(time_since_start);
-        self.dcbrange_rl.prune(time_since_start);
-        self.dcbroot_rl.prune(time_since_start);
+
+        let Self {
+            prune_interval: _,
+            init_time: _,
+            goodbye_rl,
+            ping_rl,
+            metadata_rl,
+            status_rl,
+            bbrange_rl,
+            bbroots_rl,
+            blbrange_rl,
+            blbroot_rl,
+            dcbroot_rl,
+            dcbrange_rl,
+            lc_bootstrap_rl,
+            lc_optimistic_update_rl,
+            lc_finality_update_rl,
+            lc_updates_by_range_rl,
+            fork_context: _,
+        } = self;
+
+        goodbye_rl.prune(time_since_start);
+        ping_rl.prune(time_since_start);
+        metadata_rl.prune(time_since_start);
+        status_rl.prune(time_since_start);
+        bbrange_rl.prune(time_since_start);
+        bbroots_rl.prune(time_since_start);
+        blbrange_rl.prune(time_since_start);
+        blbroot_rl.prune(time_since_start);
+        dcbrange_rl.prune(time_since_start);
+        dcbroot_rl.prune(time_since_start);
+        lc_bootstrap_rl.prune(time_since_start);
+        lc_optimistic_update_rl.prune(time_since_start);
+        lc_finality_update_rl.prune(time_since_start);
+        lc_updates_by_range_rl.prune(time_since_start);
     }
 }