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

Merge in upstream V2.0.24 #12

Merged
merged 14 commits into from
Feb 5, 2025
Merged

Merge in upstream V2.0.24 #12

merged 14 commits into from
Feb 5, 2025

Conversation

nibty
Copy link

@nibty nibty commented Feb 5, 2025

Problem

Summary of Changes

Fixes #

mergify bot and others added 13 commits December 18, 2024 10:20
… (anza-xyz#4089)

* Reclaims more old accounts in `clean` (anza-xyz#4044)

(cherry picked from commit 3d43824)

# Conflicts:
#	accounts-db/src/accounts_db.rs
#	accounts-db/src/accounts_db/tests.rs

* fix merge conflicts

---------

Co-authored-by: Brooks <[email protected]>
…xyz#4147) (anza-xyz#4166)

* Fixes clean_old_storages_with_reclaims tests (anza-xyz#4147)

(cherry picked from commit 4eabeed)

# Conflicts:
#	accounts-db/src/accounts_db/tests.rs

* fix merge conflicts

---------

Co-authored-by: Brooks <[email protected]>
…t (backport of anza-xyz#3970) (anza-xyz#4074)

* blockstore: mark slot as dead on data shred merkle root conflict (anza-xyz#3970)

(cherry picked from commit 5564a94)

# Conflicts:
#	ledger/src/blockstore.rs

* fix conflicts

---------

Co-authored-by: Ashwin Sekar <[email protected]>
Co-authored-by: Ashwin Sekar <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…ort of anza-xyz#4431) (anza-xyz#4434)

rolls out chained Merkle shreds to ~21% of mainnet slots (anza-xyz#4431)

(cherry picked from commit 9d09787)

Co-authored-by: behzad nouri <[email protected]>
…ackport of anza-xyz#3700) (anza-xyz#4442)

[rpc] Fatal `getSignaturesForAddress()` when Bigtable errors (anza-xyz#3700)

* Unindent code in `get_signatures_for_address`

* Add a custom JSON-RPC error to throw when long-term storage (ie. Bigtable) can't be reached

* When the `before`/`until` signatures can't be found, throw `SignatureNotFound` instead of `RowNotFound`

* Fatal `getSignaturesForAddress` calls when Bigtable must be queried but can't be reached

(cherry picked from commit 52f132c)

Co-authored-by: Steven Luscher <[email protected]>
ci: bump [upload|download]-artifact to v4
ci: hardcode rust version for publish-crate
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…ort of anza-xyz#2801) (anza-xyz#4544)

fix: reduce max packet receive time during leader window (anza-xyz#2801)

(cherry picked from commit 20e0df4)

Co-authored-by: cavemanloverboy <[email protected]>
…#4576)

* Change prio_graph_scheduler configurations for 1k maxs, 256 look ahead

* Break loop on scanned transaction count

* make Hold decision behave same as Consume during receive

* receive maximum of 5_000 packets - loose max

* receive_completed before process_transactions

---------

Co-authored-by: Andrew Fitzgerald <[email protected]>
@nibty nibty force-pushed the v2.0.24-release branch 2 times, most recently from 8bd5c53 to ae46cc5 Compare February 5, 2025 17:41
@nibty nibty marked this pull request as ready for review February 5, 2025 22:07
@nibty nibty merged commit 1834554 into v2.0 Feb 5, 2025
21 of 22 checks passed
@nibty nibty deleted the v2.0.24-release branch February 5, 2025 22:07
nibty added a commit that referenced this pull request Feb 6, 2025
* v2.0: Reclaims more old accounts in `clean` (backport of anza-xyz#4044) (anza-xyz#4089)

* Reclaims more old accounts in `clean` (anza-xyz#4044)

(cherry picked from commit 3d43824)

# Conflicts:
#	accounts-db/src/accounts_db.rs
#	accounts-db/src/accounts_db/tests.rs

* fix merge conflicts

---------

Co-authored-by: Brooks <[email protected]>

* v2.0: Fixes clean_old_storages_with_reclaims tests (backport of anza-xyz#4147) (anza-xyz#4166)

* Fixes clean_old_storages_with_reclaims tests (anza-xyz#4147)

(cherry picked from commit 4eabeed)

# Conflicts:
#	accounts-db/src/accounts_db/tests.rs

* fix merge conflicts

---------

Co-authored-by: Brooks <[email protected]>

* v2.0: blockstore: mark slot as dead on data shred merkle root conflict (backport of anza-xyz#3970) (anza-xyz#4074)

* blockstore: mark slot as dead on data shred merkle root conflict (anza-xyz#3970)

(cherry picked from commit 5564a94)

# Conflicts:
#	ledger/src/blockstore.rs

* fix conflicts

---------

Co-authored-by: Ashwin Sekar <[email protected]>
Co-authored-by: Ashwin Sekar <[email protected]>

* Bump version to v2.0.22 (anza-xyz#4200)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* v2.0: hardcode rust version for publish-crate (anza-xyz#4228)

* Bump version to v2.0.23 (anza-xyz#4419)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* v2.0: rolls out chained Merkle shreds to ~21% of mainnet slots (backport of anza-xyz#4431) (anza-xyz#4434)

rolls out chained Merkle shreds to ~21% of mainnet slots (anza-xyz#4431)

(cherry picked from commit 9d09787)

Co-authored-by: behzad nouri <[email protected]>

* v2.0: [rpc] Fatal `getSignaturesForAddress()` when Bigtable errors (backport of anza-xyz#3700) (anza-xyz#4442)

[rpc] Fatal `getSignaturesForAddress()` when Bigtable errors (anza-xyz#3700)

* Unindent code in `get_signatures_for_address`

* Add a custom JSON-RPC error to throw when long-term storage (ie. Bigtable) can't be reached

* When the `before`/`until` signatures can't be found, throw `SignatureNotFound` instead of `RowNotFound`

* Fatal `getSignaturesForAddress` calls when Bigtable must be queried but can't be reached

(cherry picked from commit 52f132c)

Co-authored-by: Steven Luscher <[email protected]>

* v2.0: ci: bump [upload|download]-artifact to v4 (anza-xyz#4501)

ci: bump [upload|download]-artifact to v4

* v2.0: ci: hardcode crate publishing version (anza-xyz#4515)

ci: hardcode rust version for publish-crate

* Bump version to v2.0.24 (anza-xyz#4528)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* v2.0: fix: reduce max packet receive time during leader window (backport of anza-xyz#2801) (anza-xyz#4544)

fix: reduce max packet receive time during leader window (anza-xyz#2801)

(cherry picked from commit 20e0df4)

Co-authored-by: cavemanloverboy <[email protected]>

* v2.0: Scheduler Frequency Fixes (backport of anza-xyz#4545) (anza-xyz#4576)

* Change prio_graph_scheduler configurations for 1k maxs, 256 look ahead

* Break loop on scanned transaction count

* make Hold decision behave same as Consume during receive

* receive maximum of 5_000 packets - loose max

* receive_completed before process_transactions

---------

Co-authored-by: Andrew Fitzgerald <[email protected]>

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Brooks <[email protected]>
Co-authored-by: Ashwin Sekar <[email protected]>
Co-authored-by: Ashwin Sekar <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Yihau Chen <[email protected]>
Co-authored-by: behzad nouri <[email protected]>
Co-authored-by: Steven Luscher <[email protected]>
Co-authored-by: cavemanloverboy <[email protected]>
Co-authored-by: Andrew Fitzgerald <[email protected]>
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.

2 participants