-
Notifications
You must be signed in to change notification settings - Fork 844
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.
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
Force tx replacement price bump to zero when zero base fee market is configured #6079
Conversation
Signed-off-by: Fabio Di Fabio <[email protected]>
|
…configured Signed-off-by: Fabio Di Fabio <[email protected]>
4a6fd41
to
c7ca182
Compare
Signed-off-by: Fabio Di Fabio <[email protected]>
Signed-off-by: Fabio Di Fabio <[email protected]>
CHANGELOG.md
Outdated
@@ -3,8 +3,10 @@ | |||
### Breaking Changes | |||
|
|||
### Deprecations | |||
- `--tx-pool-disable-locals` has been deprecated for removal in favor of `--tx-pool-no-local-priority`, no semantic change, only a renaming [#5959](https://github.com/hyperledger/besu/pull/5959) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this from another PR? It doesn't seem related to the price-bump behaviour.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
removed, this is not related to this PR
.from(txPoolConf) | ||
.saveFile((dataPath.resolve(txPoolConf.getSaveFile().getPath()).toFile())); | ||
|
||
if (getActualGenesisConfigOptions().isZeroBaseFee()) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does this mean that you need to be on the london
fork in order to get the new behaviour? Could it be made to work in the same way for --min-gas-price=0
for users pre-london?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I thought about that, but setting --min-gas-price=0
does not necessarily imply that it is a zero-gas-price network (actually also in zeroBaseFee network, the maxGasPrice could be > 0).
So what if we introduce a specific option, that acts like a profile, that state clearly that we want a gas free network, for example --gas-free
? that has the effect of setting sound values for other options like the min-gas-price
and the tx-pool-price-bump
, instead of trying to deduce the intent of the network from single options.
what do you think of this approach?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In principle I agree @fab-10. However, I do have a couple of concerns about introducing it under this PR:
- Most people are probably using
--min-gas-price=0
and/orzeroBaseFee: true
to create what they think of as agas free
network. I agree it's not strictly gas free - but it probably means that defaulting--tx-pool-price-bump
to0
if you're using one/both of those settings is what most people would expect. They can after all set--tx-pool-price-bump= (num > 0)
if they don't want it - I think if we had a
--gas-free
option people would have additional expectations if they set it - not just a default price bump of0
. For example, would allocating initial funds to accounts be valid if--gas-free
was set? Would setting a transaction with agasPrice>0
be allowed?
So I agree that --gas-free
would be a really useful option. But I think it's probably worth separate discussion & PR to introduce it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok I see your point about min-gas-price
and will implement your suggestion.
And let's continue the discussion about a gas-free
profile, and all the feature that it should enable separately.
private static final String TX_MESSAGE_KEEP_ALIVE_SEC_FLAG = | ||
"--Xincoming-tx-messages-keep-alive-seconds"; | ||
|
||
private static final String ETH65_TX_ANNOUNCED_BUFFERING_PERIOD_FLAG = | ||
"--Xeth65-tx-announced-buffering-period-milliseconds"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Again this seems to be unrelated to this PR?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I put this here since, I am in the process of refactoring how we manage the option, and so when I took some, I also take the opportunity to iterate on it, in this case it was the merging of (un)stable options in a single place.
@fab-10 I've pulled and built this branch and run a 5-node QBFT chain. The transaction replacement works just as you'd expect - replacement transactions are accepted for any un-mined transaction. Thanks, I think this will be really useful for a lot of users. I've added a couple of specific comments in the PR review. |
Re. docs updates, I think https://besu.hyperledger.org/public-networks/concepts/transactions/pool is the main page that would need updating for this PR, particularly the line |
# Conflicts: # CHANGELOG.md
# Conflicts: # CHANGELOG.md
4228dca
to
1452550
Compare
…zero Signed-off-by: Fabio Di Fabio <[email protected]>
1452550
to
c481949
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Happy approving this based on the discussion. I'm OK with --min-gas-price=0
not defaulting to --tx-pool-price-bump=0
as long as if you do set --tx-pool-price-bump=0
then it's honoured.
Just realised that you've updated it to set price bump when |
yes, unless you specifically set a price bump > 0, the it is internally set to 0 when |
…configured (hyperledger#6079) Signed-off-by: Fabio Di Fabio <[email protected]> (cherry picked from commit 636ad8a)
* 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 <[email protected]> (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 <[email protected]> --------- Signed-off-by: Sally MacFarlane <[email protected]> (cherry picked from commit e8bca61) * Update changelog release (#6062) Signed-off-by: Gabriel-Trintinalia <[email protected]> (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 <[email protected]> * cherry pick changes from https://github.com/hyperledger/besu/pull/6054/files\#diff-61db834b59eae5ce5c438462505de1add8fa244deda830742060d15f668a9806R39-R44 Signed-off-by: Sally MacFarlane <[email protected]> * formatting Signed-off-by: Sally MacFarlane <[email protected]> * update the EIP-6110 acceptance tests Signed-off-by: Danno Ferrin <[email protected]> --------- Signed-off-by: Sally MacFarlane <[email protected]> Signed-off-by: Danno Ferrin <[email protected]> Co-authored-by: Danno Ferrin <[email protected]> (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 <[email protected]> (cherry picked from commit c839a3b) * Mining options refactor (#6027) Signed-off-by: Fabio Di Fabio <[email protected]> Co-authored-by: Sally MacFarlane <[email protected]> (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 <[email protected]> * update the subrepo Signed-off-by: Danno Ferrin <[email protected]> * update the EIP-6110 acceptance tests Signed-off-by: Danno Ferrin <[email protected]> * update to develop Signed-off-by: Danno Ferrin <[email protected]> --------- Signed-off-by: Danno Ferrin <[email protected]> Signed-off-by: Sally MacFarlane <[email protected]> Co-authored-by: Sally MacFarlane <[email protected]> (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 <[email protected]> Signed-off-by: Sally MacFarlane <[email protected]> Co-authored-by: Sally MacFarlane <[email protected]> (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 <[email protected]> (cherry picked from commit 20f518e) * Implement miner_setMinPriorityFee and miner_getMinPriorityFee (#6080) * Refactor mining options Signed-off-by: Fabio Di Fabio <[email protected]> * Fix null pointer exception Signed-off-by: Fabio Di Fabio <[email protected]> * fix another null pointer exception Signed-off-by: Fabio Di Fabio <[email protected]> * uncomment code Signed-off-by: Fabio Di Fabio <[email protected]> * Move miner options tests Signed-off-by: Fabio Di Fabio <[email protected]> * Unit test fixes Signed-off-by: Fabio Di Fabio <[email protected]> * Removed the commented code Signed-off-by: Fabio Di Fabio <[email protected]> * WIP Signed-off-by: Fabio Di Fabio <[email protected]> * WIP Signed-off-by: Fabio Di Fabio <[email protected]> * New miner option: min-priority-fee Signed-off-by: Fabio Di Fabio <[email protected]> * Remove not relevant for this feature Signed-off-by: Fabio Di Fabio <[email protected]> * Remove not relevant for this feature Signed-off-by: Fabio Di Fabio <[email protected]> * Fix javadoc Signed-off-by: Fabio Di Fabio <[email protected]> * Remove code not belonging to this PR Signed-off-by: Fabio Di Fabio <[email protected]> * coinbase is an updatable parameter Signed-off-by: Fabio Di Fabio <[email protected]> * Move MiningOptions to upper package Signed-off-by: Fabio Di Fabio <[email protected]> * Fix coinbase for *bft Signed-off-by: Fabio Di Fabio <[email protected]> * Implement methods to get and set min priority fee Signed-off-by: Gabriel-Trintinalia <[email protected]> * Fix spotless Signed-off-by: Gabriel-Trintinalia <[email protected]> * Apply suggestions from code review Signed-off-by: Fabio Di Fabio <[email protected]> * Update besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java [skip-ci] Co-authored-by: Sally MacFarlane <[email protected]> Signed-off-by: Fabio Di Fabio <[email protected]> * Add new config option to everything config Signed-off-by: Gabriel-Trintinalia <[email protected]> * Fix unit test Signed-off-by: Gabriel-Trintinalia <[email protected]> * Accept PR suggestions Signed-off-by: Gabriel-Trintinalia <[email protected]> --------- Signed-off-by: Fabio Di Fabio <[email protected]> Signed-off-by: Gabriel-Trintinalia <[email protected]> Signed-off-by: Stefan Pingel <[email protected]> Co-authored-by: Fabio Di Fabio <[email protected]> Co-authored-by: Sally MacFarlane <[email protected]> Co-authored-by: Stefan Pingel <[email protected]> (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 <[email protected]> * codeql scan Signed-off-by: Danno Ferrin <[email protected]> --------- Signed-off-by: Danno Ferrin <[email protected]> Signed-off-by: Sally MacFarlane <[email protected]> Co-authored-by: Sally MacFarlane <[email protected]> (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 <[email protected]> (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 <[email protected]> (cherry picked from commit 9a22703) * add RpcEndpointService to thread runner (#6091) Signed-off-by: Sally MacFarlane <[email protected]> (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 <[email protected]> * Set ENR tree for DNS discovery for Mordor network Signed-off-by: Diego López León <[email protected]> * Add ECIP-1109: 'Spiral' network upgrade support Signed-off-by: Diego López León <[email protected]> --------- Signed-off-by: Diego López León <[email protected]> Signed-off-by: Sally MacFarlane <[email protected]> Co-authored-by: Sally MacFarlane <[email protected]> (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 <[email protected]> Signed-off-by: delehef <[email protected]> --------- Signed-off-by: Franklin Delehelle <[email protected]> Signed-off-by: delehef <[email protected]> Signed-off-by: Sally MacFarlane <[email protected]> Co-authored-by: Sally MacFarlane <[email protected]> (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 <[email protected]> Signed-off-by: Franklin Delehelle <[email protected]> * Fix read-past-end * Do not abuse method overload * Update CHANGELOG.md Signed-off-by: delehef <[email protected]> Signed-off-by: Franklin Delehelle <[email protected]> * add tests for MessageFrame.shadowReadMemory Signed-off-by: Daniel Lehrner <[email protected]> Signed-off-by: Franklin Delehelle <[email protected]> * Straddled reads tests Signed-off-by: Franklin Delehelle <[email protected]> --------- Signed-off-by: Franklin Delehelle <[email protected]> Signed-off-by: Daniel Lehrner <[email protected]> Signed-off-by: delehef <[email protected]> Signed-off-by: delehef <[email protected]> Co-authored-by: Daniel Lehrner <[email protected]> (cherry picked from commit edf23cb) * renamed env field (#6096) Signed-off-by: Justin Florentine <[email protected]> (cherry picked from commit 67ef9e0) * [MINOR] Upgrade netty and grpc (#6100) * Upgrade netty and grpc * fix verification file Signed-off-by: Simon Dudley <[email protected]> --------- Signed-off-by: Sally MacFarlane <[email protected]> Co-authored-by: Sally MacFarlane <[email protected]> (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 <[email protected]> (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 <[email protected]> * Add json new rpc valid and invalid request to test the changes Signed-off-by: Gabriel Fukushima <[email protected]> * Change JsonCallParameter signature to avoid duplicating constructor Signed-off-by: Gabriel Fukushima <[email protected]> * Add changelog Signed-off-by: Gabriel Fukushima <[email protected]> --------- Signed-off-by: Gabriel Fukushima <[email protected]> (cherry picked from commit 6dd558b) * Fix some typos (#6093) * Fix some typos * Update plugin version Signed-off-by: GoodDaisy <[email protected]> --------- Signed-off-by: GoodDaisy <[email protected]> (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 <[email protected]> * changelog Signed-off-by: Danno Ferrin <[email protected]> * spotless Signed-off-by: Danno Ferrin <[email protected]> --------- Signed-off-by: Danno Ferrin <[email protected]> (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 <[email protected]> (cherry picked from commit 311570f) * Add API to set and get the minGasPrice at runtime (#6097) Signed-off-by: Fabio Di Fabio <[email protected]> (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 <[email protected]> * Update unit tests Signed-off-by: Matthew Whitehead <[email protected]> * Use list of errors to ignore Signed-off-by: Matthew Whitehead <[email protected]> --------- Signed-off-by: Matthew Whitehead <[email protected]> Signed-off-by: Matt Whitehead <[email protected]> Signed-off-by: Fabio Di Fabio <[email protected]> Co-authored-by: Fabio Di Fabio <[email protected]> (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 <[email protected]> (cherry picked from commit 094c841) * setMinPriorityFee - Return Invalid Param when invalid and use hexadecimal instead of Long (#6099) Signed-off-by: Gabriel-Trintinalia <[email protected]> (cherry picked from commit 7acdd87) * [MINOR] - Add 23.10.1 correct changelog (#6110) Signed-off-by: Gabriel-Trintinalia <[email protected]> (cherry picked from commit 236779d) * Add transaction selector based on min priority fee parameter (#6083) Signed-off-by: Gabriel-Trintinalia <[email protected]> (cherry picked from commit 41b9575) * Add config option to clique to allow not creating empty blocks (#6082) Signed-off-by: Jason Frame <[email protected]> (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 <[email protected]> (cherry picked from commit d049cb3) * Reference Tests v13 (#6114) v13 of the official Ethereum Reference Tests. Signed-off-by: Danno Ferrin <[email protected]> (cherry picked from commit cea3d8a) * clean up the ProcessableBlockHeader (#6117) * clean up Signed-off-by: [email protected] <[email protected]> (cherry picked from commit 646c5a3) * Log missing chain head as warning, not trace (#6127) Signed-off-by: Matthew Whitehead <[email protected]> (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 <[email protected]> (cherry picked from commit 2284242) * Make tracer in block building block aware (#6135) Signed-off-by: [email protected] <[email protected]> (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 <[email protected]> (cherry picked from commit 914ab79) * Reverse sort order (#6106) * Reverse added order and sequence number Signed-off-by: Matthew Whitehead <[email protected]> * Remove extraneous 'addedAt' check Signed-off-by: Matthew Whitehead <[email protected]> --------- Signed-off-by: Matthew Whitehead <[email protected]> (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 <[email protected]> (cherry picked from commit 636ad8a) * Time limited block creation (#6044) Signed-off-by: Fabio Di Fabio <[email protected]> Co-authored-by: Sally MacFarlane <[email protected]> (cherry picked from commit 8319fae) * Limit memory used in handling invalid blocks (#6138) Signed-off-by: Jason Frame <[email protected]> (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 <[email protected]> (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 <[email protected]> (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 <[email protected]> * Fix unit tests Signed-off-by: Matthew Whitehead <[email protected]> * Update eviction unit tests to expect highest-sequence TXs be evicted first Signed-off-by: Matthew Whitehead <[email protected]> * Update change log Signed-off-by: Matthew Whitehead <[email protected]> * Spotless fixes Signed-off-by: Matthew Whitehead <[email protected]> --------- Signed-off-by: Matthew Whitehead <[email protected]> (cherry picked from commit 8afad41) --------- Co-authored-by: Sally MacFarlane <[email protected]> Co-authored-by: Gabriel-Trintinalia <[email protected]> Co-authored-by: matkt <[email protected]> Co-authored-by: Fabio Di Fabio <[email protected]> Co-authored-by: Danno Ferrin <[email protected]> Co-authored-by: Suyash Nayan <[email protected]> Co-authored-by: Simon Dudley <[email protected]> Co-authored-by: Diego López León <[email protected]> Co-authored-by: delehef <[email protected]> Co-authored-by: daniellehrner <[email protected]> Co-authored-by: Gabriel Fukushima <[email protected]> Co-authored-by: GoodDaisy <[email protected]> Co-authored-by: Matt Whitehead <[email protected]> Co-authored-by: Jason Frame <[email protected]> Co-authored-by: Stefan Pingel <[email protected]> Co-authored-by: garyschulte <[email protected]> Co-authored-by: ahamlat <[email protected]>
…configured (hyperledger#6079) Signed-off-by: Fabio Di Fabio <[email protected]>
PR description
This PR allows to replace txs on zero base fee markets, or on gas price network, where the txs have gas price set to zero (with
min-gas-price=0
).To achieve that we force the
tx-pool-price-bump=0
when thezeroBaseFee:true
genesis option is present, or whenmin-gas-price=0
andtx-pool-price-bump
option is not set.But this was not enough, since the transaction replacement rules were forcing the new price to be strictly greater than the price bump, that in my opinion is not intuitive, since for example if your existing tx has a gas price of 100, and the price bump is 10%, then we should accept a valid replacement a tx with a gas price of 110, and not 111 as it was before.
So the other change is to accept, as valid replacement, tx with a gas price greater than or equal to the price bump. This make also the
tx-pool-price-bump=0
case more intuitive, since you can replace a tx without increasing the gas price.doc-change-required
to explain that ifzeroBaseFee:true
in the genesis, thentx-pool-price-bump=0
is forced internally, and any attempt to specify a value for it results in an error, and that if you setmin-gas-price=0
thentx-pool-price-bump=0
is forced internally, unless you specifically set it to a different value.Fixed Issue(s)
fixes #6043