Page MenuHomePhabricator
Differential D4639

Merge #13566: Fix get balance
ClosedPublic
Actions

Authored by jasonbcox on Dec 4 2019, 22:03.

Details

Reviewers
deadalnix
Group Reviewers
Restricted Project
Commits
rSTAGING7f763edae785: Merge #13566: Fix get balance
rABC7f763edae785: Merge #13566: Fix get balance
Summary

702ae1e21a [RPC] [wallet] allow getbalance to use min_conf and watch_only without accounts. (John Newbery)
cf15761f6d [wallet] GetBalance can take a min_depth argument. (John Newbery)
0f3d6e9ab7 [wallet] factor out GetAvailableWatchOnlyBalance() (John Newbery)
7110c830f8 [wallet] deduplicate GetAvailableCredit logic (John Newbery)
ef7bc8893c [wallet] Factor out GetWatchOnlyBalance() (John Newbery)
4279da4785 [wallet] GetBalance can take an isminefilter filter. (John Newbery)

Pull request description:

#12953 inadvertently removed the functionality to call `getbalance "*" <int> <bool>` to get the wallet's balance with either minconfs or include_watchonly.

This restores that functionality (when `-deprecatedrpc=accounts`), and also makes it possible to call ``getbalance minconf=<int> include_watchonly=<bool>` when accounts are not being used.

Tree-SHA512: 67e84de9291ed6d34b23c626f4dc5988ba0ae6c99708d02b87dd3aaad3f4b6baa6202a66cc2dadd30dd993a39de8036ee920fcaa8cbb1c5dfe606e6fac183344

Backport of Core PR13566
https://github.com/bitcoin/bitcoin/pull/13566/files

Test Plan
ninja check
test_runner.py wallet_basic

Diff Detail

Repository
rABC Bitcoin ABC
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

jasonbcox created this revision.Dec 4 2019, 22:03
Herald added a reviewer: deadalnix. · View Herald TranscriptDec 4 2019, 22:03
jasonbcox planned changes to this revision.Dec 4 2019, 22:03
teamcity added a comment.Dec 4 2019, 22:03

Build Bitcoin-ABC / Diffs / Diff Testing started.

teamcity added a comment.Dec 4 2019, 22:14

Build Bitcoin-ABC / Diffs / Diff Testing passed.

Harbormaster completed remote builds in B8415: Diff 14626.Dec 4 2019, 22:14
jasonbcox updated this revision to Diff 14632.Dec 4 2019, 23:04

Fixup multiline strings

teamcity added a comment.Dec 4 2019, 23:04

Build Bitcoin-ABC / Diffs / Diff Testing started.

teamcity added a comment.Dec 4 2019, 23:15

Build Bitcoin-ABC / Diffs / Diff Testing passed.

Harbormaster completed remote builds in B8418: Diff 14632.Dec 4 2019, 23:15
deadalnix accepted this revision.Dec 4 2019, 23:19
This revision is now accepted and ready to land.Dec 4 2019, 23:19
Closed by commit rABC7f763edae785: Merge #13566: Fix get balance (authored by Pieter Wuille <pieter.wuille@gmail.com>, committed by jasonbcox). · Explain WhyDec 5 2019, 16:17
This revision was automatically updated to reflect the committed changes.
jasonbcox added a commit: rABC7f763edae785: Merge #13566: Fix get balance.
jasonbcox added a commit: rSTAGING7f763edae785: Merge #13566: Fix get balance.Apr 7 2020, 21:59

Revision Contents
Changeset List

PathSize
src/
interfaces/
3 lines
wallet/
172 lines
10 lines
82 lines
test/
functional/
10 lines

Diff 14642

View Options

src/interfaces/wallet.cpp

Loading...
View Options

src/wallet/rpcwallet.cpp

Loading...
View Options

src/wallet/wallet.h

Loading...
View Options

src/wallet/wallet.cpp

Loading...
View Options

test/functional/wallet_basic.py

Loading...