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.

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

[GUI] P2CS transaction divided in two types for visual accuracy. #1263

Merged
merged 1 commit into from
Jan 14, 2020

Conversation

furszy
Copy link

@furszy furszy commented Jan 14, 2020

Send P2CS divided in two types for a better visual treatment.

  • P2CSDelegationSentOwner: Is the wallet who delegated the coins and kept the ownership.
  • P2CSDelegationSent: Is the wallet who delegated the coins and transferred the coin's ownership to a remote address.

TODO: Add external address stored name (if any) in the record presentation for the P2CSDelegationSent txs.

@furszy furszy self-assigned this Jan 14, 2020
src/wallet/wallet.cpp Outdated Show resolved Hide resolved
@random-zebra random-zebra added this to the 4.0.2 milestone Jan 14, 2020
…onSent distinction.

* P2CSDelegationSentOwner: Is the wallet who delegated the coins and kept the ownership.
* P2CSDelegationSent: Is the wallet who delegated the coins and transferred the coin's ownership to a remote address.
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.

utACK 94f78fa and merging...

random-zebra added a commit that referenced this pull request Jan 14, 2020
…ccuracy.

94f78fa [GUI] TransactionRecord type P2CSDelegationSentOwner and P2CSDelegationSent distinction. (furszy)

Pull request description:

  Send P2CS divided in two types for a better visual treatment.

  * P2CSDelegationSentOwner: Is the wallet who delegated the coins and kept the ownership.
  * P2CSDelegationSent: Is the wallet who delegated the coins and transferred the coin's ownership to a remote address.

  TODO: Add external address stored name (if any) in the record presentation for the `P2CSDelegationSent` txs.

ACKs for top commit:
  random-zebra:
    utACK 94f78fa and merging...

Tree-SHA512: e5f56c0afe322de3296cb4efad869c6ab5fa574ba761d2ff4477527bd1c71469a0b91301409d189544f1a0151d12a42746c2ea993833b8cebdf9d2b1cb6231f9
@random-zebra random-zebra merged commit 94f78fa into PIVX-Project:master Jan 14, 2020
Fuzzbawls pushed a commit to Fuzzbawls/PIVX that referenced this pull request Jan 16, 2020
…onSent distinction.

* P2CSDelegationSentOwner: Is the wallet who delegated the coins and kept the ownership.
* P2CSDelegationSent: Is the wallet who delegated the coins and transferred the coin's ownership to a remote address.

Github-Pull: PIVX-Project#1263
Rebased-From: 94f78fa
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
random-zebra added a commit that referenced this pull request Jan 23, 2020
…oMaturity

4d38d42 [Wallet] Remove extra checks before GetBlocksToMaturity (random-zebra)

Pull request description:

  Ref: #1263 (comment)

  `GetBlocksToMaturity` returns `0` for txes that are neither coinbases nor coinstakes, so no need to check that before.
  There are actually only two places needing this quick cleanup.

  Note: there are, instead, several occurrences of `if (IsCoinBase() && GetBlocksToMaturity() > 0)` (i.e. test failing for coinstakes but not coinbases).
  These need further inspection because a change there affects reported balances (e.g. in `CWalletTx::UpdateAmount` or `CWalletTx::GetUnlockedCredit`).

ACKs for top commit:
  furszy:
    This is ok, ACK 4d38d42
  Fuzzbawls:
    utACK 4d38d42

Tree-SHA512: 50693af631a653be940a77aa6a52ec17490236fd56a843536689a0e04c0a10c85edeccd254aa389d84d89c24fb916d54c3703bf8eb18d958d9ee1bbd0428ea60
Liquid369 pushed a commit to dogecash/dogecash-old that referenced this pull request Jan 24, 2020
…oMaturity

4d38d42 [Wallet] Remove extra checks before GetBlocksToMaturity (random-zebra)

Pull request description:

  Ref: PIVX-Project/PIVX#1263 (comment)

  `GetBlocksToMaturity` returns `0` for txes that are neither coinbases nor coinstakes, so no need to check that before.
  There are actually only two places needing this quick cleanup.

  Note: there are, instead, several occurrences of `if (IsCoinBase() && GetBlocksToMaturity() > 0)` (i.e. test failing for coinstakes but not coinbases).
  These need further inspection because a change there affects reported balances (e.g. in `CWalletTx::UpdateAmount` or `CWalletTx::GetUnlockedCredit`).

ACKs for top commit:
  furszy:
    This is ok, ACK 4d38d42
  Fuzzbawls:
    utACK 4d38d42

Tree-SHA512: 50693af631a653be940a77aa6a52ec17490236fd56a843536689a0e04c0a10c85edeccd254aa389d84d89c24fb916d54c3703bf8eb18d958d9ee1bbd0428ea60
wqking pushed a commit to wqking-temp/Vitae that referenced this pull request Jul 27, 2020
…oMaturity

4d38d42059fcb49d9292e66a8365466a8422ad20 [Wallet] Remove extra checks before GetBlocksToMaturity (random-zebra)

Pull request description:

  Ref: PIVX-Project/PIVX#1263 (comment)

  `GetBlocksToMaturity` returns `0` for txes that are neither coinbases nor coinstakes, so no need to check that before.
  There are actually only two places needing this quick cleanup.

  Note: there are, instead, several occurrences of `if (IsCoinBase() && GetBlocksToMaturity() > 0)` (i.e. test failing for coinstakes but not coinbases).
  These need further inspection because a change there affects reported balances (e.g. in `CWalletTx::UpdateAmount` or `CWalletTx::GetUnlockedCredit`).

ACKs for top commit:
  furszy:
    This is ok, ACK 4d38d42
  Fuzzbawls:
    utACK 4d38d42059fcb49d9292e66a8365466a8422ad20

Tree-SHA512: 50693af631a653be940a77aa6a52ec17490236fd56a843536689a0e04c0a10c85edeccd254aa389d84d89c24fb916d54c3703bf8eb18d958d9ee1bbd0428ea60
@furszy furszy deleted the 2020_delegated_coins branch November 29, 2022 14:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants