use v2 api to get block bodies

ethpandaops · Aug 17, 2023 · 57ba3c6 · 57ba3c6
1 parent ff7d5e5
commit 57ba3c6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/indexer/indexer.go b/indexer/indexer.go
@@ -340,6 +340,7 @@ func (indexer *Indexer) runIndexerLoop() error {
 				logger.Errorf("Indexer Error while polling latest head: %v", err)
 			}
 		case <-time.After(30 * time.Second):
+			logger.Info("No head event since 30 secs, polling chain head")
 			err := indexer.pollHeadBlock()
 			if err != nil {
 				logger.Errorf("Indexer Error while polling latest head: %v", err)

diff --git a/rpc/beaconapi.go b/rpc/beaconapi.go
@@ -182,7 +182,10 @@ func (bc *BeaconClient) GetBlockHeaderBySlot(slot uint64) (*rpctypes.StandardV1B
 }
 
 func (bc *BeaconClient) GetBlockBodyByBlockroot(blockroot []byte) (*rpctypes.StandardV2BeaconBlockResponse, error) {
-	resp, err := bc.get(fmt.Sprintf("%s/eth/v1/beacon/blocks/0x%x", bc.endpoint, blockroot))
+	resp, err := bc.get(fmt.Sprintf("%s/eth/v2/beacon/blocks/0x%x", bc.endpoint, blockroot))
+	if err != nil {
+		resp, err = bc.get(fmt.Sprintf("%s/eth/v1/beacon/blocks/0x%x", bc.endpoint, blockroot))
+	}
 	if err != nil {
 		return nil, fmt.Errorf("error retrieving block body for 0x%x: %v", blockroot, err)
 	}