Skip to content

Conversation

@garyschulte
Copy link
Contributor

PR description

prep 23.1.x release branch for alternate burn-in candidate by merging main into release-23.1.x

Fixed Issue(s)

Documentation

  • I thought about documentation and added the doc-change-required label to this PR if
    updates are required.

Acceptance Tests (Non Mainnet)

  • I have considered running ./gradlew acceptanceTestNonMainnet locally if my PR affects non-mainnet modules.

Changelog

siladu and others added 30 commits February 8, 2023 16:06
…ds (hyperledger#4980)

* Add engine get payload body methods and test

Signed-off-by: Zhenyang Shi <[email protected]>
Signed-off-by: Gabriel Fukushima <[email protected]>

* Add header

Signed-off-by: Zhenyang Shi <[email protected]>

* Update result struct & add test

Signed-off-by: Zhenyang Shi <[email protected]>

* Change constant to use upper case

Signed-off-by: Gabriel Fukushima <[email protected]>

* Add PayloadBody class and withdrawals to response of methods

Signed-off-by: Gabriel Fukushima <[email protected]>

* Add unit tests

Signed-off-by: Gabriel Fukushima <[email protected]>

* Add changelog

Signed-off-by: Gabriel Fukushima <[email protected]>

* spotless

Signed-off-by: Gabriel Fukushima <[email protected]>

* Add check to prevent returning trailing null results past the head

Signed-off-by: Gabriel Fukushima <[email protected]>

* Add test to check trailing null post head scenario

Signed-off-by: Gabriel Fukushima <[email protected]>

* Split tests into pre and post shanghai

Signed-off-by: Gabriel Fukushima <[email protected]>

* spotless

Signed-off-by: Gabriel Fukushima <[email protected]>

* Rename methods

Signed-off-by: Gabriel Fukushima <[email protected]>

* Use getName() to log method name

Signed-off-by: Gabriel Fukushima <[email protected]>

* spotless

Signed-off-by: Gabriel Fukushima <[email protected]>

* Rename variable

Signed-off-by: Gabriel Fukushima <[email protected]>

* Call constructor directly

Signed-off-by: Gabriel Fukushima <[email protected]>

* Fix ByHash json parsing
Signed-off-by: Simon Dudley <[email protected]>

* Fix json parsing again
Signed-off-by: Simon Dudley <[email protected]>

* Add check to prevent unnecessary queries

Signed-off-by: Gabriel Fukushima <[email protected]>

* Refactor method

Signed-off-by: Gabriel Fukushima <[email protected]>

* Add new error code for EngineGetPayloadBodies methods

Signed-off-by: Gabriel Fukushima <[email protected]>

* Add return error for request above the API limit

Signed-off-by: Gabriel Fukushima <[email protected]>

* Add constructor for empty response

Signed-off-by: Gabriel Fukushima <[email protected]>

* add check for number of blocks requested and for requests of post head

Signed-off-by: Gabriel Fukushima <[email protected]>

* Add test to check error code when request exceeds API limits

Signed-off-by: Gabriel Fukushima <[email protected]>

* add constant for max blocks allowed per request

Signed-off-by: Gabriel Fukushima <[email protected]>

* spotless

Signed-off-by: Gabriel Fukushima <[email protected]>

* Fix some nits

Signed-off-by: Gabriel Fukushima <[email protected]>

* Add invalid params check

Signed-off-by: Gabriel Fukushima <[email protected]>

* Add tests for invalid params check

Signed-off-by: Gabriel Fukushima <[email protected]>

* Fix test and spotless

Signed-off-by: Gabriel Fukushima <[email protected]>

* Revert "Fix json parsing again"

This reverts commit 558d325.

Signed-off-by: Gabriel Fukushima <[email protected]>

* Revert "Fix ByHash json parsing Signed-off-by: Simon Dudley <[email protected]>"

This reverts commit 663e11e

Signed-off-by: Gabriel Fukushima <[email protected]>

* Use UnsignedLongParameter to cast params of the request

Signed-off-by: Gabriel Fukushima <[email protected]>

* Add optional withdrawals to the NewPayload log (hyperledger#5021)

Signed-off-by: Simon Dudley <[email protected]>

* kubernetes and errorprone - update versions (hyperledger#5013)

* update errorprone and kubernetes versions
* fixed errorprone issues in prod cod
* fixed errorprone issues in test code

---------

Signed-off-by: Sally MacFarlane <[email protected]>

* Rename JsonRpcService to EngineJsonRpcService (hyperledger#5036)

* rename JsonRpcService to EngineJsonRpcService

Signed-off-by: Daniel Lehrner <[email protected]>

* Params should be single item of array type, not outer array of strings (hyperledger#5037)

Signed-off-by: Simon Dudley <[email protected]>

* Add EIP-2537 (BLS12-381 curve precompiles) to Cancun (hyperledger#5017)

Add the BLS curve precompiles into the registry for cancun.  All of the
curve precompiles have been here since berlin, so this is just wiring
them in.

Signed-off-by: Danno Ferrin <[email protected]>
Co-authored-by: Sally MacFarlane <[email protected]>

* Use UnsignedLongParameter to cast params of the request

Signed-off-by: Gabriel Fukushima <[email protected]>

* Add optional withdrawals to the NewPayload log (hyperledger#5021)

Signed-off-by: Simon Dudley <[email protected]>

* kubernetes and errorprone - update versions (hyperledger#5013)

* update errorprone and kubernetes versions
* fixed errorprone issues in prod cod
* fixed errorprone issues in test code

---------

Signed-off-by: Sally MacFarlane <[email protected]>

* Rename JsonRpcService to EngineJsonRpcService (hyperledger#5036)

* rename JsonRpcService to EngineJsonRpcService

Signed-off-by: Daniel Lehrner <[email protected]>

* Params should be single item of array type, not outer array of strings (hyperledger#5037)

Signed-off-by: Simon Dudley <[email protected]>

* Add EIP-2537 (BLS12-381 curve precompiles) to Cancun (hyperledger#5017)

Add the BLS curve precompiles into the registry for cancun.  All of the
curve precompiles have been here since berlin, so this is just wiring
them in.

Signed-off-by: Danno Ferrin <[email protected]>
Co-authored-by: Sally MacFarlane <[email protected]>

* Convert start and count from hex to match JSON-RPC Spec standard

Signed-off-by: Gabriel Fukushima <[email protected]>

---------

Signed-off-by: Zhenyang Shi <[email protected]>
Signed-off-by: Gabriel Fukushima <[email protected]>
Signed-off-by: Simon Dudley <[email protected]>
Signed-off-by: Sally MacFarlane <[email protected]>
Signed-off-by: Daniel Lehrner <[email protected]>
Signed-off-by: Danno Ferrin <[email protected]>
Co-authored-by: Zhenyang Shi <[email protected]>
Co-authored-by: Simon Dudley <[email protected]>
Co-authored-by: Sally MacFarlane <[email protected]>
Co-authored-by: Daniel Lehrner <[email protected]>
Co-authored-by: Danno Ferrin <[email protected]>
* change validation to lessThan

Signed-off-by: Gabriel Fukushima <[email protected]>

* Change exception message to PoS instead of Near head

Signed-off-by: Gabriel Fukushima <[email protected]>

* Add unit test and fix message of existing unit test

Signed-off-by: Gabriel Fukushima <[email protected]>

---------

Signed-off-by: Gabriel Fukushima <[email protected]>
* Use the copy during prepareTrieLog instead of saveTrieLog
* add final flag on BonsaiWorldStateUpdater
* Use a copy of BonsaiInMemoryWorldState inside prepareTrieLog
* add link to persisted worldstate storage
* fix tests
* Make a copy of the worldstate after committing changes to the trielog
* spotless + remove maybeUnSubscribe in setNextWorldView
* subscribe storage on layered worldstate
* fix null issue
* not close layered worldstate during getAccount
* clean code
* Add changelog entry

---------

Signed-off-by: Ameziane H <[email protected]>
Signed-off-by: Karim TAAM <[email protected]>
Co-authored-by: Karim TAAM <[email protected]>
Update and fix forkId tests

Move timestamp forks from getForkBlockNumbers to getForkBlockTimestamps in JsonGenesisConfigOptions - this ultimately gets used to popoulate the ForkIdManager which handles lists of blocks and timestamps the same way so this hasn't changed any actual behaviour, but rather supports the test fixes.

Implement TransitionProtocolSchedule.streamMilestoneBlocks as a concatenation of blockNumbers++blockTimestamps. This may have been a latent bug since it's used to update the node record when a fork transition occurs.

Signed-off-by: Simon Dudley <[email protected]>
hyperledger#5048)

* If a PoS block creation repetition takes less than a configurable duration, then waits before next repetition

Signed-off-by: Fabio Di Fabio <[email protected]>

* Update CHANGELOG

Signed-off-by: Fabio Di Fabio <[email protected]>

* Add unit test

Signed-off-by: Fabio Di Fabio <[email protected]>

* Update besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java

Co-authored-by: Sally MacFarlane <[email protected]>
Signed-off-by: Fabio Di Fabio <[email protected]>

* Update besu/src/main/java/org/hyperledger/besu/cli/options/unstable/MiningOptions.java

Co-authored-by: Sally MacFarlane <[email protected]>
Signed-off-by: Fabio Di Fabio <[email protected]>

---------

Signed-off-by: Fabio Di Fabio <[email protected]>
Co-authored-by: Sally MacFarlane <[email protected]>
…t PoS (Revert PR#3911) (hyperledger#5083)

* reintroduce checking of block height for certain tasks when we are not PoS (Revert PR#3911)

Signed-off-by: Stefan <[email protected]>
* Add gasUsed calculation

Signed-off-by: Gabriel Fukushima <[email protected]>

* Fix unit test

Signed-off-by: Gabriel Fukushima <[email protected]>

* Fix typo

Signed-off-by: Gabriel Fukushima <[email protected]>

---------

Signed-off-by: Gabriel Fukushima <[email protected]>
* default global max rpc batch size to 1000 for now

Signed-off-by: garyschulte <[email protected]>
Signed-off-by: garyschulte <[email protected]>
Signed-off-by: Simon Dudley <[email protected]>
* light edits and fix to BlockBody type reference
* updated plugin api hash

Signed-off-by: Sally MacFarlane <[email protected]>
Adding the t8n and b11r tool allows Hyperledger besu to produce reference 
tests from the https://github.com/ethereum/execution-spec-tests repository.

* Add t8n tool, or transition tool. Calculates the state changes from a set 
  of transactions against a given parent context
* Add b11r tool, or block-builder tool. Given block parts it can generate a 
  RLP block.
* Change some tracing CLI flags to work better with retesteth

Signed-off-by: Danno Ferrin <[email protected]>
Fix a formatting error in standard trace that produced non-parsable
JSON. Add unit tests to cover those cases.

Signed-off-by: Danno Ferrin <[email protected]>
* Add flag to distinguish when bad block is a proposed block

Signed-off-by: Gabriel Fukushima <[email protected]>

* Add flag to distinguish when bad block is a proposed block

Signed-off-by: Gabriel Fukushima <[email protected]>

* javadoc

Signed-off-by: Gabriel Fukushima <[email protected]>

* Add shouldRecordBadBlock flag to stop adding proposed bad blocks to the bad block manager

Signed-off-by: Gabriel Fukushima <[email protected]>

* Add overload to validateAndProcessBlock with shouldRecordBadBlock flag

Signed-off-by: Gabriel Fukushima <[email protected]>

* Add unit test to ensure flag is being used to add blocks to bad block manager

Signed-off-by: Gabriel Fukushima <[email protected]>

* Add unit test to ensure we don't add our own proposed bad block to the bad block manager

Signed-off-by: Gabriel Fukushima <[email protected]>

* Add debug log when badBlock is not added

Signed-off-by: Gabriel Fukushima <[email protected]>

* Undo change done in the first approach

Signed-off-by: Gabriel Fukushima <[email protected]>

* Improve log

Signed-off-by: Gabriel Fukushima <[email protected]>

* Improve test names

Signed-off-by: Gabriel Fukushima <[email protected]>

* Improve javadoc of validateProposedBlock method

Signed-off-by: Gabriel Fukushima <[email protected]>

* Remove method from interface

Signed-off-by: Gabriel Fukushima <[email protected]>

* Change validateProposedBlock access modifier to private

Signed-off-by: Gabriel Fukushima <[email protected]>

---------

Signed-off-by: Gabriel Fukushima <[email protected]>
…te for old head (hyperledger#5101)

This is misleading when debugging because we return VALID in the API and there's not actually an INVALID issue to debug despite what the logs were saying.

Also rename and flip the isValid boolean to be shouldNotProceedToPayloadBuildProcess for clarity.

Signed-off-by: Simon Dudley <[email protected]>
In one case reading config files used parseLong instead of decode.
decode accepts `0x` and decimal, only a single radix for parseLong.

Signed-off-by: Danno Ferrin <[email protected]>
Support two in-the-wild models of blockhash for testing. For state-tests
always use the keccak hash of the decimal text of the block number.
For t8n always use the blockHashes table in the env. No change to production
handling of blockhash. Refactored BlockHashLookup to split caching 
implementation from API.

Signed-off-by: Danno Ferrin <[email protected]>
fab-10 and others added 10 commits February 25, 2023 10:18
The regression was introduced in commit 28f2bd4
Signed-off-by: Fabio Di Fabio <[email protected]>
* Bump SLF4J version and replace helper for lambdas

Signed-off-by: Diego López León <[email protected]>

* Remove unnecessary toString calls

Signed-off-by: Diego López León <[email protected]>

* Replace unnecessaryy lambdas for constant references

Signed-off-by: Diego López León <[email protected]>

---------

Signed-off-by: Diego López León <[email protected]>
Added Ethereum execution spec test to be generated and executed by reference tests gradle task. Add `https://github.com/ethereum/execution-spec-tests/releases` as custom ivy repository to easily download and cache the test specs. Updated the reference test gradle file to generate the test Java classes.

Signed-off-by: Usman Saleem <[email protected]>
Signed-off-by: Gabriel Fukushima <[email protected]>
Signed-off-by: Jason Frame <[email protected]>
…yperledger#5146)

Add an acceptance test to ensure eth_getBlockByNumber and eth_getBlockByHash return withdrawals correctly for shanghai

Signed-off-by: Simon Dudley <[email protected]>
@garyschulte garyschulte enabled auto-merge (squash) March 3, 2023 20:11
@garyschulte garyschulte merged commit 0b57525 into hyperledger:release-23.1.x Mar 3, 2023
@garyschulte garyschulte deleted the 23.1.1-prep branch March 3, 2023 20:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.