From e7fc5716d49335d4ca7a400a96c4044707d1bc21 Mon Sep 17 00:00:00 2001 From: Simon Dudley Date: Mon, 30 Jan 2023 20:51:05 +1000 Subject: [PATCH 1/4] Add optional withdrawals to the NewPayload log Signed-off-by: Simon Dudley --- .../engine/AbstractEngineNewPayload.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java index 36ce1cc5976..c14b275ccb7 100644 --- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java @@ -55,6 +55,7 @@ import org.hyperledger.besu.ethereum.trie.MerkleTrieException; import org.hyperledger.besu.plugin.services.exception.StorageException; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Optional; @@ -320,16 +321,24 @@ protected EngineStatus getInvalidBlockHashStatus() { } private void logImportedBlockInfo(final Block block, final double timeInS) { - LOG.info( - String.format( - "Imported #%,d / %d tx / base fee %s / %,d (%01.1f%%) gas / (%s) in %01.3fs. Peers: %d", - block.getHeader().getNumber(), - block.getBody().getTransactions().size(), + final StringBuilder message = new StringBuilder(); + List messageArgs = + new ArrayList<>( + List.of(block.getHeader().getNumber(), block.getBody().getTransactions().size())); + message.append("Imported #%,d / %d tx"); + if (block.getBody().getWithdrawals().isPresent()) { + message.append(" / %s ws"); + messageArgs.add(block.getBody().getWithdrawals().get().size()); + } + message.append(" / base fee %s / %,d (%01.1f%%) gas / (%s) in %01.3fs. Peers: %d"); + messageArgs.addAll( + List.of( block.getHeader().getBaseFee().map(Wei::toHumanReadableString).orElse("N/A"), block.getHeader().getGasUsed(), (block.getHeader().getGasUsed() * 100.0) / block.getHeader().getGasLimit(), block.getHash().toHexString(), timeInS, ethPeers.peerCount())); + LOG.info(String.format(message.toString(), messageArgs.toArray())); } } From 02cde400b656eda6e9d65074b3e7fb690e569e71 Mon Sep 17 00:00:00 2001 From: Simon Dudley Date: Mon, 30 Jan 2023 20:58:18 +1000 Subject: [PATCH 2/4] Missed final Signed-off-by: Simon Dudley --- .../internal/methods/engine/AbstractEngineNewPayload.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java index c14b275ccb7..86956ddf379 100644 --- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java @@ -322,7 +322,7 @@ protected EngineStatus getInvalidBlockHashStatus() { private void logImportedBlockInfo(final Block block, final double timeInS) { final StringBuilder message = new StringBuilder(); - List messageArgs = + final List messageArgs = new ArrayList<>( List.of(block.getHeader().getNumber(), block.getBody().getTransactions().size())); message.append("Imported #%,d / %d tx"); From 95ab2a57c6edcf5f4ff82ea63faa00e35e9d47ee Mon Sep 17 00:00:00 2001 From: Simon Dudley Date: Mon, 30 Jan 2023 21:00:59 +1000 Subject: [PATCH 3/4] Tidy up Signed-off-by: Simon Dudley --- .../internal/methods/engine/AbstractEngineNewPayload.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java index 86956ddf379..178d505701a 100644 --- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java @@ -322,10 +322,10 @@ protected EngineStatus getInvalidBlockHashStatus() { private void logImportedBlockInfo(final Block block, final double timeInS) { final StringBuilder message = new StringBuilder(); + message.append("Imported #%,d / %d tx"); final List messageArgs = new ArrayList<>( List.of(block.getHeader().getNumber(), block.getBody().getTransactions().size())); - message.append("Imported #%,d / %d tx"); if (block.getBody().getWithdrawals().isPresent()) { message.append(" / %s ws"); messageArgs.add(block.getBody().getWithdrawals().get().size()); From 5504c0001efb93fd23ddeae6e4cf218b09847ee5 Mon Sep 17 00:00:00 2001 From: Simon Dudley Date: Mon, 30 Jan 2023 21:08:47 +1000 Subject: [PATCH 4/4] Minor format tweak Signed-off-by: Simon Dudley --- .../internal/methods/engine/AbstractEngineNewPayload.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java index 178d505701a..de4b2a12f6c 100644 --- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java @@ -327,7 +327,7 @@ private void logImportedBlockInfo(final Block block, final double timeInS) { new ArrayList<>( List.of(block.getHeader().getNumber(), block.getBody().getTransactions().size())); if (block.getBody().getWithdrawals().isPresent()) { - message.append(" / %s ws"); + message.append(" / %d ws"); messageArgs.add(block.getBody().getWithdrawals().get().size()); } message.append(" / base fee %s / %,d (%01.1f%%) gas / (%s) in %01.3fs. Peers: %d");