Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port changes from develop to upstream_merge #1405

Merged
merged 782 commits into from
Jan 16, 2025
Merged

Port changes from develop to upstream_merge #1405

merged 782 commits into from
Jan 16, 2025

Conversation

cffls
Copy link
Contributor

@cffls cffls commented Jan 15, 2025

Description

Keep upstream_merge up to date.

BabyHalimao and others added 30 commits June 17, 2024 11:03
updates some docstrings
---------

Co-authored-by: rjl493456442 <[email protected]>
* core/state/snapshot: acquire the lock on release

* core/state/snapshot: only acquire read-lock when iterating
…handling (#1268)

* eth, consensus: refactor whitelisting related logs and error handling

* core: fix lint

* eth: fix tests, check against root error

* eth: use ctx correctly while logging

* eth: refactor comments and error message
* cmd/geth, ethdb/pebble: polish method naming and code comment

* implement db stat for pebble

* cmd, core, ethdb, internal, trie: remove db property selector

* cmd, core, ethdb: fix function description

---------

Co-authored-by: prpeh <[email protected]>
Co-authored-by: Gary Rong <[email protected]>
* trie: don't reset tracer at the end of Commit

* Update trie.go

---------

Co-authored-by: rjl493456442 <[email protected]>
Since Decimal is defined as unsiged `uint64`, we should use `strconv.ParseUint` instead of `strconv.ParseInt` during unmarshalling.

---------

Co-authored-by: Martin Holst Swende <[email protected]>
* avoid unnecessary copy

* delete the never used function ProofList

* eth/protocols/snap, trie/trienode: polish the code

---------

Co-authored-by: Gary Rong <[email protected]>
Revert "core/state/snapshot: tiny fixes (#29995)"

This reverts commit e0e45db.
Log level is specified in L259 so it's unnecessary to specify it for handlers (L234, L236).
* all: add stateless verifications

* all: simplify witness and integrate it into live geth

---------

Co-authored-by: Péter Szilágyi <[email protected]>
manav2401 and others added 23 commits December 10, 2024 21:15
* Fix incorrect balance when CreateContract is used in block-stm

* address CR comments
…r-set

Use `header.ParentHash` while fetching validator set from child chain contract so that while making the call, it uses the state which belongs to the same fork which is being imported.
Removing control files and updating the updateVersion.sh
Fix typos and improve documentation across several files
This pull request fixes the broken feature where the entire storage set is overridden.

Originally, the storage set override was achieved by marking the associated account
as deleted, preventing access to the storage slot on disk. However, since #29520, this
flag is also checked when accessing the account, rendering the account unreachable.

A fix has been applied in this pull request, which re-creates a new state object with all
account metadata inherited.

Co-authored-by: rjl493456442 <[email protected]>
This will fix a hasher bug that was introduced in a23701f
Backport master to develop
@cffls cffls requested a review from a team January 15, 2025 22:38
Block execution contains the time it takes to fetch state sync data from heimdall, which sometimes returns data with long latency (> 1s). When the latency is significant, the chain execution time will be affected and become inaccurate. This PR isolate the time of heimdall requests from block execution.
Make block execution timer more accurate
@cffls cffls merged commit 1901120 into upstream_merge Jan 16, 2025
17 checks passed
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.