Mining options refactor #6027

fab-10 · 2023-10-12T16:21:11Z

PR description

Before adding new mining options for upcoming features, I took some time to review and refactor mining options.
Mining parameters are a bit odd when compared to other options, since they do not follow the same pattern of using immutables, as for txpool options, stable options are defined in BesuCommand, and since that file is already too big, adding more options there should be avoided.

For the refactoring I have reapplied most of the solutions used for the refactoring of txpool options (see #5772 if interested), with some novelty, since for mining configuration a new feature is required, that is having the possibility to update the value of some options at runtime.
One notable difference with #5772, is that stable and unstable options are no more split on two classes, since it make more sense to keep all the related options in a single place, also because some validations could make use of a mix of stable and unstable options, and for that it is better to have all of them in a single place.

To implement the update at runtime feature, in a thread safe way, unfortunately it is not possible to use the immutables library directly, so instead of using annotations, some code has to be added to the MiningParameters class to manage the updatables options. If the proposed solution prove to be effective and looks good, after it stabilize, we can also think of extending the immutables library to support this, or introduce our own annotations, or find another library that is best suited for managing configuration.
The updatable parameters work like that:

on startup their initial value is set, as usual from config file or CLI,
these parameters have also a set, along with the normal get one,
the values are kept in volatile fields, to make it multi thread friendly
Note that initial values are kept in case it is needed, even if the parameters then updated at runtime,

The proposed implementation also has the goal to centralize all the parameters in the MiningParameters class, and only passing this class around instead of passing single parameters, like coinbase, extraData, etc... so it should help readability and make easier to manage these parameter.

More refactoring may be proposed in following PRs, to avoid making this one too big, for example MiningParameters could be renamed to MiningConfiguration for consistency with the naming of similar classes, then could make sense to pass mining parameters directly to RPC methods that update things like coinbase, targetGasLimit etc... instead of passing through other objects.

Fixed Issue(s)

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

github-actions · 2023-10-12T16:21:29Z

I thought about documentation and added the doc-change-required label to this PR if updates are required.
I thought about the changelog and included a changelog update if required.
If my PR includes database changes (e.g. KeyValueSegmentIdentifier) I have thought about compatibility and performed forwards and backwards compatibility tests

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

# Conflicts: # ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/txselection/BlockTransactionSelector.java # ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockTransactionSelectorTest.java # plugin-api/build.gradle

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

# Conflicts: # ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/txselection/selectors/PriceTransactionSelector.java

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

macfarla

looks ok to me

macfarla · 2023-10-18T02:50:42Z

...merge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinator.java

-    this.targetGasLimit =
-        miningParameters
-            .getTargetGasLimit()
-            // TODO: revisit default target gas limit


this TODO got removed - is it still relevant?

let's ask to @garyschulte, that wrote the comment, what he think it is still TODO

Gabriel-Trintinalia · 2023-10-18T06:53:57Z

besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java

@@ -1489,6 +1429,7 @@ public void run() {

      // Need to create vertx after cmdline has been parsed, such that metricsSystem is configurable
      vertx = createVertx(createVertxOptions(metricsSystem.get()));
+      miningParameters = getMiningParameters();


Is there a reason why this needs to happen here? Inside of the Run method? Can we move it to the configure method?

removed since call is not needed anymore

fab-10 · 2023-10-18T06:56:08Z

I am running this PR on some nodes, and will wait to see there are no regressions before merging to main.

siladu

Nice PR.
+1 for making BesuCommand smaller!

PR is a bit too big to do a thorough review without spending a lot more time on it so can't explicitly approve it. Seems a fairly safe change so won't block either. Spot checked a few interesting parts and have some comments.

siladu · 2023-10-18T07:20:54Z

besu/src/main/java/org/hyperledger/besu/cli/options/MiningOptions.java

+  private Double minBlockOccupancyRatio = DEFAULT_MIN_BLOCK_OCCUPANCY_RATIO;
+
+  @Option(
+      names = {"--min-gas-price"},


Interested to hear your reasoning for grouping this with mining options. My initial thought is that it is potentially misleading. It is commonly used/referenced in PoA networks, although I think other miner- options are as well so maybe nbd.
Perhaps "block building" is a more modern term than "mining" but I'm not suggesting renaming things for this PR, just musing.

Also want to bring this (and the PR generally) to the attention of @matthew1001 who has worked in this area fairly recently.

This option is used when selecting txs for block creation, for any kind of network, so it make sense to group here, and I agree that the miner naming is now misleading, since we have different ways of building and proposing blocks, so a renaming could help

Agree changing Miner Options to something like "Block Builder Options" makes sense

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/MiningParameters.java

siladu · 2023-10-18T09:05:18Z

besu/src/main/java/org/hyperledger/besu/controller/IbftBesuControllerBuilder.java

@@ -145,6 +145,7 @@ protected MiningCoordinator createMiningCoordinator(

    final Address localAddress = Util.publicKeyToAddress(nodeKey.getPublicKey());
    final BftProtocolSchedule bftProtocolSchedule = (BftProtocolSchedule) protocolSchedule;
+    miningParameters.setCoinbase(localAddress);


Why do we need to do this here now?

Also, surprised we do this here but not for QbftBesuControllerBuilder.

removed since it is redundant the coinbase is already set in `BftBlockCreator' for all *bft

fab-10 · 2023-10-18T09:37:41Z

PR is a bit too big to do a thorough review without spending a lot more time on it so can't explicitly approve it. Seems a fairly safe change so won't block either. Spot checked a few interesting parts and have some comments.

Thanks, will review your comment, and since there is no rush to merge this, so feel free to think about it and review in steps

… mining-options-refactor

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

macfarla

couple of comments. I think "Mining Options" could be renamed but that could also be a separate PR and it's not a dealbreaker

macfarla · 2023-10-24T01:41:00Z

besu/src/main/java/org/hyperledger/besu/cli/options/MiningOptions.java

+  private Double minBlockOccupancyRatio = DEFAULT_MIN_BLOCK_OCCUPANCY_RATIO;
+
+  @Option(
+      names = {"--min-gas-price"},


Agree changing Miner Options to something like "Block Builder Options" makes sense

besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java

[skip-ci] Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

… mining-options-refactor

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com>

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> (cherry picked from commit 20a82d4)

* Unsigned timestamps and blob gas used (#6046) * lots of places an unsigned timestamp is a problem * adds unchecked annotations to OptionalUnsignedLong rpc parameter type --------- Signed-off-by: Justin Florentine <justin+github@florentine.us> (cherry picked from commit a90ea05) * [MINOR] ux improvements (#6049) * log command line option that is affected * made plugins summary log part of config overview * check for null plugin context Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> --------- Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> (cherry picked from commit e8bca61) * Update changelog release (#6062) Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net> (cherry picked from commit f810887) * Dencun corner cases (#6060) * cherry pick changes from https://github.com/hyperledger/besu/pull/6054/files\#diff-22b78733e37a697fa8d1d8a02d2a87fe5ccea9cf67c34ce5e6311f024c14abd6L643-R738 Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> * cherry pick changes from https://github.com/hyperledger/besu/pull/6054/files\#diff-61db834b59eae5ce5c438462505de1add8fa244deda830742060d15f668a9806R39-R44 Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> * formatting Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> * update the EIP-6110 acceptance tests Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> --------- Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> Co-authored-by: Danno Ferrin <danno.ferrin@swirldslabs.com> (cherry picked from commit 9d9fe8c) * add retry logic on sync pipeline for rocksdb issue (#6004) * add retry logic for sync pipeline with rocksdb issue Signed-off-by: Karim TAAM <karim.t2am@gmail.com> (cherry picked from commit c839a3b) * Mining options refactor (#6027) Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> (cherry picked from commit 20a82d4) * Update reference tests to Cancun (#6054) * Update reference tests to Cancun Update reference tests to cancun tests. Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> * update the subrepo Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> * update the EIP-6110 acceptance tests Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> * update to develop Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> --------- Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> (cherry picked from commit 909649f) * Optimize GetPooledTransactionsFromPeerTask with HashSet (#6071) Switch from using a List to a HashSet for transaction hashes in GetPooledTransactionsFromPeerTask to improve performance. Signed-off-by: Suyash Nayan <suyashnyn1@gmail.com> Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> (cherry picked from commit a2dbb82) * Decouple TrieLogManager and CachedWorldStorageManager (#6072) Separate out the concepts of world state caching and trie log management. Remove AbstractTrieLogManager and make TrieLogManager the concrete implementation. Signed-off-by: Simon Dudley <simon.dudley@consensys.net> (cherry picked from commit 20f518e) * Implement miner_setMinPriorityFee and miner_getMinPriorityFee (#6080) * Refactor mining options Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Fix null pointer exception Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * fix another null pointer exception Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * uncomment code Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Move miner options tests Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Unit test fixes Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Removed the commented code Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * WIP Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * WIP Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * New miner option: min-priority-fee Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Remove not relevant for this feature Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Remove not relevant for this feature Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Fix javadoc Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Remove code not belonging to this PR Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * coinbase is an updatable parameter Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Move MiningOptions to upper package Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Fix coinbase for *bft Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Implement methods to get and set min priority fee Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net> * Fix spotless Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net> * Apply suggestions from code review Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Update besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java [skip-ci] Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Add new config option to everything config Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net> * Fix unit test Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net> * Accept PR suggestions Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net> --------- Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net> Signed-off-by: Stefan Pingel <16143240+pinges@users.noreply.github.com> Co-authored-by: Fabio Di Fabio <fabio.difabio@consensys.net> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Stefan Pingel <16143240+pinges@users.noreply.github.com> (cherry picked from commit 3310c41) * Use Bytes Trie to track warm addresses (#6069) * Use Bytes Trie to track warm addresses Move from a java HashSet to a custom Trie based on bytes to store the warm addresses, creates, and self-destructs. This avoids needing to calculate java hashes or engage in using custom Comparators. Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> * codeql scan Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> --------- Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> (cherry picked from commit af011d2) * Migrate Operand Stack to Growing Stack (#6068) To improve the performance of CALL operations move the OperandStack and ReturnStack to growing stacks instead of a fully allocated stack. Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> (cherry picked from commit 949c724) * Remove a BonsaiWorldStateProvider constructor (#6090) Was only used for supporting test code and can instead reuse static factory from InMemoryKeyValueStorageProvider Signed-off-by: Simon Dudley <simon.dudley@consensys.net> (cherry picked from commit 9a22703) * add RpcEndpointService to thread runner (#6091) Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> (cherry picked from commit 7ac8af0) * ETC 'Spiral' network upgrade (#6078) * Add 23.10.2 section to changelog Signed-off-by: Diego López León <dieguitoll@gmail.com> * Set ENR tree for DNS discovery for Mordor network Signed-off-by: Diego López León <dieguitoll@gmail.com> * Add ECIP-1109: 'Spiral' network upgrade support Signed-off-by: Diego López León <dieguitoll@gmail.com> --------- Signed-off-by: Diego López León <dieguitoll@gmail.com> Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> (cherry picked from commit f58f6cf) * Trigger contextEnter/Exit for all frames, including root (#6074) * Trigger contextEnter/Exit for all frames, including root * Differentiate between context entry and re-entry in `OperationTracer` * Update evm/src/test/java/org/hyperledger/besu/evm/processor/AbstractMessageProcessorTest.java Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> Signed-off-by: delehef <github@odena.eu> --------- Signed-off-by: Franklin Delehelle <franklin.delehelle@odena.eu> Signed-off-by: delehef <github@odena.eu> Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> (cherry picked from commit 0345b24) * feat: add a way to read memory without altering the word capacity (#6073) * feat: add a way to read memory without altering the word capacity * add tests Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> Signed-off-by: Franklin Delehelle <franklin.delehelle@odena.eu> * Fix read-past-end * Do not abuse method overload * Update CHANGELOG.md Signed-off-by: delehef <github@odena.eu> Signed-off-by: Franklin Delehelle <franklin.delehelle@odena.eu> * add tests for MessageFrame.shadowReadMemory Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> Signed-off-by: Franklin Delehelle <franklin.delehelle@odena.eu> * Straddled reads tests Signed-off-by: Franklin Delehelle <franklin.delehelle@odena.eu> --------- Signed-off-by: Franklin Delehelle <franklin.delehelle@odena.eu> Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> Signed-off-by: delehef <github@odena.eu> Signed-off-by: delehef <franklin.delehelle@odena.eu> Co-authored-by: Daniel Lehrner <daniel.lehrner@consensys.net> (cherry picked from commit edf23cb) * renamed env field (#6096) Signed-off-by: Justin Florentine <justin+github@florentine.us> (cherry picked from commit 67ef9e0) * [MINOR] Upgrade netty and grpc (#6100) * Upgrade netty and grpc * fix verification file Signed-off-by: Simon Dudley <simon.dudley@consensys.net> --------- Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> (cherry picked from commit accac1c) * TraceService: return results for transactions in block (#6087) * TraceService: return results for transactions in block Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> (cherry picked from commit a60b31b) * RPC Parameters to accept input and data field (#6094) * Accept input or data as payload for RPC calls Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * Add json new rpc valid and invalid request to test the changes Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * Change JsonCallParameter signature to avoid duplicating constructor Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * Add changelog Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> --------- Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> (cherry picked from commit 6dd558b) * Fix some typos (#6093) * Fix some typos * Update plugin version Signed-off-by: GoodDaisy <90915921+GoodDaisy@users.noreply.github.com> --------- Signed-off-by: GoodDaisy <90915921+GoodDaisy@users.noreply.github.com> (cherry picked from commit e814886) * Correct reference test blobgas calculation (#6107) * Correct reference test blobgas calculation Fix tpyo that resulted in an NPE in t8n blob gas calculations. Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> * changelog Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> * spotless Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> --------- Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> (cherry picked from commit d0a6a70) * Restore javadoc and sources jar as trusted artifacts (#6109) Makes Idea happy again as documented here https://docs.gradle.org/6.8.3/userguide/dependency_verification.html#sec:skipping-javadocs Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> (cherry picked from commit 311570f) * Add API to set and get the minGasPrice at runtime (#6097) Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> (cherry picked from commit de8ca10) * Don't put NONCE_TOO_LOW transactions into the invalid nonce cache (#6067) * Don't put NONCE_TOO_LOW transactions into the invalid nonce cache Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> * Update unit tests Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> * Use list of errors to ignore Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> --------- Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> Signed-off-by: Matt Whitehead <matthew1001@gmail.com> Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> Co-authored-by: Fabio Di Fabio <fabio.difabio@consensys.net> (cherry picked from commit 84dee29) * Journaled world state (#6023) Introduce a new Journaled World State Updater. Within a transaction it keeps one copy of account and storage state, restoring previous revisions on reverts and exceptional halts. This updater only supports post-merge semantics with regard to empty accounts, namely that they do not exist in world state. Adds an EvmConfiguration option for stacked vs journaled updater, and wire it in where needed. The staked updater is default mode, which is the current behavior prior to this patch. Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> (cherry picked from commit 094c841) * setMinPriorityFee - Return Invalid Param when invalid and use hexadecimal instead of Long (#6099) Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net> (cherry picked from commit 7acdd87) * [MINOR] - Add 23.10.1 correct changelog (#6110) Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net> (cherry picked from commit 236779d) * Add transaction selector based on min priority fee parameter (#6083) Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net> (cherry picked from commit 41b9575) * Add config option to clique to allow not creating empty blocks (#6082) Signed-off-by: Jason Frame <jason.frame@consensys.net> (cherry picked from commit 6a2d41f) * load all accounts into cache (#6101) There was a slight problem on the bonsai side because all account reads did not go through a single method. One of the two add the account to the cache but the other did not. This had two consequences: Less good performance because certain accounts had to be read several times and also all account reads were not marked in the trielog. This will fix both problems. Signed-off-by: Karim TAAM <karim.t2am@gmail.com> (cherry picked from commit d049cb3) * Reference Tests v13 (#6114) v13 of the official Ethereum Reference Tests. Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> (cherry picked from commit cea3d8a) * clean up the ProcessableBlockHeader (#6117) * clean up Signed-off-by: stefan.pingel@consensys.net <stefan.pingel@consensys.net> (cherry picked from commit 646c5a3) * Log missing chain head as warning, not trace (#6127) Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> (cherry picked from commit 83ae69a) * Update RPCs for yParity (#6119) Update the GraphQL and JSON-RPC endpoints to provide `yParity` instead of `v` for non-legacy transactions. Update the JSON-RPC tests to use the Hive data. Add tests for Shanghai and Cancun Blocks. Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> (cherry picked from commit 2284242) * Make tracer in block building block aware (#6135) Signed-off-by: stefan.pingel@consensys.net <stefan.pingel@consensys.net> (cherry picked from commit f42f8c1) * Revert "Discard invalid transaction" warning logs (#6137) * Revert "Log missing chain head as warning, not trace (#6127)" * leave chain head at warning, just revert the discard warning Signed-off-by: garyschulte <garyschulte@gmail.com> (cherry picked from commit 914ab79) * Reverse sort order (#6106) * Reverse added order and sequence number Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> * Remove extraneous 'addedAt' check Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> --------- Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> (cherry picked from commit 0203092) * Force tx replacement price bump to zero when zero base fee market is configured (#6079) Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> (cherry picked from commit 636ad8a) * Time limited block creation (#6044) Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> (cherry picked from commit 8319fae) * Limit memory used in handling invalid blocks (#6138) Signed-off-by: Jason Frame <jason.frame@consensys.net> (cherry picked from commit 701cbb0) * Delete leftPad when capturing the stack before and after a frame execution (#6102) * Delete leftPad when capturing the stack before and after the execution * Still use leftPad when displaying the stack in the output (ex. for debug_traceTransaction) * Fix integration test * Use StringBuilder to left pad the hex representation of a 32 bytes Signed-off-by: Ameziane H <ameziane.hamlat@consensys.net> (cherry picked from commit 9710a9a) * fix yParity flakey test (#6151) Fix the flakeiness in EthGetTransactionByHashTest as well as some other sonar identified cleanup. Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> (cherry picked from commit 4b58d07) * Apply the same reverse sort order as https://github.com/hyperledger/b… (#6146) * Apply the same reverse sort order as #6106 but to the base fee sorter Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> * Fix unit tests Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> * Update eviction unit tests to expect highest-sequence TXs be evicted first Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> * Update change log Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> * Spotless fixes Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> --------- Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> (cherry picked from commit 8afad41) --------- Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net> Co-authored-by: matkt <karim.t2am@gmail.com> Co-authored-by: Fabio Di Fabio <fabio.difabio@consensys.net> Co-authored-by: Danno Ferrin <danno.ferrin@swirldslabs.com> Co-authored-by: Suyash Nayan <89125422+7suyash7@users.noreply.github.com> Co-authored-by: Simon Dudley <simon.dudley@consensys.net> Co-authored-by: Diego López León <dieguitoll@gmail.com> Co-authored-by: delehef <franklin.delehelle@odena.eu> Co-authored-by: daniellehrner <daniel.lehrner@consensys.net> Co-authored-by: Gabriel Fukushima <gabrielfukushima@gmail.com> Co-authored-by: GoodDaisy <90915921+GoodDaisy@users.noreply.github.com> Co-authored-by: Matt Whitehead <matthew1001@gmail.com> Co-authored-by: Jason Frame <jason.frame@consensys.net> Co-authored-by: Stefan Pingel <16143240+pinges@users.noreply.github.com> Co-authored-by: garyschulte <garyschulte@gmail.com> Co-authored-by: ahamlat <ameziane.hamlat@consensys.net>

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com>

fab-10 added 6 commits October 10, 2023 15:44

Refactor mining options

c57c2ac

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

Fix null pointer exception

b408b64

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

fix another null pointer exception

da79e09

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

uncomment code

7684d7e

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

Move miner options tests

78741da

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

Unit test fixes

18bcce3

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

Removed the commented code

59fbe8e

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

fab-10 force-pushed the mining-options-refactor branch from c511638 to 59fbe8e Compare October 12, 2023 17:04

fab-10 added 2 commits October 13, 2023 09:41

WIP

8f14dd3

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

fab-10 force-pushed the mining-options-refactor branch 5 times, most recently from 3f0d9ea to 53f9d02 Compare October 13, 2023 15:47

WIP

65bdabd

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

fab-10 force-pushed the mining-options-refactor branch from 53f9d02 to 65bdabd Compare October 13, 2023 17:32

fab-10 added 6 commits October 16, 2023 11:32

Remove not relevant for this feature

e89a244

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

Merge branch 'main' into mining-options-refactor

20e498b

Merge branch 'main' into mining-options-refactor

86b9a6e

# Conflicts: # ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/txselection/selectors/PriceTransactionSelector.java

Fix javadoc

2267bc7

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

Remove code not belonging to this PR

c6b56d2

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

coinbase is an updatable parameter

477acf9

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

fab-10 force-pushed the mining-options-refactor branch from 2be8c7d to 477acf9 Compare October 17, 2023 15:37

fab-10 added 2 commits October 17, 2023 18:45

Move MiningOptions to upper package

4626230

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

Fix coinbase for *bft

25b1522

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

fab-10 force-pushed the mining-options-refactor branch from 6532234 to 25b1522 Compare October 17, 2023 16:48

fab-10 marked this pull request as ready for review October 17, 2023 17:43

macfarla approved these changes Oct 18, 2023

View reviewed changes

Gabriel-Trintinalia reviewed Oct 18, 2023

View reviewed changes

Merge branch 'main' into mining-options-refactor

ae775ae

siladu reviewed Oct 18, 2023

View reviewed changes

macfarla and others added 3 commits October 20, 2023 14:22

Merge branch 'main' into mining-options-refactor

16315a4

Merge branch 'mining-options-refactor' of github.com:fab-10/besu into…

2700930

… mining-options-refactor

Apply suggestions from code review

e55392b

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

macfarla approved these changes Oct 24, 2023

View reviewed changes

fab-10 and others added 3 commits October 24, 2023 10:29

Merge branch 'main' into mining-options-refactor

d710e5c

Update besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java

639af82

[skip-ci] Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

Merge branch 'mining-options-refactor' of github.com:fab-10/besu into…

232caa6

… mining-options-refactor

fab-10 enabled auto-merge (squash) October 24, 2023 08:31

fab-10 merged commit 20a82d4 into hyperledger:main Oct 24, 2023
19 checks passed

daniellehrner pushed a commit to daniellehrner/besu that referenced this pull request Oct 25, 2023

Mining options refactor (hyperledger#6027)

6a2835a

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com>

Gabriel-Trintinalia mentioned this pull request Nov 2, 2023

Add transaction selector based on min priority fee parameter #6083

Merged

jflo pushed a commit to jflo/besu that referenced this pull request Nov 10, 2023

Mining options refactor (hyperledger#6027)

ed7e462

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> (cherry picked from commit 20a82d4)

NickSneo pushed a commit to NickSneo/besu that referenced this pull request Nov 12, 2023

Mining options refactor (hyperledger#6027)

f3c6cf4

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Mining options refactor #6027

Mining options refactor #6027

fab-10 commented Oct 12, 2023 •

edited

github-actions bot commented Oct 12, 2023

macfarla left a comment

macfarla Oct 18, 2023

fab-10 Oct 23, 2023

Gabriel-Trintinalia Oct 18, 2023

fab-10 Oct 23, 2023

fab-10 commented Oct 18, 2023

siladu left a comment

siladu Oct 18, 2023

fab-10 Oct 23, 2023

macfarla Oct 24, 2023

siladu Oct 18, 2023 •

edited

fab-10 Oct 23, 2023

fab-10 commented Oct 18, 2023

macfarla left a comment

macfarla Oct 24, 2023

Mining options refactor #6027

Mining options refactor #6027

Conversation

fab-10 commented Oct 12, 2023 • edited

PR description

Fixed Issue(s)

github-actions bot commented Oct 12, 2023

macfarla left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fab-10 commented Oct 18, 2023

siladu left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

siladu Oct 18, 2023 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fab-10 commented Oct 18, 2023

macfarla left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fab-10 commented Oct 12, 2023 •

edited

siladu Oct 18, 2023 •

edited