Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rpc: Enhance consolidateunspent and fix fee calculation #1994

Merged
merged 7 commits into from
Jan 9, 2021
Merged

rpc: Enhance consolidateunspent and fix fee calculation #1994

merged 7 commits into from
Jan 9, 2021

Conversation

jamescowens
Copy link
Member

@jamescowens jamescowens commented Jan 3, 2021 •
edited
Loading

This PR enhances consolidateunspent. It implements two new parameters which correspond to two new features:

  1. [sweep all addresses], which is an optional boolean that defaults to false. If set true, then all inputs that belong to the walletholder (ISMINE) are selected as candidates for the consolidation, not just inputs from the specified address. The output of the consolidation will go to the specified address in this case.
  2. [sweep change], which is an optional boolean that defaults to false. If set true then inputs that have change addresses that were change of an input address that corresponds to the specified consolidation address are also included in the consolidation. If the [sweep all addresses] is set true, then the setting of this is irrelevant and is ignored (i.e. change sweep is implied when [sweep all addresses] is set).

I also corrected the fee calculations, as I discovered a slight error was causing rejects in certain corner cases.

This PR also closes #1296 and #638 in a very simple way by adding a "reset" button to reset the inputs.

@jamescowens jamescowens self-assigned this Jan 3, 2021
@jamescowens jamescowens added this to the Hilda milestone Jan 3, 2021
@jamescowens jamescowens marked this pull request as ready for review January 3, 2021 19:15
@jamescowens
Improvements to consolidateunspent
853b17f 
This commit implements two new features for consolidateunspent:

1. The ability to consolidate from all addresses to the specified
address, and

2. The ability to sweep up change in the consolidation.
@jamescowens
Corrections to fee calculations for consolidateunspent
3ed7e31
@jamescowens
Add reset button to clear coincontrol entries
4c8dbfa 
When advanced coin control is enabled, and via the inputs button
inputs are selected, then those inputs are spent via an underlying
transaction or staking, they become "stuck". This is because
the coinControl object still has the stale COutPuts in it.

A simple reset button has been added that calls SetNull() to
nullify the coinControl object and then updates the coin control
labels. This gets rid of the stuck selected inputs.
@jamescowens jamescowens linked an issue Jan 4, 2021 that may be closed by this pull request
Coin control sometimes displays wrong quantity #638
Closed
div72
div72 reviewed Jan 8, 2021
View reviewed changes
src/rpc/rawtransaction.cpp Outdated Show resolved Hide resolved
div72
div72 reviewed Jan 8, 2021
View reviewed changes
src/rpc/rawtransaction.cpp Outdated Show resolved Hide resolved
jamescowens and others added 2 commits January 8, 2021 17:21
@jamescowens @div72
Fix typo on consolidateunspent
4a50634 
Co-authored-by: div72 <60045611+div72@users.noreply.github.com>
@jamescowens @div72
Change int64_t to CAmount to follow new Bitcoin types.
022c221 
Co-authored-by: div72 <60045611+div72@users.noreply.github.com>
@jamescowens
Add time based expiry for wallet model balance cache
58772a1 
This adds a time based expiration to the wallet balance cache
to avoid repeated calls to GetBalance() during periods of rapid
updateTransaction calls due to operations like consolidatunspent
or syncing from zero with a busy wallet.
@jamescowens
Merge branch 'enhance_consolidateunspent' of https://github.com/james…
94b180d 
…cowens/Gridcoin-Research into enhance_consolidateunspent
@jamescowens jamescowens merged commit 54da74a into gridcoin-community:development Jan 9, 2021
jamescowens added a commit that referenced this pull request Mar 1, 2021
@jamescowens
5.2.0.0, 2021-03-01, mandatory, "Hilda"
454f103 
 Added
 - gui: Add RAC column to wizard summary page projects table #1951 (@cyrossignol)
 - rpc: clean up the superblocks function and add magnitude to getmininginfo #1966 (@jamescowens)
 - rpc: Add transaction size to RPC output #1971 (@cyrossignol)
 - voting: Add user-facing support for poll response types #1976 (@cyrossignol)
 - gui: Port Bitcoin Intro class (implement the ability to choose a data directory via the GUI) #1978 (@jamescowens)
 - gui: Port Bitcoin MacOS app nap manager #1991 (@jamescowens)
 - mining, rpc: Implement staking efficiency measure and improve SelectCoinsForStaking and CreateCoinStake #1992 (@jamescowens)
 - accrual, rpc: Implement auditsnapshotaccruals #2001 (@jamescowens)
 - docs: add doxygen support #2000 (@div72)
 - beacon: Specialized beacon storage in leveldb #2009 (@jamescowens)
 - rpc: Add a call to dump contracts in binary form #2011 (@div72)
 - rpc: Add boolean option to report active beacons only in beaconreport #2013 (@jamescowens)
 - consensus: Set Hilda mainnet hardfork height to 2197000 #2022 (@jamescowens)

 Changed
 - refactor: [Memory optimization] Block index duplicate PoS state #1945 (@cyrossignol)
 - refactor: [Memory optimization] Block index superblock and contract flags #1950 (@cyrossignol)
 - refactor: [Memory optimization] Remove stake modifier checksums #1954 (@cyrossignol)
 - refactor: [Memory optimization] Block index allocation overhead #1957 (@cyrossignol)
 - refactor: [Memory optimization] Remove block index subsidy fields #1960 (@cyrossignol)
 - refactor: [Memory optimization] Separate chain trust from the block index #1961 (@cyrossignol)
 - refactor: [Memory optimization] Eliminate padding between block index fields #1962 (@cyrossignol)
 - beacon, gui: Add check for presence of beacon private key to updateBeacon() #1968 (@jamescowens)
 - util: Enhance ETTS calculation #1973 (@jamescowens)
 - refactor: Use new clamp in util.h #1975 (@jamescowens)
 - gui: Redo global status for overview #1983 (@jamescowens)
 - util: Improvements to MilliTimer class and use in the miner and init #1987 (@jamescowens)
 - rpc: Move rpc files to directory #1995 (@Pythonix)
 - rpc: Enhance consolidateunspent and fix fee calculation #1994 (@jamescowens)
 - contract: Double the lookback scope of contract replay #1998 (@jamescowens)
 - net: Don't rely on external IP resolvers #2002 (@Tetrix42)
 - beacon: Change beacon map to pointers #2008 (@jamescowens)
 - gui: Update bitcoin_sv.ts #2014 (@sweede-se)
 - util: Update snapshot URLs and add accrual directory #2019 (@jamescowens)
 - beacon: Tweak BeaconRegistry::Revert #2020 (@jamescowens)
 - rpc, qt: bump fees @2023 (@div72)

 Removed
 - researcher: Remove automatic legacy beacon key import #1963 (@cyrossignol)
 - util: Revert "Close LevelDB after loading the block index" #1969 (@cyrossignol)
 - ci: Fix python symlink issue & remove travis #1990 (@div72)
 - ci: remove python workaround #2005 (@div72)

 Fixed
 - gui: fix mandatory/leisure detection of upgrade check #1959 (@Pythonix)
 - voting: Fix title in "gettransaction" RPC for legacy poll contracts @1970 (@cyrossignol)
 - gui: Fix missing menu items on macOS #1972 (@scribblemaniac)
 - rpc: Fix answer offset in "votedetails" #1974 (@cyrossignol)
 - voting: Implement missing try-catch in VotingVoteDialog::vote #1980 (@jamescowens)
 - scraper: Add check for minimum housekeeping complete in scraper #1977 (@jamescowens)
 - voting: Fix nonsense vote weights for legacy polls #1988 (@cyrossignol)
 - voting: Fix incorrect field returned in ResolveMoneySupplyForPoll() #1989 (@cyrossignol)
 - consensus, accrual: Fix newbie accrual #2004 (@jamescowens)
 - log: grammar correction #2016 (@nathanielcwm)
 - wallet: Correct nMinFee fee calculation in CreateTransaction #2021 (@jamescowens)
 - rpc, miner: Correct GetLastStake #2026 (@jamescowens)
 - wallet: Fix bug in CreateTransaction causing insufficient fees #2029 (@jamescowens)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@div72 div72 div72 approved these changes

@cyrossignol cyrossignol Awaiting requested review from cyrossignol

Assignees

@jamescowens jamescowens

Labels
bug enhancement
Projects
None yet
Milestone
Hilda
Development

Successfully merging this pull request may close these issues.

coin control counts spent inputs when they stake Coin control sometimes displays wrong quantity
2 participants
@jamescowens @div72