Commit Graph

14757 Commits

Author SHA1 Message Date
Pedro Branco
20cdc2b36c Fix importmulti bug when importing an already imported key
Github-Pull: #11483
Rebased-From: a44a215177
2017-10-17 21:44:23 +02:00
Dusty Williams
405e069d3b Update importprivkey named args documentation
Fixes #11462. Updated documentation for importprivkey function to use the correct name for the first argument.
Also updates a call to importprivkey to use named args in functional test.

Github-Pull: #11465
Rebased-From: aa57590d7c
2017-10-09 22:31:41 +02:00
fanquake
c94527a973 [Docs] Update Windows build instructions for using WSL and Ubuntu 17.04
Github-Pull: #11437
Rebased-From: 696ce46306
2017-10-09 22:31:41 +02:00
Wladimir J. van der Laan
27e861a9b3 net: Improve and document SOCKS code
Make the SOCKS code more consistent, and document the constants used.

Github-Pull: #11397
Rebased-From: 22f816ef4d
2017-10-09 22:31:41 +02:00
Donal OConnor
dea3b87dd9 Add new step to clean $PATH var by removing /mnt specific Window's %PATH% paths that cause issues with the make system
Github-Pull: #11437
Rebased-From: 4f890ba6bc
2017-10-05 18:56:54 +02:00
Wladimir J. van der Laan
a43be5bcdb rpc: Prevent dumpwallet from overwriting files
Prevent arbitrary files from being overwritten. There have been reports
that users have overwritten wallet files this way. It may also avoid
other security issues.

Fixes #9934. Adds mention to release notes and adds a test.

Github-Pull: #9937
Rebased-From: 0cd9273fd9
2017-10-04 15:11:24 +02:00
Matt Corallo
b6c0209aaf Fix validationinterface build on super old boost/clang
This should fix all the non-dependancy issues for termux builds.
See Github issue #11388.

Github-Pull: #11440
Rebased-From: 96c2ce9d34
2017-10-04 11:54:36 +02:00
Wladimir J. van der Laan
6a62c745a9 qt: Backup former GUI settings on -resetguisettings
Writes the GUI settings to `guisettings.bak` in the data directory
before wiping them. This can be used to retroactively troubleshoot
issues (e.g. #11262) where `-resetguisettings` solves the problem.

Github-Pull: #11338
Rebased-From: 723aa1b875
2017-10-04 11:53:18 +02:00
Gregory Sanders
0fe2a9a196 when clearing addrman clear mapInfo and mapAddr
Github-Pull: #11252
Rebased-From: b86a42077a
2017-10-04 11:48:39 +02:00
Suhas Daftuar
6b4d9f2736 wallet: update stored witness in AddToWallet
Replace witness-stripped wallet transactions with full transactions;
this can happen when upgrading from a pre-segwit wallet to a segwit-
aware wallet.

Github-Pull: #11225
Rebased-From: d01a9682b1
2017-10-04 11:47:44 +02:00
MarcoFalke
62d18cdb89 doc: Prepare release notes for 0.15.1 2017-10-03 20:28:38 +02:00
Paul Berg
8b61aee690 Put back inadvertently removed copyright notices
In an abundance of caution this restores "Bitcoin Developers" to the COPYING file in
case there were contributors before that point in time that would object to the
current label.  It's harmless and more pedantically correct.

[Change extracted from the Bitcoin-abc repository, commit message by gmaxwell]

Signed-off-by: Gregory Maxwell <greg@xiph.org>

Github-Pull: #11318
Rebased-From: d552ed678c
2017-10-03 20:18:01 +02:00
Matt Corallo
75997c3b35 Disallow uncompressed pubkeys in bitcoin-tx [multisig] output adds
Github-Pull: #11377
Rebased-From: 28d4542a0a
2017-10-03 20:12:07 +02:00
MeshCollider
8d13b4298c Replace save|restoreWindowGeometry with Qt functions
Github-Pull: #11335
Rebased-From: 13baf7217b
2017-10-03 20:12:07 +02:00
Lucas Betschart
6642558078 [Qt] Add delay before filtering transactions
Fixes 3141

Github-Pull: #11015
Rebased-From: 7b137acedd
2017-10-03 20:03:42 +02:00
Andrew Chow
19d63e8a93 Remove custom fee radio group
Removes the extraneous custom fee radio group and its single radio
button. The radio button is replaced with a label that has the
radio button's text.

Github-Pull: #11334
Rebased-From: e53fa4a1ca
2017-10-03 19:51:35 +02:00
Wladimir J. van der Laan
b1a6c94683 rpc: make estimatesmartfee argument naming consistent with documentation
Github-Pull: #11267
Rebased-From: 5acd82de9a
2017-10-03 19:30:27 +02:00
Wladimir J. van der Laan
921542e0bd rpc: update cli for estimatefee argument rename
The first argument of estimatesmartfee was renamed from nblocks to
conf_target in 06bcdb8da6. Update the
client-side table as well.

Github-Pull: #11267
Rebased-From: 24697c40ee
2017-10-03 19:23:55 +02:00
MeshCollider
2e31b1d48d Fix division by zero in time remaining
Github-Pull: #11237
Rebased-From: 3b69a08c53
2017-10-03 19:19:46 +02:00
Chris Moore
47c02a8ae8 qt: Use IsMine to validate custom change address
(cherry picked from commit c41224dfd5)

Github-Pull: #11247
Rebased-From: a1ea1cfbd8
2017-10-03 18:52:28 +02:00
Daniel Edgecumbe
7310f1f2eb [Qt] Fix display of package name on 'open config file' tooltip
Github-Pull: #11198
Rebased-From: 14ccd4d8d1
2017-10-03 18:46:51 +02:00
Russell Yanofsky
2cb720ae61 Acquire cs_main lock before cs_wallet during wallet initialization
CWallet::MarkConflicted may acquire the cs_main lock after
CWalletDB::LoadWallet acquires the cs_wallet lock during wallet initialization.
(CWalletDB::LoadWallet calls ReadKeyValue which calls CWallet::LoadToWallet
which calls CWallet::MarkConflicted). This is the opposite order that cs_main
and cs_wallet locks are acquired in the rest of the code, and so leads to
POTENTIAL DEADLOCK DETECTED errors if bitcoin is built with -DDEBUG_LOCKORDER.

This commit changes CWallet::LoadWallet (which calls CWalletDB::LoadWallet) to
acquire both locks in the standard order. It also fixes some tests that were
acquiring wallet and main locks out of order and failed with the new locking in
CWallet::LoadWallet.

Error was reported by Luke Dashjr <luke-jr@utopios.org> in
https://botbot.me/freenode/bitcoin-core-dev/msg/90244330/

Github-Pull: #11126
Rebased-From: de9a1db2ed
2017-10-03 18:35:39 +02:00
Wladimir J. van der Laan
b278a43646 rpc: Write authcookie atomically
Use POSIX rename atomicity at the `bitcoind` side to create a working
cookie atomically:

- Write `.cookie.tmp`, close file
- Rename `.cookie.tmp` to `.cookie`

This avoids clients reading invalid/partial cookies as in #11129.

Github-Pull: #11131
Rebased-From: 82dd7195e1
2017-10-03 18:34:30 +02:00
practicalswift
50bd3f626d Avoid returning a BIP9Stats object with uninitialized values
Uninitialized data potentially used in `rpc/blockchain.cpp`:

```
static UniValue BIP9SoftForkDesc(const Consensus::Params& consensusParams, Consensus::DeploymentPos id)
{
    ...
    const ThresholdState thresholdState = VersionBitsTipState(consensusParams, id);
    ...
    if (THRESHOLD_STARTED == thresholdState)
    {
        UniValue statsUV(UniValue::VOBJ);
        BIP9Stats statsStruct = VersionBitsTipStatistics(consensusParams, id);
        statsUV.push_back(Pair("period", statsStruct.period));
        statsUV.push_back(Pair("threshold", statsStruct.threshold));
        statsUV.push_back(Pair("elapsed", statsStruct.elapsed));
        statsUV.push_back(Pair("count", statsStruct.count));
        statsUV.push_back(Pair("possible", statsStruct.possible));
        rv.push_back(Pair("statistics", statsUV));
    }
    ...
    return rv;
}
```

Github-Pull: #10957
Rebased-From: 3eb53b8671
2017-10-03 18:19:35 +02:00
Karl-Johan Alm
9e8aae31c1 [wallet] Close DB on error.
Github-Pull: #11017
Rebased-From: 03bc719a85
2017-10-03 18:15:46 +02:00
Wladimir J. van der Laan
fb7b529384 doc: Release notes for 0.15.0.1
Tree-SHA512: ce2e874659ea59fa3f1f34a02ed910f655db2ec5b030ef40f89dca0b90932a3b579768db4e7f30773ca9cbbf72891369efe34fdbf111669c3bb583e8c69eda85
v0.15.0.1
2017-09-15 16:00:59 +02:00
Wladimir J. van der Laan
f266f2668b qt: Translations update pre-0.15.0.1
Tree-SHA512: 942fbba8a959ec5430afeecbb663731944fd646fa3b997252e599d835faff12f329d1b70509b161275c3c88845de031357c8317d7f7c801e24be488912cf4035
2017-09-15 15:38:06 +02:00
Wladimir J. van der Laan
7123b95bea doc: Bump manpages to 0.15.0.1
Tree-SHA512: 8097788934031d0ef47ebac8ddda10e4d124c14e8d0ccee697faba971a68ad7bfcc2f838ae53b1110719ade879743187d170c4d2e69446343c6e2e89febf633c
2017-09-15 15:20:37 +02:00
Wladimir J. van der Laan
843233277d build: Bump version to 0.15.0.1
Tree-SHA512: 7ee9ff3941737aae3086cabcd792c6a00054e911045b4ee198bdc03ffed01328bce504bf7d4fb177e78da8c01812d1a5081dca13e767433aa9ac441e979102e6
2017-09-15 14:59:07 +02:00
Matt Corallo
46c8d23dad Fix Qt 0.14.2->0.15.0 segfault if "total at least" is selected
A button was removed, so now button(1) is nullptr

Github-Pull: #11332
Rebased-From: cdaf3a1f9e
Tree-SHA512: 0a49bf4e9ab08e5869170c8a212da60c9a6b90c36427d788de384aa4be6d87bb5e00a21edf78eed34f81bbc554b6f15565bb9b493dafcbfe9d6f4664d7424d9d
2017-09-15 09:56:11 +02:00
Wladimir J. van der Laan
7c53587101 doc: Clean out release notes on 0.15 branch
Prepare for 0.15.1

Tree-SHA512: d306369ebf2090dd3f74ead6ca6b9f3f2d56bcde6eb6aaab22ac38a5f7ab6cdf3da1142ad6fe266f793f27bbed4247397375f6177f2c7ccc1a57de9acaa5a181
2017-09-14 16:17:21 +02:00
Wladimir J. van der Laan
3751912e8e Merge #11295: doc: Old fee_estimates.dat are discarded by 0.15.0
fa120bd01 doc: Old fee_estimates.dat are discarded by 0.15.0 (MarcoFalke)

Pull request description:

Tree-SHA512: b4b1cb3efa307a7a0c37b8cc0a35f8fd31c8268747be59efba6530c36ba6423d9fb37e752782c7ebd5bc22a4aa1d2730b0e9ab560239fb2874afd42197ed9fd0
v0.15.0
2017-09-11 00:13:03 +02:00
MarcoFalke
fa120bd01c doc: Old fee_estimates.dat are discarded by 0.15.0 2017-09-10 04:24:12 +02:00
Pieter Wuille
5f2cf88c23 Merge #11292: travis: filter out pyenv
0ced455b9 travis: filter out pyenv (Cory Fields)

Pull request description:

  Backport of #11271

Tree-SHA512: 34fa201051e4bc3600c2ee6121380c93f03a0639361e4955cdc22af0f95b787a3eb590a5246133377357c803dbb5d17a543672b382de8afa2226e480b63e7555
2017-09-08 16:54:01 -07:00
Cory Fields
0ced455b99 travis: filter out pyenv 2017-09-08 16:20:13 -07:00
Wladimir J. van der Laan
adcc788f2a Merge #11279: doc: Add missing contributors to release notes
fad16a90b doc: Add missing contributors to release notes (MarcoFalke)

Pull request description:

  Guido Vranken via commit 9fe1f6b

Tree-SHA512: 9f5c860ed8e23ad679e8c9e9392a66b7ee25c7be84d256855ef65caf335a8e819c7146be47d90686e61450d2501ed96b04b813860725856619088a4378dbfa90
2017-09-08 00:38:04 +02:00
Wladimir J. van der Laan
d4c9d00e7e doc: Add PRs list to release notes
Tree-SHA512: 1dd5e19a2ece38002da1d4bcf017a0a1a3ab2dc8b31fe7b3e7ebc6fef58de4547abbff3fb6555496da1ecf1f9a0cc941f980b053a0376a776e8301de3834aac1
2017-09-07 23:52:48 +02:00
Wladimir J. van der Laan
134d824193 Merge #11255: Release Notes: Fix SHA256-with-SSE4 PR link
58f1e54cb Release Notes: Fix SHA256-with-SSE4 PR link (Janus Troelsen)

Pull request description:

Tree-SHA512: 7f3dc2a1fb1e602fa947f4a00e39f4958eabeb47800b5b85a2035568258f0679c026d7ffe377c9256a97019b174868db82fd4aaac9c218bed145ba86f56330b1
2017-09-06 18:38:29 +02:00
Janus Troelsen
58f1e54cbf Release Notes: Fix SHA256-with-SSE4 PR link 2017-09-06 12:30:44 +02:00
MarcoFalke
fad16a90b2 doc: Add missing contributors to release notes
Guido Vranken via commit 9fe1f6b
2017-09-01 15:14:37 +02:00
Wladimir J. van der Laan
48790e0efa Merge #11180: [release-notes.md] Remove alias
a461cf4 Update release-notes.md (kallewoof)

Pull request description:

  They're the same person.

Tree-SHA512: dcdcf18d57db87445ce09d5e20ea17b0cb0653e749028b2662d708e2798e38296f0598210fb196bf3255a6bfd0837724e56419c39ebe9564406f11296c40be68
2017-08-28 17:05:28 +02:00
kallewoof
a461cf4e37 Update release-notes.md 2017-08-29 00:00:43 +09:00
Wladimir J. van der Laan
29a3cb2378 qt: Translation update pre-rc3
Tree-SHA512: d813ef923d804722bc161cc62e09ee003b386c0abf2d513ede671e9f14ac4c3df749a9f23ddcba9400fcc335dbef6540e47a212dca8ddc0a3d73aee01f098754
v0.15.0rc3
2017-08-28 10:29:10 +02:00
Matt Corallo
e8ad101e5b Changing -txindex requires -reindex, not -reindex-chainstate
Github-Pull: #11108
Rebased-From: cd0ea48742
Tree-SHA512: 0fbd50b1343eec14301ee9c2fc76e48dcb1610ce1ddbf3cccbd937e2c0d1bbdfc4920fbc05e7e560c424e0ed7367d6ad3595a1bd38dea669bcbd1c838f522d8e
2017-08-28 10:18:58 +02:00
Alex Morcos
5b059a833e Output a bit more information for fee calculation report.
Github-Pull: #11145
Rebased-From: 6af49dddea
Tree-SHA512: 7245c6f7ed81cf3913e351ff1df7f74f4be7abe0ae8be312e4862c9875e2943b0b11136bc9999191cdf03468fdac5d41e294bb59b657605c22643b102e37c070
2017-08-28 10:14:58 +02:00
Alex Morcos
e51bb71e4a Fix rounding errors in calculation of minimum change size
Github-Pull: #11145
Rebased-From: a54c7b94f8
Tree-SHA512: d9abb9794edbf7e52450c63d183a4f28e9a3621a670b7f21af92407be096363b44a356818f2abbea11c168d123c04852bd0b60f1cd9d423aefbf4ae831f8567d
2017-08-28 10:14:55 +02:00
MarcoFalke
0a6af47ffa [doc] build-windows: Mention that only trusty works
Github-Pull: #11119
Rebased-From: fa14b67970
Tree-SHA512: a790a5d37a06a691f2536763a504ead5b06b94708ba07f3b94bedbb76b0201825be3dcd95343512d7a6211089be2abc3f1e0957ed27055426e6943d4bdb6fbd9
2017-08-28 10:00:15 +02:00
Wladimir J. van der Laan
0d3e8183fa Merge #11102: Trivial: Fix typo in release-notes.md
9c76cf5 Trivial: Fix typo in release-notes.md (jbarcelo)

Pull request description:

  getmempooolentry -> getmempoolentry (twice)

Tree-SHA512: 4e52d4decf4a6b0ae6ef6f3b52fed2c2fafe63d72a3b5868f172c479a9463f28eaada29b6364a5e5ca5afe021155ee97cc9a23208d2a96c4ecccebccc173bb0e
v0.15.0rc2
2017-08-21 12:41:18 +02:00
Wladimir J. van der Laan
28b978b19e qt: Update translations pre-rc2
New locales:

- bn
- bs
- de_DE
- en_AU
- en_US
- es_419
- he_IL
- id
- ja_JP
- my
- nb_NO
- nl_NL
- si
- te
- th

Tree-SHA512: af4e9d0107122e3da7da8ee4952e01a731ed04f13e83ed1979ace24d29c437a83cc23453d8f0b2160829df02c2ffbff0ce749083f82c4d4695c69a3c7feeebed
2017-08-21 10:48:17 +02:00
jbarcelo
9c76cf50fb Trivial: Fix typo in release-notes.md
getmempooolentry -> getmempoolentry (twice)
2017-08-21 10:41:04 +02:00