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

Remove accounts rpcs #14023

Merged
merged 4 commits into from Aug 27, 2018
Merged

Remove accounts rpcs #14023

merged 4 commits into from Aug 27, 2018

Conversation

@jnewbery
Copy link
Member

@jnewbery jnewbery commented Aug 22, 2018

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
Copy link
Contributor

@DrahtBot DrahtBot commented Aug 22, 2018

Note to reviewers: This pull request conflicts with the following ones:
  • #14075 (Import watch only pubkeys to the keypool if private keys are disabled by achow101)
  • #13945 (Refactoring CRPCCommand with enum category by isghe)
  • #13249 (Make objects in range declarations immutable by default. Avoid unnecessary copying of objects in range declarations. by practicalswift)
  • #12490 ([Wallet] [RPC] Remove deprecated wallet rpc features from bitcoin_server by jnewbery)
  • #11652 (Add missing locks: validation.cpp + related by practicalswift)
  • #11413 ([wallet] [rpc] sendtoaddress/sendmany: Add explicit feerate option by kallewoof)
  • #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
Copy link
Member

@promag promag commented Aug 23, 2018

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

@gmaxwell
Copy link
Contributor

@gmaxwell gmaxwell commented Aug 24, 2018

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
Copy link
Member Author

@jnewbery jnewbery commented Aug 24, 2018

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.

@MarcoFalke
Copy link
Member

@MarcoFalke MarcoFalke commented Aug 24, 2018

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

@PierreRochard
Copy link
Contributor

@PierreRochard PierreRochard commented Aug 26, 2018

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 jnewbery force-pushed the remove_accounts_rpcs branch from 01137c1 to 288bccc Aug 27, 2018
@jnewbery
Copy link
Member Author

@jnewbery jnewbery commented Aug 27, 2018

Rebased and release note added.

@laanwj laanwj added this to Blockers in High-priority for review Aug 27, 2018
}
if (wtx.GetDepthInMainChain() < 1)
entry.pushKV("category", "orphan");
else if (wtx.GetBlocksToMaturity() > 0)
Copy link
Member

@MarcoFalke MarcoFalke Aug 27, 2018

Any reason for this change?

Copy link
Member Author

@jnewbery jnewbery Aug 27, 2018

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

Fixed in bb08423

Copy link
Contributor

@PierreRochard PierreRochard Aug 27, 2018

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.

clion ide

@MarcoFalke
Copy link
Member

@MarcoFalke MarcoFalke commented Aug 27, 2018

Almost utACK 288bccc472fe5a91acc0f4029a1daff689aead2f

jnewbery added 3 commits Aug 27, 2018
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.
@jnewbery jnewbery force-pushed the remove_accounts_rpcs branch from 288bccc to bb08423 Aug 27, 2018
@laanwj
Copy link
Member

@laanwj laanwj commented Aug 27, 2018

utACK bb08423

@laanwj laanwj merged commit bb08423 into bitcoin:master Aug 27, 2018
1 of 2 checks passed
laanwj added a commit that referenced this issue Aug 27, 2018
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
ryanofsky added a commit to ryanofsky/bitcoin that referenced this issue Oct 6, 2018
ryanofsky added a commit to ryanofsky/bitcoin that referenced this issue Oct 10, 2018
ryanofsky added a commit to ryanofsky/bitcoin that referenced this issue Oct 10, 2018
jnewbery added a commit to jnewbery/bitcoin that referenced this issue Oct 10, 2018
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 issue Oct 15, 2018
laanwj added a commit that referenced this issue Nov 10, 2018
…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
ryanofsky added a commit to ryanofsky/bitcoin that referenced this issue Nov 12, 2018
ryanofsky added a commit to ryanofsky/bitcoin that referenced this issue Nov 13, 2018
MarcoFalke added a commit that referenced this issue Nov 14, 2018
…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
HashUnlimited pushed a commit to HashUnlimited/chaincoin that referenced this issue Nov 26, 2018
@ryanofsky ryanofsky mentioned this pull request Nov 12, 2019
6 tasks
deadalnix pushed a commit to Bitcoin-ABC/bitcoin-abc that referenced this issue Feb 6, 2020
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
deadalnix pushed a commit to Bitcoin-ABC/bitcoin-abc that referenced this issue Mar 5, 2020
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
ftrader added a commit to bitcoin-cash-node/bitcoin-cash-node that referenced this issue May 19, 2020
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
xdustinface added a commit to xdustinface/dash that referenced this issue Dec 22, 2020
… 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
xdustinface added a commit to xdustinface/dash that referenced this issue Dec 22, 2020
… 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
pravblockc added a commit to pravblockc/dash that referenced this issue Jul 25, 2021
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
pravblockc added a commit to pravblockc/dash that referenced this issue Jul 27, 2021
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
pravblockc added a commit to pravblockc/dash that referenced this issue Aug 4, 2021
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
UdjinM6 added a commit to UdjinM6/dash that referenced this issue Aug 7, 2021
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
UdjinM6 added a commit to UdjinM6/dash that referenced this issue Aug 7, 2021
…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
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

9 participants