-
Notifications
You must be signed in to change notification settings - Fork 55
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
chore(deps): bump github.com/ethereum/go-ethereum from 1.14.8 to 1.14.11 #2026
chore(deps): bump github.com/ethereum/go-ethereum from 1.14.8 to 1.14.11 #2026
Conversation
Bumps [github.com/ethereum/go-ethereum](https://github.com/ethereum/go-ethereum) from 1.14.8 to 1.14.11. - [Release notes](https://github.com/ethereum/go-ethereum/releases) - [Commits](ethereum/go-ethereum@v1.14.8...v1.14.11) --- updated-dependencies: - dependency-name: github.com/ethereum/go-ethereum dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
- Added DiscoveryV5 = true to golden files to match the updated output of dumpconfig from the updated geth version. Note: geth sets DiscoveryV4 = True and DiscoveryV5 = true in the default configs see https://github.com/ethereum/go-ethereum/blob/master/cmd/utils/flags.go#L1366-L1367 for nodes not runing V5 backwards compatibility - updated all references of v1.14.8 -> v1.14.11
@@ -106,7 +106,8 @@ func MakeGethConfig(conf Config) FullConfig { | |||
|
|||
// Set the bootnodes and trusted nodes. | |||
cfg.Node.UserIdent = conf.Moniker | |||
cfg.Node.P2P.DiscoveryV4 = true // TODO(corver): Switch to v5. | |||
cfg.Node.P2P.DiscoveryV4 = true | |||
cfg.Node.P2P.DiscoveryV5 = true |
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 enabling both safe / is this necessary for 1.14.11?
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.
indeed, this require a separate issue with dedicated P2P testing
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.
Opened this issue #2069
…-ethereum-1.14.11
- Disables discv5 which is enabled by default since geth version 1.14.9 to limit scope of PR - add unittest-run to makefile
@@ -106,7 +106,8 @@ func MakeGethConfig(conf Config) FullConfig { | |||
|
|||
// Set the bootnodes and trusted nodes. | |||
cfg.Node.UserIdent = conf.Moniker | |||
cfg.Node.P2P.DiscoveryV4 = true // TODO(corver): Switch to v5. | |||
cfg.Node.P2P.DiscoveryV4 = true | |||
cfg.Node.P2P.DiscoveryV5 = true |
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.
indeed, this require a separate issue with dedicated P2P testing
@@ -17,7 +17,8 @@ | |||
"shanghaiTime": 0, | |||
"cancunTime": 0, | |||
"terminalTotalDifficulty": 0, | |||
"terminalTotalDifficultyPassed": true | |||
"terminalTotalDifficultyPassed": true, | |||
"depositContractAddress": "0x0000000000000000000000000000000000000000" |
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.
are we sure this is fine?
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.
Yes this is fine, depositContractAddress is the Eth 2.0 staking contract address. As we are only using execution layer we have no use for this. But the updated version of geth is adding this new field, so this is the updated golden file.
e2e/app/geth/config_internal_test.go
Outdated
@@ -103,7 +103,8 @@ func gethDumpConfigToml(t *testing.T, baseCfg FullConfig) []byte { | |||
fmt.Sprintf("--volume=%s:/tmp/config.toml", baseFile), | |||
fmt.Sprintf("ethereum/client-go:%s", Version), | |||
"dumpconfig", | |||
"--config=/tmp/config.toml") | |||
"--config=/tmp/config.toml", | |||
"--discv5=false") |
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.
the point of this test it to see what geth does with provided config. If it enables discv5 always, no matter what we provide in the config, then it will also do that in prod. So best make it explicit that discv5 is enabled in that case.
So please remove this line, enable discv5 in MakeGethConfig
and update golden files to indicate that discv5 is enabled. Since it is very hard to disable it.
Bumps github.com/ethereum/go-ethereum from 1.14.8 to 1.14.11.
Release notes
Sourced from github.com/ethereum/go-ethereum's releases.
... (truncated)
Commits
f3c696f
all: release go-ethereum v1.13.8f14f13b
params: go-ethereum v1.14.11 stable40fd887
internal/ethapi: remove td field from block (#30386)db6ae7f
cmd/geth: remove deprecated lightchaindata db (#30527)e67d5f8
eth/catalyst: use setcanonical instead of sethead in simulated fork (#30465)cfe25c7
build: use buildx to build multi-platform docker images (#30530)0a21cb4
core/txpool/blobpool: use types.Sender instead of signer.Sender (#30473)6b61b54
p2p/discover: add config option for disabling FINDNODE liveness check (#30512)283be23
params: begin v1.14.11 release cycle1015a42
Merge pull request #30522 from ethereum/masterDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting
@dependabot rebase
.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
@dependabot rebase
will rebase this PR@dependabot recreate
will recreate this PR, overwriting any edits that have been made to it@dependabot merge
will merge this PR after your CI passes on it@dependabot squash and merge
will squash and merge this PR after your CI passes on it@dependabot cancel merge
will cancel a previously requested merge and block automerging@dependabot reopen
will reopen this PR if it is closed@dependabot close
will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually@dependabot show <dependency name> ignore conditions
will show all of the ignore conditions of the specified dependency@dependabot ignore this major version
will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this minor version
will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this dependency
will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)