Skip to content
This repository has been archived by the owner on Jan 22, 2025. It is now read-only.

v1.17: Burn fees collected into invalid accounts (backport of #33887) #33951

Merged
merged 2 commits into from
Nov 6, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 6, 2023

This is an automatic backport of pull request #33887 done by Mergify.
Cherry-pick of ebe8afb has failed:

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

You are currently cherry-picking commit ebe8afb0c3.
  (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:   runtime/benches/accounts.rs
	new file:   runtime/src/bank/fee_distribution.rs
	modified:   runtime/src/bank/serde_snapshot.rs
	modified:   sdk/src/feature_set.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   runtime/src/bank.rs
	both modified:   runtime/src/bank/tests.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

* refactor: create bank::fee_distribution module

* feature: add checks to fee distribution

* refactor: move Bank::deposit fn into test_utils

* feedback

* feedback 2

* add datapoints

* change to datapoint_warn

* typo

(cherry picked from commit ebe8afb)

# Conflicts:
#	runtime/src/bank.rs
#	runtime/src/bank/tests.rs
@mergify mergify bot added conflicts feature-gate Pull Request adds or modifies a runtime feature gate labels Nov 6, 2023
@mergify mergify bot assigned jstarry Nov 6, 2023
@jstarry jstarry requested a review from HaoranYi November 6, 2023 03:28
Copy link

codecov bot commented Nov 6, 2023

Codecov Report

Merging #33951 (902762f) into v1.17 (1d2609e) will increase coverage by 0.0%.
The diff coverage is 97.8%.

@@           Coverage Diff            @@
##            v1.17   #33951    +/-   ##
========================================
  Coverage    81.8%    81.8%            
========================================
  Files         802      803     +1     
  Lines      217637   217862   +225     
========================================
+ Hits       178131   178350   +219     
- Misses      39506    39512     +6     

Copy link
Contributor

@HaoranYi HaoranYi left a comment

Choose a reason for hiding this comment

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

lgtm

@jstarry jstarry merged commit 9779588 into v1.17 Nov 6, 2023
@jstarry jstarry deleted the mergify/bp/v1.17/pr-33887 branch November 6, 2023 23:49
anwayde pushed a commit to firedancer-io/solana that referenced this pull request Nov 16, 2023
…labs#33887) (solana-labs#33951)

* Burn fees collected into invalid accounts (solana-labs#33887)

* refactor: create bank::fee_distribution module

* feature: add checks to fee distribution

* refactor: move Bank::deposit fn into test_utils

* feedback

* feedback 2

* add datapoints

* change to datapoint_warn

* typo

(cherry picked from commit ebe8afb)

# Conflicts:
#	runtime/src/bank.rs
#	runtime/src/bank/tests.rs

* resolve conflicts

---------

Co-authored-by: Justin Starry <justin.starry@icloud.com>
Co-authored-by: Justin Starry <justin@solana.com>
anwayde pushed a commit to firedancer-io/solana that referenced this pull request Nov 16, 2023
…labs#33887) (solana-labs#33951)

* Burn fees collected into invalid accounts (solana-labs#33887)

* refactor: create bank::fee_distribution module

* feature: add checks to fee distribution

* refactor: move Bank::deposit fn into test_utils

* feedback

* feedback 2

* add datapoints

* change to datapoint_warn

* typo

(cherry picked from commit ebe8afb)

# Conflicts:
#	runtime/src/bank.rs
#	runtime/src/bank/tests.rs

* resolve conflicts

---------

Co-authored-by: Justin Starry <justin.starry@icloud.com>
Co-authored-by: Justin Starry <justin@solana.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
conflicts feature-gate Pull Request adds or modifies a runtime feature gate
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants