Skip to content

Conversation

maflcko
Copy link
Member

@maflcko maflcko commented Apr 5, 2019

Second commit can be reviewed with --ignore-all-space

@DrahtBot DrahtBot added the Tests label Apr 5, 2019
@maflcko maflcko force-pushed the 1904-qaWalletBal branch from fa61f27 to fabc1c6 Compare April 5, 2019 21:52
@DrahtBot
Copy link
Contributor

DrahtBot commented Apr 8, 2019

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

Conflicts

Reviewers, this pull request conflicts with the following ones:

  • #15729 (rpc: Raise error in getbalance if minconf is not zero by promag)

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.

@maflcko maflcko added the Wallet label Apr 10, 2019
@maflcko
Copy link
Member Author

maflcko commented Apr 30, 2019

Unless there are objections, this will be merged tomorrow

Copy link
Contributor

@jnewbery jnewbery left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good. A few comments inline.

@jnewbery
Copy link
Contributor

utACK fa79a78

maflcko pushed a commit to maflcko/bitcoin-core that referenced this pull request May 1, 2019
fa79a78 test: Add reorg test to wallet_balance (MarcoFalke)
fad03cd test: Check that wallet txs not in the mempool are untrusted (MarcoFalke)
fa19531 test: Add getunconfirmedbalance test with conflicts (MarcoFalke)
fa464e8 test: Add wallet_balance test for watchonly (MarcoFalke)

Pull request description:

  Second commit can be reviewed with `--ignore-all-space`

ACKs for commit fa79a7:
  jnewbery:
    utACK fa79a78

Tree-SHA512: ec4919a3c93b6dcb35d58e7c65bdffe7f4c8cb87b9287f3679631c1823ef5bd72789f233def94e60c1ab332711601751645566f5997ce250af55b328ed60e917
@maflcko maflcko merged commit fa79a78 into bitcoin:master May 1, 2019
@maflcko maflcko deleted the 1904-qaWalletBal branch May 1, 2019 12:40
luke-jr pushed a commit to luke-jr/bitcoin that referenced this pull request Aug 23, 2019
luke-jr pushed a commit to luke-jr/bitcoin that referenced this pull request Aug 23, 2019
@luke-jr luke-jr mentioned this pull request Aug 23, 2019
deadalnix pushed a commit to Bitcoin-ABC/bitcoin-abc that referenced this pull request Jun 9, 2020
Summary:
bitcoin/bitcoin@fa464e8

---

Partial backport of Core [[bitcoin/bitcoin#15758 | PR15758]]

Test Plan:
  ./test/functional/test_runner.py wallet_balance

Reviewers: #bitcoin_abc, deadalnix

Reviewed By: #bitcoin_abc, deadalnix

Subscribers: deadalnix

Differential Revision: https://reviews.bitcoinabc.org/D6440
deadalnix pushed a commit to Bitcoin-ABC/bitcoin-abc that referenced this pull request Jun 9, 2020
Summary:
bitcoin/bitcoin@fa19531

---

Depends on D6440

Partial backport of Core [[bitcoin/bitcoin#15758 | PR15758]]

Test Plan:
  test_runner.py wallet_balance

Reviewers: #bitcoin_abc, deadalnix

Reviewed By: #bitcoin_abc, deadalnix

Differential Revision: https://reviews.bitcoinabc.org/D6441
deadalnix pushed a commit to Bitcoin-ABC/bitcoin-abc that referenced this pull request Jun 9, 2020
…ntrusted

Summary:
bitcoin/bitcoin@fad03cd

---

Depends on D6441

Partial backport of Core [[bitcoin/bitcoin#15758 | PR15758]]

Test Plan:
  test_runner.py wallet_balance

Reviewers: #bitcoin_abc, deadalnix

Reviewed By: #bitcoin_abc, deadalnix

Differential Revision: https://reviews.bitcoinabc.org/D6442
deadalnix pushed a commit to Bitcoin-ABC/bitcoin-abc that referenced this pull request Jun 9, 2020
Summary:
bitcoin/bitcoin@fa79a78

---

Depends on D6442

Concludes backport of Core [[bitcoin/bitcoin#15758 | PR15758]]

Test Plan:
  test_runner.py wallet_balance

Reviewers: #bitcoin_abc, deadalnix

Reviewed By: #bitcoin_abc, deadalnix

Differential Revision: https://reviews.bitcoinabc.org/D6443
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Dec 16, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants