Skip to content

Conversation

@furszy
Copy link

@furszy furszy commented Jan 14, 2020

Bug emerged for the non-presented masternodes locked balance bug fix.

The GetLockedCoins is counting the delegations by default, same as GetBalance. Before, this was badly subtracted by the GetBalance minus GetLockedCoins and showed in the GUI, which was removing the MNs locked coins balance and the double counted delegations.

This PR solves it.

Copy link

@random-zebra random-zebra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 814e510

Copy link
Collaborator

@Fuzzbawls Fuzzbawls left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 814e510

@random-zebra random-zebra added this to the 4.0.2 milestone Jan 14, 2020
furszy added a commit that referenced this pull request Jan 14, 2020
814e510 [Bug][GUI] Double counted delegated balance fix. (furszy)

Pull request description:

  Bug emerged for the non-presented masternodes locked balance bug fix.

  The `GetLockedCoins` is counting the delegations by default, same as `GetBalance`. Before, this was badly subtracted by the `GetBalance` minus `GetLockedCoins` and showed in the GUI, which was removing the MNs locked coins balance **and** the double counted delegations.

  This PR solves it.

ACKs for top commit:
  random-zebra:
    ACK 814e510
  Fuzzbawls:
    ACK 814e510

Tree-SHA512: bb8680f80a8f02f8709e7832af9c1f00f71d02fc60e9870f8c2244355a3b91025eddc589767244dd5d8021a16cf3da6e19c0c313b32eab7879827159cce09574
@furszy furszy merged commit 814e510 into PIVX-Project:master Jan 14, 2020
random-zebra added a commit that referenced this pull request Jan 14, 2020
4789652 [Wallet] Don't add P2CS automatically to CWalletTx::GetLockedCredit (random-zebra)

Pull request description:

  Prior to #1223 the total balance was calculated as `balance + delegatedBalance - nLockedBalance`, so the delegations (being part of each term) were counted only once.

  #1223 removed `nLockedBalance` (changing the total balance calculation to `balance + delegatedBalance`) thus counting the delegation twice.

  #1261 fixed the total balance calculation, removing `delegatedBalance`.

  Finally, this PR fixes `nLockedBalance` (even though not part of the total balance anymore). The error is in `GetLockedCoins` which is returning the sum of locked coins **and** cold-stake delegations owned (regardless of their locking state).

ACKs for top commit:
  furszy:
    utACK 4789652.

Tree-SHA512: 25b7b65f013f84fac5c0ffdbffb2770264926154d3c5a909144f41ee3358cdf87f85e28199006dd8cfc1420aa688b0b0d4574ea64998c3f218015a6636a7b718
Fuzzbawls pushed a commit to Fuzzbawls/PIVX that referenced this pull request Jan 16, 2020
furszy added a commit that referenced this pull request Jan 16, 2020
4663310 [GUI] Min window size (furszy)
5c76d51 Doc: Update manpages for 4.0.2 (Fuzzbawls)
79bfec9 Build: Bump version to 4.0.2 (Fuzzbawls)
82d0af7 Doc: Update release notes for 4.0.2 (Fuzzbawls)
3432e29 [GUI] Transaction record cold staking fixes. (furszy)
e5badbc [RPC] Don't do extra PoW round for pos blocks in 'generate' RPC Github-Pull: #1274 Rebased-From: 6b5ce00 (random-zebra)
7b8169c [Trivial] Update copyright headers for 4.0.2 (Fuzzbawls)
8faf4bf [Core] Update checkpoints for first v7 block (Fuzzbawls)
f6e8a14 [GUI] Add latest block number to topbar pushButtonSync Github-Pull: #1268 Rebased-From: 84b4ae4 (random-zebra)
8edfa83 [GUI] Connect P2CSUnlockOwner and P2CSUnlockStaker records to the model Github-Pull: #1265 Rebased-From: 4b24380 (random-zebra)
e475827 [GUI] CoinControlDialog, removing extra spacing char from the copy to clipboard texts. (furszy)
dbe2b3a [GUI] CoinControlDialog, copy to clipboard action implemented on every showed label + inform snackbar notifying the user. (furszy)
3404bd9 [Wallet] Don't add P2CS automatically to CWalletTx::GetLockedCredit Github-Pull: #1264 Rebased-From: 4789652 (random-zebra)
d1f5731 [GUI] Force NavMenu to show dashboard button at startup. (furszy)
cdee261 [GUI] Open the app's window in the smallest, currently available, size. (furszy)
fc766c8 [GUI] TransactionRecord type P2CSDelegationSentOwner and P2CSDelegationSent distinction. (furszy)
49de2e4 [Qt][Bug] Load the most recent instead of the first transactions (Fuzzbawls)
827ca3e [Bug][GUI] Double counted delegated balance fix. (furszy)

Pull request description:

  Updates the `4.0` branch with relevant merged PRs in preparation for tagging the `4.0.2` release.

  Included PRs:
  #1261
  #1267
  #1263
  #1266
  #1264
  #1269
  #1265
  #1268
  #1273
  #1272
  #1274
  #1279

Top commit has no ACKs.

Tree-SHA512: 561d9319d08756c040751c6ce145505610ed2ebc4351a87d9d3bb05ecb98df9f35d492e9e3eb7e111ce611268c4a24bb13720e3f81917a671038f8ab23f14de4
@furszy furszy deleted the 2020_double_counted_delegated_balance branch November 29, 2022 14:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants