Cli stake-split: adjust transfer amount if recipient has lamports #266
Conversation
|
Sidenote: this fix allows using the CLI with the existing ledger-solana app to split without blind signing by using 2 transactions, one to transfer in the rent-exempt reserve, and the other to split. This makes me a little inclined to backport to v1.18 |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #266 +/- ##
=========================================
- Coverage 81.9% 81.8% -0.1%
=========================================
Files 837 837
Lines 226805 226809 +4
=========================================
- Hits 185843 185756 -87
- Misses 40962 41053 +91 |
| owner if owner == system_program::id() => { | ||
| if !account.data.is_empty() { | ||
| Err(CliError::BadParameter(format!( | ||
| "Account {split_stake_account_address} has data and cannot be used to split stake" |
There was a problem hiding this comment.
i wonder if we should spruce up these error messages to be a little more normie-friendly? maybe in follow up
There was a problem hiding this comment.
Sure, I'll make a follow-up. If you have recommended verbiage, please do share.
| owner if owner == system_program::id() => { | ||
| if !account.data.is_empty() { | ||
| Err(CliError::BadParameter(format!( | ||
| "Account {split_stake_account_address} has data and cannot be used to split stake" |
There was a problem hiding this comment.
Sure, I'll make a follow-up. If you have recommended verbiage, please do share.
|
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. |
* Remove incorrect check * Move to closure * Use match statement instead * Adjust rent_exempt_reserve by existing balance * Only transfer lamports if rent_exempt_reserve needs are greater than 0 * Rename variable for clarity * Add minimum-delegation check * Bump test split amount to meet arbitrary mock minimum-delegation amount (cherry picked from commit dff99d0) # Conflicts: # cli/src/stake.rs
* Remove incorrect check * Move to closure * Use match statement instead * Adjust rent_exempt_reserve by existing balance * Only transfer lamports if rent_exempt_reserve needs are greater than 0 * Rename variable for clarity * Add minimum-delegation check * Bump test split amount to meet arbitrary mock minimum-delegation amount (cherry picked from commit dff99d0) # Conflicts: # cli/src/stake.rs
* Remove incorrect check * Move to closure * Use match statement instead * Adjust rent_exempt_reserve by existing balance * Only transfer lamports if rent_exempt_reserve needs are greater than 0 * Rename variable for clarity * Add minimum-delegation check * Bump test split amount to meet arbitrary mock minimum-delegation amount (cherry picked from commit dff99d0) # Conflicts: # cli/src/stake.rs
…rts (backport of #266) (#369) Cli stake-split: adjust transfer amount if recipient has lamports (#266) * Remove incorrect check * Move to closure * Use match statement instead * Adjust rent_exempt_reserve by existing balance * Only transfer lamports if rent_exempt_reserve needs are greater than 0 * Rename variable for clarity * Add minimum-delegation check * Bump test split amount to meet arbitrary mock minimum-delegation amount (cherry picked from commit dff99d0) # Conflicts: # cli/src/stake.rs Co-authored-by: Tyera <[email protected]>
…rts (backport of anza-xyz#266) (anza-xyz#369) Cli stake-split: adjust transfer amount if recipient has lamports (anza-xyz#266) * Remove incorrect check * Move to closure * Use match statement instead * Adjust rent_exempt_reserve by existing balance * Only transfer lamports if rent_exempt_reserve needs are greater than 0 * Rename variable for clarity * Add minimum-delegation check * Bump test split amount to meet arbitrary mock minimum-delegation amount (cherry picked from commit dff99d0) # Conflicts: # cli/src/stake.rs Co-authored-by: Tyera <[email protected]>
Problem
The #162 cli change permits split recipients that carry a lamports balance. However, the message builder below always funds the account with the full rent-exempt reserve regardless of such an existing balance.
Summary of Changes
Some refactoring to make cases easier to follow (review by commit will be best)
Subtract (saturating) any existing lamports balance from the transfer amount