consensus: make Header gas limit u64

Cargo.toml

@@ -137,7 +137,7 @@ semver = "1.0"
 thiserror = "1.0"
 thiserror-no-std = "2.0.2"
 url = "2.5"
-derive_more = { version = "1.0.0", default-features = false }
+derive_more = { version = "1.0.0", default-features = false, features = ["full"] }
 http = "1.1.0"
 
 ## serde

crates/consensus/src/header.rs

@@ -60,7 +60,7 @@ pub struct Header {
     pub number: BlockNumber,
     /// A scalar value equal to the current limit of gas expenditure per block; formally Hl.
     #[cfg_attr(feature = "serde", serde(with = "alloy_serde::quantity"))]
-    pub gas_limit: u128,
+    pub gas_limit: u64,
     /// A scalar value equal to the total gas used in transactions in this block; formally Hg.
     #[cfg_attr(feature = "serde", serde(with = "alloy_serde::quantity"))]
     pub gas_used: u128,
@@ -484,7 +484,7 @@ impl Decodable for Header {
             logs_bloom: Decodable::decode(buf)?,
             difficulty: Decodable::decode(buf)?,
             number: u64::decode(buf)?,
-            gas_limit: u128::decode(buf)?,
+            gas_limit: u64::decode(buf)?,
             gas_used: u128::decode(buf)?,
             timestamp: Decodable::decode(buf)?,
             extra_data: Decodable::decode(buf)?,
@@ -671,7 +671,7 @@ pub trait BlockHeader {
     fn number(&self) -> BlockNumber;
 
     /// Retrieves the gas limit of the block
-    fn gas_limit(&self) -> u128;
+    fn gas_limit(&self) -> u64;
 
     /// Retrieves the gas used by the block
     fn gas_used(&self) -> u128;
@@ -745,7 +745,7 @@ impl BlockHeader for Header {
         self.number
     }
 
-    fn gas_limit(&self) -> u128 {
+    fn gas_limit(&self) -> u64 {
         self.gas_limit
     }
 
@@ -808,5 +808,17 @@ mod tests {
 
         let decoded: Header = serde_json::from_str(&json).unwrap();
         assert_eq!(decoded, header);
+
+        // Create a vector to store the encoded RLP
+        let mut encoded_rlp = Vec::new();
+
+        // Encode the header data
+        decoded.encode(&mut encoded_rlp);
+
+        // Decode the RLP data
+        let decoded_rlp = Header::decode(&mut encoded_rlp.as_slice()).unwrap();
+
+        // Check that the decoded RLP data matches the original header data
+        assert_eq!(decoded_rlp, decoded);
     }
 }

crates/eips/src/eip1559/basefee.rs

@@ -90,7 +90,7 @@ impl BaseFeeParams {
     ///
     /// See also [calc_next_block_base_fee]
     #[inline]
-    pub fn next_block_base_fee(self, gas_used: u128, gas_limit: u128, base_fee: u128) -> u128 {
+    pub fn next_block_base_fee(self, gas_used: u128, gas_limit: u64, base_fee: u128) -> u128 {
         calc_next_block_base_fee(gas_used, gas_limit, base_fee, self)
     }
 }

crates/eips/src/eip1559/helpers.rs

@@ -25,12 +25,12 @@ use crate::eip1559::BaseFeeParams;
 /// For more information, refer to the [EIP-1559 spec](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-1559.md).
 pub fn calc_next_block_base_fee(
     gas_used: u128,
-    gas_limit: u128,
+    gas_limit: u64,
     base_fee: u128,
     base_fee_params: BaseFeeParams,
 ) -> u128 {
     // Calculate the target gas by dividing the gas limit by the elasticity multiplier.
-    let gas_target = gas_limit / base_fee_params.elasticity_multiplier;
+    let gas_target = gas_limit as u128 / base_fee_params.elasticity_multiplier;
 
     match gas_used.cmp(&gas_target) {
         // If the gas used in the current block is equal to the gas target, the base fee remains the
@@ -126,7 +126,7 @@ mod tests {
                 next_base_fee[i],
                 calc_next_block_base_fee(
                     gas_used[i] as u128,
-                    gas_limit[i] as u128,
+                    gas_limit[i],
                     base_fee[i] as u128,
                     BaseFeeParams::optimism_sepolia(),
                 ) as u64
@@ -158,7 +158,7 @@ mod tests {
                 next_base_fee[i],
                 calc_next_block_base_fee(
                     gas_used[i] as u128,
-                    gas_limit[i] as u128,
+                    gas_limit[i],
                     base_fee[i] as u128,
                     BaseFeeParams::optimism(),
                 ) as u64
@@ -190,7 +190,7 @@ mod tests {
                 next_base_fee[i],
                 calc_next_block_base_fee(
                     gas_used[i] as u128,
-                    gas_limit[i] as u128,
+                    gas_limit[i],
                     base_fee[i] as u128,
                     BaseFeeParams::optimism_canyon(),
                 ) as u64
@@ -222,7 +222,7 @@ mod tests {
                 next_base_fee[i],
                 calc_next_block_base_fee(
                     gas_used[i] as u128,
-                    gas_limit[i] as u128,
+                    gas_limit[i],
                     base_fee[i] as u128,
                     BaseFeeParams::base_sepolia(),
                 ) as u64

crates/network-primitives/src/traits.rs

@@ -153,7 +153,7 @@ pub trait HeaderResponse {
     fn coinbase(&self) -> Address;
 
     /// Gas limit of the block
-    fn gas_limit(&self) -> u128;
+    fn gas_limit(&self) -> u64;
 
     /// Mix hash of the block
     ///
@@ -392,7 +392,7 @@ impl<T: HeaderResponse> HeaderResponse for WithOtherFields<T> {
         self.inner.coinbase()
     }
 
-    fn gas_limit(&self) -> u128 {
+    fn gas_limit(&self) -> u64 {
         self.inner.gas_limit()
     }
 

crates/provider/src/ext/anvil.rs

@@ -793,7 +793,7 @@ mod tests {
 
         let latest_block =
             provider.get_block_by_number(BlockNumberOrTag::Latest, false).await.unwrap().unwrap();
-        assert_eq!(block_gas_limit.to::<u128>(), latest_block.header.gas_limit);
+        assert_eq!(block_gas_limit.to::<u64>(), latest_block.header.gas_limit);
     }
 
     #[tokio::test]

crates/rpc-types-eth/src/block.rs

@@ -80,7 +80,7 @@ pub struct Header {
     pub number: u64,
     /// Gas Limit
     #[cfg_attr(feature = "serde", serde(default, with = "alloy_serde::quantity"))]
-    pub gas_limit: u128,
+    pub gas_limit: u64,
     /// Gas Used
     #[cfg_attr(feature = "serde", serde(default, with = "alloy_serde::quantity"))]
     pub gas_used: u128,
@@ -259,7 +259,7 @@ impl HeaderResponse for Header {
         self.miner
     }
 
-    fn gas_limit(&self) -> u128 {
+    fn gas_limit(&self) -> u64 {
         self.gas_limit
     }