Merge upstream op-geth v1.101304.1 #58
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This change improves function description and simplifies logic in statedb update and commit operations.
* eth/catalyst: set random * Apply suggestions from code review --------- Co-authored-by: Martin Holst Swende <martin@swende.se>
Revert pending subscription filter
beacon/engine: add shouldOverrideBuilder to payload envelope
* core/forkid: skip genesis forks by time * core/forkid: add comment about skipping non-zero fork times * core/forkid: skip all time based forks in genesis using loop * core/forkid: simplify logic for dropping time-based forks
On ACD 163, it was agreed to bump the target and max blob values from `2/4` to `3/6` for future devnets until we could decide on final mainnet number. This change contains said update, making master pass all the hive tests. The final decision for mainnet cancun is still to be made. --------- Co-authored-by: Felix Lange <fjl@twurst.com>
This changes removes the warn-printout about not finding unclean shutdown markers, which always happens on fresh installs / wiped databases.
This updates minisign to the latest version. One new thing is that minisign (not go-minisign) has started to prehash the file, and in order to make geth pass the version-check, we need to sign the file in legacy-mode.
Avoids the somewhat expensive stack.Caller invocation by checking if it is needed
This decrease the GPO default minimum suggested fee to 0.001 GWEI from 0.1 GWEI and also make this value configurable via the gpo.MinSuggestedPriorityFee command line option.
Co-authored-by: Adrian Sutton <adrian@oplabs.co>
…ggested_fee Decrease GPO min suggested fee & make it configurable
This fixes the derived value BlobGasPrice on the receipt of EIP-4844 transactions, which was previously erroneously set to the price cap.
…mitInterval blocks
Co-authored-by: andyzhang2023 <andyzhang2023@gmail.com> Co-authored-by: bnoieh <135800952+bnoieh@users.noreply.github.com>
|
TL;DR |
This change adds a check to ensure that transactions added to the legacy pool are not treated as 'locals' if the global locals-management has been disabled. This change makes the pool enforce the --txpool.pricelimit setting.
Co-authored-by: bnoieh <135800952+bnoieh@users.noreply.github.com>
…oad) (#186) * miner: Add block building interruption on payload resolution (getPayload) * miner: Change full payload resolution, fix and add test * miner: Add parameter validation if skipping empty block We only build the empty block if we don't use the tx pool. So if we use the tx pool, a forkchoiceUpdated call would miss the implicit validation that's happening during empty block building, so we need to add it back. * miner: Always wait for block builder result after interrupting This commit changes the way the block builder/update routine and the resolution functions Resolve and ResolveFull synchronize. Resolve(Full) now signal the payload builder to pause and set the interrupt signal in case any block building is ongoing. They then wait for the interrupted block building to complete. This allowed to simplify the Payload implementation somewhat because the builder routine is now guaranteed to return before the resulting fields (full, fullFees etc) are read, and closing of the `stop` channel is now synchronized with a sync.Once. So the mutex and conditional variable could be removed and we only use two simple signalling channels `stop` and `done` for synchronization. * miner: Add testing mode to module Some test in the miner and catalyst package assume that getPayload can be immediately called after forkchoiceUpdated and then to return some built block. Because of the new behavior of payload resolution to interrupt any ongoing payload building process, this creates a race condition on block building. The new testing mode, which can be enabled by setting the package variable IsPayloadBuildingTest to true, guarantees that always at least one full block is built. It's hacky, but seems to be the easiest and less-intrusive way to enable the new behavior of payload resolution while still keeping all tests happy. * miner: Further improve block building interruption - Priotize stop signal over recommit - Don't start payload building update if last update duration doesn't fit until slot timeout. * miner: Partially revert rework of payload build stopping When resolving, we don't want to wait for the latest update. If a full block is available, we just return that one, as before. Payload building is still interrupted, but exits in the background. * miner: Return early when building interrupted payload updates * Remove global variable to change miner behaviour. Use a longer wait in tests for the payload to build. * miner: Interrupt first payload building job Also added interrupt test. Had to add sleep to make non-interrupt test work. * eth/catalyst: Add even more sleeps to make tests get over payload interruption * Deterministically wait for payloads to build the first full block * eth/catalyst,miner: Improve payload full block waiting in tests Also fix a bug in TestNilWithdrawals where the withdrawals weren't added to the ephemeral BuildPayloadArgs instance for re-calculating the payload id. * miner: Calculate sane block building time in validateParams Also always stop interrupt timer after fillTransactions in generateWork. --------- Co-authored-by: Adrian Sutton <adrian@oplabs.co>
Co-authored-by: Martin HS <martin@swende.se> Co-authored-by: Felix Lange <fjl@twurst.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Merge upstream op-geth v1.101304.1
Rationale
To import bugsfix/improvements/features from upstream op-geth
Example
n/a
Changes
changes from geth
v1.11.6 -> v1.13.4
changes from op-geth
v1.101105.2 ➝ v1.101304.1
here's modification in this pr for changes from op-geth:
EIP1559DenominatorCanyonchanges from bnb-chain/op-geth develop branch