Skip to content

Add eip1559 params to executable payload #1480

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

Closed
cody-wang-cb wants to merge 2 commits into from
Closed

Add eip1559 params to executable payload #1480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06db2ff
add eip1559 params to executable payload
cody-wang-cb Oct 13, 2024
9540b4b
fmt and fix test
cody-wang-cb Oct 15, 2024
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
22 changes: 18 additions & 4 deletions crates/rpc-types-beacon/src/payload.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use alloy_eips::{
eip4895::Withdrawal, eip6110::DepositRequest, eip7002::WithdrawalRequest,
eip7251::ConsolidationRequest,
};
use alloy_primitives::{Address, Bloom, Bytes, B256, U256};
use alloy_primitives::{Address, Bloom, Bytes, B256, B64, U256};
use alloy_rpc_types_engine::{
ExecutionPayload, ExecutionPayloadV1, ExecutionPayloadV2, ExecutionPayloadV3,
ExecutionPayloadV4,
Expand Down Expand Up @@ -361,22 +361,36 @@ struct BeaconExecutionPayloadV3<'a> {
blob_gas_used: u64,
#[serde_as(as = "DisplayFromStr")]
excess_blob_gas: u64,
#[serde_as(as = "DisplayFromStr")]
eip_1559_params: B64,
}

impl<'a> From<BeaconExecutionPayloadV3<'a>> for ExecutionPayloadV3 {
fn from(payload: BeaconExecutionPayloadV3<'a>) -> Self {
let BeaconExecutionPayloadV3 { payload_inner, blob_gas_used, excess_blob_gas } = payload;
Self { payload_inner: payload_inner.into(), blob_gas_used, excess_blob_gas }
let BeaconExecutionPayloadV3 {
payload_inner,
blob_gas_used,
excess_blob_gas,
eip_1559_params,
} = payload;
Self {
payload_inner: payload_inner.into(),
blob_gas_used,
excess_blob_gas,
eip_1559_params,
}
}
}

impl<'a> From<&'a ExecutionPayloadV3> for BeaconExecutionPayloadV3<'a> {
fn from(value: &'a ExecutionPayloadV3) -> Self {
let ExecutionPayloadV3 { payload_inner, blob_gas_used, excess_blob_gas } = value;
let ExecutionPayloadV3 { payload_inner, blob_gas_used, excess_blob_gas, eip_1559_params } =
value;
BeaconExecutionPayloadV3 {
payload_inner: payload_inner.into(),
blob_gas_used: *blob_gas_used,
excess_blob_gas: *excess_blob_gas,
eip_1559_params: eip_1559_params.clone(),
}
}
}
Expand Down
4 changes: 4 additions & 0 deletions crates/rpc-types-engine/src/payload.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,8 @@ pub struct ExecutionPayloadV3 {
/// See <https://github.com/ethereum/execution-apis/blob/fe8e13c288c592ec154ce25c534e26cb7ce0530d/src/engine/cancun.md#ExecutionPayloadV3>
#[cfg_attr(feature = "serde", serde(with = "alloy_serde::quantity"))]
pub excess_blob_gas: u64,
/// Array of hex[`u64`] representing the EIP-1559 parameters, enabled with V3
pub eip_1559_params: B64,
Comment on lines +335 to +336
Copy link
Copy Markdown
Member

@mattsse mattsse Oct 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how will this be rolled out, will this just be a default value until this is activated?

Comment on lines +335 to +336
Copy link
Copy Markdown
Member

@mattsse mattsse Oct 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can't do this, this is an op specific change.
this would break existing engine API because this field doesn't exist.
looks like we need to roll an op specific v3 type

Copy link
Copy Markdown
Contributor Author

@cody-wang-cb cody-wang-cb Oct 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I just realized as well, I should add this in op-alloy

}

impl ExecutionPayloadV3 {
Expand Down Expand Up @@ -397,6 +399,7 @@ impl ssz::Decode for ExecutionPayloadV3 {
},
blob_gas_used: decoder.decode_next()?,
excess_blob_gas: decoder.decode_next()?,
eip_1559_params: decoder.decode_next()?,
})
}
}
Expand Down Expand Up @@ -538,6 +541,7 @@ impl ssz::Decode for ExecutionPayloadV4 {
},
blob_gas_used: decoder.decode_next()?,
excess_blob_gas: decoder.decode_next()?,
eip_1559_params: decoder.decode_next()?,
},
deposit_requests: decoder.decode_next()?,
withdrawal_requests: decoder.decode_next()?,
Expand Down