fix compilation errors, rename capella -> shanghai, cleanup some rebase issues

2026-03-23 14:54:45 +00:00 · 2022-04-05 16:55:42 -04:00
parent 809b52715e
commit fe6fc55449
38 changed files with 218 additions and 311 deletions
--- a/validator_client/src/signing_method/web3signer.rs
+++ b/validator_client/src/signing_method/web3signer.rs
@@ -90,8 +90,8 @@ impl<'a, T: EthSpec, Payload: ExecPayload<T>> Web3SignerObject<'a, T, Payload> {
                block: None,
                block_header: Some(block.block_header()),
            }),
-            BeaconBlock::Shanghai(_) => Ok(Web3SignerObject::BeaconBlock {
-                version: ForkName::Shanghai,
+            BeaconBlock::Capella(_) => Ok(Web3SignerObject::BeaconBlock {
+                version: ForkName::Capella,
                block: None,
                block_header: Some(block.block_header()),
            }),