From ff16c2fe63c693ba069a6ea5b0505aed49bbe531 Mon Sep 17 00:00:00 2001 From: Agnish Ghosh Date: Wed, 30 Oct 2024 19:56:28 +0530 Subject: [PATCH] rebased fix merge conflicts --- beacon_chain/beacon_chain_file.nim | 2 ++ beacon_chain/consensus_object_pools/block_clearance.nim | 4 +++- beacon_chain/consensus_object_pools/blockchain_dag.nim | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/beacon_chain/beacon_chain_file.nim b/beacon_chain/beacon_chain_file.nim index 4333c89d0e..f19d4cf84c 100644 --- a/beacon_chain/beacon_chain_file.nim +++ b/beacon_chain/beacon_chain_file.nim @@ -89,6 +89,8 @@ func getBlobForkCode(fork: ConsensusFork): uint64 = uint64(MaxForksCount) of ConsensusFork.Electra: uint64(MaxForksCount) + uint64(fork) - uint64(ConsensusFork.Deneb) + of ConsensusFork.Fulu: + uint64(MaxForksCount) + uint64(fork) - uint64(ConsensusFork.Electra) of ConsensusFork.Phase0 .. ConsensusFork.Capella: raiseAssert "Blobs are not supported for the fork" diff --git a/beacon_chain/consensus_object_pools/block_clearance.nim b/beacon_chain/consensus_object_pools/block_clearance.nim index d43bfe56ef..2792f6d4d5 100644 --- a/beacon_chain/consensus_object_pools/block_clearance.nim +++ b/beacon_chain/consensus_object_pools/block_clearance.nim @@ -455,7 +455,9 @@ proc addBackfillBlock*( ok() template BlockAdded(kind: static ConsensusFork): untyped = - when kind == ConsensusFork.Electra: + when kind == ConsensusFork.Fulu: + OnFuluBlockAdded + elif kind == ConsensusFork.Electra: OnElectraBlockAdded elif kind == ConsensusFork.Deneb: OnDenebBlockAdded diff --git a/beacon_chain/consensus_object_pools/blockchain_dag.nim b/beacon_chain/consensus_object_pools/blockchain_dag.nim index a95bb4b890..746869813e 100644 --- a/beacon_chain/consensus_object_pools/blockchain_dag.nim +++ b/beacon_chain/consensus_object_pools/blockchain_dag.nim @@ -1013,7 +1013,6 @@ proc applyBlock( ? state_transition( dag.cfg, state, data, cache, info, updateFlags + {slotProcessed}, noRollback) - dag.updateFlags + {slotProcessed}, noRollback) of ConsensusFork.Fulu: let data = getBlock(dag, bid, fulu.TrustedSignedBeaconBlock).valueOr: return err("Block load failed")