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

feat(engine-api): Shanghai support #1445

Merged
merged 14 commits into from
Feb 21, 2023
Merged

feat(engine-api): Shanghai support #1445

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8234790
add new message types and methods
rkrasiuk Feb 17, 2023
a706a4a
change response type
rkrasiuk Feb 17, 2023
6b7cfbc
implement payload body methods
rkrasiuk Feb 17, 2023
14ee8b3
withdrawals field validation
rkrasiuk Feb 18, 2023
5d6d8a8
Merge branch 'main' into rkrasiuk/shanghai-engine-api
rkrasiuk Feb 18, 2023
e2631cd
cleanup
rkrasiuk Feb 18, 2023
feb2ecc
delegate shanghai requests
rkrasiuk Feb 18, 2023
ff78acf
simplify engine api tests
rkrasiuk Feb 20, 2023
d1b8fd4
extract codes to constants
rkrasiuk Feb 20, 2023
465eacc
add tests for get payload bodies methods
rkrasiuk Feb 20, 2023
f16440b
Merge branch 'main' into rkrasiuk/shanghai-engine-api
rkrasiuk Feb 20, 2023
09b44f5
rm invalid test case
rkrasiuk Feb 20, 2023
b4e3b70
PR comments
rkrasiuk Feb 20, 2023
142ee1c
Apply suggestions from code review
rkrasiuk Feb 20, 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
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions crates/rpc/rpc-api/src/engine.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use jsonrpsee::{core::RpcResult as Result, proc_macros::rpc};
use reth_primitives::{BlockHash, BlockNumber, H64};
use reth_rpc_types::engine::{
ExecutionPayload, ExecutionPayloadBody, ForkchoiceState, ForkchoiceUpdated, PayloadAttributes,
PayloadStatus, TransitionConfiguration,
ExecutionPayload, ExecutionPayloadBodies, ForkchoiceState, ForkchoiceUpdated,
PayloadAttributes, PayloadStatus, TransitionConfiguration,
};

#[cfg_attr(not(feature = "client"), rpc(server))]
Expand Down Expand Up @@ -50,15 +50,15 @@ pub trait EngineApi {
async fn get_payload_bodies_by_hash_v1(
&self,
block_hashes: Vec<BlockHash>,
) -> Result<Vec<ExecutionPayloadBody>>;
) -> Result<ExecutionPayloadBodies>;

/// See also <https://github.com/ethereum/execution-apis/blob/6452a6b194d7db269bf1dbd087a267251d3cc7f8/src/engine/shanghai.md#engine_getpayloadbodiesbyrangev1>
#[method(name = "engine_getPayloadBodiesByRangeV1")]
async fn get_payload_bodies_by_range_v1(
&self,
start: BlockNumber,
count: u64,
) -> Result<Vec<ExecutionPayloadBody>>;
) -> Result<ExecutionPayloadBodies>;

/// See also <https://github.com/ethereum/execution-apis/blob/6709c2a795b707202e93c4f2867fa0bf2640a84f/src/engine/paris.md#engine_exchangetransitionconfigurationv1>
#[method(name = "engine_exchangeTransitionConfigurationV1")]
Expand Down
Loading