Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Range tracing with worldstate #5844

Merged
merged 9 commits into from
Sep 8, 2023
Merged

Range tracing with worldstate #5844

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6be5931
add range tracing
matkt Sep 4, 2023
8758a0c
fix range
matkt Sep 4, 2023
16aa775
add javadoc
matkt Sep 6, 2023
ad293da
add javadoc
matkt Sep 6, 2023
2efb8d2
Merge branch 'main' into trace-with-worldstate
matkt Sep 6, 2023
fbde305
Merge branch 'main' into trace-with-worldstate
matkt Sep 6, 2023
128b19d
add tests
matkt Sep 8, 2023
6692b34
Merge branch 'main' into trace-with-worldstate
matkt Sep 8, 2023
ea47972
fix javadoc
matkt Sep 8, 2023
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
Next Next commit
add range tracing 
Signed-off-by: Karim TAAM <karim.t2am@gmail.com>
  • Loading branch information
@matkt
matkt committed Sep 4, 2023
commit 6be5931898d84f502693fa9326975e594eb4dfaf
141 changes: 92 additions & 49 deletions besu/src/main/java/org/hyperledger/besu/services/TraceServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,15 @@
import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
import org.hyperledger.besu.ethereum.vm.CachingBlockHashLookup;
import org.hyperledger.besu.evm.worldstate.WorldState;
import org.hyperledger.besu.plugin.Unstable;
import org.hyperledger.besu.plugin.services.TraceService;
import org.hyperledger.besu.plugin.services.tracer.BlockAwareOperationTracer;

import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.function.Consumer;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -88,61 +90,102 @@ public void traceBlock(final Hash hash, final BlockAwareOperationTracer tracer)
block.ifPresent(value -> trace(value, tracer));
}

private void trace(final Block block, final BlockAwareOperationTracer tracer) {
LOG.debug("Tracing block {}", block.toLogString());
final List<TransactionProcessingResult> results = new ArrayList<>();
@Override
public void trace(
final List<Long> blockNumbers,
final Consumer<WorldState> beforeTracing,
final Consumer<WorldState> afterTracing,
final BlockAwareOperationTracer tracer) {
checkArgument(tracer != null);
garyschulte marked this conversation as resolved.
Show resolved Hide resolved
checkArgument(!blockNumbers.isEmpty());
LOG.debug(
"Tracing from block {} to block {}",
blockNumbers.get(0),
blockNumbers.get(blockNumbers.size() - 1));
final Blockchain blockchain = blockchainQueries.getBlockchain();
final List<Block> blocks =
blockNumbers.stream()
.map(
number ->
blockchain
.getBlockByNumber(blockNumbers.get(0))
.orElseThrow(() -> new RuntimeException("Block not found " + number)))
.toList();
Tracer.processTracing(
blockchainQueries,
block.getHash(),
blocks.get(0).getHash(),
garyschulte marked this conversation as resolved.
Show resolved Hide resolved
traceableState -> {
final Blockchain blockchain = blockchainQueries.getBlockchain();
final ChainUpdater chainUpdater = new ChainUpdater(traceableState);
final ProtocolSpec protocolSpec = protocolSchedule.getByBlockHeader(block.getHeader());
final MainnetTransactionProcessor transactionProcessor =
protocolSpec.getTransactionProcessor();
final BlockHeader header = block.getHeader();

tracer.traceStartBlock(block.getHeader(), block.getBody());

block
.getBody()
.getTransactions()
.forEach(
transaction -> {
final Optional<BlockHeader> maybeParentHeader =
blockchain.getBlockHeader(header.getParentHash());
final Wei blobGasPrice =
protocolSpec
.getFeeMarket()
.blobGasPricePerGas(
maybeParentHeader
.map(
parent ->
calculateExcessBlobGasForParent(protocolSpec, parent))
.orElse(BlobGas.ZERO));

tracer.traceStartTransaction(transaction);

final TransactionProcessingResult result =
transactionProcessor.processTransaction(
blockchain,
chainUpdater.getNextUpdater(),
header,
transaction,
header.getCoinbase(),
tracer,
new CachingBlockHashLookup(header, blockchain),
false,
blobGasPrice);

long transactionGasUsed = transaction.getGasLimit() - result.getGasRemaining();
tracer.traceEndTransaction(result.getOutput(), transactionGasUsed, 0);

results.add(result);
});
beforeTracing.accept(traceableState);
final List<TransactionProcessingResult> results = new ArrayList<>();
blocks.forEach(
block -> {
results.addAll(trace(blockchain, block, traceableState, tracer));
tracer.traceEndBlock(block.getHeader(), block.getBody());
});
afterTracing.accept(traceableState);
return Optional.of(results);
});
}

private void trace(final Block block, final BlockAwareOperationTracer tracer) {
LOG.debug("Tracing block {}", block.toLogString());
final Blockchain blockchain = blockchainQueries.getBlockchain();
Tracer.processTracing(
blockchainQueries,
block.getHash(),
traceableState -> Optional.of(trace(blockchain, block, traceableState, tracer)));
tracer.traceEndBlock(block.getHeader(), block.getBody());
}

private List<TransactionProcessingResult> trace(
final Blockchain blockchain,
final Block block,
final Tracer.TraceableState traceableState,
final BlockAwareOperationTracer tracer) {
final List<TransactionProcessingResult> results = new ArrayList<>();
final ChainUpdater chainUpdater = new ChainUpdater(traceableState);
final ProtocolSpec protocolSpec = protocolSchedule.getByBlockHeader(block.getHeader());
final MainnetTransactionProcessor transactionProcessor = protocolSpec.getTransactionProcessor();
final BlockHeader header = block.getHeader();
tracer.traceStartBlock(block.getHeader(), block.getBody());

block
.getBody()
.getTransactions()
.forEach(
transaction -> {
final Optional<BlockHeader> maybeParentHeader =
blockchain.getBlockHeader(header.getParentHash());
final Wei blobGasPrice =
protocolSpec
.getFeeMarket()
.blobGasPricePerGas(
maybeParentHeader
.map(parent -> calculateExcessBlobGasForParent(protocolSpec, parent))
.orElse(BlobGas.ZERO));

tracer.traceStartTransaction(transaction);

final TransactionProcessingResult result =
transactionProcessor.processTransaction(
blockchain,
chainUpdater.getNextUpdater(),
header,
transaction,
header.getCoinbase(),
tracer,
new CachingBlockHashLookup(header, blockchain),
false,
blobGasPrice);

long transactionGasUsed = transaction.getGasLimit() - result.getGasRemaining();
tracer.traceEndTransaction(result.getOutput(), transactionGasUsed, 0);

results.add(result);
});

tracer.traceEndBlock(block.getHeader(), block.getBody());

return results;
}
}
10 changes: 10 additions & 0 deletions plugin-api/src/main/java/org/hyperledger/besu/plugin/services/TraceService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,13 @@
package org.hyperledger.besu.plugin.services;

import org.hyperledger.besu.datatypes.Hash;
import org.hyperledger.besu.evm.worldstate.WorldState;
import org.hyperledger.besu.plugin.Unstable;
import org.hyperledger.besu.plugin.services.tracer.BlockAwareOperationTracer;

import java.util.List;
import java.util.function.Consumer;

/** The Trace service interface */
@Unstable
public interface TraceService extends BesuService {
Expand All @@ -36,4 +40,10 @@ public interface TraceService extends BesuService {
* @param tracer the tracer (OperationTracer)
*/
void traceBlock(Hash hash, BlockAwareOperationTracer tracer);

void trace(
List<Long> blocks,
Consumer<WorldState> beforeTracing,
Consumer<WorldState> afterTracing,
BlockAwareOperationTracer tracer);
}