Merge branch 'main' into minhd-vu/style-cmd-usage-strings

Author: minhd-vu

cmd/dumpblocks/dumpblocks.go

@@ -75,9 +75,9 @@ var DumpblocksCmd = &cobra.Command{
 		start := inputDumpblocks.Start
 		end := inputDumpblocks.End
 
-		for start < end {
+		for start <= end {
 			rangeStart := start
-			rangeEnd := min(rangeStart+inputDumpblocks.BatchSize, end)
+			rangeEnd := min(rangeStart+inputDumpblocks.BatchSize-1, end)
 
 			pool <- true
 			wg.Add(1)
@@ -129,7 +129,7 @@ var DumpblocksCmd = &cobra.Command{
 				}
 				<-pool
 			}()
-			start = rangeEnd
+			start = rangeEnd + 1
 		}
 
 		log.Info().Msg("Finished requesting data starting to wait")

util/util.go

@@ -112,21 +112,101 @@ func GetBlockRangeInPages(ctx context.Context, from, to, pageSize uint64, c *eth
 	return allBlocks, nil
 }
 
+var getReceiptsByBlockIsSupported *bool
+
 func GetReceipts(ctx context.Context, rawBlocks []*json.RawMessage, c *ethrpc.Client, batchSize uint64) ([]*json.RawMessage, error) {
+	if getReceiptsByBlockIsSupported == nil {
+		err := c.CallContext(ctx, nil, "eth_getBlockReceipts", "0x0")
+		supported := err == nil
+		getReceiptsByBlockIsSupported = &supported
+	}
+
+	if getReceiptsByBlockIsSupported != nil && *getReceiptsByBlockIsSupported {
+		return getReceiptsByBlock(ctx, rawBlocks, c, batchSize)
+	}
+
+	return getReceiptsByTx(ctx, rawBlocks, c, batchSize)
+}
+
+func getReceiptsByBlock(ctx context.Context, rawBlocks []*json.RawMessage, c *ethrpc.Client, batchSize uint64) ([]*json.RawMessage, error) {
+	var startBlock *string
+	batchElements := make([]ethrpc.BatchElem, 0, len(rawBlocks))
+	for _, rawBlock := range rawBlocks {
+		var block simpleRPCBlock
+		err := json.Unmarshal(*rawBlock, &block)
+		if err != nil {
+			return nil, err
+		}
+		batchElements = append(batchElements, ethrpc.BatchElem{
+			Method: "eth_getBlockReceipts",
+			Args:   []interface{}{block.Number},
+			Result: new([]*json.RawMessage),
+		})
+		if startBlock == nil {
+			startBlock = &block.Number
+		}
+	}
+	if len(batchElements) == 0 {
+		log.Debug().Int("Length of BatchElem", len(batchElements)).Msg("BatchElem is empty")
+		return nil, nil
+	}
+
+	var start uint64 = 0
+	for {
+		last := false
+		end := start + batchSize
+		if int(end) >= len(batchElements) {
+			last = true
+			end = uint64(len(batchElements))
+		}
+
+		log.Trace().Str("startblock", *startBlock).Uint64("start", start).Uint64("end", end).Msg("Fetching receipt range")
+		err := c.BatchCallContext(ctx, batchElements[start:end])
+		if err != nil {
+			log.Error().Err(err).Uint64("start", start).Uint64("end", end).Msg("RPC issue fetching receipts, have you checked the batch size limit of the RPC endpoint and adjusted the --batch-size flag?")
+			break
+		}
+		start = end
+		if last {
+			break
+		}
+	}
+
+	receipts := make([]*json.RawMessage, 0)
+	for _, b := range batchElements {
+		if b.Error != nil {
+			log.Error().Err(b.Error).
+				Interface("blockNumber", b.Args[0]).
+				Msg("Block response err")
+			return nil, b.Error
+		}
+		if b.Result == nil || reflect.ValueOf(b.Result).IsNil() {
+			continue
+		}
+		rs := *(b.Result.(*[]*json.RawMessage))
+		receipts = append(receipts, rs...)
+	}
+	if len(receipts) == 0 {
+		log.Info().Msg("No receipts have been fetched")
+		return nil, nil
+	}
+	log.Info().Int("blocks", len(rawBlocks)).Int("receipts", len(receipts)).Msg("Fetched tx receipts")
+	return receipts, nil
+}
+
+func getReceiptsByTx(ctx context.Context, rawBlocks []*json.RawMessage, c *ethrpc.Client, batchSize uint64) ([]*json.RawMessage, error) {
 	txHashes := make([]string, 0)
 	txHashMap := make(map[string]string, 0)
 	for _, rb := range rawBlocks {
 		var block simpleRPCBlock
 		err := json.Unmarshal(*rb, &block)
 		if err != nil {
 			return nil, err
-
 		}
 		for _, tx := range block.Transactions {
 			txHashes = append(txHashes, tx.Hash)
 			txHashMap[tx.Hash] = block.Number
 		}
-
 	}
 	if len(txHashes) == 0 {
 		return nil, nil
@@ -199,7 +279,7 @@ func GetReceipts(ctx context.Context, rawBlocks []*json.RawMessage, c *ethrpc.Cl
 		receipts = append(receipts, b.Result.(*json.RawMessage))
 	}
 	if len(receipts) == 0 {
-		log.Error().Msg("No receipts have been fetched")
+		log.Info().Msg("No receipts have been fetched")
 		return nil, nil
 	}
 	log.Info().Int("hashes", len(txHashes)).Int("receipts", len(receipts)).Msg("Fetched tx receipts")