Specify finalized head state

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "sw-utils"
-version = "v0.6.20"
+version = "v0.6.21"
 description = "StakeWise Python utils"
 authors = ["StakeWise Labs <[email protected]>"]
 license = "GPL-3.0-or-later"

sw_utils/consensus.py

@@ -206,13 +206,15 @@ def get_consensus_client(
 
 
 async def get_chain_finalized_head(
-    consensus_client: ExtendedAsyncBeacon, slots_per_epoch: int, finality: Finality = 'finalized'
+    consensus_client: ExtendedAsyncBeacon,
+    slots_per_epoch: int,
+    finality: Finality = 'finalized',
 ) -> ChainHead:
     """Fetches the fork safe chain head."""
     checkpoints = await consensus_client.get_finality_checkpoint()
     epoch: int = int(checkpoints['data'][finality]['epoch'])
-    last_slot_id: int = (epoch * slots_per_epoch) + slots_per_epoch - 1
-    for i in range(slots_per_epoch):
+    last_slot_id: int = epoch * slots_per_epoch
+    for i in range(slots_per_epoch + 1):
         try:
             slot = await consensus_client.get_block(str(last_slot_id - i))
         except ClientResponseError as e:
@@ -224,8 +226,8 @@ async def get_chain_finalized_head(
         execution_payload = slot['data']['message']['body']['execution_payload']
         return ChainHead(
             epoch=epoch,
-            consensus_block=last_slot_id - i,
-            execution_block=BlockNumber(int(execution_payload['block_number'])),
+            slot=last_slot_id - i,
+            block_number=BlockNumber(int(execution_payload['block_number'])),
             execution_ts=Timestamp(int(execution_payload['timestamp'])),
         )
 
@@ -252,8 +254,8 @@ async def get_chain_epoch_head(
             execution_payload = slot['data']['message']['body']['execution_payload']
             return ChainHead(
                 epoch=epoch,
-                consensus_block=slot_id - i,
-                execution_block=BlockNumber(int(execution_payload['block_number'])),
+                slot=slot_id - i,
+                block_number=BlockNumber(int(execution_payload['block_number'])),
                 execution_ts=Timestamp(int(execution_payload['timestamp'])),
             )
         except KeyError:  # pre shapella slot
@@ -265,8 +267,8 @@ async def get_chain_epoch_head(
 
             return ChainHead(
                 epoch=epoch,
-                consensus_block=slot_id - i,
-                execution_block=BlockNumber(int(block['number'])),
+                slot=slot_id - i,
+                block_number=BlockNumber(int(block['number'])),
                 execution_ts=Timestamp(int(block['timestamp'])),
             )
 

sw_utils/typings.py

@@ -20,13 +20,17 @@ class ConsensusFork:
 @dataclass
 class ChainHead:
     epoch: int
-    consensus_block: int
-    execution_block: BlockNumber
+    slot: int
+    block_number: BlockNumber
     execution_ts: Timestamp
 
     @property
-    def slot(self) -> int:
-        return self.consensus_block
+    def consensus_block(self) -> int:
+        return self.slot
+
+    @property
+    def execution_block(self) -> BlockNumber:
+        return self.block_number
 
 
 @dataclass