Code

Minimized changes for the merge #23761

Code

Merged

karalabe merged 33 commits intoethereum:masterethereum/go-ethereum:masterfrom MariusVanDerWijden:test-branchMariusVanDerWijden/go-ethereum:test-branchCopy head branch name to clipboardNov 26, 2021

+3,233-792

Commits

Commits on Nov 1, 2021

• all: work for eth1/2 transtition

  

  rjl493456442

  authored and

  MariusVanDerWijden

  committed
  38eb641

• consensus/beacon, eth: change beacon difficulty to 0

  

  rjl493456442

  authored and

  MariusVanDerWijden

  committed
  ed1c9ce

• eth: updates

  

  rjl493456442

  authored and

  MariusVanDerWijden

  committed
  e234c25

• all: add terminalBlockDifficulty config, fix rebasing issues

  

  rjl493456442

  authored and

  MariusVanDerWijden

  committed
  e3a3374

• eth: implemented merge interop spec

  MariusVanDerWijden

  committed
  da9c5a4

• internal/ethapi: update to v1.0.0.alpha.2

  Show description for 1037258
  MariusVanDerWijden

  committed
  1037258

• all: sync polishes, other fixes + refactors

  

  karalabe

  authored and

  MariusVanDerWijden

  committed
  6418972

• core, eth: correct semantics for LeavePoW, EnterPoS

  MariusVanDerWijden

  committed
  7727d0e

Commits on Nov 2, 2021

• core: fixed rebasing artifacts

  MariusVanDerWijden

  committed
  0bc0bb2

• core: light: performance improvements

  MariusVanDerWijden

  committed
  16be60f

Commits on Nov 3, 2021

• core: use keyed field (f)

  MariusVanDerWijden

  committed
  54c752a

Commits on Nov 8, 2021

• Merge branch 'master' into test-branch

  MariusVanDerWijden

  authored
  f7ce07b

• core: eth: fix compilation issues + tests

  MariusVanDerWijden

  committed
  6963517

Commits on Nov 9, 2021

• eth/catalyst: dbetter error codes

  MariusVanDerWijden

  committed
  c0216eb

Commits on Nov 11, 2021

• all: move Merger to consensus/, remove reliance on it in bc

  MariusVanDerWijden

  committed
  92fdcc4

• all: renamed EnterPoS and LeavePoW to ReachTDD and FinalizePoS

  MariusVanDerWijden

  committed
  148f1fd

• core: make mergelogs a function

  MariusVanDerWijden

  committed
  c9a852d

• core: use InsertChain instead of InsertBlock

  MariusVanDerWijden

  committed
  7f54690

• les: drop merger from lightchain object

  MariusVanDerWijden

  committed
  e8ce790

• consensus: add merger

  MariusVanDerWijden

  committed
  9304474

Commits on Nov 15, 2021

• core: recoverAncestors in catalyst mode

  MariusVanDerWijden

  committed
  6ccb36c

• core: fix nitpick

  MariusVanDerWijden

  committed
  5b1c3cc

Commits on Nov 16, 2021

• all: removed merger from beacon, use TTD, nitpicks

  MariusVanDerWijden

  committed
  75bc816

• consensus: eth: add docstring, removed unnecessary code duplication

  MariusVanDerWijden

  committed
  fe45669

• consensus/beacon: better comment

  MariusVanDerWijden

  committed
  9b78e1e

Commits on Nov 17, 2021

• all: easy to fix nitpicks by karalabe

  MariusVanDerWijden

  committed
  153d85f

• consensus/beacon: verify known headers to be sure

  MariusVanDerWijden

  committed
  87686a1

• core: comments

  MariusVanDerWijden

  committed
  082d6a8

Commits on Nov 19, 2021

• core: eth: don't drop peers who advertise blocks, nitpicks

  MariusVanDerWijden

  committed
  3440375

• core: never add beacon blocks to the future queue

  MariusVanDerWijden

  committed
  d4212be

Commits on Nov 22, 2021

• core: fixed nitpicks

  MariusVanDerWijden

  committed
  237fadc

Commits on Nov 23, 2021

• consensus/beacon: simplify IsTTDReached check

  MariusVanDerWijden

  committed
  1a92d4a

• consensus/beacon: correct IsTTDReached check

  MariusVanDerWijden

  committed
  dd22e9a