Skip to content

Commit cbaecec

Browse files
authored
feat: remove preemptive excess blob gas check (paradigmxyz#16729)
1 parent 3dd0db5 commit cbaecec

File tree

2 files changed

+0
-21
lines changed

2 files changed

+0
-21
lines changed

crates/consensus/common/src/validation.rs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@ pub fn validate_4844_header_standalone<H: BlockHeader>(
185185
blob_params: BlobParams,
186186
) -> Result<(), ConsensusError> {
187187
let blob_gas_used = header.blob_gas_used().ok_or(ConsensusError::BlobGasUsedMissing)?;
188-
let excess_blob_gas = header.excess_blob_gas().ok_or(ConsensusError::ExcessBlobGasMissing)?;
189188

190189
if header.parent_beacon_block_root().is_none() {
191190
return Err(ConsensusError::ParentBeaconBlockRootMissing)
@@ -198,15 +197,6 @@ pub fn validate_4844_header_standalone<H: BlockHeader>(
198197
})
199198
}
200199

201-
// `excess_blob_gas` must also be a multiple of `DATA_GAS_PER_BLOB`. This will be checked later
202-
// (via `calc_excess_blob_gas`), but it doesn't hurt to catch the problem sooner.
203-
if excess_blob_gas % DATA_GAS_PER_BLOB != 0 {
204-
return Err(ConsensusError::ExcessBlobGasNotMultipleOfBlobGasPerBlob {
205-
excess_blob_gas,
206-
blob_gas_per_blob: DATA_GAS_PER_BLOB,
207-
})
208-
}
209-
210200
if blob_gas_used > blob_params.max_blob_gas_per_block() {
211201
return Err(ConsensusError::BlobGasUsedExceedsMaxBlobGasPerBlock {
212202
blob_gas_used,

crates/consensus/consensus/src/lib.rs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -320,17 +320,6 @@ pub enum ConsensusError {
320320
blob_gas_per_blob: u64,
321321
},
322322

323-
/// Error when excess blob gas is not a multiple of blob gas per blob.
324-
#[error(
325-
"excess blob gas {excess_blob_gas} is not a multiple of blob gas per blob {blob_gas_per_blob}"
326-
)]
327-
ExcessBlobGasNotMultipleOfBlobGasPerBlob {
328-
/// The actual excess blob gas.
329-
excess_blob_gas: u64,
330-
/// The blob gas per blob.
331-
blob_gas_per_blob: u64,
332-
},
333-
334323
/// Error when the blob gas used in the header does not match the expected blob gas used.
335324
#[error("blob gas used mismatch: {0}")]
336325
BlobGasUsedDiff(GotExpected<u64>),

0 commit comments

Comments
 (0)