Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -494,12 +494,14 @@ public synchronized void appendBlockWithoutIndexingTransactions(
@Override
public synchronized void appendSyncBlock(
final SyncBlock block, final List<TransactionReceipt> receipts) {
cacheBlockHeader(block.getHeader());
appendSyncBlockHelper(block, receipts, true);
}

@Override
public synchronized void appendSyncBlockWithoutIndexingTransactions(
final SyncBlock block, final List<TransactionReceipt> receipts) {
cacheBlockHeader(block.getHeader());
appendSyncBlockHelper(block, receipts, false);
}

Expand All @@ -514,6 +516,7 @@ public synchronized void storeBlock(

@Override
public void unsafeStoreHeader(final BlockHeader blockHeader, final Difficulty totalDifficulty) {
// as this is used only to store premerge block headers, we don't cache the header in this case
final BlockchainStorage.Updater updater = blockchainStorage.updater();
updater.putBlockHeader(blockHeader.getHash(), blockHeader);
updater.putBlockHash(blockHeader.getNumber(), blockHeader.getBlockHash());
Expand All @@ -528,7 +531,7 @@ private void cacheBlockData(
final Block block,
final List<TransactionReceipt> receipts,
final Optional<BlockAccessList> blockAccessList) {
blockHeadersCache.ifPresent(cache -> cache.put(block.getHash(), block.getHeader()));
cacheBlockHeader(block.getHeader());
blockBodiesCache.ifPresent(cache -> cache.put(block.getHash(), block.getBody()));
transactionReceiptsCache.ifPresent(cache -> cache.put(block.getHash(), receipts));
totalDifficultyCache.ifPresent(
Expand All @@ -537,6 +540,10 @@ private void cacheBlockData(
cache -> blockAccessList.ifPresent(t -> cache.put(block.getHash(), t)));
}

private void cacheBlockHeader(final BlockHeader blockHeader) {
blockHeadersCache.ifPresent(cache -> cache.put(blockHeader.getHash(), blockHeader));
}

private boolean blockShouldBeProcessed(
final Block block, final List<TransactionReceipt> receipts) {
checkArgument(
Expand Down