Code

#2598 + cleanups#2630

Code

Merged

djrtwo merged 22 commits intodevethereum/consensus-specs:devfrom tests/merge-clean-upethereum/consensus-specs:tests/merge-clean-upCopy head branch name to clipboardSep 27, 2021

+599-13

Commits

Commits on Sep 10, 2021

• Merge branch 'dev' into tests/merge

  zilm13

  committed
  f38750a

  Copy full SHA for f38750a

Commits on Sep 14, 2021

• Fixed uint256 type misalign

  zilm13

  committed
  14a3825

  Copy full SHA for 14a3825

• Extracted process_merge_execution_payload, terminal block validation function

  zilm13

  committed
  9acf60f

  Copy full SHA for 9acf60f

• Added new Merge tests

  zilm13

  committed
  7ff173b

  Copy full SHA for 7ff173b

• Fixed lint errors for merge tests

  zilm13

  committed
  cf1bd6c

  Copy full SHA for cf1bd6c

• Renamed test_on_block -> test_terminal_validity to avoid misleading as generator test

  zilm13

  committed
  b99720e

  Copy full SHA for b99720e

Commits on Sep 15, 2021

• Enable genesis client tests for MERGE

  zilm13

  committed
  829c6e7

  Copy full SHA for 829c6e7

Commits on Sep 20, 2021

• Merge branch 'hardcoded-ttd' into tests/merge

  zilm13

  committed
  8bfa518

  Copy full SHA for 8bfa518

Commits on Sep 21, 2021

• Changed terminal total difficulty to have some difficulty range for tests without overflow

  zilm13

  committed
  9bd95c4

  Copy full SHA for 9bd95c4

• merge tests updated to be in line with transition_store removal

  zilm13

  committed
  cdcf366

  Copy full SHA for cdcf366

Commits on Sep 23, 2021

• Added on_merge_block client tests

  zilm13

  committed
  b1aa227

  Copy full SHA for b1aa227

• Fixed lint errors for test_on_merge_block.py

  zilm13

  committed
  239653e

  Copy full SHA for 239653e

• Merge branch 'dev' into tests/merge

  zilm13

  committed
  8ae078a

  Copy full SHA for 8ae078a

• Polishing merge tests

  zilm13

  committed
  1ecfc40

  Copy full SHA for 1ecfc40

• Fixed imports in merge tests

  zilm13

  committed
  f3f1c86

  Copy full SHA for f3f1c86

Commits on Sep 24, 2021

• update PowBlock generation with random hash

  zilm13

  committed
  457b039

  Copy full SHA for 457b039

• Fixed test_on_merge_block tests

  zilm13

  committed
  f8b3a67

  Copy full SHA for f8b3a67

• Make empty pow_block hash generation Python 3.8 compatible

  zilm13

  committed
  deb4dbd

  Copy full SHA for deb4dbd

Commits on Sep 27, 2021

• Apply suggestions from code review

  djrtwo

  authored
  c8d05c6

  Copy full SHA for c8d05c6

• Apply the trivial suggestions

  hwwhww

  authored
  2fa595f

  Copy full SHA for 2fa595f

• Clean up, refactor test_transition.py

  hwwhww

  committed
  5ab2824

  Copy full SHA for 5ab2824

• Change mainnet TERMINAL_TOTAL_DIFFICULTY placeholder to 2**256-2**10 to avoid overflow

  hwwhww

  committed
  ef51e1c

  Copy full SHA for ef51e1c