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

collect min prioritization fees when replaying sanitized transactions (backport #26709) #29539

Merged
merged 4 commits into from Jan 7, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 5, 2023

This is an automatic backport of pull request #26709 done by Mergify.
Cherry-pick of 8bb039d has failed:

On branch mergify/bp/v1.14/pr-26709
Your branch is up to date with 'origin/v1.14'.

You are currently cherry-picking commit 8bb039d08.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   Cargo.lock
	modified:   core/src/forward_packet_batches_by_accounts.rs
	modified:   core/src/lib.rs
	modified:   ledger/src/blockstore_processor.rs
	modified:   programs/bpf/Cargo.lock
	modified:   runtime/Cargo.toml
	new file:   runtime/benches/prioritization_fee_cache.rs
	modified:   runtime/src/lib.rs
	new file:   runtime/src/prioritization_fee.rs
	new file:   runtime/src/prioritization_fee_cache.rs
	renamed:    core/src/transaction_priority_details.rs -> runtime/src/transaction_priority_details.rs

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   core/src/immutable_deserialized_packet.rs
	both modified:   core/src/replay_stage.rs
	both modified:   core/src/tvu.rs
	both modified:   core/src/unprocessed_packet_batches.rs
	both modified:   core/src/validator.rs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

tao-stones and others added 3 commits January 5, 2023 15:28
…#26709)

* Collect blocks' minimum prioritization fees when replaying sanitized transactions

* Limits block min-fee metrics reporting to top 10 writable accounts

* Add service thread to asynchronously update and finalize prioritization fee cache

* Add bench test for prioritization_fee_cache

Co-authored-by: Tyera Eulberg <teulberg@gmail.com>
(cherry picked from commit 8bb039d)

# Conflicts:
#	core/src/immutable_deserialized_packet.rs
#	core/src/replay_stage.rs
#	core/src/tvu.rs
#	core/src/unprocessed_packet_batches.rs
#	core/src/validator.rs
@CriesofCarrots
Copy link
Contributor

Prereq for backport of #27278

Copy link
Member

@mvines mvines left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A larger backport than what we'd normally want at this point in time but looks low risk in general, and it's a dep for adding the getRecentPrioritizationFees RPC method so ✅

@CriesofCarrots CriesofCarrots merged commit 6c66421 into v1.14 Jan 7, 2023
@CriesofCarrots CriesofCarrots deleted the mergify/bp/v1.14/pr-26709 branch January 7, 2023 02:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants