Revert PRs caused hash mismatch #35018
Conversation
There was a problem hiding this comment.
I'm fine with this. Adding @t-nelson , so he can object if he feels strongly about having them go in separately.
|
confirmed bankhash matches |
|
Backports to the beta branch are to be avoided unless absolutely necessary for fixing bugs, security issues, and perf regressions. Changes intended for backport should be structured such that a minimum effective diff can be committed separately from any refactoring, plumbing, cleanup, etc that are not strictly necessary to achieve the goal. Any of the latter should go only into master and ride the normal stabilization schedule. Exceptions include CI/metrics changes, CLI improvements and documentation updates on a case by case basis. |
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #35018 +/- ##
=======================================
Coverage 81.6% 81.6%
=======================================
Files 830 830
Lines 224837 224828 -9
=======================================
+ Hits 183505 183526 +21
+ Misses 41332 41302 -30 |
* Revert "refactor unused parameter (#34970)" This reverts commit 0838909. (cherry picked from commit 1542392) # Conflicts: # sdk/src/fee.rs * Revert "separate priority fee and transaction fee from fee calculation (#34757)" This reverts commit 5ecc47e. (cherry picked from commit df2ee12) # Conflicts: # sdk/src/fee.rs * Revert "Remove congestion multiplier from calculate fee (#34865)" This reverts commit 73d3973. (cherry picked from commit 0dcac3f) # Conflicts: # sdk/src/fee.rs * fix merge conflicts --------- Co-authored-by: Tao Zhu <tao@solana.com>
Problem
#34865 caused hash mismatch.
Summary of Changes
revert #34865, and two PRs built on top of it: #34757 and #34970
Fixes #35008