feat(l1): implement forkchoiceupdatedv2, newpayloadv2 and getpayloadv2 #1297
Conversation
This reverts commit 4256146.
| serde_json::json!(request.fork_choice_state), | ||
| serde_json::json!(attrs), | ||
| ]), | ||
| ..Default::default() |
There was a problem hiding this comment.
Nit: I'd prefer if we used some explicit fields here.
There was a problem hiding this comment.
I kind of prefer that too... but it's like repeating arbitrary code:
id: RpcRequestId::Number(1),
jsonrpc: "2.0".to_string(),
| @@ -157,3 +150,138 @@ impl RpcHandler for ForkChoiceUpdatedV3 { | |||
| serde_json::to_value(response).map_err(|error| RpcErr::Internal(error.to_string())) | |||
| } | |||
| } | |||
|
|
|||
| trait ForkChoiceUpdatedImpl { | |||
There was a problem hiding this comment.
nit: can we just call it ForkChoiceUpdated?
There was a problem hiding this comment.
There is a struct already named like that
|
|
||
| impl RpcHandler for ForkChoiceUpdatedV2 { | ||
| fn parse(params: &Option<Vec<Value>>) -> Result<Self, RpcErr> { | ||
| Ok(Self(ForkChoiceUpdated::parse(params)?)) |
There was a problem hiding this comment.
where do you validate that params is in fact v2?
There was a problem hiding this comment.
The only difference is the parent_beacon_block_root that shouldn't be present in V2. And it is checked in v2 validate() here
| )); | ||
| } | ||
| let chain_config = storage.get_chain_config()?; | ||
| fork_choice_updated.validate(attributes, chain_config, head_block)?; |
There was a problem hiding this comment.
So this is the only thing that is different between the FCU calls? What if there is any actions besides validating?
There was a problem hiding this comment.
For this call the only difference are the validations and the version field in the PayloadArgs here. If some other action or validation is required we can extend the ForkChoiceUpdatedImpl trait to handle it in each version that implements it
|
Included in #1411 |
Motivation
We need to support post merge
V1,V2andV3forGetPayloadNewPayloadndForkChoiceUpdatedfunctionsDescription
Implemented
V2for those functionsCloses #892, #1184, #1186
Makes to pass about 20 new hive tests