From 0212e84fa8b1be350552eda728796465029a5b83 Mon Sep 17 00:00:00 2001
From: Eitan Seri- Levi <eserilev@gmail.com>
Date: Mon, 2 Mar 2026 23:39:24 -0800
Subject: [PATCH] Use max request payloads

---
 beacon_node/lighthouse_network/src/rpc/methods.rs  | 2 +-
 beacon_node/lighthouse_network/src/rpc/protocol.rs | 6 ++++++
 consensus/types/src/core/chain_spec.rs             | 9 ++++++++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/beacon_node/lighthouse_network/src/rpc/methods.rs b/beacon_node/lighthouse_network/src/rpc/methods.rs
index 8113a0b5c1..390510d2e3 100644
--- a/beacon_node/lighthouse_network/src/rpc/methods.rs
+++ b/beacon_node/lighthouse_network/src/rpc/methods.rs
@@ -530,7 +530,7 @@ impl PayloadEnvelopesByRootRequest {
     ) -> Result<Self, String> {
         let max_requests_envelopes = fork_context
             .spec
-            .max_request_blocks(fork_context.current_fork_name());
+            .max_request_payloads(fork_context.current_fork_name());
 
         let beacon_block_roots =
             RuntimeVariableList::new(beacon_block_roots, max_requests_envelopes).map_err(|e| {
diff --git a/beacon_node/lighthouse_network/src/rpc/protocol.rs b/beacon_node/lighthouse_network/src/rpc/protocol.rs
index dd9982056b..17b4054248 100644
--- a/beacon_node/lighthouse_network/src/rpc/protocol.rs
+++ b/beacon_node/lighthouse_network/src/rpc/protocol.rs
@@ -423,6 +423,12 @@ impl SupportedProtocol {
                 ProtocolId::new(SupportedProtocol::DataColumnsByRangeV1, Encoding::SSZSnappy),
             ]);
         }
+        if fork_context.fork_exists(ForkName::Gloas) {
+            supported.extend_from_slice(&[
+                ProtocolId::new(SupportedProtocol::PayloadEnvelopesByRangeV1, Encoding::SSZSnappy),
+                ProtocolId::new(SupportedProtocol::PayloadEnvelopesByRootV1, Encoding::SSZSnappy),
+            ]);
+        }
         supported
     }
 }
diff --git a/consensus/types/src/core/chain_spec.rs b/consensus/types/src/core/chain_spec.rs
index adf87dee94..90253c12aa 100644
--- a/consensus/types/src/core/chain_spec.rs
+++ b/consensus/types/src/core/chain_spec.rs
@@ -295,6 +295,7 @@ pub struct ChainSpec {
     /*
      * Networking Gloas
      */
+    pub max_request_payloads: u64,
 
     /*
      * Networking Derived
@@ -700,6 +701,10 @@ impl ChainSpec {
         }
     }
 
+    pub fn max_request_payloads(&self) -> usize {
+        self.max_request_payloads as usize
+    }
+
     pub fn max_request_blob_sidecars(&self, fork_name: ForkName) -> usize {
         if fork_name.electra_enabled() {
             self.max_request_blob_sidecars_electra as usize
@@ -1228,6 +1233,7 @@ impl ChainSpec {
             builder_payment_threshold_numerator: 6,
             builder_payment_threshold_denominator: 10,
             min_builder_withdrawability_delay: Epoch::new(4096),
+            max_request_payloads: 128,
 
             /*
              * Network specific
@@ -1622,7 +1628,8 @@ impl ChainSpec {
             builder_payment_threshold_numerator: 6,
             builder_payment_threshold_denominator: 10,
             min_builder_withdrawability_delay: Epoch::new(4096),
-
+            max_request_payloads: 128,
+            
             /*
              * Network specific
              */