reintroduce checking of block height for certain tasks when we are not PoS (Revert PR#3911) #5083

pinges · 2023-02-10T07:01:55Z

fixes issue #5061

Signed-off-by: Stefan stefan.pingel@consensys.net

…t PoS (Revert PR#3911) Signed-off-by: Stefan <stefan.pingel@consensys.net>

fab-10

Since I think that info if the network is running on PoS should be in ProtocolSpec, I did a PR for that, note that it is not yet complete, since the revert of some minimunRequiredBlockNumber has still to be done, but it should give an idea.
Many files are modified only to pass new constructor params, so the main ones to check are:
EthPeers, ProtocolSpec and MainnetProtocolSpecs

fab-10 · 2023-02-10T18:28:42Z

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSchedule.java

 import java.util.stream.Stream;

-public interface ProtocolSchedule
-    extends HeaderBasedProtocolSchedule, PrivacySupportingProtocolSchedule {
+public abstract class ProtocolSchedule


The information if the network is running PoS or not, should not be here, but in the ProtocolSpec returned when querying ProtocolSchedule, since that is the standard way of getting info that changes with the protocol.
Since it could be complex to explain in words, I drafted a PR that added the info if the network is a PoS to ProtocolSpec, please check it here #5085

fab-10 · 2023-02-10T18:31:42Z

.../eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetBodiesFromPeerTask.java

@@ -83,12 +83,15 @@ public static GetBodiesFromPeerTask forHeaders(
  protected PendingPeerRequest sendRequest() {
    final List<Hash> blockHashes =
        headers.stream().map(BlockHeader::getHash).collect(Collectors.toList());
+    final long minimumRequiredBlockNumber =
+        protocolSchedule.isPostMerge() ? 0 : headers.get(headers.size() - 1).getNumber();


another thing that I have done in my PR is to do a catch all check directly in EthPeers::executePeerRequest so we do not need to repeat it everywhere

Signed-off-by: Stefan <stefan.pingel@consensys.net>

fab-10

looks good, only some code to remove since no more useful

fab-10 · 2023-02-14T13:37:22Z

.../eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BackwardSyncStep.java

+    final Optional<BlockHeader> maybeFinalizedHeader =
+        context
+            .getProtocolContext()
+            .getBlockchain()
+            .getFinalized()
+            .flatMap(context.getProtocolContext().getBlockchain()::getBlockHeader);

    final RetryingGetHeadersEndingAtFromPeerByHashTask
        retryingGetHeadersEndingAtFromPeerByHashTask =
            RetryingGetHeadersEndingAtFromPeerByHashTask.endingAtHash(
                context.getProtocolSchedule(),
                context.getEthContext(),
                hash,
+                maybeFinalizedHeader.map(BlockHeader::getNumber).orElse(0L),


No need to revert this part, since backward sync is always on PoS, so you can statically set 0 here

Signed-off-by: Stefan <stefan.pingel@consensys.net>

macfarla

LGTM

Sally has checked the changes :-)

…t PoS (Revert PR#3911) (hyperledger#5083) * reintroduce checking of block height for certain tasks when we are not PoS (Revert PR#3911) Signed-off-by: Stefan Pingel <16143240+pinges@users.noreply.github.com>

…t PoS (Revert PR#3911) (hyperledger#5083) * reintroduce checking of block height for certain tasks when we are not PoS (Revert PR#3911) Signed-off-by: Stefan <stefan.pingel@consensys.net>

…t PoS (Revert PR#3911) (hyperledger#5083) * reintroduce checking of block height for certain tasks when we are not PoS (Revert PR#3911) Signed-off-by: Stefan Pingel <16143240+pinges@users.noreply.github.com>

* Prepare for version 23.1.1-SNAPSHOT (#5067) Signed-off-by: Simon Dudley <simon.dudley@consensys.net> * Add getPayloadBodiesByRangeV1 and getPayloadBodiesByHash engine methods (#4980) * Add engine get payload body methods and test Signed-off-by: Zhenyang Shi <wcgcyx@gmail.com> Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * Add header Signed-off-by: Zhenyang Shi <wcgcyx@gmail.com> * Update result struct & add test Signed-off-by: Zhenyang Shi <wcgcyx@gmail.com> * Change constant to use upper case Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * Add PayloadBody class and withdrawals to response of methods Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * Add unit tests Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * Add changelog Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * spotless Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * Add check to prevent returning trailing null results past the head Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * Add test to check trailing null post head scenario Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * Split tests into pre and post shanghai Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * spotless Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * Rename methods Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * Use getName() to log method name Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * spotless Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * Rename variable Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * Call constructor directly Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * Fix ByHash json parsing Signed-off-by: Simon Dudley <simon.dudley@consensys.net> * Fix json parsing again Signed-off-by: Simon Dudley <simon.dudley@consensys.net> * Add check to prevent unnecessary queries Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * Refactor method Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * Add new error code for EngineGetPayloadBodies methods Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * Add return error for request above the API limit Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * Add constructor for empty response Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * add check for number of blocks requested and for requests of post head Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * Add test to check error code when request exceeds API limits Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * add constant for max blocks allowed per request Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * spotless Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * Fix some nits Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * Add invalid params check Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * Add tests for invalid params check Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * Fix test and spotless Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * Revert "Fix json parsing again" This reverts commit 558d325. Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * Revert "Fix ByHash json parsing Signed-off-by: Simon Dudley <simon.dudley@consensys.net>" This reverts commit 663e11e Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * Use UnsignedLongParameter to cast params of the request Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * Add optional withdrawals to the NewPayload log (#5021) Signed-off-by: Simon Dudley <simon.dudley@consensys.net> * kubernetes and errorprone - update versions (#5013) * update errorprone and kubernetes versions * fixed errorprone issues in prod cod * fixed errorprone issues in test code --------- Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> * Rename JsonRpcService to EngineJsonRpcService (#5036) * rename JsonRpcService to EngineJsonRpcService Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> * Params should be single item of array type, not outer array of strings (#5037) Signed-off-by: Simon Dudley <simon.dudley@consensys.net> * Add EIP-2537 (BLS12-381 curve precompiles) to Cancun (#5017) Add the BLS curve precompiles into the registry for cancun. All of the curve precompiles have been here since berlin, so this is just wiring them in. Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> * Use UnsignedLongParameter to cast params of the request Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * Add optional withdrawals to the NewPayload log (#5021) Signed-off-by: Simon Dudley <simon.dudley@consensys.net> * kubernetes and errorprone - update versions (#5013) * update errorprone and kubernetes versions * fixed errorprone issues in prod cod * fixed errorprone issues in test code --------- Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> * Rename JsonRpcService to EngineJsonRpcService (#5036) * rename JsonRpcService to EngineJsonRpcService Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> * Params should be single item of array type, not outer array of strings (#5037) Signed-off-by: Simon Dudley <simon.dudley@consensys.net> * Add EIP-2537 (BLS12-381 curve precompiles) to Cancun (#5017) Add the BLS curve precompiles into the registry for cancun. All of the curve precompiles have been here since berlin, so this is just wiring them in. Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> * Convert start and count from hex to match JSON-RPC Spec standard Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> --------- Signed-off-by: Zhenyang Shi <wcgcyx@gmail.com> Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> Signed-off-by: Simon Dudley <simon.dudley@consensys.net> Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> Co-authored-by: Zhenyang Shi <wcgcyx@gmail.com> Co-authored-by: Simon Dudley <simon.dudley@consensys.net> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Daniel Lehrner <daniel.lehrner@consensys.net> Co-authored-by: Danno Ferrin <danno.ferrin@swirldslabs.com> * Revert "Keep Worldstate Storage open for Bonsai archive latest layer (#5039)" (#5073) This reverts commit e715010. Signed-off-by: Simon Dudley <simon.dudley@consensys.net> * Support post merge forks at genesis for hive tests (#5019) Signed-off-by: Jason Frame <jason.frame@consensys.net> * Fix manifest docker not skipping interim builds for RCs (#5068) Signed-off-by: Jason Frame <jason.frame@consensys.net> * Fix PoS checkpoint validation (#5081) * change validation to lessThan Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * Change exception message to PoS instead of Near head Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * Add unit test and fix message of existing unit test Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> --------- Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * moves check for init code length before balance check (#5077) Signed-off-by: Justin Florentine <justin+github@florentine.us> * bump revision for 23.1.x release branch Signed-off-by: garyschulte <garyschulte@gmail.com> * Burn in build of 23.1.0 (#5093) * rebase off of burn-in release, remove unreleased 23.1.0-RC2 from CHANGELOG Signed-off-by: garyschulte <garyschulte@gmail.com> Signed-off-by: Simon Dudley <simon.dudley@consensys.net> Signed-off-by: Ameziane H <ameziane.hamlat@consensys.net> Signed-off-by: Karim TAAM <karim.t2am@gmail.com> * re-default global max rpc batch size to 1k (#5104) (#5105) * default global max rpc batch size to 1000 for now Signed-off-by: garyschulte <garyschulte@gmail.com> * Fix Layered World State issue (#5076) * Use the copy during prepareTrieLog instead of saveTrieLog * add final flag on BonsaiWorldStateUpdater * Use a copy of BonsaiInMemoryWorldState inside prepareTrieLog * add link to persisted worldstate storage * fix tests * Make a copy of the worldstate after committing changes to the trielog * spotless + remove maybeUnSubscribe in setNextWorldView * subscribe storage on layered worldstate * fix null issue * not close layered worldstate during getAccount * clean code * Add changelog entry --------- Signed-off-by: ahamlat <ameziane.hamlat@consensys.net> Signed-off-by: Karim TAAM <karim.t2am@gmail.com> Co-authored-by: Karim TAAM <karim.t2am@gmail.com> * Add shanghaiTime to sepolia (#5088) Update and fix forkId tests Move timestamp forks from getForkBlockNumbers to getForkBlockTimestamps in JsonGenesisConfigOptions - this ultimately gets used to popoulate the ForkIdManager which handles lists of blocks and timestamps the same way so this hasn't changed any actual behaviour, but rather supports the test fixes. Implement TransitionProtocolSchedule.streamMilestoneBlocks as a concatenation of blockNumbers++blockTimestamps. This may have been a latent bug since it's used to update the node record when a fork transition occurs. Signed-off-by: Simon Dudley <simon.dudley@consensys.net> * If a PoS block creation repetition takes less than a configurable dur… (#5048) * If a PoS block creation repetition takes less than a configurable duration, then waits before next repetition Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Update CHANGELOG Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Add unit test Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Update besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Update besu/src/main/java/org/hyperledger/besu/cli/options/unstable/MiningOptions.java Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> --------- Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> * Allow dashes in ethstats password (#5090) Signed-off-by: Simon Dudley <simon.dudley@consensys.net> * reintroduce checking of block height for certain tasks when we are not PoS (Revert PR#3911) (#5083) * reintroduce checking of block height for certain tasks when we are not PoS (Revert PR#3911) Signed-off-by: Stefan Pingel <16143240+pinges@users.noreply.github.com> * Allow other users to read the /opt/besu dir when using docker (#5092) Signed-off-by: Rafael Matias <rafael@skyle.net> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> * Only use MAINNET version of KZG (#5095) Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * add more context to exception messages and debug logging (#5066) Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> * Fix block value calculation (#5100) * Add gasUsed calculation Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * Fix unit test Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * Fix typo Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> --------- Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * Add 23.1.1-RC1 changelog Signed-off-by: Jason Frame <jason.frame@consensys.net> * Change version to 23.1.1-RC1 Signed-off-by: Jason Frame <jason.frame@consensys.net> --------- Signed-off-by: Simon Dudley <simon.dudley@consensys.net> Signed-off-by: Zhenyang Shi <wcgcyx@gmail.com> Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> Signed-off-by: Jason Frame <jason.frame@consensys.net> Signed-off-by: Justin Florentine <justin+github@florentine.us> Signed-off-by: garyschulte <garyschulte@gmail.com> Signed-off-by: Ameziane H <ameziane.hamlat@consensys.net> Signed-off-by: Karim TAAM <karim.t2am@gmail.com> Signed-off-by: ahamlat <ameziane.hamlat@consensys.net> Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> Signed-off-by: Stefan Pingel <16143240+pinges@users.noreply.github.com> Signed-off-by: Rafael Matias <rafael@skyle.net> Co-authored-by: Simon Dudley <simon.dudley@consensys.net> Co-authored-by: Gabriel Fukushima <gabrielfukushima@gmail.com> Co-authored-by: Zhenyang Shi <wcgcyx@gmail.com> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Daniel Lehrner <daniel.lehrner@consensys.net> Co-authored-by: Danno Ferrin <danno.ferrin@swirldslabs.com> Co-authored-by: Justin Florentine <justin+github@florentine.us> Co-authored-by: garyschulte <garyschulte@gmail.com> Co-authored-by: ahamlat <ameziane.hamlat@consensys.net> Co-authored-by: Karim TAAM <karim.t2am@gmail.com> Co-authored-by: Fabio Di Fabio <fabio.difabio@consensys.net> Co-authored-by: Stefan Pingel <16143240+pinges@users.noreply.github.com> Co-authored-by: Rafael Matias <rafael@skyle.net>

…t PoS (Revert PR#3911) (hyperledger#5083) * reintroduce checking of block height for certain tasks when we are not PoS (Revert PR#3911) Signed-off-by: Stefan <stefan.pingel@consensys.net>

reintroduce checking of block height for certain tasks when we are no…

b677f6c

…t PoS (Revert PR#3911) Signed-off-by: Stefan <stefan.pingel@consensys.net>

pinges requested a review from fab-10 February 10, 2023 07:02

fab-10 reviewed Feb 10, 2023

View reviewed changes

pinges added 2 commits February 13, 2023 15:22

Merge branch 'main' of github.com:hyperledger/besu into revert3911

eea1da8

make some changes after review by Fabio

f1d9de6

Signed-off-by: Stefan <stefan.pingel@consensys.net>

pinges requested a review from fab-10 February 14, 2023 03:06

pinges added 2 commits February 14, 2023 13:14

merged

3e7e1b1

Merge branch 'main' of github.com:hyperledger/besu into revert3911

a96da12

fab-10 previously requested changes Feb 14, 2023

View reviewed changes

fab-10 mentioned this pull request Feb 14, 2023

Do not enforce min block number when sending peer requests on a PoS n… #5085

Closed

3 tasks

pinges added 2 commits February 15, 2023 11:19

remove some code that is not needed

e12ac32

Signed-off-by: Stefan <stefan.pingel@consensys.net>

Merge branch 'main' of github.com:hyperledger/besu into revert3911

a27afb0

pinges enabled auto-merge (squash) February 15, 2023 01:22

macfarla approved these changes Feb 15, 2023

View reviewed changes

macfarla added mainnet peering labels Feb 15, 2023

pinges merged commit 08e2f87 into hyperledger:main Feb 15, 2023

pinges deleted the revert3911 branch February 15, 2023 01:38

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

reintroduce checking of block height for certain tasks when we are not PoS (Revert PR#3911) #5083

reintroduce checking of block height for certain tasks when we are not PoS (Revert PR#3911) #5083

pinges commented Feb 10, 2023 •

edited by macfarla

Loading

fab-10 left a comment •

edited

Loading

fab-10 Feb 10, 2023

fab-10 Feb 10, 2023

fab-10 left a comment

fab-10 Feb 14, 2023

macfarla left a comment

reintroduce checking of block height for certain tasks when we are not PoS (Revert PR#3911) #5083

reintroduce checking of block height for certain tasks when we are not PoS (Revert PR#3911) #5083

Conversation

pinges commented Feb 10, 2023 • edited by macfarla Loading

fab-10 left a comment • edited Loading

Choose a reason for hiding this comment

fab-10 Feb 10, 2023

Choose a reason for hiding this comment

fab-10 Feb 10, 2023

Choose a reason for hiding this comment

fab-10 left a comment

Choose a reason for hiding this comment

fab-10 Feb 14, 2023

Choose a reason for hiding this comment

macfarla left a comment

Choose a reason for hiding this comment

pinges commented Feb 10, 2023 •

edited by macfarla

Loading

fab-10 left a comment •

edited

Loading