Backport missing PRs from Bitcoin 0.13 - Part 1 #1770

codablock · 2017-12-09T17:44:14Z

This is the first batch of backported PRs from Bitcoin which are still missing in Dash.

I've got a total of ~780 PRs (including 0.13+0.14 PRs) in my local branches, so the amount of changed code is huge. I was thinking alot about how large the individual batches should be and decided to make them ~50 PRs per batch. This way we'll have around 16 huge PRs instead of hundreds of small ones. I understand that reviewing these batches will be hell, but having smaller batches won't really change the amount of work required and only prolong everything.

I've gone through all PRs and tried my best to omit PRs for features we do not want in Dash or which conflict with Dash specific features/changes. If I mistakenly included something that should have been omitted, please tell me and I remove these changes.

As the splitting of main.cpp->net_processing.cpp/validation.cpp was done out-of-order, I had to do a lot of manual copy+paste conflict resolution. This poses a high risk of loosing changes. My plan is to do a full-tree diff when all PRs are merged and if anything was lost, I'll hopefully catch it this way.

Got added due to wrong merge conflict resolution

f22f14c doc: mention bitcoin-cli -stdin in release notes (Wladimir J. van der Laan) 92bcca3 rpc: Input-from-stdin mode for bitcoin-cli (Wladimir J. van der Laan)

086ee67 Switch to a more efficient rolling Bloom filter (Pieter Wuille)

6e76587 rpc: remove cs_main lock from `createrawtransaction` (Wladimir J. van der Laan)

5e10922 Combine common error strings for different options so translations can be shared and reused (Luke Dashjr)

6cd198f Removed comment about IsStandard for P2SH scripts (Marcel Krüger)

8a7f000 [RPC] remove the option of having multiple timer interfaces (Jonas Schnelli) db198d5 Fix RPCTimerInterface ordering issue Dispatching a QThread from a non Qt thread is not allowed. Always use the HTTPRPCTimerInterface (non QT) to dispatch RPCRunLater threads. (Jonas Schnelli)

3a9dfe9 Fix typo, wrong information in gettxout help text. (paveljanik)

0331aa3 Fixing typos on security-check.py and torcontrol.cpp (calebogden)

fa074a6 [contrib] Prepare clang-format-diff for usage (MarcoFalke) fa4f4b6 Add clang-format-diff.py from the LLVM svn (MarcoFalke)

fa461df Clarify mocktime help message (MarcoFalke) faa572a [init] Help Msg: Use Params(CBaseChainParams::MAIN) (MarcoFalke) fa6ab96 [init] Add missing help for args (MarcoFalke) fac11ea [init] Fix error message of maxtxfee invalid amount (MarcoFalke)

64360f1 Make max tip age an option instead of chainparam (Wladimir J. van der Laan)

faeda0e [travis] Run contrib/devtools/check-doc.py early (MarcoFalke) fada0c9 [travis] Fail when documentation is outdated (MarcoFalke)

da6d18b devtools: replace github-merge with python version (Wladimir J. van der Laan)

…n to wallet/ code dd2dc40 [RPC, Wallet] Move RPC dispatch table registration to wallet/ code (Jonas Schnelli)

96efcad Improved readability of sorting for coin selection. (Murch)

…eive coins table df6e8e1 [Qt] rename "amount" to "requested amount" in receive coins table (Jonas Schnelli)

2409865 Reduce inefficiency of GetAccountAddress() (Chris Moore)

e279038 Use createrawtx locktime parm in txn_clone (Tom Harding)

…hub-merge 17b5d38 devtools: show pull and commit information in github-merge (Wladimir J. van der Laan)

…extra whitespace 5ed2f16 [devtools] github-merge get toplevel dir without extra whitespace (Andrew C)

codablock · 2017-12-10T04:50:53Z

I disabled check-doc.py on Travis for now. I'll fix errors reported by check-doc.py after all PRs have been merged.

UdjinM6

Nice job! 👍

Few general comments:

Technically, f840708 fixes the bug introduced in #888 and shouldn't be a part of this PR but ok, let's keep it;
bitcoin#7583 is incomplete, changes in doc/shared-libraries.md are missing;
ba290c7 is weird - its content doesn't match the description (Merge #7482: [P2P] Ensure headers count is correct) and it feels like it's a mix of two other PRs/commits.

see inline comments

UdjinM6 · 2017-12-10T19:28:08Z

configure.ac

 define(_COPYRIGHT_YEAR, 2017)
+define(_COPYRIGHT_HOLDERS,[The %s developers])
+define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[Dash Core])
 AC_INIT([Dash Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/dashpay/dash/issues],[dashcore])


Needs [https://dash.org/] like in original PR https://github.com/bitcoin/bitcoin/pull/7192/files#diff-67e997bcfdac55191033d57a16d1408aR11

Fixed and squashed

UdjinM6 · 2017-12-10T19:29:31Z

contrib/macdeploy/custom_dsstore.py

+alias.volume.name = package_name_ns
+alias.volume.posix_path = '/Volumes/' + package_name_ns
+alias.volume.disk_image_alias.target.filename = package_name_ns + '.temp.dmg'
+alias.volume.disk_image_alias.target.carbon_path = 'Macintosh HD:Users:\x00bitcoinuser:\x00Documents:\x00bitcoin:\x00bitcoin:\x00' + package_name_ns + '.temp.dmg'


Lines 48, 49, 57 should probably be dashified

Fixed and squashed

UdjinM6 · 2017-12-10T19:31:38Z

share/qt/Info.plist.in


  <key>CFBundleGetInfoString</key>
-  <string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@, Copyright © 2009-@COPYRIGHT_YEAR@ The Bitcoin Core developers, 2014-@COPYRIGHT_YEAR@ The Dash Core developers</string>
+  <string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@, Copyright © 2009-@COPYRIGHT_YEAR@ @COPYRIGHT_HOLDERS_FINAL@</string>


Should keep Bitcoin Core copyright here

Fixed and squashed

UdjinM6 · 2017-12-10T19:32:08Z

src/clientversion.h


 //! Copyright string used in Windows .rc files
-#define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin Core Developers, 2014-" STRINGIZE(COPYRIGHT_YEAR) " The Dash Core Developers"
+#define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " " COPYRIGHT_HOLDERS_FINAL


Should keep Bitcoin Core copyright here

Fixed and squashed

UdjinM6 · 2017-12-10T19:33:11Z

src/qt/res/dash-qt-res.rc

        BEGIN
            VALUE "CompanyName",        "Dash"
-            VALUE "FileDescription",    "Dash Core (GUI node for Dash)"
+            VALUE "FileDescription",    PACKAGE_NAME " (GUI node for Bitcoin)"


s/Bitcoin/Dash/

Fixed and squashed

fabcee1 Remove copyright header from autogenerated chainparamsseeds.h (MarcoFalke) fa60d05 Add missing copyright headers (MarcoFalke) fa7e4c0 Bump copyright headers to 2014 (MarcoFalke)

schinzelh

utACK

dashpay#1770 - SPORK 17 - block time enforcement See merge request energi/dev/gen2/core/energi!333

… for Gen 3

codablock force-pushed the pr_backport_bitcoin_0.12-1 branch 2 times, most recently from aa3d93f to 2d81191 Compare December 9, 2017 21:47

codablock changed the title ~~Backport missing PRs from Bitcoin 0.12 - Part 1~~ Backport missing PRs from Bitcoin 0.13 - Part 1 Dec 9, 2017

codablock and others added 21 commits December 10, 2017 00:04

Remove duplicated CCACHE= line in depends/config.site.in

f840708

Got added due to wrong merge conflict resolution

Merge bitcoin#7550: rpc: Input-from-stdin mode for bitcoin-cli

f1da40c

f22f14c doc: mention bitcoin-cli -stdin in release notes (Wladimir J. van der Laan) 92bcca3 rpc: Input-from-stdin mode for bitcoin-cli (Wladimir J. van der Laan)

Merge pull request bitcoin#7113

bf688ab

086ee67 Switch to a more efficient rolling Bloom filter (Pieter Wuille)

Merge pull request bitcoin#7156

3f6d657

6e76587 rpc: remove cs_main lock from `createrawtransaction` (Wladimir J. van der Laan)

Merge pull request bitcoin#7257

f04f8c1

5e10922 Combine common error strings for different options so translations can be shared and reused (Luke Dashjr)

Merge pull request bitcoin#7266

bcebc7c

6cd198f Removed comment about IsStandard for P2SH scripts (Marcel Krüger)

Merge pull request bitcoin#7326

26a5dfe

3a9dfe9 Fix typo, wrong information in gettxout help text. (paveljanik)

Merge pull request bitcoin#7313

3808025

0331aa3 Fixing typos on security-check.py and torcontrol.cpp (calebogden)

Merge pull request bitcoin#7304

25ba3ab

fa074a6 [contrib] Prepare clang-format-diff for usage (MarcoFalke) fa4f4b6 Add clang-format-diff.py from the LLVM svn (MarcoFalke)

Merge pull request bitcoin#7208

2474fd0

64360f1 Make max tip age an option instead of chainparam (Wladimir J. van der Laan)

Merge pull request bitcoin#7280

42997ee

faeda0e [travis] Run contrib/devtools/check-doc.py early (MarcoFalke) fada0c9 [travis] Fail when documentation is outdated (MarcoFalke)

Merge pull request bitcoin#7378

3be7784

da6d18b devtools: replace github-merge with python version (Wladimir J. van der Laan)

Merge bitcoin#7307: [RPC, Wallet] Move RPC dispatch table registratio…

78ad32d

…n to wallet/ code dd2dc40 [RPC, Wallet] Move RPC dispatch table registration to wallet/ code (Jonas Schnelli)

Merge bitcoin#7183: Improved readability of ApproximateBestSubset

59db2fd

96efcad Improved readability of sorting for coin selection. (Murch)

Merge bitcoin#7383: [Qt] rename "amount" to "requested amount" in rec…

43700ee

…eive coins table df6e8e1 [Qt] rename "amount" to "requested amount" in receive coins table (Jonas Schnelli)

Merge bitcoin#7262: Reduce inefficiency of GetAccountAddress()

643181f

2409865 Reduce inefficiency of GetAccountAddress() (Chris Moore)

Merge bitcoin#7236: Use createrawtx locktime parm in txn_clone

8591933

e279038 Use createrawtx locktime parm in txn_clone (Tom Harding)

Merge bitcoin#7395: devtools: show pull and commit information in git…

d9d9e95

…hub-merge 17b5d38 devtools: show pull and commit information in github-merge (Wladimir J. van der Laan)

Merge bitcoin#7402: [devtools] github-merge get toplevel dir without …

577f683

…extra whitespace 5ed2f16 [devtools] github-merge get toplevel dir without extra whitespace (Andrew C)

codablock force-pushed the pr_backport_bitcoin_0.12-1 branch 2 times, most recently from 00eb70c to 38c12ff Compare December 9, 2017 23:48

UdjinM6 added this to the 12.3 milestone Dec 10, 2017

UdjinM6 requested changes Dec 10, 2017

View reviewed changes

Merge bitcoin#7300: [trivial] Add missing copyright headers

5323a08

fabcee1 Remove copyright header from autogenerated chainparamsseeds.h (MarcoFalke) fa60d05 Add missing copyright headers (MarcoFalke) fa7e4c0 Bump copyright headers to 2014 (MarcoFalke)

schinzelh approved these changes Dec 19, 2017

View reviewed changes

UdjinM6 merged commit 0658252 into dashpay:develop Dec 19, 2017

This was referenced Dec 19, 2017

Backport missing PRs from Bitcoin 0.13 - Part 2 #1790

Merged

Backport missing PRs from Bitcoin 0.13 - Part 3 #1795

Merged

Backport missing PRs from Bitcoin 0.13 - Part 4 #1804

Merged

Backport missing PRs from Bitcoin 0.13 - Part 5 #1811

Merged

This was referenced Dec 27, 2017

Swap iterations and fUseInstantSend parameters in ApproximateBestSubset #1819

Merged

Backport missing PRs from Bitcoin 0.13 - Part 6 #1821

Merged

UdjinM6 mentioned this pull request Dec 28, 2017

Fix calls to AcceptToMemoryPool in PS submodules #1823

Merged

codablock mentioned this pull request Dec 29, 2017

Backport missing PRs from Bitcoin 0.14 - Part 1 #1824

Merged

codablock mentioned this pull request Jan 9, 2018

Backport missing PRs from Bitcoin 0.14 - Part 2 #1842

Merged

zgreat mentioned this pull request Jan 10, 2018

[Wallet] Fix build warnings for wallet.cpp #1845

Closed

This was referenced Jan 19, 2018

Backport missing PRs from Bitcoin 0.14 - Part 9 #1859

Merged

Backport missing PRs from Bitcoin 0.14 - Part 10 #1867

Merged

Backport missing PRs from Bitcoin 0.14 - Part 11 #1879

Merged

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

andvgal added a commit to energicryptocurrency/gen2-energi that referenced this pull request Oct 4, 2019

NEW: dashpay#1770 SPORK 17 - block time enforcement

36603f7

andvgal added a commit to energicryptocurrency/gen2-energi that referenced this pull request Oct 4, 2019

CHANGED: dashpay#1770 to prefer older blocks of the same height

45524cd

andvgal added a commit to energicryptocurrency/gen2-energi that referenced this pull request Oct 4, 2019

CHANGED: dashpay#1770 - disabled time adjustment according to network

cccbea3

andvgal added a commit to energicryptocurrency/gen2-energi that referenced this pull request Oct 4, 2019

NEW: dashpay#1770 protocol version updated to 70213

eba2788

andvgal added a commit to energicryptocurrency/gen2-energi that referenced this pull request Oct 4, 2019

CHANGED: dashpay#1770 - updated miner to support Spork 17

a3239eb

andvgal pushed a commit to energicryptocurrency/gen2-energi that referenced this pull request Oct 4, 2019

Merge branch 'dev/1770-miner-strategy' into 'develop'

de73ddf

dashpay#1770 - SPORK 17 - block time enforcement See merge request energi/dev/gen2/core/energi!333

andvgal added a commit to energicryptocurrency/gen2-energi that referenced this pull request Oct 4, 2019

CHANGED: dashpay#1770 - disabled PrivateSend on client in preparation…

64146b7

… for Gen 3

andvgal added a commit to energicryptocurrency/gen2-energi that referenced this pull request Oct 4, 2019

NEW: dashpay#1770 - version bit 3 to indicate SPORK 17 readiness

78400d5

Backport missing PRs from Bitcoin 0.13 - Part 1 #1770

Backport missing PRs from Bitcoin 0.13 - Part 1 #1770

Uh oh!

Conversation

codablock commented Dec 9, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codablock commented Dec 10, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

UdjinM6 left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

schinzelh left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

codablock commented Dec 9, 2017 •

edited

Loading

codablock commented Dec 10, 2017 •

edited

Loading

UdjinM6 left a comment •

edited

Loading