Backports 0.15 pr20 #3025

PastaPastaPasta · 2019-07-11T16:00:01Z

No description provided.

4265bf3 Remove unreachable or otherwise redundant code (practicalswift) Tree-SHA512: bc9666ab5d20c936d78c50c0361405aca9edd116602aa9bcd71a79a904b647ac9eca0651d1a9d530189a6ac1c4e235bfc69ec1a68f7e36cc14d6848ac2206b7b

5555fa8 qa: Add stopatheight test (MarcoFalke) Tree-SHA512: ea3f318c3dc73a885db5e258f5d6a25e0017e2360a72ac5f6914bce6f7798d36aca45d2626aafd57ead744bd28fd38b561207a7a547a1d417e594976c35bccee

700d8d8 Remove obsolete _MSC_VER check (practicalswift) Tree-SHA512: 3b33f3ce90a3b3b6abec74990fab88402f896402fc563b7081575f85dab05fc7e21fd4c640ca4b9a57a6ca01c5c8ca931be37cac6fa62968fc7b84c719ec6ede

2c3fc51 [depends] expat 2.2.1 (fanquake) Tree-SHA512: ad0e18f2770c0c4b378123bcbcf93ed0ee0b03dbf6360f02e88b01052ef7b0f5540a0a5cbb6d0d3a3d70db29b0413a43f17e7fa5092185fb874470a9f6be4d76

…cesses of array in class base_uint<BITS> e5c6168 Fix instantiation and array accesses in class base_uint<BITS> (Pavlos Antoniou) Tree-SHA512: e4d39510d776c5ae8814cd5fb5c5d183cd8da937e339bff95caff68a84492fbec68bf513c5a6267446a564d39093e0c7fc703c645b511caab80f7baf7955b804

6171826 Don't create change at the dust limit, even if it means paying more than expected (Alex Morcos) Tree-SHA512: d4cf939b97a92d63d4703ad152093c9dc60e74af590697bc21adbcdf17fc9e6ffb37d46d5eefafbd69327d1bcb79911f1b826ce1d960d895d464c4408c4995c3

…apped libevents. 1ae86ec Changed event RAII helper functions to inline to deal with duplicate symbol linker errors. (Karl-Johan Alm) fd369d2 Switched httpserver.cpp to use RAII wrapped libevents. (Kalle Alm) Tree-SHA512: 877e431f211024d42a3b0800e860e02833398611433e8393f8d5d4970f47f4bd670b900443678c067fec110c087aaab7dc1981ccbf17f6057676fdbbda89aed9

8d4dafd contrib/verifybinaries: allow filtering by platform (Andres G. Aragoneses) Tree-SHA512: 5c117d18fd6e73cdbbf39c610f521bccb32ca7100eb8d5d5ed9c664514c37b32bd2f94f357b64c34f7c093e0c09312ecff330b7f5c708700d4b48643780ebac5

…Verifier cf68a48 Deduplicate addrdb.cpp and use CHashWriter/Verifier (Pieter Wuille) Tree-SHA512: 0301332e797f64da3a1588c9ebaf533af58da41e38f8a64206bff20102c5e82c2a7c630ca3150cf451b2ccf4acb3dd45e44259b6ba15e92786e9e9a2b225bd2f

0a5a6b9 Fixed multiple typos (Dimitris Tsapakidis) Tree-SHA512: 57748710bcbc03945b160db5e95bd686a2c64605f25d5e11d8ed9d0e1be3b3bf287a63588dc6eb33d0cef4ff17c765fda7c226d667a357acc539c8fcf2b9bb7e

…overage report d5711f4 Filter subtrees and and benchmarks from coverage report (Andrew Chow) 405b86a Replace lcov -r commands with faster way (Andrew Chow) c8914b9 Have `make cov` optionally include branch coverage statistics (Andrew Chow) Tree-SHA512: 9c349a7baeb7430ea586617c52f91177df58e3546d6dc573e26815ddb79e30ab1873542d85ac1daca5e1fb2c6d6c8965824b42d027b6b0496a744af57b095852

…-power of two range. dd869c6 Add an explanation of quickly hashing onto a non-power of two range. (Gregory Maxwell) Tree-SHA512: 8b362e396206a4ee2e825908dcff6fe4525c12b9c85a6e6ed809d75f03d42edcfba5e460a002e5d17cc70c103792f84d99693563b638057e4e97946dd1d800b2

0ef7de9 [RPCs] Remove submitblock parameters argument help text (John Newbery) Tree-SHA512: f39ad4bb3006e3d722fa51ae2ab4a48726e740993d6bed5737b355d1e0a99cf475ca9519f97adf8cde1b7187b14a24d5951ce4f34624d01d9ef84b49124c2894

…ount of time (in seconds) bitcoind has been running c074752 [RPC] Add an uptime command that displays the amount of time that bitcoind has been running (Ricardo Velhote) Tree-SHA512: 8f59d4205042885f23f5b87a0eae0f5d386e9c6134e5324598e7ee304728d4275f383cd154bf1fb25350f5a88cc0ed9f97edb099e9b50c4a0ba72d63ec5ca5b4

fab9b60 doc: Remove outdated minrelaytxfee comment (MarcoFalke) Tree-SHA512: e36c5a554a9773f034c2d358c52a772688009a5a71dfd3f664d9b5566c98378f44ef7c6dc0902b42d69ab5fd54b60d4850a2903823d0b2309c7ae063d1923f7f

c1be285 chainparams: make supported service bits option explicit (Cory Fields) d5c7c1c net: use an internal address for fixed seeds (Cory Fields) 6cdc488 net: switch to dummy internal ip for dns seed source (Cory Fields) 6d0bd5b net: do not allow resolving to an internal address (Cory Fields) 7f31762 net: add an internal subnet for representing unresolved hostnames (Cory Fields) Tree-SHA512: 9bf1042bef546ac3ef0e0d3a9a5555eb21628ff2674a0cf8c6367194b22bfdab477adf452c0e7c56f44e0fb37debc5e14bdb623452e076fb9c492c7702601d7a

deaf48b Handle TIMESTAMP_WINDOW within CWallet::RescanFromTime (Russell Yanofsky) 5b2be2b Make CWallet::RescanFromTime comment less ambiguous (Russell Yanofsky) 9bb66ab Add RescanFromTime method and use from rpcdump (Russell Yanofsky) ccf84bb Move birthday optimization out of ScanForWalletTransactions (Russell Yanofsky) Tree-SHA512: cd38433b8f5c5e44ecfba830a6a26bd9a9d0f4a22ae42bce17773d1a6fb25e1ee4289484996dad2d7acfa03059917ff062459f25030a761da7083ba5fbc87bc9

…eDB::LoadBlockIndexGuts() b324b28 Globals: Pass Consensus::Params through CBlockTreeDB::LoadBlockIndexGuts() (Jorge Timón) Tree-SHA512: 9ef561a026960dc69df52603f4d60246c913bdd127465e8238f0954c6bbbc6b8b3b039bab70df38be1cbf5d06788fb631a2236b49c0167633d54366103c7c055

108f04f Add missing LOCK2 in CWallet::GetAvailableBalance (Russell Yanofsky) 429aa9e [test] Move some tests from qt -> wallet (Russell Yanofsky) d944bd7 [qt] Move some WalletModel functions into CWallet (Russell Yanofsky) ef8ca17 [test] Add tests for some walletmodel functions (Russell Yanofsky) Tree-SHA512: f6384d9f2ff3f7fb173d414588c3e7dc8c311b8ed2ce2b0979fb824a0ed83a7302890ccd3d83197f07f6fdcb6b1ca151584d90ea1961d88dfe8956c87087cde8

Signed-off-by: Pasta <pasta@dashboost.org>

…consistency. 5a9b508 [trivial] Add end of namespace comments (practicalswift) Tree-SHA512: 92b0fcae4d1d3f4da9e97569ae84ef2d6e09625a5815cd0e5f0eb6dd2ecba9852fa85c184c5ae9de5117050330ce995e9867b451fa8cd5512169025990541a2b

…man::Options 07b2afe add Binds, WhiteBinds to CConnman::Options (Marko Bencun) ce79f32 add WhitelistedRange to CConnman::Options (Marko Bencun) Tree-SHA512: c23a6f317c955338af531fa3e53e3c42e995f88c6e1939bbc2ad119fa5b786c54b3dad3d2e9b3f830b7292c0c63a02fcff66a89907d0fa8d7c83aefade01af45

e7ba6c1 [tests] add example test (John Newbery) 76859e6 [tests] Update functional tests documentation (John Newbery) Tree-SHA512: 74eb464e965e16466f95b9eda7d1e89a31ef1ef204dd30e1b11ddf482336f12f33fa5ca3cc733b6eaf440c46401e663585af9caca202deddb440bbadce964a62

…Set() ed866ab Indentation after 'Remove redundant calls to gArgs.IsArgSet()' (Jorge Timón) 506b700 Util: Remove redundant calls to gArgs.IsArgSet() (Jorge Timón) Tree-SHA512: 4f97a0bf2a76c0f351a6343db62898cf057d745c848de00fa09465e870a120f28e0d836cafd6a047f4ec0da7ab671aebee43fa7410c9f0e66382edd1bb2009ba

…g generate call fab1fb7 [qa] blockchain: Pass on closed connection during generate call (MarcoFalke) Tree-SHA512: 754be08675c3aca6f8003dc4bc68336e3693609ec14afc91cec592603aabe515f82534ef7b3db469792458ae4c70d5eae0ea0e8abd0ea338e22351aa01173046

PastaPastaPasta · 2019-07-11T21:24:19Z

forcepushed to re-trigger travis

src/wallet/wallet.cpp

UdjinM6 · 2019-07-11T23:33:59Z

contrib/verifybinaries/README.md

+If you only want to download the binaries of certain platform, add the corresponding suffix, e.g.:
+
+```sh
+./verify.sh bitcoin-core-0.11.2-osx


We should dashify this file.

We should, but I think that's out of scope of this PR

src/chainparams.cpp

UdjinM6 · 2019-07-11T23:48:38Z

src/netaddress.cpp

 static const unsigned char pchIPv4[12] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff };
 static const unsigned char pchOnionCat[] = {0xFD,0x87,0xD8,0x7E,0xEB,0x43};

+// 0xFD + sha256("bitcoin")[0:5]


Should we dashify this or is it ok-ish to leave it the same? Thoughts @codablock ?

I'd say yes. But now I'm wondering about pchOnionCat and where it comes from...There is no info in the original PR which introduced it.

doc/developer-notes.md

test/README.md

test/functional/README.md

Signed-off-by: Pasta <pasta@dashboost.org>

UdjinM6 · 2019-07-12T17:22:39Z

Looks like we also need bitcoin#11126 to fix the crash in wallet tests due to a potential deadlock (see 32d709f332579c6dd4cd7e5f98f1fa740abe09a2) and then the ListCoins part of bitcoin#11824 should be backported too (some other parts of which were backported earlier) to fix the fix :) (see 2811824bfc4ed08ea0ca77514d1912fa5f2528c8). Travis: https://travis-ci.org/UdjinM6/dash/builds/557935845

@luke-jr

…let initialization de9a1db Acquire cs_main lock before cs_wallet during wallet initialization (Russell Yanofsky) Pull request description: `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. Error was reported by @luke-jr in https://botbot.me/freenode/bitcoin-core-dev/msg/90244330/ Tree-SHA512: 353fe21bc0a4a2828b41876897001a3c414d4b115ee7430925bd391d8bc396fca81661145d00996c1ba1a01516d9acf8b89fb5c3da27092f5f3aa7e37ef26ffa

UdjinM6

LGTM, utACK

codablock · 2019-07-15T08:57:38Z

src/netaddress.cpp

 static const unsigned char pchIPv4[12] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff };
 static const unsigned char pchOnionCat[] = {0xFD,0x87,0xD8,0x7E,0xEB,0x43};

+// 0xFD + sha256("bitcoin")[0:5]


I'd say yes. But now I'm wondering about pchOnionCat and where it comes from...There is no info in the original PR which introduced it.

doc/developer-notes.md

src/net.cpp

Signed-off-by: Pasta <pasta@dashboost.org>

waiting for more fixes

UdjinM6

utACK

codablock

utACK

sipa and others added 25 commits July 11, 2019 10:34

Merge bitcoin#10536: Remove unreachable or otherwise redundant code

d46aff5

4265bf3 Remove unreachable or otherwise redundant code (practicalswift) Tree-SHA512: bc9666ab5d20c936d78c50c0361405aca9edd116602aa9bcd71a79a904b647ac9eca0651d1a9d530189a6ac1c4e235bfc69ec1a68f7e36cc14d6848ac2206b7b

Merge bitcoin#10632: qa: Add stopatheight test

43c952d

5555fa8 qa: Add stopatheight test (MarcoFalke) Tree-SHA512: ea3f318c3dc73a885db5e258f5d6a25e0017e2360a72ac5f6914bce6f7798d36aca45d2626aafd57ead744bd28fd38b561207a7a547a1d417e594976c35bccee

Merge bitcoin#10642: Remove obsolete _MSC_VER check

6b6ea24

700d8d8 Remove obsolete _MSC_VER check (practicalswift) Tree-SHA512: 3b33f3ce90a3b3b6abec74990fab88402f896402fc563b7081575f85dab05fc7e21fd4c640ca4b9a57a6ca01c5c8ca931be37cac6fa62968fc7b84c719ec6ede

Merge bitcoin#10628: [depends] expat 2.2.1

41302bb

2c3fc51 [depends] expat 2.2.1 (fanquake) Tree-SHA512: ad0e18f2770c0c4b378123bcbcf93ed0ee0b03dbf6360f02e88b01052ef7b0f5540a0a5cbb6d0d3a3d70db29b0413a43f17e7fa5092185fb874470a9f6be4d76

Merge bitcoin#10633: doc: Fix various typos

5f2c9d7

0a5a6b9 Fixed multiple typos (Dimitris Tsapakidis) Tree-SHA512: 57748710bcbc03945b160db5e95bd686a2c64605f25d5e11d8ed9d0e1be3b3bf287a63588dc6eb33d0cef4ff17c765fda7c226d667a357acc539c8fcf2b9bb7e

Merge bitcoin#10626: doc: Remove outdated minrelaytxfee comment

f68c7bc

fab9b60 doc: Remove outdated minrelaytxfee comment (MarcoFalke) Tree-SHA512: e36c5a554a9773f034c2d358c52a772688009a5a71dfd3f664d9b5566c98378f44ef7c6dc0902b42d69ab5fd54b60d4850a2903823d0b2309c7ae063d1923f7f

fix tests 50 -> 500

8c998f2

Signed-off-by: Pasta <pasta@dashboost.org>

PastaPastaPasta force-pushed the backports-0.15-pr20 branch from 748decf to 4c61aed Compare July 11, 2019 21:23

UdjinM6 requested changes Jul 12, 2019

View reviewed changes

PastaPastaPasta added 2 commits July 12, 2019 11:32

remove unneeded space wallet.cpp

5ac5e66

Signed-off-by: Pasta <pasta@dashboost.org>

update seeds emplace_back based on code review

f4736b3

Signed-off-by: Pasta <pasta@dashboost.org>

PastaPastaPasta added 3 commits July 12, 2019 11:37

don't use replace-by-fee.py as example

7e866ed

Signed-off-by: Pasta <pasta@dashboost.org>

dashify test/README.md

2f56063

Signed-off-by: Pasta <pasta@dashboost.org>

dashify test/functional/README.md

bcef238

Signed-off-by: Pasta <pasta@dashboost.org>

laanwj and others added 2 commits July 12, 2019 12:31

Backport yet another part of 11824

b71a187

UdjinM6 added this to the 14.1 milestone Jul 12, 2019

UdjinM6 previously approved these changes Jul 12, 2019

View reviewed changes

UdjinM6 added the RPC Some notable changes to RPC params/behaviour/descriptions label Jul 12, 2019

codablock reviewed Jul 15, 2019

View reviewed changes

PastaPastaPasta added 2 commits July 15, 2019 13:55

add end commend for all llmq namespace

4e46f25

Signed-off-by: Pasta <pasta@dashboost.org>

revert the accidental revertion of c1bdf64

8b224e0

Signed-off-by: Pasta <pasta@dashboost.org>

UdjinM6 approved these changes Jul 16, 2019

View reviewed changes

codablock approved these changes Jul 16, 2019

View reviewed changes

UdjinM6 merged commit 9d49fbf into dashpay:develop Jul 17, 2019

PastaPastaPasta deleted the backports-0.15-pr20 branch October 1, 2019 16:43

UdjinM6 mentioned this pull request Jan 22, 2020

Backports 0.16 pr5 #3300

Merged

Backports 0.15 pr20 #3025

Backports 0.15 pr20 #3025

Uh oh!

Conversation

PastaPastaPasta commented Jul 11, 2019

Uh oh!

PastaPastaPasta commented Jul 11, 2019

Uh oh!

Uh oh!

UdjinM6 Jul 11, 2019

Choose a reason for hiding this comment

Uh oh!

PastaPastaPasta Jul 12, 2019

Choose a reason for hiding this comment

Uh oh!

Uh oh!

UdjinM6 Jul 11, 2019

Choose a reason for hiding this comment

Uh oh!

codablock Jul 15, 2019

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

UdjinM6 commented Jul 12, 2019

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

codablock Jul 15, 2019

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

codablock left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants