rebased fix merge conflicts

status-im · Oct 30, 2024 · ff16c2f · ff16c2f
1 parent d82defd
commit ff16c2f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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")