merge main into verkle #7928

matkt · 2024-11-26T15:19:59Z

PR description

merge main (674a7ba) into verkle

Fixed Issue(s)

Thanks for sending a pull request! Have you done the following?

Checked out our contribution guidelines?
Considered documentation and added the doc-change-required label to this PR if updates are required.
Considered the changelog and included an update if required.
For database changes (e.g. KeyValueSegmentIdentifier) considered compatibility and performed forwards and backwards compatibility tests

Locally, you can run these tests to catch failures early:

unit tests: ./gradlew build
acceptance tests: ./gradlew acceptanceTest
integration tests: ./gradlew integrationTest
reference tests: ./gradlew ethereum:referenceTests:referenceTests

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

…PI (hyperledger#7832) Signed-off-by: Fabio Di Fabio <[email protected]>

* Make timeout feature use vertx timer. * Handle all errors resulting from timeout. * Ensure that after the timeout occurs, we properly handle the response and don't allow the execution to continue. --------- Signed-off-by: Ade Lucas <[email protected]> Signed-off-by: cloudspores <[email protected]> Co-authored-by: Ade Lucas <[email protected]> Co-authored-by: Ade Lucas <[email protected]> Co-authored-by: Justin Florentine <[email protected]>

Signed-off-by: Matilda Clerke <[email protected]>

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

…r#7837) Also change "Missing" -> "Unexpected" message when V3 blob params sent to V2 Signed-off-by: Simon Dudley <[email protected]>

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

* remove retesteth rpc service and commands Signed-off-by: garyschulte <[email protected]>

decoupled parent block header from block creators optionalized some fields of ProtocolSchedule constructor, which will allow us to reduce number of constructors later. Refactored JsonBlockImporterTest so it can provide a BesuComponent ProtocolScheduleBuilder optionalizes the default chainid Blocks SubCommand is now Dagger aware Creates but rarely uses ProtocolSpec and ProtocolSchedule modules. Deeper adoption pending. Adds a Coinbase module with fixed values for use in testing. Introduces an EthereumCoreComponent, to be used as a subcomponent of BesuComponent in the future. Introduces a MiningParameters module with common static values used by tests. Removes MiningParameters static constructor. --------- Signed-off-by: Justin Florentine <[email protected]> Signed-off-by: jflo <[email protected]>

Signed-off-by: jflo <[email protected]>

* adds issue templates Signed-off-by: jflo <[email protected]> * adopts pr suggestions Signed-off-by: jflo <[email protected]> --------- Signed-off-by: jflo <[email protected]> Co-authored-by: Sally MacFarlane <[email protected]>

Signed-off-by: jflo <[email protected]>

Signed-off-by: garyschulte <[email protected]>

…ger#7821) * add optional worldstate move to debug_setHead * make state rolling occur incrementally so as not to overwhelm memory and resources Signed-off-by: garyschulte <[email protected]>

…yperledger#7834) * fix(push): right pad if push parameter exceeds code length * test: add push operation padding tests * better perf rightPadding thnks to Ameziane Signed-off-by: F Bojarski <[email protected]> Co-authored-by: Ameziane H. <[email protected]>

* fixes hyperledger#7749 Signed-off-by: vaidikcode <[email protected]> * tests Signed-off-by: vaidikcode <[email protected]> * spotless format fix Signed-off-by: vaidikcode <[email protected]> --------- Co-authored-by: Sally MacFarlane <[email protected]> Co-authored-by: Fabio Di Fabio <[email protected]>

Signed-off-by: jflo <[email protected]>

…dger#7860) Signed-off-by: Fabio Di Fabio <[email protected]>

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

Signed-off-by: jflo <[email protected]>

Signed-off-by: wangjingcun <[email protected]>

* Fix incorrect duration for THREE_MINUTES from 1 minute to 3 minutes Signed-off-by: Bhanu Pulluri <[email protected]> * Add options to enable TLS/mTLS for websocket connections Signed-off-by: Bhanu Pulluri <[email protected]> * Revert an irrelevant change Signed-off-by: Bhanu Pulluri <[email protected]> * Update tests, options and option dependencies Signed-off-by: Bhanu Pulluri <[email protected]> * Fix CHANGELOG entry Signed-off-by: Bhanu Pulluri <[email protected]> * Fix CHANGELOG entry Signed-off-by: Bhanu Pulluri <[email protected]> --------- Signed-off-by: Bhanu Pulluri <[email protected]> Co-authored-by: Bhanu Pulluri <[email protected]> Co-authored-by: Fabio Di Fabio <[email protected]>

…fications (hyperledger#7858) Signed-off-by: Fabio Di Fabio <[email protected]>

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

"ope.ex.mem" should be "op.ex.mem" — The abbreviation for "opcode execution" should be "op" rather than "ope." Corrected. Signed-off-by: Dmitry <[email protected]> Co-authored-by: Sally MacFarlane <[email protected]>

* Implementing Issue hyperledger#7047 - Optionally load jemalloc Signed-off-by: Antonio Mota <[email protected]> * Implementing Issue hyperledger#7047 - Optionally load jemalloc Signed-off-by: Antonio Mota <[email protected]> * Implementing Issue hyperledger#7047 - Optionally load jemalloc: fixes after review Signed-off-by: Antonio Mota <[email protected]> * Implementing Issue hyperledger#7047 - Optionally load jemalloc: added entry to CHANGELOG Signed-off-by: Antonio Mota <[email protected]> * Changes after review Signed-off-by: Antonio Mota <[email protected]> * Added env var check in unix script Signed-off-by: Antonio Mota <[email protected]> * Improved code and script, build and tested Signed-off-by: amsmota <[email protected]> * Improved code and script, build and tested Signed-off-by: amsmota <[email protected]> --------- Signed-off-by: Antonio Mota <[email protected]> Signed-off-by: amsmota <[email protected]>

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

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

…#7878) * Upgrade netty to 4.1.115 (latest version) to resolve CVE Signed-off-by: Matthew Whitehead <[email protected]> * Update changelog Signed-off-by: Matthew Whitehead <[email protected]> --------- Signed-off-by: Matthew Whitehead <[email protected]>

Signed-off-by: jflo <[email protected]>

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

…r#7877) * Consolidate all metric collectors into the metrics system Signed-off-by: Fabio Di Fabio <[email protected]> * Fixes Signed-off-by: Fabio Di Fabio <[email protected]> * Do not recreate the Prometheus metric system Signed-off-by: Fabio Di Fabio <[email protected]> --------- Signed-off-by: Fabio Di Fabio <[email protected]>

…er#7861) Signed-off-by: Fabio Di Fabio <[email protected]>

* fix-hyperledger#7810 Signed-off-by: vaidikcode <[email protected]> * fix-hyperledger#7810 Signed-off-by: vaidikcode <[email protected]> --------- Co-authored-by: Sally MacFarlane <[email protected]>

* add state and account overrides Signed-off-by: Sally MacFarlane <[email protected]> --------- Signed-off-by: Sally MacFarlane <[email protected]> Co-authored-by: Fabio Di Fabio <[email protected]>

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

* Don't create reward account if no reward Signed-off-by: Matthew Whitehead <[email protected]> * Remove unnecessary test stub Signed-off-by: Matthew Whitehead <[email protected]> * Extra check to only create 0 balance accounts if clearEmptyAccounts isn't set Signed-off-by: Matthew Whitehead <[email protected]> --------- Signed-off-by: Matthew Whitehead <[email protected]>

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

…ger#7894) * Add support for counter metric with external supplied value Signed-off-by: Fabio Di Fabio <[email protected]> * Update CHANGELOG Signed-off-by: Fabio Di Fabio <[email protected]> --------- Signed-off-by: Fabio Di Fabio <[email protected]>

* parse account overrides parameter for eth_estimateGas Signed-off-by: Sally MacFarlane <[email protected]> * changelog Signed-off-by: Sally MacFarlane <[email protected]> --------- Signed-off-by: Sally MacFarlane <[email protected]>

BesuContext was not a helpful name for an interface that only manipulates services to be used by plugins. --------- Signed-off-by: jflo <[email protected]>

* move AccountOverrides into plugin datatypes; add simulate method that accepts this param Signed-off-by: Sally MacFarlane <[email protected]> --------- Signed-off-by: Sally MacFarlane <[email protected]>

…t sync (hyperledger#7891) * typo * added deprecation for sunset group Signed-off-by: Sally MacFarlane <[email protected]> --------- Signed-off-by: Sally MacFarlane <[email protected]>

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

@Deprecation

* add deprecation notice to help descriptions for all privacy options * log deprecation warning for privacy enabled options * added @Deprecation annotations to privacy plugin classes Signed-off-by: Sally MacFarlane <[email protected]> --------- Signed-off-by: Sally MacFarlane <[email protected]>

This pull request addresses a minor stylistic improvement in the documentation. Signed-off-by: Donny <[email protected]> Co-authored-by: Sally MacFarlane <[email protected]>

Signed-off-by: garyschulte <[email protected]>

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

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

Signed-off-by: Jason Frame <[email protected]>

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

Signed-off-by: Karim Taam <[email protected]>

* Upgrade rocksdb jni lib from 8.3.2 to 9.7.3 * Remove deprecated metrics * Add changelog entry Signed-off-by: Ameziane H. <[email protected]>

Signed-off-by: Karim Taam <[email protected]>

lu-pinto

should fix DCO issues but LGTM

fab-10 and others added 30 commits October 30, 2024 16:21

Fix registering new metric categories from plugins (hyperledger#7825)

22a570e

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

Add a method to check if a metric category is enabled to the plugin A…

ba86ce1

…PI (hyperledger#7832) Signed-off-by: Fabio Di Fabio <[email protected]>

7311: add GetReceiptsFromPeerTask (hyperledger#7638)

db29df7

Signed-off-by: Matilda Clerke <[email protected]>

Update DCO.md (hyperledger#7827)

c5020be

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

Test against EngineNewPayloadV4 in EngineNewPayloadV4Test (hyperledge…

ec46074

…r#7837) Also change "Missing" -> "Unexpected" message when V3 blob params sent to V2 Signed-off-by: Simon Dudley <[email protected]>

update discord invite link (hyperledger#7836)

24ed2d0

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

Remove retesteth rpc service and commands (hyperledger#7833)

d846e37

* remove retesteth rpc service and commands Signed-off-by: garyschulte <[email protected]>

IntelliJ do not fail me (hyperledger#7846)

8fce5aa

Signed-off-by: jflo <[email protected]>

adds issue templates (hyperledger#7820)

11fc094

* adds issue templates Signed-off-by: jflo <[email protected]> * adopts pr suggestions Signed-off-by: jflo <[email protected]> --------- Signed-off-by: jflo <[email protected]> Co-authored-by: Sally MacFarlane <[email protected]>

IntelliJ do not fail me (hyperledger#7855)

03a2b92

Signed-off-by: jflo <[email protected]>

remove dangling retesteth references (hyperledger#7856)

1da0e9f

Signed-off-by: garyschulte <[email protected]>

feature: Add optional worldstate move flag to debug_setHead (hyperled…

d415b7d

…ger#7821) * add optional worldstate move to debug_setHead * make state rolling occur incrementally so as not to overwhelm memory and resources Signed-off-by: garyschulte <[email protected]>

calling the wrong create() method (hyperledger#7857)

d73e815

Signed-off-by: jflo <[email protected]>

Fully initialize MetricCategoryRegistry for acceptance tests (hyperle…

a585f1f

…dger#7860) Signed-off-by: Fabio Di Fabio <[email protected]>

Add more subprojects to BOM (hyperledger#7859)

4099b3b

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

adds action to manage stale issues (hyperledger#7864)

deb3fa2

Signed-off-by: jflo <[email protected]>

chore: fix some typos in comments (hyperledger#7866)

3ebf50e

Signed-off-by: wangjingcun <[email protected]>

Fix missing registration of PeerTransactionTracker to dropped tx noti…

62b2c50

…fications (hyperledger#7858) Signed-off-by: Fabio Di Fabio <[email protected]>

Make healing an action of the WorldStateArchive (hyperledger#7862)

62b8b4e

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

Remove the Synchronizer from ProtocolContext (hyperledger#7863)

1c75afb

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

Typo Update trace_rpc_apis.md (hyperledger#7868)

1895d44

"ope.ex.mem" should be "op.ex.mem" — The abbreviation for "opcode execution" should be "op" rather than "ope." Corrected. Signed-off-by: Dmitry <[email protected]> Co-authored-by: Sally MacFarlane <[email protected]>

Fix registration of RocksDB metrics categories (hyperledger#7879)

f156a17

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

MAINTAINERS - Add Matilda Clerke (hyperledger#7829)

e548cdc

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

jflo and others added 26 commits November 19, 2024 13:15

narrows dependencies of BlockchainService (hyperledger#7882)

dc81641

Signed-off-by: jflo <[email protected]>

Simplify ProtocolContext creation (hyperledger#7792)

833a5ce

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

Add support for TransactionPoolService in acceptance tests (hyperledg…

58acfce

…er#7861) Signed-off-by: Fabio Di Fabio <[email protected]>

Fix hyperledger#7810 (hyperledger#7867)

2384c09

* fix-hyperledger#7810 Signed-off-by: vaidikcode <[email protected]> * fix-hyperledger#7810 Signed-off-by: vaidikcode <[email protected]> --------- Co-authored-by: Sally MacFarlane <[email protected]>

eth_call overrides (hyperledger#7801)

8b7ca20

* add state and account overrides Signed-off-by: Sally MacFarlane <[email protected]> --------- Signed-off-by: Sally MacFarlane <[email protected]> Co-authored-by: Fabio Di Fabio <[email protected]>

Pass correct evmUpdater to trace end transaction (hyperledger#7886)

46f3d64

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

Simplify difficulty calculator interface (hyperledger#7893)

73a1e5b

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

eth_estimateGas state overrides (hyperledger#7890)

9718fd5

* parse account overrides parameter for eth_estimateGas Signed-off-by: Sally MacFarlane <[email protected]> * changelog Signed-off-by: Sally MacFarlane <[email protected]> --------- Signed-off-by: Sally MacFarlane <[email protected]>

naming things is important (hyperledger#7895)

c127f9c

BesuContext was not a helpful name for an interface that only manipulates services to be used by plugins. --------- Signed-off-by: jflo <[email protected]>

add Tx simulate method that accepts state override (hyperledger#7892)

55920e0

* move AccountOverrides into plugin datatypes; add simulate method that accepts this param Signed-off-by: Sally MacFarlane <[email protected]> --------- Signed-off-by: Sally MacFarlane <[email protected]>

[CHANGELOG] Deprecation warnings for privacy, permissioning, PoW, fas…

ab12657

…t sync (hyperledger#7891) * typo * added deprecation for sunset group Signed-off-by: Sally MacFarlane <[email protected]> --------- Signed-off-by: Sally MacFarlane <[email protected]>

Refactor Body Validation logic (hyperledger#7896)

7bb2cf3

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

Fix minor stylistic issue in tracing documentation (hyperledger#7901)

35b138d

This pull request addresses a minor stylistic improvement in the documentation. Signed-off-by: Donny <[email protected]> Co-authored-by: Sally MacFarlane <[email protected]>

shorten rolling increment to 32 (hyperledger#7909)

4a629da

Signed-off-by: garyschulte <[email protected]>

Correct other counters that were created as gauges (hyperledger#7908)

6a2f4c9

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

Add mining service (hyperledger#7913)

4064851

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

remove unused dependencies from qbft (hyperledger#7915)

a0fa599

Signed-off-by: Jason Frame <[email protected]>

deprecate RPC methods related to privacy (hyperledger#7903)

788b29f

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

renaming state trie account for verkle integration (hyperledger#7907)

4620477

Signed-off-by: Karim Taam <[email protected]>

Upgrade rocksdb jni lib from 8.3.2 to 9.7.3 (hyperledger#7817)

674a7ba

* Upgrade rocksdb jni lib from 8.3.2 to 9.7.3 * Remove deprecated metrics * Add changelog entry Signed-off-by: Ameziane H. <[email protected]>

merge main (674a7ba) into verkle

e02fb60

Signed-off-by: Karim Taam <[email protected]>

spotless and fix after review

e01f0ff

Signed-off-by: Karim Taam <[email protected]>

lu-pinto approved these changes Nov 27, 2024

View reviewed changes

matkt merged commit 72d2781 into hyperledger:verkle Nov 27, 2024
0 of 3 checks passed

matkt deleted the feature/merge-main-verkle branch November 28, 2024 15:42

matkt added the verkle label Nov 29, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

merge main into verkle #7928

merge main into verkle #7928

matkt commented Nov 26, 2024

lu-pinto left a comment •

edited

Loading

merge main into verkle #7928

merge main into verkle #7928

Conversation

matkt commented Nov 26, 2024

PR description

Fixed Issue(s)

Thanks for sending a pull request! Have you done the following?

Locally, you can run these tests to catch failures early:

lu-pinto left a comment • edited Loading

Choose a reason for hiding this comment

lu-pinto left a comment •

edited

Loading