[wallet] Restore ability to list incoming transactions by label #14411

ryanofsky · 2018-10-06T05:51:37Z

This change partially reverts #13075 and #14023.

maflcko · 2018-10-06T06:46:40Z

Is this for backport to 0.17.1? While not necessary, I believe it would simplify upgrade from 0.17.1+ to 0.18.0, because 0.17.1 could be used without -deprecatedrpc as workaround.

ryanofsky · 2018-10-06T08:43:43Z

I think it'd be reasonable to backport this, since it's a small change that restores a removed feature. But I think it won't cherry-pick cleanly because #14023 was merged since the 0.17 branch. @Saicere originally reported the issue so they might be able to say whether there's a benefit to backporting.

DrahtBot · 2018-10-06T08:46:00Z

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

Reviewers, this pull request conflicts with the following ones:

#14726 (Use RPCHelpMan for all RPCs by MarcoFalke)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

Saicere · 2018-10-07T16:45:06Z

@Saicere originally reported the issue so they might be able to say whether there's a benefit to backporting.

As far as I am concerned, it's not really a big deal whether or not it's backported to the 0.17 branch as long as it's in before accounts are removed entirely. If you were using accounts in your application, you are probably running 0.17 with -deprecatedrpc=accounts anyway while RPC-facing code is updated.

kristapsk · 2018-10-07T20:54:04Z

ACK 8fcb765

promag

Concept ACK.

src/wallet/rpcwallet.cpp

jnewbery · 2018-10-08T08:16:57Z

Concept ACK. For completeness, this functionality was hidden behind a deprecation switch in #12953 (based on #11497). The functionality was marked deprecated in #5575.

Apologies - it was my oversight that this functionality got dropped. I'm happy to backport this to V0.17 once this gets merged. I aim to review this week.

jnewbery

Tested ACK 8fcb765 with a couple of nits.

@MarcoFalke - I'll go ahead and open a PR for backporting. A couple of questions:

does the backport need release notes?
if we add release notes for the backport, do we also need release notes here?

test/functional/wallet_listtransactions.py

maflcko · 2018-10-09T04:23:31Z

We assume the reader goes through the release notes for each release, so it should be sufficient to only mention on the 0.17. branch.

src/wallet/rpcwallet.cpp

jnewbery · 2018-10-09T08:05:32Z

Backport is #14441. PR numbering was totally intentional.

ryanofsky

Added 1 commit 8fcb765 -> 665d00f (pr/list-label.1 -> pr/list-label.2, compare) with suggested fixes.
Squashed 665d00f -> fa7fae5 (pr/list-label.2 -> pr/list-label.3)
Updated fa7fae5 -> 4deba4c (pr/list-label.3 -> pr/list-label.4) with release notes changes to reflect the intent to backport this to 0.17.1

src/wallet/rpcwallet.cpp

test/functional/wallet_listtransactions.py

jnewbery · 2018-10-10T07:23:25Z

ACK 4deba4c

jnewbery · 2018-10-10T07:41:29Z

The release note should be removed from this PR (assuming #14441 is merged)

src/wallet/rpcwallet.cpp

ryanofsky · 2018-10-15T17:49:25Z

Updated 4deba4c -> 7cbe74f (pr/list-label.4 -> pr/list-label.5) removing release notes and changing whitespace as suggested.

sipa · 2018-10-15T21:58:56Z

Very nitty comment; it feels like this functionality is closer to listreceivedbylabel than to listtransactions (as the latter is about all transactions which affect the balance of the wallet - and formerly account) rather than just incoming payments. Would it make sense to add it as an extra option to listreceivedbylabel (verbose or so), or a separate RPC, instead?

Saicere · 2018-10-15T23:06:23Z

Would it make sense to add it as an extra option to listreceivedbylabel (verbose or so), or a separate RPC, instead?

listreceivedbylabel doesn't take a label argument or list transactions in any way, it just lists total received coins per label, as per the code.

jnewbery · 2018-10-16T13:36:31Z

ACK 7cbe74f. Only change since 4deba4c is removing release notes and changing whitespace.

ryanofsky · 2018-10-16T16:57:55Z

Would it make sense to add it as an extra option to listreceivedbylabel (verbose or so), or a separate RPC, instead?

It'd be good to improve listreceivedbylabel. But filtering by label in listtransactions used to work previously and I think was just removed by accident.

You could maybe say that listtransactions shouldn't return labels or filter by label at all, since outgoing transactions won't have labels. But I don't think it makes sense to keep returning labels and only remove the ability to filter them.

maflcko · 2018-11-13T21:45:29Z

src/wallet/rpcwallet.cpp

@@ -1352,10 +1356,12 @@ UniValue listtransactions(const JSONRPCRequest& request)

    if (request.fHelp || request.params.size() > 4)
        throw std::runtime_error(
-            "listtransactions (dummy count skip include_watchonly)\n"
+            "listtransactions ( label count skip include_watchonly )\n"


From the documentation below, label is a string, so should be surrounded by quotation marks in the oneline doc.

Suggested change

"listtransactions ( label count skip include_watchonly )\n"

"listtransactions ( \"label\" count skip include_watchonly )\n"

re: #14411 (comment)

From the documentation below, label is a string, so should be surrounded by quotation marks in the oneline doc.

Done in rebase.

This change partially reverts bitcoin#13075 and bitcoin#14023. Fixes bitcoin#14382

Suggested by MeshCollider <dobsonsa68@gmail.com> in bitcoin#14411 (comment)

ryanofsky

Rebased 671d8ee -> da427db (pr/list-label.6 -> pr/list-label.7) due to conflict with #14720

ryanofsky · 2018-11-13T21:56:06Z

src/wallet/rpcwallet.cpp

@@ -1352,10 +1356,12 @@ UniValue listtransactions(const JSONRPCRequest& request)

    if (request.fHelp || request.params.size() > 4)
        throw std::runtime_error(
-            "listtransactions (dummy count skip include_watchonly)\n"
+            "listtransactions ( label count skip include_watchonly )\n"


re: #14411 (comment)

From the documentation below, label is a string, so should be surrounded by quotation marks in the oneline doc.

Done in rebase.

maflcko · 2018-11-14T16:57:30Z

ACK da427db (Only checked that the rebase was done properly from the last time people reviewed this. Also checked that the tests are the same as in the backport 5150acc, didn't look at the code)

…by label da427db Rename ListTransactions filter variable (Russell Yanofsky) 65b740f [wallet] Restore ability to list incoming transactions by label (Russell Yanofsky) Pull request description: This change partially reverts #13075 and #14023. Fixes #14382 Tree-SHA512: 8c4e56104b3a45784cdc06bae8e5facdfff04fe3545b63a35e0ec2e440a41b79d84833ca4c4e728d8af7ebb8a519303a9eda7bee4bbfb92bd50c58587a33eb30

jnewbery · 2018-11-21T22:17:49Z

utACK da427db

Suggested by MeshCollider <dobsonsa68@gmail.com> in bitcoin#14411 (comment)

…by label Summary: da427dbd48 Rename ListTransactions filter variable (Russell Yanofsky) 65b740f92b [wallet] Restore ability to list incoming transactions by label (Russell Yanofsky) Pull request description: This change partially reverts #13075 and #14023. Fixes #14382 Tree-SHA512: 8c4e56104b3a45784cdc06bae8e5facdfff04fe3545b63a35e0ec2e440a41b79d84833ca4c4e728d8af7ebb8a519303a9eda7bee4bbfb92bd50c58587a33eb30 Backport of Core [[bitcoin/bitcoin#14411 | PR14411]] Addresses concern raised #354 Test Plan: ninja check ninja check-functional ./bitcoind ./bitcoin-cli help listtransactions Verify changes to help text. Reviewers: O1 Bitcoin ABC, #bitcoin_abc, jasonbcox Reviewed By: O1 Bitcoin ABC, #bitcoin_abc, jasonbcox Differential Revision: https://reviews.bitcoinabc.org/D5507

…by label Summary: da427dbd48 Rename ListTransactions filter variable (Russell Yanofsky) 65b740f92b [wallet] Restore ability to list incoming transactions by label (Russell Yanofsky) Pull request description: This change partially reverts #13075 and #14023. Fixes #14382 Tree-SHA512: 8c4e56104b3a45784cdc06bae8e5facdfff04fe3545b63a35e0ec2e440a41b79d84833ca4c4e728d8af7ebb8a519303a9eda7bee4bbfb92bd50c58587a33eb30 Backport of Core [[bitcoin/bitcoin#14411 | PR14411]] Addresses concern raised Bitcoin-ABC#354 Test Plan: ninja check ninja check-functional ./bitcoind ./bitcoin-cli help listtransactions Verify changes to help text. Reviewers: O1 Bitcoin ABC, #bitcoin_abc, jasonbcox Reviewed By: O1 Bitcoin ABC, #bitcoin_abc, jasonbcox Differential Revision: https://reviews.bitcoinabc.org/D5507

… incoming transactions by label 89306ab [wallet] Restore ability to list incoming transactions by label (Russell Yanofsky) Pull request description: Backport of PR bitcoin#14411 to v0.17. This change partially reverts bitcoin#13075 and bitcoin#14023. Fixes bitcoin#14382 Tree-SHA512: 1f8300e1a79e826cd706561265b8788deef505fa510be1a76ed9a62e5fca37cf6a741423ac0e5de2a36d6e8b9f25f141885455aacacbbf6474814e6eae406a27

…ctions by label da427db Rename ListTransactions filter variable (Russell Yanofsky) 65b740f [wallet] Restore ability to list incoming transactions by label (Russell Yanofsky) Pull request description: This change partially reverts bitcoin#13075 and bitcoin#14023. Fixes bitcoin#14382 Tree-SHA512: 8c4e56104b3a45784cdc06bae8e5facdfff04fe3545b63a35e0ec2e440a41b79d84833ca4c4e728d8af7ebb8a519303a9eda7bee4bbfb92bd50c58587a33eb30

Backport bitcoin#14023, bitcoin#13825, bitcoin#14411 (and revert bitcoin#14441)

…ctions by label da427db Rename ListTransactions filter variable (Russell Yanofsky) 65b740f [wallet] Restore ability to list incoming transactions by label (Russell Yanofsky) Pull request description: This change partially reverts bitcoin#13075 and bitcoin#14023. Fixes bitcoin#14382 Tree-SHA512: 8c4e56104b3a45784cdc06bae8e5facdfff04fe3545b63a35e0ec2e440a41b79d84833ca4c4e728d8af7ebb8a519303a9eda7bee4bbfb92bd50c58587a33eb30

… incoming transactions by label 89306ab [wallet] Restore ability to list incoming transactions by label (Russell Yanofsky) Pull request description: Backport of PR bitcoin#14411 to v0.17. This change partially reverts bitcoin#13075 and bitcoin#14023. Fixes bitcoin#14382 Tree-SHA512: 1f8300e1a79e826cd706561265b8788deef505fa510be1a76ed9a62e5fca37cf6a741423ac0e5de2a36d6e8b9f25f141885455aacacbbf6474814e6eae406a27

…ctions by label da427db Rename ListTransactions filter variable (Russell Yanofsky) 65b740f [wallet] Restore ability to list incoming transactions by label (Russell Yanofsky) Pull request description: This change partially reverts bitcoin#13075 and bitcoin#14023. Fixes bitcoin#14382 Tree-SHA512: 8c4e56104b3a45784cdc06bae8e5facdfff04fe3545b63a35e0ec2e440a41b79d84833ca4c4e728d8af7ebb8a519303a9eda7bee4bbfb92bd50c58587a33eb30

fanquake added the Wallet label Oct 6, 2018

This was referenced Oct 6, 2018

Refactor: separate wallet from node #10973

Merged

Multiprocess bitcoin #10102

Draft

promag reviewed Oct 7, 2018

View reviewed changes

src/wallet/rpcwallet.cpp Outdated Show resolved Hide resolved

maflcko added this to the 0.17.1 milestone Oct 8, 2018

maflcko added the Needs backport label Oct 8, 2018

DrahtBot mentioned this pull request Oct 9, 2018

Refactor: Start to separate wallet from node #14437

Merged

jnewbery reviewed Oct 9, 2018

View reviewed changes

test/functional/wallet_listtransactions.py Outdated Show resolved Hide resolved

test/functional/wallet_listtransactions.py Outdated Show resolved Hide resolved

jnewbery reviewed Oct 9, 2018

View reviewed changes

src/wallet/rpcwallet.cpp Outdated Show resolved Hide resolved

jnewbery mentioned this pull request Oct 9, 2018

[wallet] Backport(0.17): Restore ability to list incoming transactions by label #14441

Merged

ryanofsky force-pushed the pr/list-label branch from 8fcb765 to fa7fae5 Compare October 10, 2018 03:26

ryanofsky commented Oct 10, 2018

View reviewed changes

src/wallet/rpcwallet.cpp Outdated Show resolved Hide resolved

src/wallet/rpcwallet.cpp Outdated Show resolved Hide resolved

test/functional/wallet_listtransactions.py Outdated Show resolved Hide resolved

test/functional/wallet_listtransactions.py Outdated Show resolved Hide resolved

ryanofsky force-pushed the pr/list-label branch from fa7fae5 to 4deba4c Compare October 10, 2018 06:28

promag reviewed Oct 10, 2018

View reviewed changes

src/wallet/rpcwallet.cpp Outdated Show resolved Hide resolved

ryanofsky force-pushed the pr/list-label branch from 4deba4c to 7cbe74f Compare October 15, 2018 17:48

maflcko reviewed Nov 13, 2018

View reviewed changes

ryanofsky added 2 commits November 13, 2018 17:49

[wallet] Restore ability to list incoming transactions by label

65b740f

This change partially reverts bitcoin#13075 and bitcoin#14023. Fixes bitcoin#14382

Rename ListTransactions filter variable

da427db

Suggested by MeshCollider <dobsonsa68@gmail.com> in bitcoin#14411 (comment)

ryanofsky force-pushed the pr/list-label branch from 671d8ee to ae81320 Compare November 13, 2018 21:53

DrahtBot added the Needs rebase label Nov 13, 2018

ryanofsky force-pushed the pr/list-label branch 3 times, most recently from ae81320 to da427db Compare November 13, 2018 22:00

ryanofsky commented Nov 13, 2018

View reviewed changes

DrahtBot removed the Needs rebase label Nov 13, 2018

maflcko merged commit da427db into bitcoin:master Nov 14, 2018

HashUnlimited pushed a commit to HashUnlimited/chaincoin that referenced this pull request Nov 26, 2018

Rename ListTransactions filter variable

acf214b

Suggested by MeshCollider <dobsonsa68@gmail.com> in bitcoin#14411 (comment)

kristapsk mentioned this pull request Dec 12, 2020

Drop support for pre-0.17 Bitcoin Core JoinMarket-Org/joinmarket-clientserver#764

Merged

UdjinM6 mentioned this pull request Dec 28, 2020

backport: Deprecate accounts dashpay/dash#3886

Merged

UdjinM6 added a commit to dashpay/dash that referenced this pull request Sep 24, 2021

Merge pull request #4442 from UdjinM6/pr4319_new

b664064

Backport bitcoin#14023, bitcoin#13825, bitcoin#14411 (and revert bitcoin#14441)

bitcoin locked as resolved and limited conversation to collaborators Aug 16, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[wallet] Restore ability to list incoming transactions by label #14411

[wallet] Restore ability to list incoming transactions by label #14411

ryanofsky commented Oct 6, 2018

maflcko commented Oct 6, 2018

ryanofsky commented Oct 6, 2018

DrahtBot commented Oct 6, 2018 •

edited

Loading

Saicere commented Oct 7, 2018

kristapsk commented Oct 7, 2018

promag left a comment

jnewbery commented Oct 8, 2018

jnewbery left a comment

maflcko commented Oct 9, 2018

jnewbery commented Oct 9, 2018

ryanofsky left a comment •

edited

Loading

jnewbery commented Oct 10, 2018

jnewbery commented Oct 10, 2018

ryanofsky commented Oct 15, 2018 •

edited

Loading

sipa commented Oct 15, 2018

Saicere commented Oct 15, 2018

jnewbery commented Oct 16, 2018

ryanofsky commented Oct 16, 2018

maflcko Nov 13, 2018

ryanofsky Nov 13, 2018

ryanofsky left a comment

ryanofsky Nov 13, 2018

maflcko commented Nov 14, 2018

jnewbery commented Nov 21, 2018

	"listtransactions ( label count skip include_watchonly )\n"
	"listtransactions ( \"label\" count skip include_watchonly )\n"

[wallet] Restore ability to list incoming transactions by label #14411

[wallet] Restore ability to list incoming transactions by label #14411

Conversation

ryanofsky commented Oct 6, 2018

maflcko commented Oct 6, 2018

ryanofsky commented Oct 6, 2018

DrahtBot commented Oct 6, 2018 • edited Loading

Conflicts

Saicere commented Oct 7, 2018

kristapsk commented Oct 7, 2018

promag left a comment

Choose a reason for hiding this comment

jnewbery commented Oct 8, 2018

jnewbery left a comment

Choose a reason for hiding this comment

maflcko commented Oct 9, 2018

jnewbery commented Oct 9, 2018

ryanofsky left a comment • edited Loading

Choose a reason for hiding this comment

jnewbery commented Oct 10, 2018

jnewbery commented Oct 10, 2018

ryanofsky commented Oct 15, 2018 • edited Loading

sipa commented Oct 15, 2018

Saicere commented Oct 15, 2018

jnewbery commented Oct 16, 2018

ryanofsky commented Oct 16, 2018

maflcko Nov 13, 2018

Choose a reason for hiding this comment

ryanofsky Nov 13, 2018

Choose a reason for hiding this comment

ryanofsky left a comment

Choose a reason for hiding this comment

ryanofsky Nov 13, 2018

Choose a reason for hiding this comment

maflcko commented Nov 14, 2018

jnewbery commented Nov 21, 2018

DrahtBot commented Oct 6, 2018 •

edited

Loading

ryanofsky left a comment •

edited

Loading

ryanofsky commented Oct 15, 2018 •

edited

Loading