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

[RPC][QT] UI support for abandoned transactions #7707

Merged
merged 1 commit into from Apr 4, 2016

Conversation

Projects
None yet
5 participants
@jonasschnelli
Member

jonasschnelli commented Mar 17, 2016

This PR adds the "abandoned" state to the RPC call listtransaction (only outgoing transactions), it also adds a context menu option to abandon a transaction over the GUI.

Abandoned transaction are marked with a light-red color and a "trash" icon.

Some screens:
bildschirmfoto 2016-03-17 um 20 04 17
bildschirmfoto 2016-03-17 um 20 04 09
bildschirmfoto 2016-03-17 um 20 31 17

@jonasschnelli

This comment has been minimized.

Show comment
Hide comment
@jonasschnelli

jonasschnelli Mar 18, 2016

Member

Added serval things:

  • table row will be updated (redrawn) after a transaction has been abandoned (new color / change icon)
  • "Abandon transaction" action is only available if tx is not in mempool and has no confirmation (otherwise it's disabled)
  • Simple reordering of the context menu (keep mutable action together)

bildschirmfoto 2016-03-18 um 09 46 20

Member

jonasschnelli commented Mar 18, 2016

Added serval things:

  • table row will be updated (redrawn) after a transaction has been abandoned (new color / change icon)
  • "Abandon transaction" action is only available if tx is not in mempool and has no confirmation (otherwise it's disabled)
  • Simple reordering of the context menu (keep mutable action together)

bildschirmfoto 2016-03-18 um 09 46 20

@laanwj

This comment has been minimized.

Show comment
Hide comment
@laanwj

laanwj Mar 23, 2016

Member

Concept ACK

Member

laanwj commented Mar 23, 2016

Concept ACK

@morcos

This comment has been minimized.

Show comment
Hide comment
@morcos

morcos Mar 23, 2016

Member

utACK on 42e945d only for backport to 0.12

Member

morcos commented Mar 23, 2016

utACK on 42e945d only for backport to 0.12

@@ -268,7 +268,8 @@ RES_ICONS = \
qt/res/icons/tx_output.png \
qt/res/icons/tx_mined.png \
qt/res/icons/warning.png \
qt/res/icons/verify.png
qt/res/icons/verify.png \
qt/res/icons/transaction_abandoned.png

This comment has been minimized.

@MarcoFalke

MarcoFalke Mar 24, 2016

Member

Nit: Document the author?

Edit: Also you may want to consider adding the source svg and running optimize png, if not already done.

@MarcoFalke

MarcoFalke Mar 24, 2016

Member

Nit: Document the author?

Edit: Also you may want to consider adding the source svg and running optimize png, if not already done.

This comment has been minimized.

@jonasschnelli

jonasschnelli Apr 4, 2016

Member

It's already optimized and the source SVG is not required because it's part of Hutchings typicons (we only added sourced for manipulated or self-created icons).
Also src/qt/res/icons/transaction*.png covers the copyright info in contrib/debian/copyright.

@jonasschnelli

jonasschnelli Apr 4, 2016

Member

It's already optimized and the source SVG is not required because it's part of Hutchings typicons (we only added sourced for manipulated or self-created icons).
Also src/qt/res/icons/transaction*.png covers the copyright info in contrib/debian/copyright.

This comment has been minimized.

@MarcoFalke

MarcoFalke Apr 4, 2016

Member

Thanks for clarifying, I haven't seen this is unmodified.

@MarcoFalke

MarcoFalke Apr 4, 2016

Member

Thanks for clarifying, I haven't seen this is unmodified.

@MarcoFalke

View changes

Show outdated Hide outdated src/wallet/rpcwallet.cpp
@MarcoFalke

This comment has been minimized.

Show comment
Hide comment
@MarcoFalke

MarcoFalke Mar 24, 2016

Member

Tested ACK df80f3d

Member

MarcoFalke commented Mar 24, 2016

Tested ACK df80f3d

@paveljanik

This comment has been minimized.

Show comment
Hide comment
@paveljanik

paveljanik Mar 30, 2016

Contributor

@jonasschnelli can you please rebase so the rpcwallet.cpp file is not touched here?

Contributor

paveljanik commented Mar 30, 2016

@jonasschnelli can you please rebase so the rpcwallet.cpp file is not touched here?

@jonasschnelli

This comment has been minimized.

Show comment
Hide comment
@jonasschnelli

jonasschnelli Mar 30, 2016

Member

Rebased.

Member

jonasschnelli commented Mar 30, 2016

Rebased.

@paveljanik

This comment has been minimized.

Show comment
Hide comment
@paveljanik

paveljanik Mar 30, 2016

Contributor

ACK 3d580e5

For other testers: start with -walletbroadcast=0.

Contributor

paveljanik commented Mar 30, 2016

ACK 3d580e5

For other testers: start with -walletbroadcast=0.

@jonasschnelli jonasschnelli merged commit 8efed3b into bitcoin:master Apr 4, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

jonasschnelli added a commit that referenced this pull request Apr 4, 2016

Merge #7707: [RPC][QT] UI support for abandoned transactions
8efed3b [Qt] Support for abandoned/abandoning transactions (Jonas Schnelli)

codablock added a commit to codablock/dash that referenced this pull request Sep 7, 2017

Merge #7707: [RPC][QT] UI support for abandoned transactions
8efed3b [Qt] Support for abandoned/abandoning transactions (Jonas Schnelli)

UdjinM6 added a commit to dashpay/dash that referenced this pull request Sep 9, 2017

Backport Bitcoin Qt/Gui changes up to 0.14.x part 2 (#1615)
* Merge #7506: Use CCoinControl selection in CWallet::FundTransaction

d6cc6a1 Use CCoinControl selection in CWallet::FundTransaction (João Barbosa)

* Merge #7732: [Qt] Debug window: replace "Build date" with "Datadir"

fc737d1 [Qt] remove unused formatBuildDate method (Jonas Schnelli)
4856f1d [Qt] Debug window: replace "Build date" with "Datadir" (Jonas Schnelli)

* Merge #7707: [RPC][QT] UI support for abandoned transactions

8efed3b [Qt] Support for abandoned/abandoning transactions (Jonas Schnelli)

* Merge #7688: List solvability in listunspent output and improve help

c3932b3 List solvability in listunspent output and improve help (Pieter Wuille)

* Merge #8006: Qt: Add option to disable the system tray icon

8b0e497 Qt: Add option to hide the system tray icon (Tyler Hardin)

* Merge #8073: qt: askpassphrasedialog: Clear pass fields on accept

02ce2a3 qt: askpassphrasedialog: Clear pass fields on accept (Pavel Vasin)

* Merge #8231: [Qt] fix a bug where the SplashScreen will not be hidden during startup

b3e1348 [Qt] fix a bug where the SplashScreen will not be hidden during startup (Jonas Schnelli)

* Merge #8257: Do not ask a UI question from bitcoind

1acf1db Do not ask a UI question from bitcoind (Pieter Wuille)

* Merge #8463: [qt] Remove Priority from coincontrol dialog

fa8dd78 [qt] Remove Priority from coincontrol dialog (MarcoFalke)

* Merge #8678: [Qt][CoinControl] fix UI bug that could result in paying unexpected fee

0480293 [Qt][CoinControl] fix UI bug that could result in paying unexpected fee (Jonas Schnelli)

* Merge #8672: Qt: Show transaction size in transaction details window

c015634 qt: Adding transaction size to transaction details window (Hampus Sjöberg)
 \-- merge fix for s/size/total size/
fdf82fb Adding method GetTotalSize() to CTransaction (Hampus Sjöberg)

* Merge #8371: [Qt] Add out-of-sync modal info layer

08827df [Qt] modalinfolayer: removed unused comments, renamed signal, code style overhaul (Jonas Schnelli)
d8b062e [Qt] only update "amount of blocks left" when the header chain is in-sync (Jonas Schnelli)
e3245b4 [Qt] add out-of-sync modal info layer (Jonas Schnelli)
e47052f [Qt] ClientModel add method to get the height of the header chain (Jonas Schnelli)
a001f18 [Qt] Always pass the numBlocksChanged signal for headers tip changed (Jonas Schnelli)
bd44a04 [Qt] make Out-Of-Sync warning icon clickable (Jonas Schnelli)
0904c3c [Refactor] refactor function that forms human readable text out of a timeoffset (Jonas Schnelli)

* Merge #8805: Trivial: Grammar and capitalization

c9ce17b Trivial: Grammar and capitalization (Derek Miller)

* Merge #8885: gui: fix ban from qt console

cb78c60 gui: fix ban from qt console (Cory Fields)

* Merge #8821: [qt] sync-overlay: Don't block during reindex

fa85e86 [qt] sync-overlay: Don't show estimated number of headers left (MarcoFalke)
faa4de2 [qt] sync-overlay: Don't block during reindex (MarcoFalke)

* Support themes for new transaction_abandoned icon

* Fix constructor call to COutput

* Merge #7842: RPC: do not print minping time in getpeerinfo when no ping received yet

62a6486 RPC: do not print ping info in getpeerinfo when no ping received yet, fix help (Pavel Janík)

* Merge #8918: Qt: Add "Copy URI" to payment request context menu

21f5a63 Qt: Add "Copy URI" to payment request context menu (Luke Dashjr)

* Merge #8925: qt: Display minimum ping in debug window.

1724a40 Display minimum ping in debug window. (R E Broadley)

* Merge #8972: [Qt] make warnings label selectable (jonasschnelli)

ef0c9ee [Qt] make warnings label selectable (Jonas Schnelli)

* Make background of warning icon transparent in modaloverlay

* Merge #9088: Reduce ambiguity of warning message

77cbbd9 Make warning message about wallet balance possibly being incorrect less ambiguous. (R E Broadley)

* Replace Bitcoin with Dash in modal overlay

* Remove clicked signals from labelWalletStatus and labelTransactionsStatus

As both are really just labels, clicking on those is not possible.
This is different in Bitcoin, where these labels are actually buttons.

* Pull out modaloverlay show/hide into it's own if/else block and switch to time based check

Also don't use masternodeSync.IsBlockchainSynced() for now as it won't
report the blockchain being synced before the first block (or other MN
data?) arrives. This would otherwise give the impression that sync is
being stuck.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment