ci: check Cargo version against Git tag in release.yml (#16657)

.github/workflows/release.yml

@@ -43,6 +43,22 @@ jobs:
     outputs:
       VERSION: ${{ steps.extract_version.outputs.VERSION }}
 
+  check-version:
+    name: check version
+    runs-on: ubuntu-latest
+    needs: extract-version
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
+      - name: Verify crate version matches tag
+        # Check that the Cargo version starts with the tag,
+        # so that Cargo version 1.4.8 can be matched against both v1.4.8 and v1.4.8-rc.1
+        run: |
+          tag="${{ needs.extract-version.outputs.VERSION }}"
+          tag=${tag#v}
+          cargo_ver=$(cargo metadata --no-deps --format-version 1 | jq -r '.packages[0].version')
+          [[ "$tag" == "$cargo_ver"* ]] || { echo "Tag $tag doesn’t match the Cargo version $cargo_ver"; exit 1; }
+
   build:
     name: build release
     runs-on: ${{ matrix.configs.os }}

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace.package]
-version = "1.4.7"
+version = "1.4.8"
 edition = "2021"
 rust-version = "1.86"
 license = "MIT OR Apache-2.0"

crates/node/core/src/cli/config.rs

@@ -42,9 +42,9 @@ pub trait PayloadBuilderConfig {
         }
 
         match chain.kind() {
-            ChainKind::Named(NamedChain::Sepolia | NamedChain::Holesky | NamedChain::Hoodi) => {
-                ETHEREUM_BLOCK_GAS_LIMIT_60M
-            }
+            ChainKind::Named(
+                NamedChain::Mainnet | NamedChain::Sepolia | NamedChain::Holesky | NamedChain::Hoodi,
+            ) => ETHEREUM_BLOCK_GAS_LIMIT_60M,
             _ => ETHEREUM_BLOCK_GAS_LIMIT_36M,
         }
     }

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

@@ -2,15 +2,12 @@
 //! previous blocks.
 
 use super::{EthApiError, EthResult, EthStateCache, RpcInvalidTransactionError};
-use alloy_consensus::{
-    constants::GWEI_TO_WEI, transaction::SignerRecoverable, BlockHeader, Transaction,
-};
+use alloy_consensus::{constants::GWEI_TO_WEI, BlockHeader, Transaction};
 use alloy_eips::BlockNumberOrTag;
 use alloy_primitives::{B256, U256};
 use alloy_rpc_types_eth::BlockId;
 use derive_more::{Deref, DerefMut, From, Into};
 use itertools::Itertools;
-use reth_primitives_traits::BlockBody;
 use reth_rpc_server_types::{
     constants,
     constants::gas_oracle::{
@@ -234,7 +231,7 @@ where
         let parent_hash = block.parent_hash();
 
         // sort the functions by ascending effective tip first
-        let sorted_transactions = block.body().transactions_iter().sorted_by_cached_key(|tx| {
+        let sorted_transactions = block.transactions_recovered().sorted_by_cached_key(|tx| {
             if let Some(base_fee) = base_fee_per_gas {
                 (*tx).effective_tip_per_gas(base_fee)
             } else {
@@ -259,10 +256,8 @@ where
             }
 
             // check if the sender was the coinbase, if so, ignore
-            if let Ok(sender) = tx.recover_signer() {
-                if sender == block.beneficiary() {
-                    continue
-                }
+            if tx.signer() == block.beneficiary() {
+                continue
             }
 
             // a `None` effective_gas_tip represents a transaction where the max_fee_per_gas is