Commit graph

21768 commits

Author SHA1 Message Date
Glenn Willen
cca21e18ea Remove redundant txConst parameter to FillPSBT
Github-Pull: #14588
Rebased-From: 4f3f5cb4b1
2020-03-26 15:39:50 +02:00
Andrew Chow
b7e58f9c1d Convert non-witness UTXOs to witness if witness sig created
If a witness signature was created when a non-witness UTXO is used,
convert the non-witness UTXO to a witness one.
2020-03-26 15:39:50 +02:00
Gregory Sanders
d2611e9d97 CreateTransaction: Assume minimum p2sh-p2wpkh spend size for unknown change 2020-03-26 15:39:50 +02:00
MarcoFalke
0050a7e979 qa: Avoid race in p2p_invalid_block by waiting for the block request
Github-Pull: #14700
Rebased-From: fa21568208
2020-03-26 15:39:50 +02:00
Chun Kuan Lee
56df309b1b build: Add bitcoin-tx.exe into Windows installer
Github-Pull: #14698
Rebased-From: 5c5902acc5
2020-03-26 15:39:50 +02:00
gustavonalle
7871dd58fe [wallet] Ensure wallet is unlocked before signing
Github-Pull: #14310
Rebased-From: db15805668
2020-03-26 15:39:50 +02:00
Russell Yanofsky
c33bab30d2 [wallet] Restore ability to list incoming transactions by label
Backport of PR 14411 to v0.17.

This change partially reverts #13075 and #14023.

Fixes #14382
2020-03-26 15:39:50 +02:00
Wladimir J. van der Laan
afb4aabe3b doc: Clean out release notes after 0.17.0.1
Tree-SHA512: c04192e3b93537f4b37f5ea55fd455b26dd7d902da3b5f8b59ef6fa4590cf413b72fc11bba330a8fd7fa3938b09e6c1d35171806ab5ce85d6b99681953c291a5
2020-03-26 15:39:50 +02:00
MarcoFalke
70998ac794 qa: Run all tests even if wallet is not compiled
Github-Pull: #14180
Rebased-From: fac9539836
2020-03-26 15:39:50 +02:00
Wladimir J. van der Laan
3a102216f4 doc: Update release notes for 0.17.0.1 2020-03-26 15:39:50 +02:00
Wladimir J. van der Laan
e4152f67f3 doc: Clean out release notes after release 0.17.0
Tree-SHA512: 0b641fdf4cf4ac6a6f9f5c1b45d65c4449b0d7bb777ba57498e389840ba7a37bfc0569ce5e70f0ac998785fc4eea600ecf6f7c7d83d86513997f4033bcc14a5d
2020-03-26 15:39:50 +02:00
Suhas Daftuar
826219f99c [qa] backport: Test for duplicate inputs within a transaction 2020-03-26 15:39:50 +02:00
Wladimir J. van der Laan
e275004f72 qt: Pre-rc1 translations update
Tree-SHA512: 11d0d6a23f47e428661b33fa175aa97cc6841452c0c55845fdb0a903a0b147cd6df65e8fdab8b98823bf411018d5d85006af8c2cf14597286e9e284764d15041
2020-03-26 15:39:50 +02:00
MarcoFalke
05f5dd96c7
Merge #18218: [0.19] Further 0.19 backports
48fef5ebae gui: Fix race in WalletModel::pollBalanceChanged (Russell Yanofsky)
1964561a3a build: don't embed a build-id when building libdmg-hfsplus (fanquake)

Pull request description:

  These are not blockers for the 0.19.1 release, as per [IRC discussion this morning](http://www.erisian.com.au/bitcoin-core-dev/log-2020-02-27.html#l-331), doesn't look like there will be an rc3. This PR can collect further backports for the 0.19 branch.

  Currently backports:
  * https://github.com/bitcoin/bitcoin/pull/18004 - build: don't embed a build-id when building libdmg-hfsplus
  * https://github.com/bitcoin/bitcoin/pull/18123 - gui: Fix race in WalletModel::pollBalanceChanged

ACKs for top commit:
  promag:
    ACK 48fef5ebae.
  laanwj:
    ACK 48fef5ebae
  luke-jr:
    utACK 48fef5ebae

Tree-SHA512: c7e7ddda9ee7b8015f16d39aab000e0595f85fe073f79abc1a57b3e2adb0dedc4e07e5fd918e1df5e88b7f3fbc39b57ab3382233c4354b9c2196f65fa1fa6c04
2020-03-04 10:24:05 -05:00
Wladimir J. van der Laan
58ba7c314d
build: Bump version for 0.19.1 final
Tree-SHA512: c0a5fbc072b03e36ffb9af23e699c6b3a897fcd509fdc3c6741ecc8e510aea5d87851c5a7926909746d03d390af10cae266189160b4a7b303f8be9418ea6a0c0
2020-03-04 13:14:49 +01:00
Russell Yanofsky
48fef5ebae
gui: Fix race in WalletModel::pollBalanceChanged
Poll function was wrongly setting cached height to the current chain height
instead of the chain height at the time of polling.

This bug could cause balances to appear out of date, and was first introduced
a0704a8996 (r378452145)
Before that commit, there wasn't a problem because cs_main was held during the
poll update.

Currently, the problem should be rare. But if
8937d99ce81a27ae5e1012a28323c0e26d89c50b from #17954 were merged, the problem
would get worse, because the wrong cachedNumBlocks value would be set if the
wallet was polled in the interval between a block being connected and it
processing the BlockConnected notification.

MarcoFalke <falke.marco@gmail.com> also points out that a0704a8996 could lead
to GUI hangs as well, because previously the pollBalanceChanged method, which
runs on the GUI thread, would only make a nonblocking TRY_LOCK(cs_main) call,
but after could make blocking LOCK(cs_main) calls, potentially locking up the
GUI.

Thanks to John Newbery <john@johnnewbery.com> for finding this bug this while
reviewing https://github.com/bitcoin/bitcoin/pull/17954.

Github-Pull: #18123
Rebased-From: bf36a3ccc212ad4d7c5cb8f26d7a22e279fe3cec
2020-02-28 12:07:39 +08:00
fanquake
1964561a3a
build: don't embed a build-id when building libdmg-hfsplus
Github-Pull: #18004
Rebased-From: cb9e88e73a042ff4e1c83289a6f8fa1db03fb093
2020-02-28 12:04:51 +08:00
Wladimir J. van der Laan
a28ea316ed
Merge #18139: doc: Add missing author to 0.19.1 release notes
facbdc0f5e doc: Add missing author to 0.19.1 release notes (MarcoFalke)

Pull request description:

  Commit 88729d8 is in 0.19, but the author is not in the release notes.

ACKs for top commit:
  practicalswift:
    ACK facbdc0f5e - credit where credit is due :)

Tree-SHA512: 5e65bdb6d1e2318143c978f7e69e2c22f09dc257d92c5a88c52da43b12b812ebbe1a9202382545d8dfd3bc1ca1927543cfeb1d2e5d6da98c1e90bc26765cb8b4
2020-02-13 16:27:24 +01:00
MarcoFalke
facbdc0f5e
doc: Add missing author to 0.19.1 release notes 2020-02-13 06:22:07 -08:00
Wladimir J. van der Laan
628103d673
build: Bump version to 0.19.1rc2
Tree-SHA512: 7ba1efdc24835405562b5ff710ed4223d7e4463dffa58721cc9e0f0f0ba90925e59719cb68b31f95cfc632a73ca9a5573e762167eed264c66323828a397b9127
2020-02-10 15:34:02 +01:00
Wladimir J. van der Laan
c3caf2d84c
doc: UNIX manual pages update for rc2
Tree-SHA512: 23fc6e3712608a2d4ccec5ee2d0efdb3f8df8093f555890611039881a78147eee3a5226aade13d750e88be8f6814699424606b32cf7947faa6c034f1ff2dd81a
2020-02-10 15:26:11 +01:00
Wladimir J. van der Laan
e5322d6dad
qt: Pre-rc2 translations update
Tree-SHA512: 18182903fed7034dc16c2d74ebccf992dd5343376d0f02bebaa50be4ff8fd76c9dd59a95524aef326b74b75a921c819063f06ef45fb9980ae87aacbfb7190554
2020-02-10 15:25:40 +01:00
Wladimir J. van der Laan
9bd082e657
doc: Update release notes for rc2
Tree-SHA512: 320576b94b58246ea7f2426e1dbe43cd0222c0ea58cf9a03e75225fcc226384478f39d7f54099d2cecbcf134a639932e7f2033eb3dd38786bb666dbb81aae2d7
2020-02-10 15:21:08 +01:00
Wladimir J. van der Laan
ba0b7e1296
Merge #18079: [0.19] psbt: check that various indexes and amounts are within bounds
f5fb7fca96 psbt: check output index is within bounds before accessing (Andrew Chow)
1cf77a2dc3 Don't calculate tx fees for PSBTs with invalid money values (Andrew Chow)

Pull request description:

  Backport of #17156, non-trivial due to crossing the refactor in #17371

ACKs for top commit:
  laanwj:
    ACK f5fb7fca96

Tree-SHA512: 7aabf9a6b8a8e287a26dfbf73a437a3bc55177bef8fc5149d822ef81b8ef2458e1d718c3a19c73532c5cef0f9bd8144574c7fad90ca89f13a08b44edf3a2656d
2020-02-10 13:55:41 +01:00
Wladimir J. van der Laan
4755037d45
Merge #18083: [0.19] wallet: Reset reused transactions cache
f11872cbf4 wallet: Reset reused transactions cache (Fabian Jahr)

Pull request description:

  Backport of #17843

  Required porting to pre-`WalletBatch`

ACKs for top commit:
  kallewoof:
    Code review ACK f11872cbf4
  laanwj:
    code review ACK f11872cbf4
  meshcollider:
    utACK f11872cbf4

Tree-SHA512: 5cf5f136d1eafb0783c2e6799e3675ebc50997ebb56b379d8a198ac35eb3b32f6b98656760a8b1c821eeac665eb80efb1723dd4e9eb58d2b4d45c4674499bedf
2020-02-10 13:04:13 +01:00
Wladimir J. van der Laan
f55442aa81
Merge #18100: 0.19: Update univalue subtree
5e1728017b Squashed 'src/univalue/' changes from 7890db99d6..98261b1e7b (MarcoFalke)

Pull request description:

  Version bump backported from #18099

ACKs for top commit:
  laanwj:
    ACK fa4d00b569

Tree-SHA512: dc34c98d9b1f450db700633ce7b674a3edf83bd12f3b77b74544a6b24f3e3b1f3c91f40d0ad6c27f82c1b26e88cf7625311b93f00e492a813dbdcca9f461cb5e
2020-02-10 12:09:51 +01:00
MarcoFalke
fa4d00b569
Update univalue subtree 2020-02-09 07:50:08 -08:00
MarcoFalke
5e1728017b Squashed 'src/univalue/' changes from 7890db99d6..98261b1e7b
98261b1e7b Merge #22: Clamp JSON object depth to PHP limit
54c4015415 Clamp JSON object depth to PHP limit
5a58a46671 Merge #21: Remove hand-coded UniValue destructor.
b4cdfc4f47 Remove hand-coded UniValue destructor.
7fba60b5ad Merge #17: [docs] Update readme
4577454e7e Merge #13: Fix typo
ac7e73cda8 [docs] Update readme
4a4964729b Fix typo

git-subtree-dir: src/univalue
git-subtree-split: 98261b1e7be4ce9820e25c8ce37d40cdef19ab20
2020-02-09 07:49:51 -08:00
Andrew Chow
f5fb7fca96 psbt: check output index is within bounds before accessing
Github-Pull: #17156
Rebased-From: deaa6dd144f5650b385658a0c4f9a014aff8dde2
2020-02-06 23:22:30 +00:00
fanquake
7d53995ff2
Merge #18084: 0.19: gui: Fix unintialized WalletView::progressDialog
b4e5363ccc gui: Fix unintialized WalletView::progressDialog (João Barbosa)

Pull request description:

  Backport #18062 to 0.19.

ACKs for top commit:
  Empact:
    ACK b4e5363ccc
  jonasschnelli:
    utACK b4e5363ccc

Tree-SHA512: 9ebf0c29b606689de118c3d64f0a8f4dd53df05799b3be6da1891cb214c4fca7f0e3f2cd2a205c78496914cec1f7fa469d6df88428fcd6854ede6c61dbbc6d2a
2020-02-06 21:18:08 +08:00
João Barbosa
b4e5363ccc gui: Fix unintialized WalletView::progressDialog
Github-Pull: #18062
Rebased-From: acf8abc7f3cf7efa418a46f9f69f23f1a5035582
2020-02-06 09:14:08 +00:00
Fabian Jahr
f11872cbf4 wallet: Reset reused transactions cache
If a destination is reused we mark the cache of the other transactions going to that destination dirty so they are not accidentally reported as trusted when the cache is hit.

Github-Pull: #17843
Rebased-From: 6fc554f591d8ea1681b8bb25aa12da8d4f023f66
2020-02-06 05:17:18 +00:00
Andrew Chow
1cf77a2dc3 Don't calculate tx fees for PSBTs with invalid money values
In decodepsbt if an invalid amount is seen, don't calculate the fee
but still show the invalid value in the decode.

In analyze psbt, if an invalid amount is seen, set the next step to
be the creator as the creator needs to remake the transaction so that
it is valid.

Github-Pull: #17156
Rebased-From: f1ef7f0aa46338f4cd8de79696027a1bf868f359
2020-02-05 22:55:25 +00:00
Wladimir J. van der Laan
755b0734bb
doc: Preliminary 0.19.1 release notes
Tree-SHA512: c6a57b79318a428a57f4e984a6f3432c5ef8aaab2c8ae708566e856f574b1f93cd852e347b6995a01babd5c98a9f05ec3416a82457ecc2d9287995e1c5b100fc
2020-01-27 17:40:08 +01:00
Wladimir J. van der Laan
178a834687
Merge #17988: [0.19] Final backports for 0.19.1
daf2fff236 test: add missing #include to fix compiler errors (Karl-Johan Alm)
c8ad23c529 bug-fix macos: give free bytes to F_PREALLOCATE (Karl-Johan Alm)

Pull request description:

  We're about ready to do a [0.19.1 release](https://github.com/bitcoin/bitcoin/milestone/44); so I've opened this to collect the last remaining backports.

  If there's something that's been missed / or isn't tagged ["Needs backport (0.19)"](https://github.com/bitcoin/bitcoin/issues?q=is%3Aopen+label%3A%22Needs+backport+%280.19%29%22) that you think should be, please comment.

  Currently backports:
  * #17887 - bug-fix macos: give free bytes to F_PREALLOCATE
  * #17980 - test: add missing #include to fix compiler errors

ACKs for top commit:
  laanwj:
    ACK daf2fff236

Tree-SHA512: 8438f992d0c39315a4da4c3f8ab5c92acefada4b0ba5a5cec3775dea2541492d386bf4e7c9e76e1494a6d4cf16a9205287d27ffd23d9c3056f213d733605eeee
2020-01-23 20:48:55 +01:00
Wladimir J. van der Laan
1b0afb71a2
doc: Manpage updates for 0.19.1rc1
This is effectively a no-op except for the dates and version numbers.

Tree-SHA512: a2b298bfac6466e81f4951c382cdd350f43989b08dc466e72ea02588b2fc6d1b9a2839401e6c188361696aa25b0c851c142df88985b106d4c41b067366ced55e
2020-01-23 15:05:51 +01:00
Wladimir J. van der Laan
c3cb60222c
build: Bump version to 0.19.1rc1
Release preparations.

Tree-SHA512: e00729c146ca78d45efe9834373057119f98c5c90abab3658b01b7c7774d395ae95dafde5160617815c3f00d6bfba1ccb4ea643860af450889a5c6c8b9a6c8d8
2020-01-23 15:05:43 +01:00
Wladimir J. van der Laan
1299a1a11f
qt: Translations update pre-rc1
Tree-SHA512: 0e0d696c32c20e550bda5bd0fe73a73ab1d944f3fb368d50993248ff6feef7373b4feba91dc38e62b180c9854dd4528dfd62e6628bc2b24b12d7c9ff07f34e55
2020-01-23 14:33:52 +01:00
Karl-Johan Alm
daf2fff236
test: add missing #include to fix compiler errors
Github-Pull: #17980
Rebased-From: a5a2654bbc43b5c208418872e5d4c0acbadda5de
2020-01-23 09:41:09 +08:00
Karl-Johan Alm
c8ad23c529
bug-fix macos: give free bytes to F_PREALLOCATE
The macos manpage for fcntl (for F_PEOFPOSMODE) states:

> Allocate from the physical end of file.  In this case, fst_length indicates the number of newly allocated bytes desired.

Github-Pull: #17887
Rebased-From: 75163f4729c10c40d2843da28a8c79ab89193f6a
2020-01-23 08:11:10 +08:00
Wladimir J. van der Laan
4cf7350422
Merge branch '0.19_2' into 0.19
There was an accidental direct push to the 0.19 branch, add a merge
commit with signature and treehash to make verify-commits happy again.

Tree-SHA512: 47e9f37ec2b8d8402cf3d05f71713ef7e71843dd8360d68e21f99dcd285fc397171907102aad8e6e8525097f589f3c419f1f0c18ff66c7e45a553af8625a0842
2020-01-22 11:10:21 +01:00
Jim Posen
9d980c1f7f
init: Stop indexes on shutdown after ChainStateFlushed callback.
Currently, the latest index state may not be committed to disk on shutdown.

Github-Pull: #17897
Rebased-From: 9dd58ca611f6f2b59c25d727a4e955333525d345
2020-01-22 17:51:23 +08:00
Wladimir J. van der Laan
98159132c3
Merge #17792: 0.19: Backports
cd67b1dcb8 Use correct C++11 header for std::swap() (Hennadii Stepanov)
b8101fb7ac Fix comparison function signature (Hennadii Stepanov)
eac49073eb Don't allow implementers to think ScriptHash(Witness*()) results in nesting computation (Gregory Sanders)
e2c45d89f7 IsUsedDestination shouldn't use key id as script id for ScriptHash (Gregory Sanders)
a5489c9892 IsUsedDestination should count any known single-key address (Gregory Sanders)
88729d804e Fix issue with conflicted mempool tx in listsinceblock (Adam Jonas)
eafcea7a0a gui: Fix duplicate wallet showing up (João Barbosa)
7e66d04770 Drop signal CClientUIInterface::LoadWallet (Russell Yanofsky)
179d55f052 zmq: Fix due to invalid argument and multiple notifiers (João Barbosa)

Pull request description:

  Backports
   - #16963
   - #17445
   - #17258
   - #17621
   - #17924
   - #17634

ACKs for top commit:
  laanwj:
    ACK cd67b1dcb8, checked that I got more or less the same result (including conflict resolution) backporting these commits

Tree-SHA512: 645786267cfb10a01a56f7cfd91ddead5f1475df5714595ae480237e04d40c5cfb7460b40532279cacd83e4b775a4ace68a258ec2184b8ad0e997a690a9245e5
2020-01-20 19:39:41 +01:00
Hennadii Stepanov
cd67b1dcb8 Use correct C++11 header for std::swap()
Github-Pull: #17634
Rebased-From: 98fbd1cdffaa69357091cc67e959ac21119dfa16
2020-01-15 12:13:02 +00:00
Hennadii Stepanov
b8101fb7ac Fix comparison function signature
This commit fixes build on CentOS 7 with GCC 4.8.5

Github-Pull: #17634
Rebased-From: b66861e2e5e8a49e11e7489cf22c3007bc7082cc
2020-01-15 12:12:43 +00:00
Gregory Sanders
eac49073eb Don't allow implementers to think ScriptHash(Witness*()) results in nesting computation
Github-Pull: #17924
Rebased-From: 6dd59d2e491bc11ab26498668543e65440a3a931
2020-01-15 09:59:47 +00:00
Gregory Sanders
e2c45d89f7 IsUsedDestination shouldn't use key id as script id for ScriptHash
Github-Pull: #17924
Rebased-From: 4b8f1e989f3b969dc628b0801d5c31ebd373719c
2020-01-15 09:58:56 +00:00
Gregory Sanders
a5489c9892 IsUsedDestination should count any known single-key address
Github-Pull: #17621
Rebased-From: 09502452bbbe21bb974f1de8cf53196373921ab9
2020-01-14 10:35:34 +00:00
Adam Jonas
88729d804e Fix issue with conflicted mempool tx in listsinceblock
listsinceblock now checks that returned transactions are not
conflicting with any transactions that are filtered out by
the given blockhash

Co-Authored-By: Michael Chrostowski <michael.chrostowski@gmail.com>

Github-Pull: #17258
Rebased-From: 436ad436434b94982bcb7dc1d13a21949263ef73
2020-01-14 09:34:44 +00:00
João Barbosa
eafcea7a0a gui: Fix duplicate wallet showing up
The slot BitcoinGUI::addWallet can be invoked twice for the same
WalletModel due to a concurrent wallet being loaded after the first `connect()`:

```cpp
 connect(wallet_controller, &WalletController::walletAdded, this, &BitcoinGUI::addWallet);
 connect(wallet_controller, &WalletController::walletRemoved, this, &BitcoinGUI::removeWallet);

 for (WalletModel* wallet_model : m_wallet_controller->getOpenWallets()) {
     addWallet(wallet_model);
```

Github-Pull: #16963
Rebased-From: 6d6a7a8403ae923f189812edebdd95761de0e7f2
2020-01-14 09:34:35 +00:00