Commit Graph

21619 Commits

Author SHA1 Message Date
Gregory Sanders
52c3bec1ba test addition of unknown segwit spends to txid reject filter
Github-Pull: #19620
Rebased-From: 9f88ded82b
2020-08-11 10:27:39 -04:00
Suhas Daftuar
2ea826cfc4 Add txids with non-standard inputs to reject filter
Our policy checks for non-standard inputs depend only on the non-witness
portion of a transaction: we look up the scriptPubKey of the input being
spent from our UTXO set (which is covered by the input txid), and the p2sh
checks only rely on the scriptSig portion of the input.

Consequently it's safe to add txids of transactions that fail these checks to
the reject filter, as the witness is irrelevant to the failure. This is helpful
for any situation where we might request the transaction again via txid (either
from txid-relay peers, or if we might fetch the transaction via txid due to
parent-fetching of orphans).

Further, in preparation for future witness versions being deployed on the
network, ensure that WITNESS_UNKNOWN transactions are rejected in
AreInputsStandard(), so that transactions spending v1 (or greater) witness
outputs will fall into this category of having their txid added to the reject
filter.

Github-Pull: #19620
Rebased-From: 7989901c7e
2020-08-11 10:27:39 -04:00
MarcoFalke
28a9df7d76 Merge #19025: [0.19] Backports
be951470be Updated appveyor job to checkout a specific vcpkg commit ID. (Aaron Clauson)
1fd9cd2cb4 appveyor: Remove clcache (MarcoFalke)
8c0a9595ec Remove cached directories and associated script blocks from appveyor CI configuration. (Aaron Clauson)
d70f700021 lint: fix shellcheck URL in CI install (fanquake)
f8f7d91b80 test: remove Cirrus CI FreeBSD job (fanquake)
b7e16a82c9 Add missing QPainterPath include (Andrew Chow)
30a28146ac gui: Avoid Wallet::GetBalance in WalletModel::pollBalanceChanged (João Barbosa)
0d87a5b4e2 QA: feature_segwit: Check that template "rules" includes "!segwit" as appropriate (Luke Dashjr)
bde6a5a676 Bugfix: Include "csv","!segwit" in "rules" (Luke Dashjr)
e422f65aee build: Set libevent minimum version to 2.0.21 (Hennadii Stepanov)
0d0dd6ae96 Update with new Windows code signing certificate (Andrew Chow)

Pull request description:

  Backports the following to the 0.19 branch:

  * #17946 - Fix GBT: Restore "!segwit" and "csv" to "rules" key
  * #18160 - gui: Avoid Wallet::GetBalance in WalletModel::pollBalanceChanged
  * #18425 - releases: Update with new Windows code signing certificate
  * #18676 - build: Check libevent minimum version in configure script
  * #19097 - qt: Add missing QPainterPath include (as per #19510)
  * #18640 - appveyor: Remove clcache
  * #19444 - test: Remove cached directories and associated script blocks from appveyor config
  * #19612 - lint: fix shellcheck URL in CI install
  * #18001 -  Updated appveyor job to checkout a specific vcpkg commit ID

  Closes: #19510.

ACKs for top commit:
  jnewbery:
    ACK be951470be
  MarcoFalke:
    cherry-pick ACK be951470be 🌎

Tree-SHA512: 2ec7e3ae1da99799ff6f8cfe26095d6885cffe6952b18a7e236dc5e657b3918225c2601b8c8e17cdff5319c40cb0a214d9fad49b0ff2f54af1db7c81d83a1df5
2020-08-11 11:59:40 +02:00
Aaron Clauson
be951470be Updated appveyor job to checkout a specific vcpkg commit ID.
Github-Pull: #18001
Rebased-From: 2bcc70531a
2020-08-11 13:45:03 +08:00
MarcoFalke
1fd9cd2cb4 appveyor: Remove clcache
Github-Pull: #18640
Rebased-From: fac0c8db9f
2020-08-11 09:11:13 +08:00
Aaron Clauson
8c0a9595ec Remove cached directories and associated script blocks from appveyor CI configuration.
Github-Pull: #19444
Rebased-From: 961e667600
2020-08-11 09:10:47 +08:00
fanquake
d70f700021 lint: fix shellcheck URL in CI install
This is causing the tests to fail for backports etc.

Github-Pull: #19612
Rebased-From: 7ee4769cd4
2020-08-11 09:02:03 +08:00
fanquake
f8f7d91b80 test: remove Cirrus CI FreeBSD job
This has been removed from the master branch, and always seems to fail
at the installing packages phase. i.e:
```bash
pkg install -y autoconf automake boost-libs git gmake libevent libtool pkgconf python3 ccache
Updating FreeBSD repository catalogue...
Fetching meta.txz: . done
pkg: repository meta /var/db/pkg/FreeBSD.meta has wrong version 2
repository FreeBSD has no meta file, using default settings
Fetching packagesite.txz: .......... done
pkg: repository meta /var/db/pkg/FreeBSD.meta has wrong version 2
pkg: Repository FreeBSD load error: meta cannot be loaded No error: 0
Unable to open created repository FreeBSD
Unable to update repository FreeBSD
Error updating repositories!

Exit status: 3
```

Github-Pull: #19224
Rebased-From: e7f06f9b0e
2020-08-11 09:01:51 +08:00
Andrew Chow
b7e16a82c9 Add missing QPainterPath include
This is needed to compile with Qt 5.15.

Github-Pull: #19097
Rebased-From: 79b0a69e09
2020-07-15 11:12:22 +08:00
João Barbosa
30a28146ac gui: Avoid Wallet::GetBalance in WalletModel::pollBalanceChanged
Github-Pull: #18160
Rebased-From: 0933a37078
2020-06-09 20:50:21 +08:00
Luke Dashjr
0d87a5b4e2 QA: feature_segwit: Check that template "rules" includes "!segwit" as appropriate
Github-Pull: #17946
Rebased-From : 412d5fe879
2020-05-20 10:38:21 +08:00
Luke Dashjr
bde6a5a676 Bugfix: Include "csv","!segwit" in "rules"
They have been missing since buried deployments were merged

Github-Pull: #17946
Rebased-From: 2abe8cc3b7
2020-05-20 10:37:31 +08:00
Hennadii Stepanov
e422f65aee build: Set libevent minimum version to 2.0.21
Github-Pull: #18676
Rebased-From: b68e717967
2020-05-20 10:36:41 +08:00
Andrew Chow
0d0dd6ae96 Update with new Windows code signing certificate
Github-Pull: #18425
Rebased-From: 3e0df92bf2
2020-05-20 10:29:26 +08: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
v0.19.1
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: bf36a3ccc2
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: cb9e88e73a
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
v0.19.1rc2
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: deaa6dd144
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: acf8abc7f3
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: 6fc554f591
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: f1ef7f0aa4
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
v0.19.1rc1
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: a5a2654bbc
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: 75163f4729
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: 9dd58ca611
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: 98fbd1cdff
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: b66861e2e5
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: 6dd59d2e49
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: 4b8f1e989f
2020-01-15 09:58:56 +00:00
Gregory Sanders
a5489c9892 IsUsedDestination should count any known single-key address
Github-Pull: #17621
Rebased-From: 09502452bb
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: 436ad43643
2020-01-14 09:34:44 +00:00