Skip to content

Commit 9309415

Browse files
committed
remove get block from clickhouse verificatino
1 parent e1104ac commit 9309415

3 files changed

Lines changed: 14 additions & 12 deletions

File tree

internal/committer/reorg.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,19 @@ func handleReorgForRange(startBlock uint64, endBlock uint64) error {
225225
return fmt.Errorf("handleReorgForRange: failed to get old block data: %w", err)
226226
}
227227

228+
nonNilOldBlocks := 0
229+
for _, bd := range oldblockDataArray {
230+
if bd != nil {
231+
nonNilOldBlocks++
232+
}
233+
}
234+
log.Debug().
235+
Uint64("start_block", startBlock).
236+
Uint64("end_block", endBlock).
237+
Int("requested_old_blocks", len(oldblockDataArray)).
238+
Int("non_nil_old_blocks", nonNilOldBlocks).
239+
Msg("handleReorgForRange: loaded old block data from ClickHouse")
240+
228241
if err := libs.KafkaPublisherV2.PublishBlockDataReorg(newblockDataArray, oldblockDataArray); err != nil {
229242
log.Error().
230243
Err(err).

internal/libs/clickhouse.go

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -240,18 +240,6 @@ func GetBlockDataFromClickHouseV2(chainId uint64, startBlockNumber uint64, endBl
240240
Msg("skipping block because chainId is nil")
241241
continue
242242
}
243-
if blocksRaw[i].TransactionCount != uint64(len(transactionsRaw[i])) {
244-
log.Info().
245-
Any("transactionCount", blocksRaw[i].TransactionCount).
246-
Msg("skipping block because transactionCount does not match")
247-
continue
248-
}
249-
if (blocksRaw[i].LogsBloom != "" && blocksRaw[i].LogsBloom != EMPTY_LOGS_BLOOM) && len(logsRaw[i]) == 0 {
250-
log.Info().
251-
Any("logsBloom", blocksRaw[i].LogsBloom).
252-
Msg("skipping block because logsBloom is not empty and logsRaw is empty")
253-
continue
254-
}
255243
blockData[i] = &common.BlockData{
256244
Block: blocksRaw[i],
257245
Transactions: transactionsRaw[i],

internal/storage/kafka_publisher.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ func (p *KafkaPublisher) PublishBlockData(blockData []*common.BlockData) error {
116116
}
117117

118118
func (p *KafkaPublisher) PublishBlockDataReorg(newBlockData []*common.BlockData, oldBlockData []*common.BlockData) error {
119+
log.Debug().Int("new_block_data_count", len(newBlockData)).Int("old_block_data_count", len(oldBlockData)).Msg("PublishBlockDataReorg: Publishing block data reorg")
119120
if err := p.publishBlockData(oldBlockData, true, true); err != nil {
120121
return fmt.Errorf("failed to publish old block data: %v", err)
121122
}

0 commit comments

Comments
 (0)