Fix isGenesis implementation and add REST test rules for both calls.

status-im · Sep 18, 2024 · 23e6d3b · 23e6d3b
1 parent b216cba
commit 23e6d3b
Show file tree

Hide file tree

Showing 2 changed files with 383 additions and 4 deletions.
diff --git a/beacon_chain/rpc/rest_rewards_api.nim b/beacon_chain/rpc/rest_rewards_api.nim
@@ -21,10 +21,18 @@ export rest_utils
 
 logScope: topics = "rest_rewardsapi"
 
-func isGenesis(blockId: BlockIdent, genesisBsid: BlockSlotId): bool =
+func isGenesis(node: BeaconNode,
+               blockId: BlockIdent,
+               genesisBsid: BlockSlotId): bool =
   case blockId.kind
   of BlockQueryKind.Named:
-    blockId.value == BlockIdentType.Genesis
+    case blockId.value
+    of BlockIdentType.Genesis:
+      true
+    of BlockIdentType.Head:
+      node.dag.head.bid.slot == GENESIS_SLOT
+    of BlockIdentType.Finalized:
+      node.dag.finalizedHead.slot == GENESIS_SLOT
   of BlockQueryKind.Slot:
     blockId.slot == GENESIS_SLOT
   of BlockQueryKind.Root:
@@ -51,7 +59,7 @@ proc installRewardsApiHandlers*(router: var RestRouter, node: BeaconNode) =
         return RestApiResponse.jsonError(Http400, InvalidBlockIdValueError,
                                          $error)
 
-    if bident.isGenesis(genesisBsid):
+    if node.isGenesis(bident, genesisBsid):
       return RestApiResponse.response(
         genesisBlockRewardsResponse, Http200, "application/json")
 
@@ -140,7 +148,7 @@ proc installRewardsApiHandlers*(router: var RestRouter, node: BeaconNode) =
 
       targetBlock =
         withBlck(bdata):
-          if bident.isGenesis(genesisBsid):
+          if node.isGenesis(bident, genesisBsid):
             genesisBsid
           else:
             let parentBid =