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

v1.18: Revert partitioned rewards PDA commits (backport of #35088)#35100

Merged
CriesofCarrots merged 6 commits into
v1.18from
mergify/bp/v1.18/pr-35088
Feb 7, 2024
Merged

v1.18: Revert partitioned rewards PDA commits (backport of #35088)#35100
CriesofCarrots merged 6 commits into
v1.18from
mergify/bp/v1.18/pr-35088

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Feb 6, 2024

This is an automatic backport of pull request #35088 done by Mergify.
Cherry-pick of 57bbd33 has failed:

On branch mergify/bp/v1.18/pr-35088
Your branch is ahead of 'origin/v1.18' by 4 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 57bbd3363c.
  (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/src/epoch_rewards_hasher.rs
	deleted:    sdk/program/src/epoch_rewards_partition_data.rs
	modified:   sdk/program/src/lib.rs
	modified:   sdk/src/lib.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   runtime/src/bank.rs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/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

Tyera Eulberg added 5 commits February 6, 2024 02:55
This reverts commit 22500c2.

(cherry picked from commit f01f361)
…ccounts (#34914)"

This reverts commit b9947bd.

(cherry picked from commit e76da4a)
This reverts commit 4385ed1.

(cherry picked from commit 57bbd33)

# Conflicts:
#	runtime/src/bank.rs
@codecov
Copy link
Copy Markdown

codecov Bot commented Feb 6, 2024

Codecov Report

Attention: 20 lines in your changes are missing coverage. Please review.

Comparison is base (5ca66a3) 81.6% compared to head (a499183) 81.6%.

Additional details and impacted files
@@           Coverage Diff            @@
##            v1.18   #35100    +/-   ##
========================================
  Coverage    81.6%    81.6%            
========================================
  Files         828      827     -1     
  Lines      224100   223997   -103     
========================================
- Hits       182918   182906    -12     
+ Misses      41182    41091    -91     

@CriesofCarrots CriesofCarrots merged commit e782370 into v1.18 Feb 7, 2024
@CriesofCarrots CriesofCarrots deleted the mergify/bp/v1.18/pr-35088 branch February 7, 2024 06:18
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants