Skip to content

Conversation

@meowsbits
Copy link
Contributor

Merges our 1.10.20 merge branch with ethereum/go-ethereum's currently-latest release/1.10 branch, which has its head at

commit 671094279e8d27f4b4c3c94bf8b636c26b473976 (tag: v1.10.21, foundation/release/1.10)
Author: Felix Lange <[email protected]>
Date:   Wed Jul 27 13:53:06 2022 +0200

    params: go-ethereum v1.10.21 stable

diff --git a/params/version.go b/params/version.go
index 188b31d58b..c1dd05955c 100644
--- a/params/version.go
+++ b/params/version.go
@@ -21,10 +21,10 @@ import (
 )
 
 const (
-       VersionMajor = 1          // Major version component of the current release
-       VersionMinor = 10         // Minor version component of the current release
-       VersionPatch = 21         // Patch version component of the current release
-       VersionMeta  = "unstable" // Version metadata to append to the version string
+       VersionMajor = 1        // Major version component of the current release
+       VersionMinor = 10       // Minor version component of the current release
+       VersionPatch = 21       // Patch version component of the current release
+       VersionMeta  = "stable" // Version metadata to append to the version string
 )
 
 // Version holds the textual version string.

On top of #489.

karalabe and others added 30 commits June 15, 2022 15:56
The oss-fuzz engine crashes due to stack overflow decoding a large nested
structure into a interface{}. This PR limits the size of the input data, so
should avoid such crashes.
* cmd/faucet: Add error message for private posts

Fixes #22631

* grammar
cmd/faucet: Add Sepolia network support to faucet
Decrease children size instead of dirties size when marking dirties as cleaned up in trie cleaner
* internal/ethapi: rename PublicEthereumAPI to EthereumAPI

* eth: rename PublicEthereumAPI to EthereumAPI

* internal/ethapi: rename PublicTxPoolAPI to TxPoolAPI

* internal/ethapi: rename PublicAccountAPI to EthereumAccountAPI

* internal/ethapi: rename PrivateAccountAPI to PersonalAccountAPI

* internal/ethapi: rename PublicBlockChainAPI to BlockChainAPI

* internal/ethapi: rename PublicTransactionPoolAPI to TransactionAPI

* internal/ethapi: rename PublicDebugAPI to DebugAPI

* internal/ethapi: move PrivateDebugAPI methods to DebugAPI

* internal/ethapi: rename PublicNetAPI to NetAPI

* les: rename PrivateLightServerAPI to LightServerAPI

* les: rename PrivateLightAPI to LightAPI

* les: rename PrivateDebugAPI to DebugAPI

* les: rename PublicDownloaderAPI to DownloaderAPI

* eth,les: rename PublicFilterAPI to FilterAPI

* eth: rename PublicMinerAPI to MinerAPI

* eth: rename PublicDownloaderAPI to DownloaderAPI

* eth: move PrivateMinerAPI methods to MinerAPI

* eth: rename PrivateAdminAPI to AdminAPI

* eth: rename PublicDebugAPI to DebugAPI

* eth: move PrivateDebugAPI methods to DebugAPI

* node: rename publicAdminAPI to adminAPI

* node: move privateAdminAPI methods to adminAPI

* node: rename publicWeb3API to web3API

* eth,internal/ethapi: sync comments with previous renamings
* cmd/geth: drop js command

* cmd: simplify ipc path determination for attach

* Add deprecation warning for js

* rm testdata for exec

* fix account unlock test cases

* Update cmd/geth/consolecmd.go

Co-authored-by: Martin Holst Swende <[email protected]>

* fix

Co-authored-by: Martin Holst Swende <[email protected]>
* miner: retrieve mining state from live database

* eth/catalyst: ignore stale fcu events from cl
Fix typo in txPool truncateQueue comment
This changes the []byte <-> Uint8Array conversion to use an
ArrayBuffer, avoiding inefficient copying of the slice data in Goja.

Co-authored-by: Felix Lange <[email protected]>
The error was introduced in PR #21686, but there is no good reason to enforce sync
in this method, and it causes issues with EL/CL integration.
all: remove public field from rpc.API
This change updates our urfave/cli dependency to the v2 branch of the library.
There are some Go API changes in cli v2:

- Flag values can now be accessed using the methods ctx.Bool,
  ctx.Int, ctx.String, ... regardless of whether the flag is 'local' or
  'global'.

- v2 has built-in support for flag categories. Our home-grown category
  system is removed and the categories of flags are assigned as part of
  the flag definition.

For users, there is only one observable difference with cli v2: flags must now
strictly appear before regular arguments. For example, the following command is
now invalid:

   geth account import mykey.json --password file.txt

Instead, the command must be invoked as follows:

   geth account import --password file.txt mykey.json
This adds a new flag to set the discovery port to be different from
the TCP listener port.

Co-authored-by: Felix Lange <[email protected]>
…lock (#25187)

* consensus/beacon: check that only the latest pow block is valid ttd block

* consensus/beacon: move verification to async function

* consensus/beacon: fix verifyTerminalPoWBlock, add test cases

* consensus/beacon: cosmetic changes

* consensus/beacon: apply karalabe's fixes
karalabe and others added 19 commits July 25, 2022 16:50
eth/tracers/js: fix capitalization in tests
* eth: support bubbling up bad blocks from sync to the engine API

* eth/catalyst: fix typo

Co-authored-by: Marius van der Wijden <[email protected]>

* eth/catalyst: fix typo

Co-authored-by: Marius van der Wijden <[email protected]>

* Update eth/catalyst/api.go

* eth/catalyst: when forgetting bad hashes, also forget descendants

* eth/catalyst: minor bad block tweaks for resilience

Co-authored-by: Marius van der Wijden <[email protected]>
Co-authored-by: Martin Holst Swende <[email protected]>
params: change Merge config to print simpler message
* core: eth: rpc: implement safe rpc block

* core: fix setHead, panics
…ndation-release/1.10.21

Conflicts:
      cmd/devp2p/dns_cloudflare.go
      cmd/puppeth/module_dashboard.go
      cmd/puppeth/wizard_genesis.go
      cmd/utils/flags.go
      consensus/misc/forks.go
      core/forkid/forkid_test.go
      core/genesis.go
      core/vm/jump_table.go
      eth/catalyst/api.go
      eth/tracers/api.go
      go.mod
      go.sum
      internal/ethapi/api.go
      internal/ethapi/transaction_args.go
      les/catalyst/api.go
      params/config.go
      params/version.go
Date: 2022-08-01 10:11:28-07:00
Signed-off-by: meows <[email protected]>
Date: 2022-08-01 10:11:47-07:00
Signed-off-by: meows <[email protected]>
…onfig type

Date: 2022-08-01 10:22:34-07:00
Signed-off-by: meows <[email protected]>
Date: 2022-08-01 10:23:15-07:00
Signed-off-by: meows <[email protected]>
Date: 2022-08-01 10:26:33-07:00
Signed-off-by: meows <[email protected]>
Date: 2022-08-01 10:31:06-07:00
Signed-off-by: meows <[email protected]>
…o field or method IsLondon)

Date: 2022-08-01 10:34:07-07:00
Signed-off-by: meows <[email protected]>
…h,params/types/goethereum,params/types/parity: unnecessary leading newline (whitespace)

Date: 2022-08-01 10:36:06-07:00
Signed-off-by: meows <[email protected]>
…racers,eth/tracers/native,ethclient,integration,node,params/mutations,tests: unnecessary leading newline (whitespace)

Wow

Date: 2022-08-01 10:46:38-07:00
Signed-off-by: meows <[email protected]>
Date: 2022-08-01 10:48:16-07:00
Signed-off-by: meows <[email protected]>
…s/types/goethereum,params/types/multigeth,params/types/parity: implement TheMergeTransition virtual fork block interface method

This value is established by the go-ethereum config
as MergeNetsplitBlock. It is apparently to be used
as a virtual fork block, once the merge block is
finalized for some network (since Terminal TD is
used to configure the actual transition).

Date: 2022-08-01 11:10:29-07:00
Signed-off-by: meows <[email protected]>
Date: 2022-08-01 11:10:41-07:00
Signed-off-by: meows <[email protected]>
@meowsbits meowsbits requested a review from ziogaschr August 1, 2022 18:30
@meowsbits meowsbits self-assigned this Aug 1, 2022
@ziogaschr
Copy link
Member

Started reviewing this PR. All looks good so far.

On the other hand, this came under my attention ethereum/go-ethereum#25432. I will try to run similar tests to see what happens.

Conflicts:
      cmd/geth/usage.go
      cmd/utils/flags.go
Date: 2022-08-15 05:38:36-07:00
Signed-off-by: meows <[email protected]>
Copy link
Member

@ziogaschr ziogaschr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested this PR on both classic and mordor for stuff like syncing (not on a fresh chain, as @meowsbits have done it), CPU mining, tracers, accounts, USB wallet (Ledger) and it operates fine.

I also reviewed the diff of this PR and of #489 and it looks good to me.

@meowsbits meowsbits merged commit 88aedee into master Sep 5, 2022
@meowsbits meowsbits deleted the merge/foundation-release/1.10.21 branch September 5, 2022 16:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.