stake: Allow stakes with unmatched credits observed to merge (backport …

…#18985) (#19055) * stake: Allow stakes with unmatched credits observed to merge (#18985) * stake: Allow stakes with unmatched credits observed to merge * Address feedback * Remove branch by doing a ceiling in one calc (cherry picked from commit 2b33c0c) # Conflicts: # Cargo.lock # programs/stake/Cargo.toml # sdk/src/feature_set.rs * Fix merge conflicts * Fix clippy lint * Add back whitespace Co-authored-by: Jon Cinque <jon.cinque@gmail.com>
solana-labs · Aug 4, 2021 · 1a0146f · 1a0146f
1 parent 7d0a9e0
commit 1a0146f
Show file tree

Hide file tree

Showing 4 changed files with 350 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/programs/stake/Cargo.toml b/programs/stake/Cargo.toml
@@ -25,6 +25,7 @@ solana-config-program = { path = "../config", version = "=1.7.10" }
 thiserror = "1.0"
 
 [dev-dependencies]
+proptest = "1.0"
 solana-logger = { path = "../../logger", version = "=1.7.10" }
 
 [build-dependencies]