Backport missing PRs from Bitcoin 0.14 - Part 6 #1852

codablock · 2018-01-15T07:27:39Z

Continuation of #1770

…able ff6639b Do not shadow local variable (Pavel Janík)

…th datadir e760b30 qt: Use correct conversion function for boost::path datadir (Wladimir J. van der Laan)

e89614b [qa] Add more helpful RPC timeout message (Russell Yanofsky) 8463aaa [qa] Increase wallet-dump RPC timeout (Russell Yanofsky)

… at process-time fe1dc62 Hash P2P messages as they are received instead of at process-time (Matt Corallo)

fa8278e test: Fix test_random includes (MarcoFalke)

fab0f07 [qa] rpc-tests: Apply random offset to portseed (MarcoFalke) fae19aa [qa] test_framework: Exit when tmpdir exists (MarcoFalke)

…tions d59a518 Use fixed preallocation instead of costly GetSerializeSize (Pieter Wuille) 25a211a Add optimized CSizeComputer serializers (Pieter Wuille) a2929a2 Make CSerAction's ForRead() constexpr (Pieter Wuille) a603925 Avoid -Wshadow errors (Pieter Wuille) 5284721 Get rid of nType and nVersion (Pieter Wuille) 657e05a Make GetSerializeSize a wrapper on top of CSizeComputer (Pieter Wuille) fad9b66 Make nType and nVersion private and sometimes const (Pieter Wuille) c2c5d42 Make streams' read and write return void (Pieter Wuille) 50e8a9c Remove unused ReadVersion and WriteVersion (Pieter Wuille)

Also remove bogus "nVersion = this->nVersion" assignments. These were leftovers from old times.

359bac7 Add notes about variable names and shadowing (Pavel Janík) fd5654c Check and enable -Wshadow by default. (Pavel Janík)

This reverts commit fd5654c. This is still causing too many warnings for some compiler combinations, forget it for now.

d8edf03 Remove unused var UNLIKELY_PCT from fees.h (fanquake)

…ages e5d682f Fix mininode version message format (jnewbery)

bdcba6d Initialize variable to prevent compiler warning (Pavel Janík)

a79f864 fix getnettotals RPC description about timemillis. (Masahiko Hyuga)

fa97ccb [qa] util: Rework sync_*() (MarcoFalke) fac1141 [qa] preciousblock: Use assert_equal and BitcoinTestFramework.__init__ (MarcoFalke)

…eckTransaction e2b3fb3 Optimize vInOutPoints insertion a bit (Matt Corallo) eecffe5 Remove redundant duplicate-input check from CheckTransaction (Matt Corallo) b2e178a Add deserialize + CheckBlock benchmarks, and a full block hex (Matt Corallo)

7d1de30 Mention reporting security issues responsibly (Pavel Janík)

…hadow compiler warning bf49f10 Use better name for local variable to prevent -Wshadow compiler warning (Pavel Janík)

fa42e4a [qt] Make network disabled icon 50% opaque (MarcoFalke)

7943b13 [qa] Avoid 2 list comprehensions in sync_blocks (Russell Yanofsky) 05e57cc [qa] Fix sync_blocks timeout argument (Russell Yanofsky) fd6bb70 [qa] Improve sync_blocks error messages. (Russell Yanofsky)

…ail cleanly b74ff5c Bugfix: Correctly replace generated headers and fail cleanly (Luke Dashjr)

20c3215 credit values are CAmount (Gregory Sanders)

fa80ef8 [qa] proxy_test: Calculate hardcoded port numbers instead (MarcoFalke)

… atomic 079142b fNetworkActive is not protected by a lock, use an atomic (Jonas Schnelli)

79f755d Unset fImporting for loading mempool (Alex Morcos)

…error message 307acdd [qa] add assert_raises_message to check specific error message (mrbandrews)

d8274bc Add compile and link options echo to configure (Jonas Schnelli)

12519bf test: Fix use-after-free in scheduler tests (Wladimir J. van der Laan)

b4e4ba4 Introduce convenience type CTransactionRef (Pieter Wuille) 1662b43 Make CBlock::vtx a vector of shared_ptr<CTransaction> (Pieter Wuille) da60506 Add deserializing constructors to CTransaction and CMutableTransaction (Pieter Wuille) 0e85204 Add serialization for unique_ptr and shared_ptr (Pieter Wuille)

…sion handshake is complete 4662553 net: don't send feefilter messages before the version handshake is complete (Cory Fields)

fa7cc5a Set DEFAULT_LIMITFREERELAY = 0 kB/minute (MarcoFalke)

…ssing 037159c Remove block-request logic from INV message processing (Matt Corallo) 3451203 [qa] Respond to getheaders and do not assume a getdata on inv (Matt Corallo) d768f15 [qa] Make comptool push blocks instead of relying on inv-fetch (mrbandrews)

4231032 [Qt] Clean up and fix coincontrol tree widget handling (Wladimir J. van der Laan) 76af4eb [Qt] fix coincontrol sort issue (Jonas Schnelli)

…teration count e0a9cb2 bench: Fix subtle counting issue when rescaling iteration count (Wladimir J. van der Laan)

240189b add testcases for getrawtransaction (John Newbery) ce2bb23 getrawtransaction should take a bool for verbose (jnewbery)

2e44893 Move -salvagewallet, -zap(wtx) to where they belong (Jonas Schnelli)

4512550 Remove unnecessary calls to CheckFinalTx (Jonas Schnelli)

a33b169 Do not fully sort all nodes for addr relay (Pieter Wuille)

918b126 fix CreateTransaction error messages (instagibbs)

69bc8e7 [Doc] Move comments above bash command (Amir Abrams)

Bitcoin bitcoin#9145 made the icon 50% opaque, copy that to all themes.

1. Missing TX fees in some tests. No-fee transactions stopped working because the free TX relay was set to 0 2. rawtransaction tests used "hash" instead of "txid". "hash" is only valid if SegWit changes are included.

gladcow · 2018-01-15T09:48:47Z

qa/pull-tester/rpc-tests.py

@@ -255,14 +255,18 @@ def __init__(self, num_tests_parallel, test_list=None, flags=None):
        self.test_list = test_list
        self.flags = flags
        self.num_running = 0
+        # In case there is a graveyard of zombie bitcoinds, we can apply a


Should we dashify bitcoinds here?

We normally don't Dashify source comments. Only user facing strings and documentation is Dashified.

gladcow · 2018-01-15T14:10:49Z

utACK

UdjinM6

See inline comments.

Also, it looks like we missed few PRs for wallet-dump.py, including its creation. Was this intentional (i.e. they are coming in future PRs) or by a mistake?

UdjinM6 · 2018-01-15T21:57:22Z

src/test/alert_tests.cpp

@@ -8,7 +8,9 @@
 #include "chain.h"
 #include "chainparams.h"
 #include "clientversion.h"
+namespace alert_tests {


This looks a bit awkward imo, it's probably better to just remove alert_tests:: in code below.

Agree. It's this way because I aligned it with https://github.com/bitcoin/bitcoin/blob/master/src/bench/checkblock.cpp#L12
But I'll remove the namespace now.

UdjinM6 · 2018-01-15T22:43:36Z

src/chainparams.cpp

@@ -57,7 +57,7 @@ static CBlock CreateDevNetGenesisBlock(const uint256 &prevBlockHash, const std::
    genesis.nBits    = nBits;
    genesis.nNonce   = nNonce;
    genesis.nVersion = nVersion;
-    genesis.vtx.push_back(txNew);
+    genesis.vtx.push_back(MakeTransactionRef(txNew));


nit: add std::move for consistency

UdjinM6 · 2018-01-15T22:44:15Z

.github/ISSUE_TEMPLATE.md


-General bitcoin questions and/or support requests and are best directed to the [Bitcoin StackExchange](https://bitcoin.stackexchange.com).
+General bitcoin questions and/or support requests and are best directed to the [Dashpay Reddit](https://www.reddit.com/r/dashpay/).


s/bitcoin/Dash/

UdjinM6 · 2018-01-15T22:45:11Z

.github/ISSUE_TEMPLATE.md

@@ -1,10 +1,10 @@
 <!--- Remove sections that do not apply -->

-This issue tracker is only for technical issues related to bitcoin-core.
+This issue tracker is only for technical issues related to dash-core.


s/dash-core/Dash Core/

UdjinM6 · 2018-01-15T22:45:22Z

.github/ISSUE_TEMPLATE.md

@@ -23,7 +23,7 @@ Tell us what happens instead
 ### Screenshots.
 If the issue is related to the GUI, screenshots can be added to this issue via drag & drop.

-### What version of bitcoin-core are you using?
+### What version of dash-core are you using?


s/dash-core/Dash Core/

codablock · 2018-01-16T06:24:08Z

wallet-dump.py is on my extra list for HD wallet related PRs. I still have to figure out where our HD implementation came from and why it differs so much from what we have in Bitcoin. It looks like it had the same origins at some point but then diverged quite a lot.

codablock · 2018-01-16T07:37:02Z

Pushed review fixes

UdjinM6

👍

slightly tested ACK

laanwj and others added 30 commits January 15, 2018 06:13

Merge bitcoin#8981: Wshadow: Do not shadow argument with a local vari…

2933334

…able ff6639b Do not shadow local variable (Pavel Janík)

Merge bitcoin#9094: qt: Use correct conversion function for boost::pa…

2342b2a

…th datadir e760b30 qt: Use correct conversion function for boost::path datadir (Wladimir J. van der Laan)

Merge bitcoin#9077: [qa] Increase wallet-dump RPC timeout

3d7bb9c

e89614b [qa] Add more helpful RPC timeout message (Russell Yanofsky) 8463aaa [qa] Increase wallet-dump RPC timeout (Russell Yanofsky)

Merge bitcoin#9045: Hash P2P messages as they are received instead of…

9b8cc0b

… at process-time fe1dc62 Hash P2P messages as they are received instead of at process-time (Matt Corallo)

Merge bitcoin#9095: test: Fix test_random includes

705057f

fa8278e test: Fix test_random includes (MarcoFalke)

Merge bitcoin#9098: [qa] Handle zombies and cluttered tmpdirs

1121f2f

fab0f07 [qa] rpc-tests: Apply random offset to portseed (MarcoFalke) fae19aa [qa] test_framework: Exit when tmpdir exists (MarcoFalke)

Remove nType and nVersion from Dash related serialization code

7765c87

Also remove bogus "nVersion = this->nVersion" assignments. These were leftovers from old times.

Merge bitcoin#8794: Enable -Wshadow by default

5917290

359bac7 Add notes about variable names and shadowing (Pavel Janík) fd5654c Check and enable -Wshadow by default. (Pavel Janík)

Revert "Check and enable -Wshadow by default."

b64452a

This reverts commit fd5654c. This is still causing too many warnings for some compiler combinations, forget it for now.

Merge bitcoin#9111: Remove unused variable UNLIKELY_PCT from fees.h

161fa91

d8edf03 Remove unused var UNLIKELY_PCT from fees.h (fanquake)

Merge bitcoin#8894: [Testing] Include fRelay in mininode version mess…

56ed800

…ages e5d682f Fix mininode version message format (jnewbery)

Merge bitcoin#9121: Initialize variable to prevent compiler warning

5f69086

bdcba6d Initialize variable to prevent compiler warning (Pavel Janík)

Merge bitcoin#9122: fix getnettotals RPC description about timemillis.

ec08f5b

a79f864 fix getnettotals RPC description about timemillis. (Masahiko Hyuga)

Merge bitcoin#9097: [qa] Rework sync_* and preciousblock.py

3a388d9

fa97ccb [qa] util: Rework sync_*() (MarcoFalke) fac1141 [qa] preciousblock: Use assert_equal and BitcoinTestFramework.__init__ (MarcoFalke)

Merge bitcoin#9115: Mention reporting security issues responsibly

8b7eeb6

7d1de30 Mention reporting security issues responsibly (Pavel Janík)

Merge bitcoin#9124: Use better name for local variable to prevent -Ws…

db516cf

…hadow compiler warning bf49f10 Use better name for local variable to prevent -Wshadow compiler warning (Pavel Janík)

Merge bitcoin#9145: [qt] Make network disabled icon 50% opaque

2b99a4b

fa42e4a [qt] Make network disabled icon 50% opaque (MarcoFalke)

Merge bitcoin#9136: sync_blocks cleanup

12883cf

7943b13 [qa] Avoid 2 list comprehensions in sync_blocks (Russell Yanofsky) 05e57cc [qa] Fix sync_blocks timeout argument (Russell Yanofsky) fd6bb70 [qa] Improve sync_blocks error messages. (Russell Yanofsky)

Merge bitcoin#9140: Bugfix: Correctly replace generated headers and f…

a9c3544

…ail cleanly b74ff5c Bugfix: Correctly replace generated headers and fail cleanly (Luke Dashjr)

Put namespace{} around alertTests.raw.h include

c12eb7f

Merge bitcoin#9164: [trivial] credit values are CAmount

dc4fdd9

20c3215 credit values are CAmount (Gregory Sanders)

Merge bitcoin#9151: [qa] proxy_test: Calculate hardcoded port numbers

e711f4a

fa80ef8 [qa] proxy_test: Calculate hardcoded port numbers instead (MarcoFalke)

Merge bitcoin#9131: fNetworkActive is not protected by a lock, use an…

0932079

… atomic 079142b fNetworkActive is not protected by a lock, use an atomic (Jonas Schnelli)

Merge bitcoin#9133: Unset fImporting for loading mempool

9b9d3d1

79f755d Unset fImporting for loading mempool (Alex Morcos)

Merge bitcoin#9168: [qa] add assert_raises_message to check specific …

a9a2db9

…error message 307acdd [qa] add assert_raises_message to check specific error message (mrbandrews)

Merge bitcoin#9156: Add compile and link options echo to configure

2f95284

d8274bc Add compile and link options echo to configure (Jonas Schnelli)

Merge bitcoin#9186: test: Fix use-after-free in scheduler tests

c937a0b

12519bf test: Fix use-after-free in scheduler tests (Wladimir J. van der Laan)

laanwj and others added 15 commits January 15, 2018 06:14

Merge bitcoin#9117: net: don't send feefilter messages before the ver…

afa99c4

…sion handshake is complete 4662553 net: don't send feefilter messages before the version handshake is complete (Cory Fields)

Merge bitcoin#9179: Set DEFAULT_LIMITFREERELAY = 0 kB/minute

726dd1f

fa7cc5a Set DEFAULT_LIMITFREERELAY = 0 kB/minute (MarcoFalke)

Merge bitcoin#9185: [Qt] fix coincontrol sort issue

507c4e5

4231032 [Qt] Clean up and fix coincontrol tree widget handling (Wladimir J. van der Laan) 76af4eb [Qt] fix coincontrol sort issue (Jonas Schnelli)

Merge bitcoin#9200: bench: Fix subtle counting issue when rescaling i…

481bab7

…teration count e0a9cb2 bench: Fix subtle counting issue when rescaling iteration count (Wladimir J. van der Laan)

Merge bitcoin#9025: getrawtransaction should take a bool for verbose

ce3f38d

240189b add testcases for getrawtransaction (John Newbery) ce2bb23 getrawtransaction should take a bool for verbose (jnewbery)

Merge bitcoin#9142: Move -salvagewallet, -zap(wtx) to where they belong

4e1c192

2e44893 Move -salvagewallet, -zap(wtx) to where they belong (Jonas Schnelli)

Merge bitcoin#9141: Remove unnecessary calls to CheckFinalTx

d757c89

4512550 Remove unnecessary calls to CheckFinalTx (Jonas Schnelli)

Merge bitcoin#8690: Do not fully sort all nodes for addr relay

2d87a0f

a33b169 Do not fully sort all nodes for addr relay (Pieter Wuille)

Merge bitcoin#9204: Clarify CreateTransaction error messages

898bd43

918b126 fix CreateTransaction error messages (instagibbs)

Merge bitcoin#9207: [Doc] Move comments above bash command in build-unix

796bed1

69bc8e7 [Doc] Move comments above bash command (Amir Abrams)

Mogrify and optimize network_disabled.png and copy it to all themes

e02f313

Bitcoin bitcoin#9145 made the icon 50% opaque, copy that to all themes.

Use MakeTransactionRef in CreateDevNetGenesisBlock

07cd44c

Dashify ISSUE_TEMPLATE.md

76d7730

Fix rpc tests

9170c0e

1. Missing TX fees in some tests. No-fee transactions stopped working because the free TX relay was set to 0 2. rawtransaction tests used "hash" instead of "txid". "hash" is only valid if SegWit changes are included.

gladcow reviewed Jan 15, 2018

View reviewed changes

UdjinM6 requested changes Jan 15, 2018

View reviewed changes

UdjinM6 added this to the 12.3 milestone Jan 15, 2018

codablock added 3 commits January 16, 2018 08:30

Use "Dash Core" instead of "dash-core" in some places and Dashify

d0a39fb

Use std::move when calling MakeTransactionRef

7939a23

Remove namespace alert_tests when including alert test data

b6ea01e

UdjinM6 approved these changes Jan 16, 2018

View reviewed changes

UdjinM6 merged commit 18cd148 into dashpay:develop Jan 16, 2018

codablock deleted the pr_backport_bitcoin_0.14-6 branch January 16, 2018 13:37

UdjinM6 mentioned this pull request Jan 23, 2018

Fix alertTests.raw.h generation #1868

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Backport missing PRs from Bitcoin 0.14 - Part 6 #1852

Backport missing PRs from Bitcoin 0.14 - Part 6 #1852

codablock commented Jan 15, 2018

gladcow Jan 15, 2018

codablock Jan 15, 2018 •

edited

Loading

gladcow commented Jan 15, 2018

UdjinM6 left a comment •

edited

Loading

UdjinM6 Jan 15, 2018

codablock Jan 16, 2018

UdjinM6 Jan 15, 2018

UdjinM6 Jan 15, 2018

UdjinM6 Jan 15, 2018

UdjinM6 Jan 15, 2018

codablock commented Jan 16, 2018

codablock commented Jan 16, 2018

UdjinM6 left a comment


		General bitcoin questions and/or support requests and are best directed to the [Bitcoin StackExchange](https://bitcoin.stackexchange.com).
		General bitcoin questions and/or support requests and are best directed to the [Dashpay Reddit](https://www.reddit.com/r/dashpay/).

Backport missing PRs from Bitcoin 0.14 - Part 6 #1852

Backport missing PRs from Bitcoin 0.14 - Part 6 #1852

Conversation

codablock commented Jan 15, 2018

gladcow Jan 15, 2018

Choose a reason for hiding this comment

codablock Jan 15, 2018 • edited Loading

Choose a reason for hiding this comment

gladcow commented Jan 15, 2018

UdjinM6 left a comment • edited Loading

Choose a reason for hiding this comment

UdjinM6 Jan 15, 2018

Choose a reason for hiding this comment

codablock Jan 16, 2018

Choose a reason for hiding this comment

UdjinM6 Jan 15, 2018

Choose a reason for hiding this comment

UdjinM6 Jan 15, 2018

Choose a reason for hiding this comment

UdjinM6 Jan 15, 2018

Choose a reason for hiding this comment

UdjinM6 Jan 15, 2018

Choose a reason for hiding this comment

codablock commented Jan 16, 2018

codablock commented Jan 16, 2018

UdjinM6 left a comment

Choose a reason for hiding this comment

codablock Jan 15, 2018 •

edited

Loading

UdjinM6 left a comment •

edited

Loading