Rename Merge to Bellatrix (#5601)

* Rename Merge to Bellatrix * Remove tree-hash-cache which got readded from the rebase
2026-04-19 13:58:28 +00:00 · 2024-04-26 06:19:41 +10:00
parent 320345695d
commit 13f94ef0f3
104 changed files with 808 additions and 714 deletions
--- a/validator_client/src/signing_method/web3signer.rs
+++ b/validator_client/src/signing_method/web3signer.rs
@@ -87,7 +87,7 @@ impl<'a, E: EthSpec, Payload: AbstractExecPayload<E>> Web3SignerObject<'a, E, Pa
                block: Some(block),
                block_header: None,
            }),
-            BeaconBlock::Merge(_) => Ok(Web3SignerObject::BeaconBlock {
+            BeaconBlock::Bellatrix(_) => Ok(Web3SignerObject::BeaconBlock {
                version: ForkName::Bellatrix,
                block: None,
                block_header: Some(block.block_header()),