Commit Graph

14676 Commits

Author SHA1 Message Date
Alexander Block
d500d77c4a Use nBlockSize/nBlockMaxSize instead of nBlockWeight/nBlockMaxWeight 2018-01-26 12:59:29 +01:00
MarcoFalke
12770beb6b Merge #10310: [doc] Add hint about getmempoolentry to getrawmempool help.
3a0a5bc [doc] Add hint about getmempoolentry to getrawmempool help. (Karl-Johan Alm)

Tree-SHA512: 8327d7d7ad93296525fbf95b7a824e3525bde84653999f125afd845823eb39e3a03cd39725962ed949aa2b9ad207ecad6d287294fa321ff1a4d7fbd5a4b8560b
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
e9976d20f1 Merge #10495: contrib: Update location of seeds.txt
ac9cd95 contrib: Update location of seeds.txt (Wladimir J. van der Laan)

Tree-SHA512: c12a75787ba87f03707c21731da083b466762a7e0af9ca501107695ea1074025907cc24805c7c87f4a66daa7f4f13e574da16be1681e61deaf1acbd72176b3ff
2018-01-26 12:59:29 +01:00
Pieter Wuille
631d9f92ea Merge #10309: Trivial: remove extra character from comment
3503716 Trivial: remove extra character from comment (CryptAxe)

Tree-SHA512: 66ee474945b4f9fd098cee0d031c1860c0777d4b05c609c0eaba32234209356b630766de30235b49d22cc5ea7cf2bb93410dea4466396369a0cdc0b631512a33
2018-01-26 12:59:29 +01:00
MarcoFalke
ed898f1793 Merge #10258: Fixed typo in documentation for merkleblock.h
dd07068 Fixed typo in documentation for merkleblock.h (Mikerah)

Tree-SHA512: 92655c8022eb33852c116da517b12bd17b3b668713cd85fe185a15245ea9810605626b1d0955fa117f7b56863e0a52b3a86dab42409332452b5eb72a7d34f30d
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
294228afcc Merge #10451: contrib/init/bitcoind.openrcconf: Don't disable wallet by default
afc693d contrib/init/bitcoind.openrcconf: Don't disable wallet by default (Luke Dashjr)

Tree-SHA512: 1763a9e91788485b079b96239cf09f1557b338e5045aa4ffbad3908f88c4e362b9b5d86a8a0f33734899de244e76e7ced02a6be8e52b3fb69258a5101d6445ef
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
b0a8172141 Merge #10260: [doc] Minor corrections to osx dependencies
661caf8 [doc] Minor corrections to osx dependencies (fanquake)

Tree-SHA512: 61451807d6208002550d2e37d26094a5515b11daacab39eb508b6168eebcea86f93dcc7f853aab490baec3727740c90d404c481e11b3d03dcea9f76f8fc7be12
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
f7174fb655 Merge #10308: [wallet] Securely erase potentially sensitive keys/values
6c914ac [wallet] Securely erase potentially sensitive keys/values (Thomas Snider)

Tree-SHA512: 071d88c4093108d4e4eced35a6ffcebe3f499798194f5b1be661ffa5b78b5f55311667f6d2a72758d85290f61f958381ee95d380b9045ca18e9e1875f0e686c8
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
e2225f37c2 Merge #10265: [wallet] [moveonly] Check non-null pindex before potentially referencing
c36ea69 [wallet] Make sure pindex is non-null before possibly referencing in LogPrintf call. (Karl-Johan Alm)

Tree-SHA512: a14c9f3e1228bca91977bea821c56a377d80889b41d250050c9be67aa93e460319a7cf1d4b63ee40f23b5a34159590f0e3fe15dc88698dc694c0c8098bd2db4d
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
24be65e87a Merge #10328: Update contrib/debian to latest Ubuntu PPA upload.
91700aa Re-enable upnp support in contrib/debian (Matt Corallo)
c5071e1 Build with QT5 on Debian-based systems using contrib/debian (Matt Corallo)
a8e9286 Bump minimum boost version in contrib/debian (Matt Corallo)
9970219 Update contrib/debian to latest Ubuntu PPA upload. (Matt Corallo)

Tree-SHA512: ee4d3c5927a9cfb2794672eaca883c4af5df541383afbdbc6500714ee17518e78b58f509b2e9805bbc424ef97a5e64be0b9a977212c5002cb682f0569d28099b
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
7b7924d472 Merge #9497: CCheckQueue Unit Tests
96c7f2c Add CheckQueue Tests (Jeremy Rubin)
e207342 Fix CCheckQueue IsIdle (potential) race condition and remove dangerous constructors. (Jeremy Rubin)

Tree-SHA512: 5989743ad0f8b08998335e7ca9256e168fa319053f91b9dece9dbb134885bef7753b567b591acc7135785f23d19799ed7e6375917f59fe0178d389e961633d62
2018-01-26 12:59:29 +01:00
Jonas Schnelli
f1ec8c9fa1 Merge #10008: [trivial] Fix a typo (introduced two days ago) in the default fee warning
a3ca43b [trivial] Fix a typo (introduced two days ago) in the default fee warning (practicalswift)

Tree-SHA512: b88bb45cb0cbe7f0b0c1dd5d573dad36f3915b1ddde58c9b29806544c832c4a2c0a7994080a57682684f1dea0a02d5367aed8ccbee331dbc40c45948392e0f3d
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
539cf5c178 Merge #9481: [Qt] Show more significant warning if we fall back to the default fee
7abe7bb Qt/Send: Give fallback fee a reasonable indent (Luke Dashjr)
3e4d7bf Qt/Send: Figure a decent warning colour from theme (Luke Dashjr)
c5adf8f [Qt] Show more significant warning if we fall back to the default fee (Jonas Schnelli)

Tree-SHA512: 9e85b5b398d7a49aaf6c42578d63750b1b7aa9cc9e84d008fe21d6c53f1ffe2fb69286a1a764e634ebca3286564615578eea0a1bc883e4b332be8306d9883d14
2018-01-26 12:59:29 +01:00
Pieter Wuille
bcef7260d0 Merge #10196: Bugfix: PrioritiseTransaction updates the mempool tx counter
6c2e25c [qa] Test prioritise_transaction / getblocktemplate interaction (Suhas Daftuar)
acc2e4b Bugfix: PrioritiseTransaction updates the mempool tx counter (Suhas Daftuar)

Tree-SHA512: dcf834df52d84d5eb86acb847c3f28d3cffd1f78f3092b8ff8913c2c400675a071c48a19cd852fdbaac1582aa1dba23433e0e16055831ef2a5e76dde91199941
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
c716ee03f1 Merge #10441: net: only enforce expected services for half of outgoing connections
b6fbfc2 net: only enforce the services required to connect (Cory Fields)

Tree-SHA512: 88943bff63213a734f3c96c45760cadaeb9ba18287c8a20c279851ebaf058a334c969028fb2180f155508e3eea4b838147382e4f2b655e7a9aa098eadc81d53e
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
785d4d0ee5 Merge #8949: Be more agressive in getting connections to peers with relevant services.
4630479 Make dnsseed's definition of acute need include relevant services. (Gregory Maxwell)
9583477 Be more aggressive in connecting to peers with relevant services. (Gregory Maxwell)
2018-01-26 12:59:29 +01:00
Alexander Block
67196dc812 Only consider nodes missing relevant services after 40 failed attemps
Missed this change in previous backports as it was burried in SegWit commits.
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
c45c767f8e Merge #10294: [Wallet] unset change position when there is no change
7c58863 [Wallet] unset change position when there is no change on exact match (Gregory Sanders)

Tree-SHA512: ce8b9337e4132e32d80f954258d50938052c833a48e39431649d6adb16e3d18626a0ae5d300827e7fa397927fba72a1f066cb31af9b0a3ef7f1feb6024461626
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
5623326010 Merge #10228: build: regenerate bitcoin-config.h as necessary
91ab8f5 build: fix bitcoin-config.h regeneration after touching build files (Cory Fields)
3577603 build: remove wonky auto top-level convenience targets (Cory Fields)

Tree-SHA512: 2e68634439eeb7eca43cd2858135a583bfe0cf146e021a8384a24f7267aacc6f99bdc7a6d497a04d32e6a03e9446f0f599afb5bd53346dadf19f47d5fb2ea9f9
2018-01-26 12:59:29 +01:00
Pieter Wuille
ee3ff3552d Merge #10215: Check interruptNet during dnsseed lookups
b2c9254 Check interruptNet during dnsseed lookups (Matt Corallo)

Tree-SHA512: a76b5749b085d5571ac65a6925bb1c50fa1d02c02854d9126224dc2ec419eb9103f7c92bf9a0bbd39c7dee93a2266dc3973fb16b48e8daea057f45d452e2513c
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
69058b83f7 Merge #10245: Minor fix in build documentation for FreeBSD 11
0611bc3 Minor fix in build documentation for FreeBSD 11 (Shigeya Suzuki)

Tree-SHA512: d0e0b66868e4a988e1fa121b9c7b2877b77e2b3c7a9d7a6220c9e16cf0d6817786e9020aeba19dfa2cbc07b2fbba12f2afefc442e762a7d00292bde7515ef880
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
a601206d3c Merge #10410: Fix importwallet edge case rescan bug
2a8e35a Fix importwallet edge case rescan bug (Russell Yanofsky)

Tree-SHA512: 59522c962290f9ef64436349d11183dd1fd829e515d1f5ec802b63dd813d04303e28d4f3ba38df77a6c151ee4c14f3ca5d3d82204c57456ac94054de62ae4bc7
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
955939f775 Merge #10424: Populate services in GetLocalAddress
3070134 Populate services in GetLocalAddress (Alex Morcos)

Tree-SHA512: b822d7e898ccb5b959ccb1b1d0f159f27190c2105fbf8f5b67ae54debab6fa6a0723d65a66e7341f55cd0d80398c3fbb39a41e067b9f4e0bfa2c1cd366032404
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
12099e52d4 Merge #10414: [depends] miniupnpc 2.0.20170509
af5d48c [depends] miniupnpc 2.0.20170509 (fanquake)

Tree-SHA512: e6cfa7856aa4ceb17de5e84156cdb90094eedfb08a84ba1cd9a5ce1689533e17863e3f5692a1b7b7b096a7ac88f18539e4b6b7a79f7726401effb11bf9a5ef2f
2018-01-26 12:59:29 +01:00
MarcoFalke
b67fdbee96 Merge #10207: Clarify importprivkey help text ... example of blank label without rescan
c9e31c3 Clarify importprivkey help text with example of blank label without rescan Occasionally I waste a lot of time not remembering that the second parameter to importprivkey must be blank if you intend to stop rescan with "false" as the third parameter. (Warren Togami)

Tree-SHA512: 23781e1d6fd59a9d06d6e12ad10e8ed6641947b3e4a1f66c8fdb5d44cbd8f291e8f2a5e686aa9f9ba5e4bab8ca688caa17244e837f651546055ddf7cc8e7df8f
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
fb6992de5d Merge #10176: net: gracefully handle NodeId wrapping
c851be4 net: define NodeId as an int64_t (Cory Fields)

Tree-SHA512: 2ccc931cfcdc555313b9434d8de2f6cea759b31891212ca62f962208f60157d4fc593010e3ca61265d1a20d6f78c6ca79103600b85df77983d5509d192875b96
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
720325f23c Merge #10204: [rpc] rename disconnectnode argument
883154c [rpc] rename disconnectnode argument (John Newbery)

Tree-SHA512: 14245befd0a7315edd9e03c8bb283ff6b546cf4ef93c3ce02c01de687fea3bb96c510a638a42d2d6799e5e3e5b4f800021c2530b504baeaa4a4dc99323165986
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
2e45791c95 Merge #10157: [0.14] Fix the mempool_packages.py test
39febb8 [qa] Fix mempool_packages.py for the 0.14 branch (Suhas Daftuar)

Tree-SHA512: 7b5f2627a76d79da5d7c9d30794219a87bec99296d5f74f66b347c7c8914244bfd07f0d48231adda7269678706fd9158b846d710f942b724c8c5748cc4a49c7e
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
96b457d47e Merge #10144: Prioritisetransaction wasn't always updating ancestor fee
9bef02e Bugfix: ancestor modifed fees were incorrect for descendants (Suhas Daftuar)
ba7dd8b Test prioritisetransaction and ancestor fee state (Suhas Daftuar)

Tree-SHA512: 01977d88e1afb093a003f22a6f29ea60df3d70a179fe7e55910b9c8c340c4af9fb20cdc804c40235b62c43c453f0194eda0d0d4dbd365d2d98347f5dbe5de01c
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
ec563a0f17 Merge #10146: Better error handling for submitblock
30f30c0 Add braces to submitblock per current style. (Gregory Maxwell)
4f15ea1 Check transaction count early in submitblock. (Gregory Maxwell)
ada0caa Make GetWitnessCommitmentIndex callable on blocks without a coinbase txn. (Gregory Maxwell)

Tree-SHA512: 02dcd337ad9cdd8e4fa6a42c009d016026d1229c193676ed6fcc9ce55e924fedec57f516ac1e95c3db0985243ba908307338ce783a70416cb292bed881002bfc
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
0fc9b2bd8e Merge #10139: [rpc] Remove auth cookie on shutdown
4b87973 [rpc] Remove auth cookie on shutdown (practicalswift)

Tree-SHA512: 5d7d04413d3eb6a8d167443a3fdfe4c289bdc5cbc4c9b257a557c2a7fab5d4b32a81a1357e27b77ce2623e76e495b2e8b21eab0ab032bb261fdcdf171bac1dac
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
06c8714572 Merge #9959: Mining: Prevent slowdown in CreateNewBlock on large mempools
011124a Update benchmarking with package statistics (Suhas Daftuar)
42cd8c8 Add benchmarking for CreateNewBlock (Suhas Daftuar)
eed816a Mining: return early when block is almost full (Suhas Daftuar)

Tree-SHA512: c0d8f71e4e0441acf3f4ca12f8705e413b59b323659346a447145653def71710537fb4c6d80cad8e36d68b0aabf19c92e9eab7135a8897b053ed58720856cdda
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
42d3060568 Merge #10120: util: Work around (virtual) memory exhaustion on 32-bit w/ glibc
625488a util: Work around (virtual) memory exhaustion on 32-bit w/ glibc (Wladimir J. van der Laan)

Tree-SHA512: 99b610a8cf9561998af90e16fc19320fddd30c987e8f33325d63df0f56d70235b94d9482e80f28154d4b33a3ecf4961686380c444ec18d1da5e8804a8b6f4de1
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
a149129656 Merge #10130: bitcoin-tx input verification (awemany, jnewbery)
19ecd1e Add tests for bitcoin-tx input checking (John Newbery)
21704f6 Check stderr when testing bitcoin-tx (John Newbery)
eb66bf9 bitcoin-tx: Fix missing range check (Awemany)

Tree-SHA512: 08c6153cf7dd5e0ecd23e24d81af4c0f17534d484179dd91dcd78d42df14c91284341d31cc695469a64c507bce72c34231748b7cabb7df8f1051d228fb0a62c5
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
8aa00505ff Merge #10084: rpc: Rename first named arg of createrawtransaction
fa55853 rpc: Rename first named arg of createrawtransaction (MarcoFalke)

Tree-SHA512: f2e07183f2503344e676e08fe0fd73e995d7c6fda3fc11c64116208dec8e445f0627583dfba85014129b6f2dc7e253b9d760e57e66811272db89e9ba25ce6dbc
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
a81f445433 Merge #9973: depends: fix zlib build on osx
c624753 depends: fix zlib build on osx (Cory Fields)

Tree-SHA512: fd9343edc24762fc4b7eb9798f0fb6f76d5f5aeef16a0bc3bab5400cb8f9b3ae8a2d34b480f03c853bb31ff4e39c267a2b81cd86df0532f11976072354aa9378
2018-01-26 12:59:29 +01:00
Jonas Schnelli
b018751852 Merge #10060: [Qt] Ensure an item exists on the rpcconsole stack before adding
4df76e2 Ensure an item exists on the rpcconsole stack before adding (Andrew Chow)

Tree-SHA512: f3fd5e70da186949aff794f6e2ba122da2145331212dcc5e0595285bee9dc3aa6b400b15e8eeec4476099965b74f46c4ef80f8ed1e05d490580167b002b9a5e7
2018-01-26 12:59:29 +01:00
MarcoFalke
edd514c438 Merge #10037: Trivial: Fix typo in help getrawtransaction RPC
05a9f22 Trivial: Fix typo in help getrawtransaction RPC (James Evans)

Tree-SHA512: 22c68fb49771f96b94c482b28d7efc4d51737cbb973ed3954641f3ea1832c14e7b909030c132afebe17854da134f717acbf14ee26294c61a303bc33dc43aac4c
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
4321788cc9 Merge #9953: Fix shutdown hang with >= 8 -addnodes set
819b513 Add missing braces in semaphore posts in net (Matt Corallo)
e007b24 Fix shutdown hang with >= 8 -addnodes set (Matt Corallo)

Tree-SHA512: f2d7562bd5d333cd0e80562eb3b1fe329fc10ee713996e053d2ed669db6d9eb39550e0a6c6ab768cd070bfe92a5ea85e0f752470206706de196bd4a689b9bc07
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
bd0b0daaa5 Merge #9892: Bugfix: Only install manpages for built programs
8c156b7 Bugfix: Only install manpages for built programs (Luke Dashjr)

Tree-SHA512: f4c40910b257274a05d9c842b9adb5d9d01df7dd2d34a18bd2d98c78810dc3ed98ed12c08c55352e36a845f06ddb1efba9d4ecf5f1123d2c58406a5ecf589836
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
818fc1eafb Merge #9891: depends: make osx output deterministic
9e4d842 depends: make osx output deterministic (Cory Fields)

Tree-SHA512: 997a671832a28e600bc3c9cd1340c6c1fa08f050d7cf676a5d51b38f08161ac418621520459a9a53dd87102c13fb69cb2e58ec3cc00f738e204eb787d6f0cad6
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
a16d3b0057 Merge #9829: Fix importmulti returning rescan errors for wrong keys
306bd72 Fix importmulti returning rescan errors for wrong keys (Russell Yanofsky)

Tree-SHA512: ae9998236cbd3ff749d6b5c716bd76c9cec386b0708583e4912e4e05bf4584545258e1d0543aa5445024d2b5decf859a64f40c6503029773366a0f9a9ddf9b88
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
16b2a1d1b9 Merge #9791: Avoid VLA in hash.h
5c8fd50 Avoid VLA in hash.h (Pieter Wuille)
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
39f08b6e66 Merge #9865: Change bitcoin address in RPC help message
83ac719 Change bitcoin address in RPC helpaddress to an invalid address, so people don't accidentally send coins there (like I did). (Marijn Stollenga)

Tree-SHA512: ca1163466a149d567b97efbfcfa8fdfe2d474245b4dd5a1a92555b4e87f8e99df5fee4cd79ef1ce6a98db2337846af78f37c2e6b31d02008b11fa0e151ce6590
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
3693eb1570 Merge #9879: [doc] Update doc/bips.md for BIP90 implementation
fe71661 [doc] Update doc/bips.md for BIP90 implementation (Suhas Daftuar)

Tree-SHA512: cfa72662e5e8ecedb7869b64c2064cc29d8736bcd9baacd59ea420dc2f93265c8d950e469863e77e8fa9348fbf1b39a1e2397253a2fd94b63adc909cc8c14873
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
7c3b8ec4bc Merge #9840: Update sendfrom RPC help to correct coin selection misconception
f81f0d0 Update sendfrom RPC help to correct coin selection misconception (Russell Yanofsky)
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
5c7c3b3a00 Merge #9856: Terminate immediately when allocation fails
d4ee7ba prevector: assert successful allocation (Cory Fields)
c5f008a don't throw std::bad_alloc when out of memory. Instead, terminate immediately (Cory Fields)

Tree-SHA512: 699ce8df5b1775a99c71d3cfc952b45da1c0091e1a4b6adfac52d5be6144c3d98f88ac3af90e5c73fff2f74666a499feb4a34434683ce5979814e869c0aeddc3
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
397c27ff9d Merge #9875: tests: Fix dangling pwalletMain pointer in wallet tests
75a1093 tests: Fix dangling pwalletMain pointer in wallet tests (Wladimir J. van der Laan)

Tree-SHA512: 7fb6e8385fe7d542f9ecb113a08d675ca9e84907a1939b3a6ad41318fda55bc999b9bc8ffc3f56cd8610ca49d0db982d3c793df7bbcb7eb9638f4483030db6a8
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
af006a36ef Merge #9789: build: add --enable-werror and warn on vla's
205830a build: add --enable-werror option (Cory Fields)
b602fe0 build: warn about variable length arrays (Cory Fields)
2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
d88030845d Merge #9824: qa: Check return code when stopping nodes
fa4cd2e qa: Check return code when stopping nodes (MarcoFalke)
2018-01-26 12:59:29 +01:00