Backport missing PRs from Bitcoin 0.14 - Part 1 #1824

codablock · 2017-12-29T15:50:55Z

Continuation of #1770

This is the first batch of PRs from Bitcoin 0.14

UdjinM6

Nice but needs more fixes :)

UdjinM6 · 2018-01-01T18:43:20Z

src/zmq/zmqnotificationinterface.h

CDSNotificationInterface::SyncTransaction and underlying functions should be updated similarly too i.e. to use pindex and posInBlock

UdjinM6 · 2018-01-01T19:04:49Z

Makefile.am

should revert this to test_dash.info

UdjinM6 · 2018-01-01T19:13:17Z

src/qt/dash.cpp

should be return EXIT_SUCCESS;

…or loop a3e1984 Consensus: Trivial transform BOOST_FOREACH into for loop (NicolasDorier)

…alCheckBlockHeader and ContextualCheckBlock 6f3d616 Trivial: Make CBlockIndex param const in ContextualCheckBlockHeader and ContextualCheckBlock (Jorge Timón)

cc021ef remove outdated legacy code (lizhi)

…oo low) faa5931 [doc] gbuild: Set memory explicitly (default is too low) (MarcoFalke)

d3af342 prepend license statement to indirectmap (Kaz Wesley)

893f379 [Qt] Add dbcache migration path (Jonas Schnelli)

fbc6070 [trivial] Switched constants to sizeof() (Thomas Snider)

d12b732 libconsensus: Expose a flag for BIP112 (Jorge Timón)

7e87033 httpserver: replace boost threads with std (Cory Fields) d3773ca httpserver: explicitly detach worker threads (Cory Fields) 755aa05 httpserver: use a future rather than relying on boost's try_join_for (Cory Fields)

a5072a7 util: Remove zero-argument versions of LogPrint and error (Wladimir J. van der Laan) 695041e util: Update tinyformat (Wladimir J. van der Laan)

5c9e49d net: Ignore `notfound` P2P messages (Wladimir J. van der Laan)

a615386 [depends] ZeroMQ 4.1.5 (fanquake)

9bbb414 [qa]: enable rpcbind_test (whythat) 0ff4375 [qa]: add parsing for '<host>:<port>' argument form to rpc_url() (whythat)

…er main::CheckInputs a6cc299 Mempool: Use Consensus::CheckTxInputs direclty over main::CheckInputs (Jorge Timón)

…nParams& in ContextualCheckBlock c8664ee Trivial: pass Consensus::Params& instead of CChainParams& in ContextualCheckBlock (Jorge Timón)

…::AddToWallet 5723bb4 Remove unused pwalletdb from CWallet::AddToWallet (Patrick Strateman) 867f842 Remove CWalletDB* parameter from CWallet::AddToWallet (Patrick Strateman) 00f09c9 Split CWallet::AddToWallet into AddToWallet and LoadToWallet. (Patrick Strateman)

29c2d99 Make CWallet::fFileBacked private. (Patrick Strateman)

b8db185 Update README.md (Chris Stewart)

657fc19 rename mapAddrCount to mapNetGroupNodes (instagibbs)

… guide 7fdbce9 [doc] Increase recommended memory in gitian build guide (fanquake)

9d4eb9a Do diskspace check before import thread is started (Pieter Wuille) aa59f2e Add extra message to avoid a long 'Loading banlist' (Pieter Wuille) 0fd2a33 Use a signal to continue init after genesis activation (Pieter Wuille)

2c517b3 Fix p2p-feefilter.py for changed tx relay behavior (Suhas Daftuar)

05242e9 Fix minimize and close bugs (adlawren)

e11f9a2 [doc] typos, READMEs, comments (Justin Camarena)

216d796 configure: Allow building bench_bitcoin by itself (Luke Dashjr)

…t any univalue 8a270b2 Bugfix: Allow building libbitcoinconsensus without any univalue (Luke Dashjr)

c784086 use std::map::emplace() instead of std::map::insert() (whythat) 5e187e7 use c++11 std::unique_ptr instead of boost::shared_ptr (whythat) 947913f use std::map::erase(const_iterator, const_iterator) to get non-constant iterator (whythat)

…llets b3b3c2a Reduce cs_main locks during ConnectTip/SyncWithWallets (Jonas Schnelli)

…nsaction Needed due to out-of-order backporting.

3897668 Adds issue template. [skip ci] (CryptoVote)

edb6cf1 remove no-longer-used InitError logic (instagibbs)

936c144 build: Remove check for `openssl/ec.h` (Wladimir J. van der Laan)

c1582d5 qa: Remove duplicate `hash160` implementation (Wladimir J. van der Laan)

6ffd996 Corrected JSON typo on setban of net.cpp (Sev)

fad8cf6 [qa] Use single cache dir for chains (MarcoFalke) fa2d68f [qa] Adjust timeouts for micro-optimization of run time (MarcoFalke) fae596f [qa] Sort scripts by time for pull_tester and don't overwrite setup_chain (MarcoFalke)

8194a6e Fix a type error that would not compile on Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn) (Jeremy Rubin)

1aacfc2 various typos (leijurv)

eb0c52e travis: Remove hostname hack (Wladimir J. van der Laan) 3c5251d test: Remove java comparison tool (Wladimir J. van der Laan)

fa64306 [qa] abandonconflict: Use assert_equal (MarcoFalke)

This reverts commit fa2d68f. Temporary revert - see discussion in bitcoin#8532.

b213535 Squashed 'src/secp256k1/' changes from 6c527ec..7a49cac (Wladimir J. van der Laan)

… directory" dialog b4a9aa5 qt: Fix random segfault when closing "Choose data directory" dialog (Wladimir J. van der Laan)

…inginfo RPC endpoint 65f4532 document return value of networkhashps for getmininginfo RPC endpoint (Jameson Lopp)

Rename labelEncryptionIcon to labelWalletEncryptionIcon Reorder icons in Makefile.qt.include Add missing entries in debian/copyright

…tput printing fa785d1 Use __func__ to get function name for output printing (MarcoFalke)

faaec13 [qa] Remove unused code (MarcoFalke)

These were mixed into SegWit related PRs and are still needed in Dash.

…erface

codablock · 2018-01-08T17:47:31Z

Added the requested changes and rebased on develop

UdjinM6

Looks good! 👍

utACK

gladcow · 2018-01-09T10:13:58Z

utACK

PastaPastaPasta · 2019-09-08T04:58:20Z

src/init.cpp

            PruneAndFlush();
        }
    }



Why is this change missing?? https://github.com/bitcoin/bitcoin/pull/8392/files#diff-c865a8939105e6350a50af02766291b7R1304

Because this is only useful to fix missing segwit data sipa@6032f69 which we don't have anyway

UdjinM6 requested changes Jan 1, 2018

View reviewed changes

laanwj and others added 29 commits January 8, 2018 18:04

Merge bitcoin#8342: Consensus: Trivial transform BOOST_FOREACH into f…

0bea37d

…or loop a3e1984 Consensus: Trivial transform BOOST_FOREACH into for loop (NicolasDorier)

Merge bitcoin#8347: Trivial: Make CBlockIndex param const in Contextu…

9a91ddb

…alCheckBlockHeader and ContextualCheckBlock 6f3d616 Trivial: Make CBlockIndex param const in ContextualCheckBlockHeader and ContextualCheckBlock (Jorge Timón)

Merge bitcoin#8396: remove outdated legacy code from key.h

47c726e

cc021ef remove outdated legacy code (lizhi)

Merge bitcoin#8358: [doc] gbuild: Set memory explicitly (default is t…

04525b4

…oo low) faa5931 [doc] gbuild: Set memory explicitly (default is too low) (MarcoFalke)

Merge bitcoin#8414: prepend license statement to indirectmap.h

150d63f

d3af342 prepend license statement to indirectmap (Kaz Wesley)

Merge bitcoin#8407: [Qt] Add dbcache migration path

e7da254

893f379 [Qt] Add dbcache migration path (Jonas Schnelli)

Merge bitcoin#8321: [trivial] Switched constants to sizeof()

b673b7b

fbc6070 [trivial] Switched constants to sizeof() (Thomas Snider)

Merge bitcoin#8412: libconsensus: Expose a flag for BIP112

2e4e12f

d12b732 libconsensus: Expose a flag for BIP112 (Jorge Timón)

Merge bitcoin#8274: util: Update tinyformat

13b4e65

a5072a7 util: Remove zero-argument versions of LogPrint and error (Wladimir J. van der Laan) 695041e util: Update tinyformat (Wladimir J. van der Laan)

Merge bitcoin#8427: net: Ignore notfound P2P messages

7c1c9d0

5c9e49d net: Ignore `notfound` P2P messages (Wladimir J. van der Laan)

Merge bitcoin#8238: [WIP][depends] ZeroMQ 4.1.5 && ZMQ on Windows

eb54680

a615386 [depends] ZeroMQ 4.1.5 (fanquake)

Merge bitcoin#8400: [qa]: enable rpcbind_test

8c76eb7

9bbb414 [qa]: enable rpcbind_test (whythat) 0ff4375 [qa]: add parsing for '<host>:<port>' argument form to rpc_url() (whythat)

Merge bitcoin#8346: Mempool: Use Consensus::CheckTxInputs direclty ov…

60668fb

…er main::CheckInputs a6cc299 Mempool: Use Consensus::CheckTxInputs direclty over main::CheckInputs (Jorge Timón)

Merge bitcoin#8413: Trivial: pass Consensus::Params& instead of CChai…

aa6c379

…nParams& in ContextualCheckBlock c8664ee Trivial: pass Consensus::Params& instead of CChainParams& in ContextualCheckBlock (Jorge Timón)

Merge bitcoin#8432: Make CWallet::fFileBacked private.

e34e2bb

29c2d99 Make CWallet::fFileBacked private. (Patrick Strateman)

Merge bitcoin#8428: Update README.md inside of src/test/

7c62457

b8db185 Update README.md (Chris Stewart)

Merge bitcoin#8189: rename mapAddrCount to mapNetGroupNodes

2c3a218

657fc19 rename mapAddrCount to mapNetGroupNodes (instagibbs)

Merge bitcoin#8439: [doc] Increase recommended memory in gitian build…

3520292

… guide 7fdbce9 [doc] Increase recommended memory in gitian build guide (fanquake)

Merge bitcoin#8444: Fix p2p-feefilter.py for changed tx relay behavior

549894b

2c517b3 Fix p2p-feefilter.py for changed tx relay behavior (Suhas Daftuar)

Merge bitcoin#8481: Qt: Fix minimize and close bugs

d5b5aee

05242e9 Fix minimize and close bugs (adlawren)

Merge bitcoin#8503: [doc] typos, text errors

82336d8

e11f9a2 [doc] typos, READMEs, comments (Justin Camarena)

Merge bitcoin#8492: configure: Allow building bench_bitcoin by itself

7dafb53

216d796 configure: Allow building bench_bitcoin by itself (Luke Dashjr)

Merge bitcoin#8293: Bugfix: Allow building libbitcoinconsensus withou…

cca0569

…t any univalue 8a270b2 Bugfix: Allow building libbitcoinconsensus without any univalue (Luke Dashjr)

Merge bitcoin#7946: Reduce cs_main locks during ConnectTip/SyncWithWa…

256b9b7

…llets b3b3c2a Reduce cs_main locks during ConnectTip/SyncWithWallets (Jonas Schnelli)

Add SYNC_TRANSACTION_NOT_IN_BLOCK constant and fix callers of SyncTra…

f4af446

…nsaction Needed due to out-of-order backporting.

laanwj and others added 22 commits January 8, 2018 18:04

Merge bitcoin#8058: [Doc] Add issue template

a953997

3897668 Adds issue template. [skip ci] (CryptoVote)

Merge bitcoin#8516: [trivial] remove no-longer-used InitError logic

599df51

edb6cf1 remove no-longer-used InitError logic (instagibbs)

Merge bitcoin#8520: build: Remove check for openssl/ec.h

9ecef83

936c144 build: Remove check for `openssl/ec.h` (Wladimir J. van der Laan)

Merge bitcoin#8521: qa: Remove duplicate hash160 implementation

bdddabb

c1582d5 qa: Remove duplicate `hash160` implementation (Wladimir J. van der Laan)

Merge bitcoin#8512: Trivial: Corrected JSON typo on setban of net.cpp

5c928f0

6ffd996 Corrected JSON typo on setban of net.cpp (Sev)

Merge bitcoin#8513: Fix a type error that would not compile on OSX.

6b8160b

8194a6e Fix a type error that would not compile on Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn) (Jeremy Rubin)

Merge bitcoin#8505: Trivial: Fix typos in various files

10aaf04

1aacfc2 various typos (leijurv)

Merge bitcoin#8504: test: Remove java comparison tool

e6dca36

eb0c52e travis: Remove hostname hack (Wladimir J. van der Laan) 3c5251d test: Remove java comparison tool (Wladimir J. van der Laan)

Merge bitcoin#8531: [qa] abandonconflict: Use assert_equal

6ac01da

fa64306 [qa] abandonconflict: Use assert_equal (MarcoFalke)

Revert "[qa] Adjust timeouts for micro-optimization of run time"

7231c66

This reverts commit fa2d68f. Temporary revert - see discussion in bitcoin#8532.

Merge bitcoin#8453: Bring secp256k1 subtree up to date with master

55ccc56

b213535 Squashed 'src/secp256k1/' changes from 6c527ec..7a49cac (Wladimir J. van der Laan)

Merge bitcoin#8540: qt: Fix random segfault when closing "Choose data…

80573f2

… directory" dialog b4a9aa5 qt: Fix random segfault when closing "Choose data directory" dialog (Wladimir J. van der Laan)

Merge bitcoin#8461: document return value of networkhashps for getmin…

5bf3dad

…inginfo RPC endpoint 65f4532 document return value of networkhashps for getmininginfo RPC endpoint (Jameson Lopp)

Align HD wallet status icon code with Bitcoin code

ae90d0f

Rename labelEncryptionIcon to labelWalletEncryptionIcon Reorder icons in Makefile.qt.include Add missing entries in debian/copyright

Merge bitcoin#8548: [wallet] Use __func__ to get function name for ou…

b47cc13

…tput printing fa785d1 Use __func__ to get function name for output printing (MarcoFalke)

Merge bitcoin#8551: [qa] Remove unused code

5b62ad3

faaec13 [qa] Remove unused code (MarcoFalke)

Dashify translation_process.md

8460a9b

Partially cherry-pick tests refactorings found in Bitcoin SegWit PRs

f8ffc55

These were mixed into SegWit related PRs and are still needed in Dash.

Revert test_bitcoin.info to test_dash.info in Makefile.am

ebc466d

Update Dash related code to use new SyncTransaction notifications int…

e3da73e

…erface

Return EXIT_SUCCESS instead of 0 in main()

e2a795f

codablock force-pushed the pr_backport_bitcoin_0.14-1 branch from eebf8c8 to e2a795f Compare January 8, 2018 17:44

UdjinM6 approved these changes Jan 9, 2018

View reviewed changes

UdjinM6 added this to the 12.3 milestone Jan 9, 2018

UdjinM6 merged commit eecec45 into dashpay:develop Jan 9, 2018

codablock deleted the pr_backport_bitcoin_0.14-1 branch September 14, 2018 12:50

PastaPastaPasta reviewed Sep 8, 2019

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Backport missing PRs from Bitcoin 0.14 - Part 1 #1824

Backport missing PRs from Bitcoin 0.14 - Part 1 #1824

Uh oh!

codablock commented Dec 29, 2017

Uh oh!

UdjinM6 left a comment

Uh oh!

UdjinM6 Jan 1, 2018

Uh oh!

UdjinM6 Jan 1, 2018

Uh oh!

UdjinM6 Jan 1, 2018

Uh oh!

codablock commented Jan 8, 2018

Uh oh!

UdjinM6 left a comment

Uh oh!

gladcow commented Jan 9, 2018

Uh oh!

PastaPastaPasta Sep 8, 2019

Uh oh!

UdjinM6 Sep 8, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Backport missing PRs from Bitcoin 0.14 - Part 1 #1824

Backport missing PRs from Bitcoin 0.14 - Part 1 #1824

Uh oh!

Conversation

codablock commented Dec 29, 2017

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

UdjinM6 Jan 1, 2018

Choose a reason for hiding this comment

Uh oh!

UdjinM6 Jan 1, 2018

Choose a reason for hiding this comment

Uh oh!

UdjinM6 Jan 1, 2018

Choose a reason for hiding this comment

Uh oh!

codablock commented Jan 8, 2018

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

gladcow commented Jan 9, 2018

Uh oh!

PastaPastaPasta Sep 8, 2019

Choose a reason for hiding this comment

Uh oh!

UdjinM6 Sep 8, 2019

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants