mirror of https://github.com/hyperledger/besu
[NC-2138] Complete fast sync chain download (#701)
* Download receipts * store blocks without processing transactions * Only apply light validation during fast sync. * Mark fast sync chain download as complete when pivot block has been reached. Signed-off-by: Adrian Sutton <adrian.sutton@consensys.net>pull/2/head
Adrian Sutton
6 years ago
committed by
GitHub
parent
1489fa5543
commit
254661683b
@ -0,0 +1,41 @@ |
||||
/* |
||||
* Copyright 2019 ConsenSys AG. |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with |
||||
* the License. You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on |
||||
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the |
||||
* specific language governing permissions and limitations under the License. |
||||
*/ |
||||
package tech.pegasys.pantheon.ethereum.eth.sync.fastsync; |
||||
|
||||
import tech.pegasys.pantheon.ethereum.core.Block; |
||||
import tech.pegasys.pantheon.ethereum.core.BlockHeader; |
||||
import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; |
||||
|
||||
import java.util.List; |
||||
|
||||
class BlockWithReceipts { |
||||
private final Block block; |
||||
private final List<TransactionReceipt> receipts; |
||||
|
||||
BlockWithReceipts(final Block block, final List<TransactionReceipt> receipts) { |
||||
this.block = block; |
||||
this.receipts = receipts; |
||||
} |
||||
|
||||
public BlockHeader getHeader() { |
||||
return block.getHeader(); |
||||
} |
||||
|
||||
public Block getBlock() { |
||||
return block; |
||||
} |
||||
|
||||
public List<TransactionReceipt> getReceipts() { |
||||
return receipts; |
||||
} |
||||
} |
||||
@ -0,0 +1,111 @@ |
||||
/* |
||||
* Copyright 2019 ConsenSys AG. |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with |
||||
* the License. You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on |
||||
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the |
||||
* specific language governing permissions and limitations under the License. |
||||
*/ |
||||
package tech.pegasys.pantheon.ethereum.eth.sync.fastsync; |
||||
|
||||
import static java.util.Collections.emptyList; |
||||
|
||||
import tech.pegasys.pantheon.ethereum.ProtocolContext; |
||||
import tech.pegasys.pantheon.ethereum.core.Block; |
||||
import tech.pegasys.pantheon.ethereum.core.BlockHeader; |
||||
import tech.pegasys.pantheon.ethereum.core.BlockImporter; |
||||
import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; |
||||
import tech.pegasys.pantheon.ethereum.eth.manager.AbstractPeerTask.PeerTaskResult; |
||||
import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; |
||||
import tech.pegasys.pantheon.ethereum.eth.sync.tasks.CompleteBlocksTask; |
||||
import tech.pegasys.pantheon.ethereum.eth.sync.tasks.GetReceiptsFromPeerTask; |
||||
import tech.pegasys.pantheon.ethereum.eth.sync.tasks.PipelinedImportChainSegmentTask.BlockHandler; |
||||
import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode; |
||||
import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; |
||||
import tech.pegasys.pantheon.metrics.LabelledMetric; |
||||
import tech.pegasys.pantheon.metrics.OperationTimer; |
||||
|
||||
import java.util.List; |
||||
import java.util.Map; |
||||
import java.util.concurrent.CompletableFuture; |
||||
import java.util.stream.Collectors; |
||||
|
||||
import org.apache.logging.log4j.LogManager; |
||||
import org.apache.logging.log4j.Logger; |
||||
|
||||
public class FastSyncBlockHandler<C> implements BlockHandler<BlockWithReceipts> { |
||||
private static final Logger LOG = LogManager.getLogger(); |
||||
|
||||
private final ProtocolSchedule<C> protocolSchedule; |
||||
private final ProtocolContext<C> protocolContext; |
||||
private final EthContext ethContext; |
||||
private final LabelledMetric<OperationTimer> ethTasksTimer; |
||||
|
||||
public FastSyncBlockHandler( |
||||
final ProtocolSchedule<C> protocolSchedule, |
||||
final ProtocolContext<C> protocolContext, |
||||
final EthContext ethContext, |
||||
final LabelledMetric<OperationTimer> ethTasksTimer) { |
||||
this.protocolSchedule = protocolSchedule; |
||||
this.protocolContext = protocolContext; |
||||
this.ethContext = ethContext; |
||||
this.ethTasksTimer = ethTasksTimer; |
||||
} |
||||
|
||||
@Override |
||||
public CompletableFuture<List<BlockWithReceipts>> downloadBlocks( |
||||
final List<BlockHeader> headers) { |
||||
return downloadBodies(headers) |
||||
.thenCombine(downloadReceipts(headers), this::combineBlocksAndReceipts); |
||||
} |
||||
|
||||
private CompletableFuture<List<Block>> downloadBodies(final List<BlockHeader> headers) { |
||||
return CompleteBlocksTask.forHeaders(protocolSchedule, ethContext, headers, ethTasksTimer) |
||||
.run(); |
||||
} |
||||
|
||||
private CompletableFuture<Map<BlockHeader, List<TransactionReceipt>>> downloadReceipts( |
||||
final List<BlockHeader> headers) { |
||||
return GetReceiptsFromPeerTask.forHeaders(ethContext, headers, ethTasksTimer) |
||||
.run() |
||||
.thenApply(PeerTaskResult::getResult); |
||||
} |
||||
|
||||
private List<BlockWithReceipts> combineBlocksAndReceipts( |
||||
final List<Block> blocks, final Map<BlockHeader, List<TransactionReceipt>> receiptsByHeader) { |
||||
return blocks |
||||
.stream() |
||||
.map( |
||||
block -> { |
||||
final List<TransactionReceipt> receipts = |
||||
receiptsByHeader.getOrDefault(block.getHeader(), emptyList()); |
||||
return new BlockWithReceipts(block, receipts); |
||||
}) |
||||
.collect(Collectors.toList()); |
||||
} |
||||
|
||||
@Override |
||||
public CompletableFuture<List<BlockWithReceipts>> validateAndImportBlocks( |
||||
final List<BlockWithReceipts> blocksWithReceipts) { |
||||
LOG.debug( |
||||
"Storing blocks {} to {}", |
||||
blocksWithReceipts.get(0).getHeader().getNumber(), |
||||
blocksWithReceipts.get(blocksWithReceipts.size() - 1).getHeader().getNumber()); |
||||
blocksWithReceipts.forEach( |
||||
block -> { |
||||
final BlockImporter<C> blockImporter = |
||||
protocolSchedule.getByBlockNumber(block.getHeader().getNumber()).getBlockImporter(); |
||||
// TODO: This is still doing full ommer validation. Is that required?
|
||||
blockImporter.fastImportBlock( |
||||
protocolContext, |
||||
block.getBlock(), |
||||
block.getReceipts(), |
||||
HeaderValidationMode.LIGHT_SKIP_DETACHED); |
||||
}); |
||||
return CompletableFuture.completedFuture(blocksWithReceipts); |
||||
} |
||||
} |
||||
@ -0,0 +1,88 @@ |
||||
/* |
||||
* Copyright 2019 ConsenSys AG. |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with |
||||
* the License. You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on |
||||
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the |
||||
* specific language governing permissions and limitations under the License. |
||||
*/ |
||||
package tech.pegasys.pantheon.ethereum.eth.sync.fullsync; |
||||
|
||||
import tech.pegasys.pantheon.ethereum.ProtocolContext; |
||||
import tech.pegasys.pantheon.ethereum.core.Block; |
||||
import tech.pegasys.pantheon.ethereum.core.BlockHeader; |
||||
import tech.pegasys.pantheon.ethereum.core.Transaction; |
||||
import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; |
||||
import tech.pegasys.pantheon.ethereum.eth.sync.tasks.CompleteBlocksTask; |
||||
import tech.pegasys.pantheon.ethereum.eth.sync.tasks.PersistBlockTask; |
||||
import tech.pegasys.pantheon.ethereum.eth.sync.tasks.PipelinedImportChainSegmentTask.BlockHandler; |
||||
import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode; |
||||
import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; |
||||
import tech.pegasys.pantheon.metrics.LabelledMetric; |
||||
import tech.pegasys.pantheon.metrics.OperationTimer; |
||||
|
||||
import java.util.List; |
||||
import java.util.concurrent.CompletableFuture; |
||||
|
||||
import org.apache.logging.log4j.LogManager; |
||||
import org.apache.logging.log4j.Logger; |
||||
|
||||
public class FullSyncBlockHandler<C> implements BlockHandler<Block> { |
||||
private static final Logger LOG = LogManager.getLogger(); |
||||
|
||||
private final ProtocolSchedule<C> protocolSchedule; |
||||
private final ProtocolContext<C> protocolContext; |
||||
private final EthContext ethContext; |
||||
private final LabelledMetric<OperationTimer> ethTasksTimer; |
||||
|
||||
public FullSyncBlockHandler( |
||||
final ProtocolSchedule<C> protocolSchedule, |
||||
final ProtocolContext<C> protocolContext, |
||||
final EthContext ethContext, |
||||
final LabelledMetric<OperationTimer> ethTasksTimer) { |
||||
this.protocolSchedule = protocolSchedule; |
||||
this.protocolContext = protocolContext; |
||||
this.ethContext = ethContext; |
||||
this.ethTasksTimer = ethTasksTimer; |
||||
} |
||||
|
||||
@Override |
||||
public CompletableFuture<List<Block>> validateAndImportBlocks(final List<Block> blocks) { |
||||
LOG.debug( |
||||
"Validating and importing {} to {}", |
||||
blocks.get(0).getHeader().getNumber(), |
||||
blocks.get(blocks.size() - 1).getHeader().getNumber()); |
||||
return PersistBlockTask.forSequentialBlocks( |
||||
protocolSchedule, |
||||
protocolContext, |
||||
blocks, |
||||
HeaderValidationMode.SKIP_DETACHED, |
||||
ethTasksTimer) |
||||
.get(); |
||||
} |
||||
|
||||
@Override |
||||
public CompletableFuture<List<Block>> downloadBlocks(final List<BlockHeader> headers) { |
||||
return CompleteBlocksTask.forHeaders(protocolSchedule, ethContext, headers, ethTasksTimer) |
||||
.run() |
||||
.thenCompose(this::extractTransactionSenders); |
||||
} |
||||
|
||||
private CompletableFuture<List<Block>> extractTransactionSenders(final List<Block> blocks) { |
||||
LOG.debug( |
||||
"Extracting sender {} to {}", |
||||
blocks.get(0).getHeader().getNumber(), |
||||
blocks.get(blocks.size() - 1).getHeader().getNumber()); |
||||
for (final Block block : blocks) { |
||||
for (final Transaction transaction : block.getBody().getTransactions()) { |
||||
// This method internally performs the transaction sender extraction.
|
||||
transaction.getSender(); |
||||
} |
||||
} |
||||
return CompletableFuture.completedFuture(blocks); |
||||
} |
||||
} |
||||
Loading…
Reference in new issue