Backport missing PRs from Bitcoin 0.14 - Part 7 #1856

codablock · 2018-01-16T13:39:08Z

Continuation of #1770

UdjinM6

nACK for 8f8513cb3c55b3abe200b9a777389b38b682495a

see the rest below

UdjinM6 · 2018-01-16T15:05:38Z

doc/build-windows.md

should be dashified

UdjinM6 · 2018-01-16T15:17:53Z

src/dashd.cpp

s/exit(1)/exit(EXIT_FAILURE)/ for all 3 cases

UdjinM6 · 2018-01-16T17:13:31Z

src/qt/transactiondesc.cpp

I actually like the way it is ordered now i.e. txid and output index close to each other because together they form a corresponding input. Any reason to re-align with Bitcoin Core besides shrinking the diff?

It was really just about fixing a merge conflict I had in a later backport. Changed the order now to what it was before

codablock · 2018-01-16T17:25:57Z

@UdjinM6 can you give me a hint on why 8f8513c is not ok? Did you spot something there? I will later go through the commit again to try to figure out what my reasoning behind this was back then (already a few month ago when I did this)

UdjinM6 · 2018-01-16T17:47:58Z

Maybe I'm missing smth but I don't see why using AddRef() in ConnectNode() for existing connections suddenly stopped to be a problem as described in #924

codablock · 2018-01-17T10:43:00Z

#1857 is an alternative to the problematic commit. It fixes the underlying problem we had with ConnectNode by simply stopping using it. When this is merged, I'll remove the commit from this PR

UdjinM6 · 2018-01-17T15:13:53Z

Merged #1857 . Pls squash (drop 6c4d3f8 , 8f8513c , aad56b3 ) and push -f to resolve conflicts and to have a bit cleaner history here.

…top of bitcoin#9196) 1126c85 [qa] Change sync_blocks to pick smarter maxheight (Russell Yanofsky)

d2b88f9 Move orphan-conflict removal from main logic into a callback (Matt Corallo) 97e2802 Erase orphans per-transaction instead of per-block (Matt Corallo) ec4525c Move orphan processing to ActivateBestChain (Matt Corallo)

… text e3c4f7e Correct help output for waitfor RPC commands (fanquake)

f26da35 Fix copypasted comment. (Pavel Janík)

5262a15 tx_valid: re-order inputs to how they are encoded (Daniel Cousens)

…tx). 2f2625a Removed using namespace std from bitcoin-cli/-tx and added std:: in appropriate places. (Karl-Johan Alm)

c7be56d net: push only raw data into CConnman (Cory Fields) 2ec935d net: add CVectorWriter and CNetMsgMaker (Cory Fields) b7695c2 net: No need to check individually for disconnection anymore (Cory Fields) fedea8a net: don't send any messages before handshake or after requested disconnect (Cory Fields) d74e352 net: Set feelers to disconnect at the end of the version message (Cory Fields)

Needed by CMasternodePing

…ux subsystem dd34570 doc: Improve windows build instructions using Linux subsystem (Wladimir J. van der Laan)

15fa95d Fix some typos (fsb4000)

498a1d7 Include select.h when WIN32 is not defined (Ivo van der Sangen)

dfed983 Fix unlocked access to vNodes.size() (Matt Corallo) 3033522 Remove double brackets in addrman (Matt Corallo) dbfaade Fix AddrMan locking (Matt Corallo) 047ea10 Make fImporting an std::atomic (Matt Corallo) 42071ca Make fDisconnect an std::atomic (Matt Corallo)

3532818 bench: Add support for measuring CPU cycles (Wladimir J. van der Laan)

… after datadir lock errors deec83f init: Get rid of fServer flag (Wladimir J. van der Laan) 16ca0bf init: Try to aquire datadir lock before and after daemonization (Wladimir J. van der Laan) 0cc8b6b init: Split up AppInit2 into multiple phases (Wladimir J. van der Laan)

…tion declarations 446a8f9 Trivial refactor: Remove extern keyword from function declarations, as they are extern by default. (Karl-Johan Alm)

bdb922b Remove pnodeLocalHost. (Gregory Maxwell) 083f203 Remove fNetworkNode. (Gregory Maxwell)

8b22efb Make fStartedNewLine an std::atomic_bool (Matt Corallo) 507145d Fix race when accessing std::locale::classic() (Matt Corallo)

9e1f468 Fix calculation of number of bound sockets to use (Matt Corallo)

Lost while backporting bitcoin#9183

10ae7a7 Revert "Use async name resolving to improve net thread responsiveness" (Matt Corallo)

e878689 Make GUI incapable of setting tx confirm target of 1 (Alex Morcos) d824ad0 Disable fee estimates for a confirm target of 1 block (Alex Morcos)

fe37fbe bitcoin-cli: Make error message less confusing (Wladimir J. van der Laan)

b7aa290 unification of Bloom filter representation (S. Matthew English)

08ed8c1 Developer docs about existing subtrees. (Gregory Maxwell)

28f8ae8 Fix missed change to WalletTx structure (Alex Morcos)

30b620c remove obsolete run-bitcoind-for-test.sh (Alex Morcos) 2a99522 remove relaypriority from rpc tests (Alex Morcos) e2184cc Reorder RPC tests for running time (Alex Morcos) # Conflicts: # qa/pull-tester/rpc-tests.py # qa/pull-tester/run-bitcoind-for-test.sh.in

b919179 remove no longer needed check for premature v2 txs (Alex Morcos)

819ca3f Remove mapOrphanTransactionsByPrev from DoS_tests (Pieter Wuille)

8501bed Squashed 'src/crypto/ctaes/' changes from cd3c3ac..003a4ac (Pieter Wuille)

a874ab5 remove internal tracking of mempool conflicts for reporting to wallet (Alex Morcos) bf663f8 remove external usage of mempool conflict tracking (Alex Morcos)

9359f8a Wallet needs to stay unlocked for whole test (Alex Morcos)

b3a7410 Return txid even if ATMP fails for new transaction (Pieter Wuille)

7b49f22 Squashed 'src/secp256k1/' changes from 7a49cac..8225239 (Pieter Wuille)

8c1dbc5 Refactor: Removed begin/end_ptr functions. (Karl-Johan Alm)

Align code with Bitcoin

…in assert() da9cdd2 Do not run functions with necessary side-effects in assert() (Gregory Maxwell)

ed6b377 [Qt] Console: add security warning (Jonas Schnelli)

This was related to the times we directly called ConnectNode from MN code

…tion This was missed in dashpay#1857. ConnectNode is doing the initial AddRef for outgoing connections. AcceptConnection also has to do an initial AddRef call for incoming connections.

codablock · 2018-01-17T17:29:32Z

Pushed a rebased version. It also includes 3 new commits:
4ee0657: Missing commit from bitcoin#9626
41ef1f9: Comment doesn't make sense anymore
87e9b59: This should have been part of #1857, but I missed this initially

UdjinM6

👍

slightly tested ACK

Introduced in dashpay@c701839#diff-2e2ff25b7bc057a741bf93c35ae3b624R42 (committed on 10 Jul 2015). Survived all the refactoring for almost 3 years and was revealed by dashpay@525c049#diff-49ff8fea774f647034a130c40d4f3c65R519 (as a part of dashpay#1856) by causing silent crashes on multiple nodes (testnet). v0.12.2.x and earlier branches/versions aren't affected, they simply print meaningless log entry.

Introduced in c701839#diff-2e2ff25b7bc057a741bf93c35ae3b624R42 (committed on 10 Jul 2015). Survived all the refactoring for almost 3 years and was revealed by 525c049#diff-49ff8fea774f647034a130c40d4f3c65R519 (as a part of #1856) by causing silent crashes on multiple nodes (testnet). v0.12.2.x and earlier branches/versions aren't affected, they simply print meaningless log entry.

Introduced in dashpay@c701839#diff-2e2ff25b7bc057a741bf93c35ae3b624R42 (committed on 10 Jul 2015). Survived all the refactoring for almost 3 years and was revealed by dashpay@525c049#diff-49ff8fea774f647034a130c40d4f3c65R519 (as a part of dashpay#1856) by causing silent crashes on multiple nodes (testnet). v0.12.2.x and earlier branches/versions aren't affected, they simply print meaningless log entry.

facbfa5 [qa] Get rid of duplicate code (MarcoFalke) master (dashpay#1856) v0.13.1.0

Introduced in dashpay@c701839#diff-2e2ff25b7bc057a741bf93c35ae3b624R42 (committed on 10 Jul 2015). Survived all the refactoring for almost 3 years and was revealed by dashpay@525c049#diff-49ff8fea774f647034a130c40d4f3c65R519 (as a part of dashpay#1856) by causing silent crashes on multiple nodes (testnet). v0.12.2.x and earlier branches/versions aren't affected, they simply print meaningless log entry.

UdjinM6 requested changes Jan 16, 2018

View reviewed changes

UdjinM6 added this to the 12.3 milestone Jan 17, 2018

MarcoFalke and others added 24 commits January 17, 2018 17:25

Merge bitcoin#9139: Change sync_blocks to pick smarter maxheight (on …

f831710

…top of bitcoin#9196) 1126c85 [qa] Change sync_blocks to pick smarter maxheight (Russell Yanofsky)

Merge bitcoin#9144: [Trivial] Correct waitforblockheight example help…

a71702e

… text e3c4f7e Correct help output for waitfor RPC commands (fanquake)

Merge bitcoin#9216: Doc: Fix copypasted comment

d5f2f07

f26da35 Fix copypasted comment. (Pavel Janík)

Merge bitcoin#9100: tx_valid: re-order inputs to how they are encoded

2c8fe46

5262a15 tx_valid: re-order inputs to how they are encoded (Daniel Cousens)

Merge bitcoin#9220: Refactor: Stop using namespace std (bitcoin-cli/-…

c87c151

…tx). 2f2625a Removed using namespace std from bitcoin-cli/-tx and added std:: in appropriate places. (Karl-Johan Alm)

Add size() method to CVectorWriter

dadfc45

Needed by CMasternodePing

Merge bitcoin#9219: doc: Improve windows build instructions using Lin…

f8948de

…ux subsystem dd34570 doc: Improve windows build instructions using Linux subsystem (Wladimir J. van der Laan)

Merge bitcoin#9233: Fix some typos

df24dfd

15fa95d Fix some typos (fsb4000)

Merge bitcoin#9224: Prevent FD_SETSIZE error building on OpenBSD

b27c4b8

498a1d7 Include select.h when WIN32 is not defined (Ivo van der Sangen)

Merge bitcoin#9202: bench: Add support for measuring CPU cycles

27fcec0

3532818 bench: Add support for measuring CPU cycles (Wladimir J. van der Laan)

Merge bitcoin#9244: Trivial refactor: Remove extern keyword from func…

a78e0e3

…tion declarations 446a8f9 Trivial refactor: Remove extern keyword from function declarations, as they are extern by default. (Karl-Johan Alm)

Merge bitcoin#9226: Remove fNetworkNode and pnodeLocalHost.

d54ef6d

bdb922b Remove pnodeLocalHost. (Gregory Maxwell) 083f203 Remove fNetworkNode. (Gregory Maxwell)

Merge bitcoin#9230: Fix some benign races in timestamp logging

3b2fd85

8b22efb Make fStartedNewLine an std::atomic_bool (Matt Corallo) 507145d Fix race when accessing std::locale::classic() (Matt Corallo)

Merge bitcoin#9253: Fix calculation of number of bound sockets to use

180e379

9e1f468 Fix calculation of number of bound sockets to use (Matt Corallo)

Add missing comments to ProcessNewBlock and ProcessNewBlockHeaders

b2fb586

Lost while backporting bitcoin#9183

Merge bitcoin#9229: Remove calls to getaddrinfo_a

62ae4e6

10ae7a7 Revert "Use async name resolving to improve net thread responsiveness" (Matt Corallo)

Merge bitcoin#9239: Disable fee estimates for 1 block target

a95622c

e878689 Make GUI incapable of setting tx confirm target of 1 (Alex Morcos) d824ad0 Disable fee estimates for a confirm target of 1 block (Alex Morcos)

Merge bitcoin#9265: bitcoin-cli: Make error message less confusing

5a6131a

fe37fbe bitcoin-cli: Make error message less confusing (Wladimir J. van der Laan)

Merge bitcoin#9223: unification of Bloom filter representation

b8a81d4

b7aa290 unification of Bloom filter representation (S. Matthew English)

Merge bitcoin#9246: Developer docs about existing subtrees.

b390e8e

08ed8c1 Developer docs about existing subtrees. (Gregory Maxwell)

laanwj and others added 19 commits January 17, 2018 17:31

Merge bitcoin#9296: Fix missed change to WalletTx structure

63d610d

28f8ae8 Fix missed change to WalletTx structure (Alex Morcos)

Merge bitcoin#9299: Remove no longer needed check for premature v2 txs

470b526

b919179 remove no longer needed check for premature v2 txs (Alex Morcos)

Merge bitcoin#9291: Remove mapOrphanTransactionsByPrev from DoS_tests

b0c0046

819ca3f Remove mapOrphanTransactionsByPrev from DoS_tests (Pieter Wuille)

Merge bitcoin#9303: Update comments in ctaes

45727e7

8501bed Squashed 'src/crypto/ctaes/' changes from cd3c3ac..003a4ac (Pieter Wuille)

Merge bitcoin#9240: Remove txConflicted

04f6a73

a874ab5 remove internal tracking of mempool conflicts for reporting to wallet (Alex Morcos) bf663f8 remove external usage of mempool conflict tracking (Alex Morcos)

Merge bitcoin#9309: [qa] Wallet needs to stay unlocked for whole test

c0b0ae8

9359f8a Wallet needs to stay unlocked for whole test (Alex Morcos)

Merge bitcoin#9302: Return txid even if ATMP fails for new transaction

d0db70b

b3a7410 Return txid even if ATMP fails for new transaction (Pieter Wuille)

Merge bitcoin#9334: Update to latest libsecp256k1

3aee86d

7b49f22 Squashed 'src/secp256k1/' changes from 7a49cac..8225239 (Pieter Wuille)

Merge bitcoin#9305: Refactor: Removed begin/end_ptr functions.

0982d6d

8c1dbc5 Refactor: Removed begin/end_ptr functions. (Karl-Johan Alm)

Add missing null checks in wallet/crypto_tests.cpp

11e27d7

Align code with Bitcoin

Merge bitcoin#9344: Do not run functions with necessary side-effects …

91dc005

…in assert() da9cdd2 Do not run functions with necessary side-effects in assert() (Gregory Maxwell)

Merge bitcoin#9330: [Qt] Console: add security warning

5c860b3

ed6b377 [Qt] Console: add security warning (Jonas Schnelli)

Dashify part of developer-notes.md

c0607af

Dashify build-windows.md

997f9f7

Use EXIT_FAILURE when calling exit()

ea73614

Do not add to vNodes until fOneShot/fFeeler/fAddNode have been set

4ee0657

Remove comment about masternode connections

41ef1f9

This was related to the times we directly called ConnectNode from MN code

Remove AddRef call in CNode constructor and do AddRef in AcceptConnec…

87e9b59

…tion This was missed in dashpay#1857. ConnectNode is doing the initial AddRef for outgoing connections. AcceptConnection also has to do an initial AddRef call for incoming connections.

codablock force-pushed the pr_backport_bitcoin_0.14-7 branch from aad56b3 to 87e9b59 Compare January 17, 2018 17:26

UdjinM6 approved these changes Jan 17, 2018

View reviewed changes

UdjinM6 merged commit e8a710c into dashpay:develop Jan 17, 2018

codablock deleted the pr_backport_bitcoin_0.14-7 branch January 18, 2018 06:25

UdjinM6 mentioned this pull request Apr 5, 2018

Fix a very ancient bug from mid 2015 #2021

Merged

CryptoCentric pushed a commit to absolute-community/absolute that referenced this pull request Feb 25, 2019

Merge bitcoin#9221: [qa] Get rid of duplicate code

20e609b

facbfa5 [qa] Get rid of duplicate code (MarcoFalke) master (dashpay#1856) v0.13.1.0

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Backport missing PRs from Bitcoin 0.14 - Part 7 #1856

Backport missing PRs from Bitcoin 0.14 - Part 7 #1856

Uh oh!

codablock commented Jan 16, 2018

Uh oh!

UdjinM6 left a comment

Uh oh!

UdjinM6 Jan 16, 2018

Uh oh!

UdjinM6 Jan 16, 2018

Uh oh!

UdjinM6 Jan 16, 2018

Uh oh!

codablock Jan 16, 2018

Uh oh!

codablock commented Jan 16, 2018

Uh oh!

UdjinM6 commented Jan 16, 2018

Uh oh!

codablock commented Jan 17, 2018

Uh oh!

UdjinM6 commented Jan 17, 2018 •

edited

Loading

Uh oh!

codablock commented Jan 17, 2018

Uh oh!

UdjinM6 left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Backport missing PRs from Bitcoin 0.14 - Part 7 #1856

Backport missing PRs from Bitcoin 0.14 - Part 7 #1856

Uh oh!

Conversation

codablock commented Jan 16, 2018

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

UdjinM6 Jan 16, 2018

Choose a reason for hiding this comment

Uh oh!

UdjinM6 Jan 16, 2018

Choose a reason for hiding this comment

Uh oh!

UdjinM6 Jan 16, 2018

Choose a reason for hiding this comment

Uh oh!

codablock Jan 16, 2018

Choose a reason for hiding this comment

Uh oh!

codablock commented Jan 16, 2018

Uh oh!

UdjinM6 commented Jan 16, 2018

Uh oh!

codablock commented Jan 17, 2018

Uh oh!

UdjinM6 commented Jan 17, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codablock commented Jan 17, 2018

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

UdjinM6 commented Jan 17, 2018 •

edited

Loading