Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename data_gas to blob_gas #213

Merged
merged 2 commits into from
Aug 20, 2023
Merged

Rename data_gas to blob_gas #213

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2354493
Rename `data_gas` to `blob_gas`
jimmygchen Aug 14, 2023
14cb3ce
Merge branch 'main' into rename-data-gas-to-blob-gas
jimmygchen Aug 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ethereum-consensus/src/deneb/execution.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ pub struct ExecutionPayload<
pub transactions: List<Transaction<MAX_BYTES_PER_TRANSACTION>, MAX_TRANSACTIONS_PER_PAYLOAD>,
pub withdrawals: List<Withdrawal, MAX_WITHDRAWALS_PER_PAYLOAD>,
#[serde(with = "crate::serde::as_string")]
pub data_gas_used: u64,
pub blob_gas_used: u64,
#[serde(with = "crate::serde::as_string")]
pub excess_data_gas: u64,
pub excess_blob_gas: u64,
}

#[derive(Default, Debug, Clone, SimpleSerialize, PartialEq, Eq)]
Expand Down Expand Up @@ -67,9 +67,9 @@ pub struct ExecutionPayloadHeader<
pub transactions_root: Root,
pub withdrawals_root: Root,
#[serde(with = "crate::serde::as_string")]
pub data_gas_used: u64,
pub blob_gas_used: u64,
#[serde(with = "crate::serde::as_string")]
pub excess_data_gas: u64,
pub excess_blob_gas: u64,
}

impl<
Expand Down Expand Up @@ -121,8 +121,8 @@ impl<
block_hash: payload.block_hash.clone(),
transactions_root,
withdrawals_root,
data_gas_used: payload.data_gas_used,
excess_data_gas: payload.excess_data_gas,
blob_gas_used: payload.blob_gas_used,
excess_blob_gas: payload.excess_blob_gas,
})
}
}
Expand Down