Merge branch 'andrius/audit-fixes-2026-05-14' into 'main'

fix(M-01): drop log-batch parallelism, default log_range to 1000

See merge request flarenetwork/FSP/flare-system-c-chain-indexer!84

Author: adg-flare

config.example.toml

@@ -3,9 +3,9 @@ mode = "full" # "full" (default) or "fsp"
 start_index = 0 # start block; set only when history_drop = 0.
 stop_index = 0 # stop block; set 0 to index indefinitely
 history_epochs = 0 # FSP mode only: 0=last 2 hours, >0=number of reward epochs to keep/index from
-num_parallel_req = 100 # number of parallel requests to the chain
-batch_size = 1000 # the number of blocks that will be pushed to a database in a batch (should be divisible by num_parallel_req)
-log_range = 1024 # max blocks per eth_getLogs request; set to your RPC's getLogs cap (typically 100-10000)
+num_parallel_req = 100 # concurrency cap for block (eth_getBlockByNumber) and receipt (eth_getTransactionReceipt) fetches during history catchup
+batch_size = 1000 # number of blocks committed to the database in a single transaction during history catchup
+log_range = 1000 # max blocks per eth_getLogs request during history catchup; set to your RPC's getLogs cap (typically 100-10000)
 new_block_check_millis = 1000 # interval for checking for new blocks
 confirmations = 1 # number of confirmations for latest block queries
 no_new_blocks_delay_warning = 60 # max allowed delay between consecutive processed blocks before warning; 0 disables warning

internal/config/config.go

@@ -25,7 +25,7 @@ const (
 	defaultChainType               chain.ChainType = chain.ChainTypeAvax
 	defaultIndexerMode                             = IndexerModeFull
 	defaultFspIndexLookbackSeconds                 = uint64(2 * time.Hour / time.Second)
-	defaultLogRange                                = uint64(1024)
+	defaultLogRange                                = uint64(1000)
 )
 
 var (

internal/core/engine.go

@@ -313,30 +313,17 @@ func (ci *Engine) obtainLogsBatch(
 ) (*logsBatch, error) {
 	lgBatch := new(logsBatch)
 	startTime := time.Now()
-	numRequests := ci.params.BatchSize / ci.params.LogRange
-	perRunner := numRequests / uint64(ci.params.NumParallelReq)
 
 	for _, logInfo := range ci.params.CollectLogs {
-		eg, ctx := errgroup.WithContext(ctx)
-
-		for i := 0; i < ci.params.NumParallelReq; i++ {
-			start := batchIx + perRunner*ci.params.LogRange*uint64(i)
-			stop := batchIx + perRunner*ci.params.LogRange*uint64(i+1)
-
-			eg.Go(func() error {
-				return ci.requestLogs(
-					ctx,
-					lgBatch,
-					logInfo,
-					start,
-					stop,
-					lastBlockNumInRound,
-				)
-			})
-		}
+		for fromBlock := batchIx; fromBlock <= lastBlockNumInRound; fromBlock += ci.params.LogRange {
+			toBlock := min(fromBlock+ci.params.LogRange-1, lastBlockNumInRound)
 
-		if err := eg.Wait(); err != nil {
-			return nil, err
+			logs, err := ci.fetchLogsChunk(ctx, logInfo, fromBlock, toBlock)
+			if err != nil {
+				return nil, err
+			}
+
+			lgBatch.logs = append(lgBatch.logs, logs...)
 		}
 	}