Remove accounts rpcs #14023

jnewbery · 2018-08-22T13:02:38Z

This is the first part of #13825. It simply removes the RPC methods and tests.

#13825 touches lots of files and will require frequent rebasing.

Breaking it down for easier reviewing and fewer rebases.

DrahtBot · 2018-08-22T14:56:52Z

Note to reviewers: This pull request conflicts with the following ones:

Import watch only pubkeys to the keypool if private keys are disabled #14075 (Import watch only pubkeys to the keypool if private keys are disabled by achow101)
Refactoring CRPCCommand with enum category #13945 (Refactoring CRPCCommand with enum category by isghe)
Make objects in range declarations immutable by default. Avoid unnecessary copying of objects in range declarations. #13249 (Make objects in range declarations immutable by default. Avoid unnecessary copying of objects in range declarations. by practicalswift)
[Wallet] [RPC] Remove deprecated wallet rpc features from bitcoin_server #12490 ([Wallet] [RPC] Remove deprecated wallet rpc features from bitcoin_server by jnewbery)
Add missing locks: validation.cpp + related #11652 (Add missing locks: validation.cpp + related by practicalswift)
[wallet] [rpc] sendtoaddress/sendmany: Add explicit feerate option #11413 ([wallet] [rpc] sendtoaddress/sendmany: Add explicit feerate option by kallewoof)
Remove CWalletTx merging logic from AddToWallet #9381 (Remove CWalletTx merging logic from AddToWallet by ryanofsky)

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.

promag · 2018-08-23T21:58:46Z

LGTM. Should update contrib/bitcoin-cli.bash-completion?

gmaxwell · 2018-08-24T07:22:17Z

Is it still possible for a wallet to be in a state where it cannot spend funds unless they're first 'move'ed into the default account?

jnewbery · 2018-08-24T14:14:20Z

Is it still possible for a wallet to be in a state where it cannot spend funds unless they're first 'move'ed into the default account?

I'm not aware of that issue. If you can point to a github issue or some other reference describing what you're alluding to, that would be helpful.

In any case, the sendmany and sendtoaddress RPCs will not consider accounts if an account argument is not passed, so I don't see how the wallet could ever be in that state, either before or after this PR.

maflcko · 2018-08-24T14:32:58Z

utACK 01137c1. This only removes test and rpc code, not touching the wallet code.

PierreRochard · 2018-08-26T23:28:50Z

Tested ACK 01137c1, will update after the rebase

The accounts API will be removed in the next commit. Remove all functional tests for the accounts API.

jnewbery · 2018-08-27T13:56:16Z

Rebased and release note added.

maflcko · 2018-08-27T14:04:40Z

src/wallet/rpcwallet.cpp

-                }
+                if (wtx.GetDepthInMainChain() < 1)
+                    entry.pushKV("category", "orphan");
+                else if (wtx.GetBlocksToMaturity() > 0)


Any reason for this change?

No reason, except a bad rebase. Thanks for catching this!

Fixed in bb08423

Good catch Marco. Since this slipped past me, I did some research and found that the CLion IDE effectively highlights the change, while github and diff2html do not. Adding it to my review process.

maflcko · 2018-08-27T14:05:20Z

Almost utACK 288bccc472fe5a91acc0f4029a1daff689aead2f

Also remove the RPC deprecation tests for accounts, and make one small change to another wallet test that relies on account behaviour.

This wasn't done in previous commit to make diff more reviewable.

laanwj · 2018-08-27T15:52:24Z

utACK bb08423

bb08423 [doc] Add release notes for 'account' API removal (John Newbery) 1f4b865 [wallet] Re-sort wallet RPC commands (John Newbery) f0dc850 [wallet] Remove wallet account RPCs (John Newbery) c410f41 [tests] Remove wallet accounts test (John Newbery) Pull request description: This is the first part of #13825. It simply removes the RPC methods and tests. #13825 touches lots of files and will require frequent rebasing. Breaking it down for easier reviewing and fewer rebases. Tree-SHA512: d29af8e7a035e4484e6b9bb56cb86592be0ec112d8ba4ce19c15d15366ff3086e89e99fca26b90c9d66f6d3e06894486d0f29948df0bb7dcb1e2c49c6887a85a

promag

utACK bb08423, maybe fix typo in the next PR.

promag · 2018-08-27T22:33:58Z

doc/release-notes-14023.md

@@ -0,0 +1,8 @@
+Accout API removed


FWIW, codespell catched this typo. Fixed in the codespell PR #13954.

Please review :-)

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

Backport of PR 14411 to v0.17. This change partially reverts bitcoin#13075 and bitcoin#14023. Fixes bitcoin#14382

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

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

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

…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

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

Summary: 8ecaee13f70a2062e88a977c950a65d3a2de560f Increase signal to noise in appveyor build output by reducing the MSVC warning count from 12 to 4 (12 is assuming the changes in #14086 are also implemented). (practicalswift) Pull request description: Remove unreferenced local variables: Increase signal to noise in appveyor build output by reducing the MSVC warning count from 12 to 4. 12 is the number of MSVC warnings under our current appveyor setup assuming the changes in #14086 are also implemented. This makes it easier to spot errors or more important warnings in the verbose appveyor output. MSVC warnings are good, so having access to them in a noise free way (read: without trivial warnings) via appveyor without having to use Windows is really valuable. See bitcoin/bitcoin#14086 (comment) plus discussion for context. Before: ``` c:\projects\bitcoin\src\script\script.cpp(272): warning C4018: '>': signed/unsigned mismatch [C:\projects\bitcoin\build_msvc\libbitcoinconsensus\libbitcoinconsensus.vcxproj] c:\projects\bitcoin\src\rest.cpp(467): warning C4101: 'e': unreferenced local variable [C:\projects\bitcoin\build_msvc\libbitcoin_server\libbitcoin_server.vcxproj] c:\projects\bitcoin\src\test\allocator_tests.cpp(147): warning C4312: 'reinterpret_cast': conversion from 'int' to 'void *' of greater size [C:\projects\bitcoin\build_msvc\test_bitcoin\test_bitcoin.vcxproj] c:\projects\bitcoin\src\test\coins_tests.cpp(511): warning C4101: 'e': unreferenced local variable [C:\projects\bitcoin\build_msvc\test_bitcoin\test_bitcoin.vcxproj] c:\projects\bitcoin\src\test\coins_tests.cpp(524): warning C4101: 'e': unreferenced local variable [C:\projects\bitcoin\build_msvc\test_bitcoin\test_bitcoin.vcxproj] c:\projects\bitcoin\src\test\coins_tests.cpp(722): warning C4101: 'e': unreferenced local variable [C:\projects\bitcoin\build_msvc\test_bitcoin\test_bitcoin.vcxproj] c:\projects\bitcoin\src\test\coins_tests.cpp(783): warning C4101: 'e': unreferenced local variable [C:\projects\bitcoin\build_msvc\test_bitcoin\test_bitcoin.vcxproj] c:\projects\bitcoin\src\test\crypto_tests.cpp(535): warning C4334: '<<': result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?) [C:\projects\bitcoin\build_msvc\test_bitcoin\test_bitcoin.vcxproj] c:\projects\bitcoin\src\test\dbwrapper_tests.cpp(265): warning C4101: 'e': unreferenced local variable [C:\projects\bitcoin\build_msvc\test_bitcoin\test_bitcoin.vcxproj] c:\projects\bitcoin\src\test\net_tests.cpp(118): warning C4101: 'e': unreferenced local variable [C:\projects\bitcoin\build_msvc\test_bitcoin\test_bitcoin.vcxproj] c:\projects\bitcoin\src\test\net_tests.cpp(151): warning C4101: 'e': unreferenced local variable [C:\projects\bitcoin\build_msvc\test_bitcoin\test_bitcoin.vcxproj] c:\projects\bitcoin\src\test\scheduler_tests.cpp(57): warning C4305: 'argument': truncation from 'int' to 'bool' [C:\projects\bitcoin\build_msvc\test_bitcoin\test_bitcoin.vcxproj] ``` After: ``` c:\projects\bitcoin\src\script\script.cpp(272): warning C4018: '>': signed/unsigned mismatch [C:\projects\bitcoin\build_msvc\libbitcoinconsensus\libbitcoinconsensus.vcxproj] c:\projects\bitcoin\src\test\allocator_tests.cpp(147): warning C4312: 'reinterpret_cast': conversion from 'int' to 'void *' of greater size [C:\projects\bitcoin\build_msvc\test_bitcoin\test_bitcoin.vcxproj] c:\projects\bitcoin\src\test\crypto_tests.cpp(535): warning C4334: '<<': result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?) [C:\projects\bitcoin\build_msvc\test_bitcoin\test_bitcoin.vcxproj] c:\projects\bitcoin\src\test\scheduler_tests.cpp(57): warning C4305: 'argument': truncation from 'int' to 'bool' [C:\projects\bitcoin\build_msvc\test_bitcoin\test_bitcoin.vcxproj] ``` Tree-SHA512: 5051134126c570b8421d57c710f1f1b977600398d2b5e69f8a8bd766b3696f992bf4e3459643b99a6b7e08dee1adc92985ee4d0d52b20755954415cb6f23f2fb Backport of Core [[https://github.com/bitcoin/bitcoin/pull/14094/files | PR14094]] bitcoin/bitcoin#14094 Reviewer note: https://github.com/bitcoin/bitcoin/pull/14094/files#diff-df7d84ff2f53fcb2a0dc15a3a51e55ceL291 is dependent on bitcoin/bitcoin#14023 which must wait until v0.21. Test Plan: ninja check Reviewers: deadalnix, Fabien, jasonbcox, O1 Bitcoin ABC, #bitcoin_abc Reviewed By: deadalnix, jasonbcox, O1 Bitcoin ABC, #bitcoin_abc Differential Revision: https://reviews.bitcoinabc.org/D5166

Summary: bb08423d5ca866d4a139a3b57ff110d818d08b32 [doc] Add release notes for 'account' API removal (John Newbery) 1f4b865e57b4567270b1586bb1f348ab9106485d [wallet] Re-sort wallet RPC commands (John Newbery) f0dc850bf698f7377797d7d68365d4fc79b0221c [wallet] Remove wallet account RPCs (John Newbery) Pull request description: This is the first part of #13825. It simply removes the RPC methods and tests. #13825 touches lots of files and will require frequent rebasing. Breaking it down for easier reviewing and fewer rebases. Tree-SHA512: d29af8e7a035e4484e6b9bb56cb86592be0ec112d8ba4ce19c15d15366ff3086e89e99fca26b90c9d66f6d3e06894486d0f29948df0bb7dcb1e2c49c6887a85a Backport of Core [[bitcoin/bitcoin#14023 | PR14023]] Test Plan: make check ninja check ninja check-functional ./bitcoind ./bitcoin-cli help Verify the account rpcs were removed. ./bitcoin-cli help sendmany Verify the change to `sendmany` help text. Reviewers: O1 Bitcoin ABC, #bitcoin_abc, Fabien Reviewed By: O1 Bitcoin ABC, #bitcoin_abc, Fabien Subscribers: jasonbcox, Fabien Differential Revision: https://reviews.bitcoinabc.org/D5316

… 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

bb08423 [doc] Add release notes for 'account' API removal (John Newbery) 1f4b865 [wallet] Re-sort wallet RPC commands (John Newbery) f0dc850 [wallet] Remove wallet account RPCs (John Newbery) c410f41 [tests] Remove wallet accounts test (John Newbery) Pull request description: This is the first part of bitcoin#13825. It simply removes the RPC methods and tests. bitcoin#13825 touches lots of files and will require frequent rebasing. Breaking it down for easier reviewing and fewer rebases. Tree-SHA512: d29af8e7a035e4484e6b9bb56cb86592be0ec112d8ba4ce19c15d15366ff3086e89e99fca26b90c9d66f6d3e06894486d0f29948df0bb7dcb1e2c49c6887a85a

…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

jnewbery mentioned this pull request Aug 22, 2018

[wallet] Kill accounts #13825

Closed

fanquake added Refactoring Wallet labels Aug 22, 2018

This was referenced Aug 22, 2018

Refactoring CRPCCommand with enum category #13945

Closed

wallet: "avoid_reuse" wallet flag for improved privacy #13756

Merged

Add CMerkleTx::IsImmatureCoinBase method #13631

Merged

promag mentioned this pull request Aug 23, 2018

Avoid locking cs_main in some wallet RPC #12559

Merged

laanwj added the RPC/REST/ZMQ label Aug 23, 2018

DrahtBot added the Needs rebase label Aug 25, 2018

[tests] Remove wallet accounts test

c410f41

The accounts API will be removed in the next commit. Remove all functional tests for the accounts API.

jnewbery force-pushed the remove_accounts_rpcs branch from 01137c1 to 288bccc Compare August 27, 2018 13:53

maflcko reviewed Aug 27, 2018

View reviewed changes

DrahtBot mentioned this pull request Aug 27, 2018

Import watch only pubkeys to the keypool if private keys are disabled #14075

Merged

jnewbery added 3 commits August 27, 2018 10:45

[wallet] Remove wallet account RPCs

f0dc850

Also remove the RPC deprecation tests for accounts, and make one small change to another wallet test that relies on account behaviour.

[wallet] Re-sort wallet RPC commands

1f4b865

This wasn't done in previous commit to make diff more reviewable.

[doc] Add release notes for 'account' API removal

bb08423

jnewbery force-pushed the remove_accounts_rpcs branch from 288bccc to bb08423 Compare August 27, 2018 14:45

DrahtBot removed the Needs rebase label Aug 27, 2018

laanwj merged commit bb08423 into bitcoin:master Aug 27, 2018

promag reviewed Aug 27, 2018

View reviewed changes

ryanofsky added a commit to ryanofsky/bitcoin that referenced this pull request Oct 6, 2018

[wallet] Restore ability to list incoming transactions by label

8fcb765

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

ryanofsky mentioned this pull request Oct 6, 2018

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

Merged

jnewbery mentioned this pull request Oct 9, 2018

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

Merged

ryanofsky added a commit to ryanofsky/bitcoin that referenced this pull request Oct 10, 2018

[wallet] Restore ability to list incoming transactions by label

fa7fae5

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

ryanofsky added a commit to ryanofsky/bitcoin that referenced this pull request Oct 10, 2018

[wallet] Restore ability to list incoming transactions by label

4deba4c

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

jnewbery pushed a commit to jnewbery/bitcoin that referenced this pull request Oct 10, 2018

[wallet] Restore ability to list incoming transactions by label

89306ab

Backport of PR 14411 to v0.17. This change partially reverts bitcoin#13075 and bitcoin#14023. Fixes bitcoin#14382

ryanofsky added a commit to ryanofsky/bitcoin that referenced this pull request Oct 15, 2018

[wallet] Restore ability to list incoming transactions by label

7cbe74f

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

ryanofsky added a commit to ryanofsky/bitcoin that referenced this pull request Nov 12, 2018

[wallet] Restore ability to list incoming transactions by label

b6ccb77

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

ryanofsky mentioned this pull request Nov 12, 2018

Remove CWalletTx merging logic from AddToWallet #9381

Merged

ryanofsky added a commit to ryanofsky/bitcoin that referenced this pull request Nov 13, 2018

[wallet] Restore ability to list incoming transactions by label

65b740f

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

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

[wallet] Restore ability to list incoming transactions by label

2d9f104

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

ryanofsky mentioned this pull request Nov 12, 2019

Remove wallet 'account' API #12952

Closed

6 tasks

nuttycom mentioned this pull request Aug 11, 2021

[Backport] bitcoin/bitcoin#13825 kill accounts zcash/zcash#5271

Merged

bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove accounts rpcs #14023

Remove accounts rpcs #14023

jnewbery commented Aug 22, 2018

DrahtBot commented Aug 22, 2018 •

edited

Loading

promag commented Aug 23, 2018

gmaxwell commented Aug 24, 2018

jnewbery commented Aug 24, 2018

maflcko commented Aug 24, 2018

PierreRochard commented Aug 26, 2018

jnewbery commented Aug 27, 2018

maflcko Aug 27, 2018

jnewbery Aug 27, 2018

PierreRochard Aug 27, 2018 •

edited

Loading

maflcko commented Aug 27, 2018

laanwj commented Aug 27, 2018

promag left a comment

promag Aug 27, 2018

practicalswift Aug 30, 2018

Remove accounts rpcs #14023

Remove accounts rpcs #14023

Conversation

jnewbery commented Aug 22, 2018

DrahtBot commented Aug 22, 2018 • edited Loading

promag commented Aug 23, 2018

gmaxwell commented Aug 24, 2018

jnewbery commented Aug 24, 2018

maflcko commented Aug 24, 2018

PierreRochard commented Aug 26, 2018

jnewbery commented Aug 27, 2018

maflcko Aug 27, 2018

Choose a reason for hiding this comment

jnewbery Aug 27, 2018

Choose a reason for hiding this comment

PierreRochard Aug 27, 2018 • edited Loading

Choose a reason for hiding this comment

maflcko commented Aug 27, 2018

laanwj commented Aug 27, 2018

promag left a comment

Choose a reason for hiding this comment

promag Aug 27, 2018

Choose a reason for hiding this comment

practicalswift Aug 30, 2018

Choose a reason for hiding this comment

DrahtBot commented Aug 22, 2018 •

edited

Loading

PierreRochard Aug 27, 2018 •

edited

Loading