Merge/foundation release/1.13.5 #593
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 allows using the freezer from multiple processes at once in read-only mode. Co-authored-by: Martin Holst Swende <martin@swende.se>
When MatcherSession encounters an error, it attempts to close the session. Closing waits for all goroutines to finish, including the 'distributor'. However, the distributor will not exit until all requests have returned. This patch fixes the issue by delivering the (empty) result to the distributor before calling Close().
This fixes an issue where the --bootnodes flag was overridden by the config file. --------- Co-authored-by: NathanBSC <Nathan.l@nodereal.io> Co-authored-by: Felix Lange <fjl@twurst.com>
Co-authored-by: Felix Lange <fjl@twurst.com>
Adding a space beween function opOrigin() and opcCaller() in instruciton.go. Adding a space beween function opkeccak256() and opAddress() in instruciton.go.
This PR will allow a previously underpriced transaction back in after a timeout of 5 minutes. This will block most transaction spam but allow for transactions to be re-broadcasted on networks with less transaction flow. --------- Co-authored-by: Felix Lange <fjl@twurst.com>
So apparently in the spec the base block parameter of eth_call is optional. I agree that "latest" is a sane default for this that most people would use.
* eth/downloader: remove rollback mechanism in downloader * eth/downloader: remove the tests
core/txpool:fix typos
fix(core/txpool): fix typos
* core, accounts, eth, trie: handle genesis state missing * core, eth, trie: polish * core: manage txpool subscription in mainpool * eth/backend: fix test * cmd, eth: fix test * core/rawdb, trie/triedb/pathdb: address comments * eth, trie: address comments * eth: inline the function * eth: use synced flag * core/txpool: revert changes in txpool * core, eth, trie: rename functions
This change contains the final (?) address for 4788 beacon root contract. The update to the EIP is being tracked here: ethereum/EIPs#7672 --------- Co-authored-by: Martin Holst Swende <martin@swende.se>
Signed-off-by: jsvisa <delweng@gmail.com>
* fix: typo * feat: revert symbol name
…elDB (#28224) ethdb, internal/ethapi: support exposing Pebble stats too, besinde LevelDB
* fix(core/txpool): fix typos * core/asm: fix typos * core/bloombits: fix typos * core/rawdb: fix typos
Same way that the gasUsed in header is updated when a tx is added we should update blob gas used instead of requiring caller to set it manually.
Small trie prefetcher nits
* ethdb/pebble: upgrade pebble * ethdb/pebble, go.mod: update pebble to master (aa077af62593) --------- Co-authored-by: Péter Szilágyi <peterke@gmail.com>
This reverts commit b85c183
Date: 2024-02-04 07:59:44-07:00 Signed-off-by: meows <b5c6@protonmail.com>
…ethash,core,core/txpool/blobpool,core/txpool,core/types,core/vm,eth/catalyst,eth/protocols/eth,miner,params/types/coregeth,params/types/ctypes,params/types/genesisT,params/types/goethereum: add conditions per block number for cancun EIPs
…atherForks
forkid_test.go:563:40: not enough arguments in call to gatherForks
have (ctypes.ChainConfigurator)
want (ctypes.ChainConfigurator, uint64) (typecheck)
Signed-off-by: Diego López León <dieguitoll@gmail.com>
…/clique,consensus/ethash,core,core/txpool/blobpool,core/txpool,core/types,core/vm,eth/catalyst,eth/protocols/eth,miner,params/types/coregeth,params/types/ctypes,params/types/genesisT,params/types/goethereum: Merge branch 'merge/foundation-release/1.13.4' into merge/foundation-release/1.13.5 # Conflicts: # core/chain_makers.go
…4' into merge/foundation-release/1.13.5
ziogaschr
reviewed
Feb 13, 2024
| @@ -76,7 +76,7 @@ var Defaults = Config{ | |||
| DatasetsOnDisk: 2, | |||
| DatasetsLockMmap: false, | |||
| }, | |||
| NetworkId: vars.DefaultNetworkID, | |||
| NetworkId: 0, // enable auto configuration of networkID == chainID | |||
There was a problem hiding this comment.
Just a note to be extra cautious in this change.
Classic config has this hardcoded to 1, which is correct. 👍
ziogaschr
reviewed
Feb 13, 2024
| @@ -284,7 +284,12 @@ func newHandler(config *handlerConfig) (*handler, error) { | |||
| } | |||
| return 0, nil | |||
| } | |||
| return h.chain.InsertChain(blocks) | |||
| n, err := h.chain.InsertChain(blocks) | |||
| // PTAL(meowsbits) This chunk was removed upstream. (No acceptTxs.Store...) | |||
There was a problem hiding this comment.
Nice that you've added this comment here so as we don't miss it on subsequent merges.
ziogaschr
approved these changes
Feb 13, 2024
Conflicts:
eth/ethconfig/config.go
eth/ethconfig/gen_config.go
params/version.go
|
This branch is a superset of the 13.x branches:PRs below, with these stacked PRs originally intended only to piece-out the diffs for review's sake.
Those PRs have been reviewed and ✔️'d. This branch has been merged with the latest versions of both those branches (as noops, but just to be safe), so I'm going to close those PRs in favor of this one. Then I'll change the base (/target) branch of this PR to |
meowsbits
changed the base branch from
merge/foundation-release/1.13.4
to
master
meowsbits
changed the title
…alChainConfigurator patch Date: 2024-02-20 12:25:34-07:00 Signed-off-by: meows <b5c6@protonmail.com>
|
Don't know why the "go generate check" is failing... can't reproduce locally. |
|
Gosh I just love green lights. Thanks @ziogaschr 💚 |
|
Syncing finished fine on all nodes @meowsbits. Let's merge it |
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.
Rel #575, #563.
Merges https://github.com/ethereum/go-ethereum/releases/tag/v1.13.5.