Backport missing PRs from Bitcoin 0.13 - Part 3 #1795

codablock · 2017-12-20T16:34:31Z

Continuation of #1770

fada0c4 [doc] Fix doxygen comments for members (MarcoFalke)

ffff866 [qa] Remove misleading "errorString syntax" (MarcoFalke)

eda3d92 Net: Add IPv6 Link-Local Address Support (mruddy)

03c77fd Doc: Update isStandardTx comment (Matthew English)

…ams& to ProcessMessage() bf477bc Trivial: Globals: Explicitly pass const CChainParams& to ProcessMessage() (Jorge Timón)

4a1d5c1 [Doc] Update gitian build guide to debian 8.4.0 (fanquake)

facf5a4 [amount] tests: Fix off-by-one mistake (MarcoFalke) fa2da2c [amount] Add support for negative fee rates (MarcoFalke) 11114a6 [amount] test negative fee rates and full constructor (MarcoFalke)

fa6399d [doc] gitian: Replace precise with trusty (MarcoFalke)

… not an array. d12760b rpc-tests: handle KeyError nicely in test_framework.py (Rusty Russell) 85c807c getblockchaininfo: make bip9_softforks an object, not an array. (Rusty Russell)

fe53a2a doc: add arch linux setup and build example [skip ci] (mruddy)

4521f00 tests: add varints_bitpatterns test (Wladimir J. van der Laan)

5eeb913 Clean up lockorder data of destroyed mutexes (Pieter Wuille)

4f7c959 Refactor IsRBFOptIn, avoid exception (Jonas Schnelli)

Missed due to conflict resolution in out-of-order backports

fa7abe0 [test] bctest.py: Revert faa41ee (MarcoFalke)

This was missed in previous backports.

fac9ca2 [travis] echo $TRAVIS_COMMIT_RANGE (MarcoFalke) faef3b7 [travis] Print the commit which was evaluated (MarcoFalke)

11d9f6b depends: qt/cctools: fix checksum checksum tests (Cory Fields) bb717f4 depends: fix "unexpected operator" error during "make download" (Cory Fields) fe740f1 depends: fix fallback downloads (Cory Fields) dc4ec6d depends: create a hostid and buildid and add option for salts (Cory Fields)

66b0724 Only send one GetAddr response per connection. (Gregory Maxwell)

… contrib/gitian-keys faf4c83 [gitian] Move keys to contrib/gitian-keys (MarcoFalke) fa93936 [gitian] Add marcofalke-key.pgp (MarcoFalke)

f2d0944 Add lockUnspents option to fundrawtransaction (João Barbosa) af4fe7f Add change options to fundrawtransaction (João Barbosa) 41e835d Add strict flag to RPCTypeCheckObj (João Barbosa)

0528e30 Remove wxwidgets references from NSIS script. (JeremyRand) 26880c3 build: Use PACKAGE_TARNAME and new bin names in NSIS script. (JeremyRand) 0dbf6e4 build: define base filenames for use elsewhere in the buildsystem (Cory Fields)

…GB affects `gettxoutsetinfo` 28b400f doc: update release-notes for `gettxoutsetinfo` change (Wladimir J. van der Laan) 76212bb rpc: make sure `gettxoutsetinfo` hash has txids (Wladimir J. van der Laan) 9ad1a51 crypto: bytes counts are 64 bit (Wladimir J. van der Laan)

dc0693f add missing newline (Chris Moore)

3107c47 fix spelling mistake (Chris Moore)

87049e8 Speed up getchaintips. (mrbandrews)

…to wallet/test b30fb42 test: Rename wallet.dat to wallet_test.dat (Wladimir J. van der Laan) a25a4f5 wallet_ismine.h → script/ismine.h (Wladimir J. van der Laan) f4eae2d test: Create test fixture for wallet (Wladimir J. van der Laan) de39c95 test: move accounting_tests and rpc_wallet_tests to wallet/test (Wladimir J. van der Laan)

fa10ce6 Move ui_interface.cpp to libbitcoin_server_a_SOURCES (MarcoFalke) fabbf80 [ui] Move InitError, InitWarning, AmountErrMsg (MarcoFalke)

62a9abd Fixing comment in script_test.json test case (Chris Stewart)

… transactions f135e3c qt: Add transaction hash to details window title (Wladimir J. van der Laan) 17a6a21 qt: Make it possible to show details for multiple transactions (Wladimir J. van der Laan)

61c0170 Log invalid block hash to make debugging easier. (Pavel Janík)

c7aac2d Deprecating the remaining LogPrintf dependencies that were made obsolete in PR bitcoin#7459. (21E14)

…error-prone values. f8536a6 Corrected values (instagibbs) 617deeb Gave miner test values constants for less error-prone values. (instagibbs)

07e4edb auto_ptr → unique_ptr (Wladimir J. van der Laan) 073225c chain: define enum used as bit field as uint32_t (Wladimir J. van der Laan)

Align with upstream

de98290 build: No need to check for leveldb atomics (Cory Fields)

faf3d11 [doc] Update bitcoin-core GitHub links (MarcoFalke)

…ection. d90351f More comments on the design of AttemptToEvictConnection. (Gregory Maxwell)

08d7b56 util: switch LogPrint and error to variadic templates (Wladimir J. van der Laan) 9eaa0af tinyformat: force USE_VARIADIC_TEMPLATES (Wladimir J. van der Laan)

47eda2d [depends] Add -stdlib=libc++ to darwin CXX flags (fanquake)

0281678 doc: Fedora build requirements (Warren Togami)

f7c4f79 [trivial] Add missing const qualifiers. (Daniel Kraft)

Fixes test failure

UdjinM6

Will test

UdjinM6 · 2017-12-21T01:24:11Z

share/setup.nsi.in

+    WriteRegStr HKCR "@PACKAGE_TARNAME@" "URL Protocol" ""
+    WriteRegStr HKCR "@PACKAGE_TARNAME@" "" "URL:Dash"
+    WriteRegStr HKCR "@PACKAGE_TARNAME@\DefaultIcon" "" $INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@
+    WriteRegStr HKCR "@PACKAGE_TARNAME@\shell\open\command" "" '"$INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@" "%1"'


All of the above will replace dash with dashcore. Should be tested/ noted in release notes. Might require some additional cleanup or could lead to conflicts on end user machines.

Would you maybe prefer to stick with dash?

UdjinM6 · 2017-12-21T01:24:29Z

share/setup.nsi.in

    DeleteRegKey /IfEmpty HKCU "${REGKEY}\Components"
    DeleteRegKey /IfEmpty HKCU "${REGKEY}"
-    DeleteRegKey HKCR "dash"
+    DeleteRegKey HKCR "@PACKAGE_TARNAME@"


same, see above

UdjinM6 · 2017-12-21T01:46:12Z

src/test/miner_tests.cpp

    delete pblocktemplate;

+    const CAmount BLOCKSUBSIDY = 500*COIN;
+    const CAmount LOWFEE = 10*CENT;


Why bumping fees 10x here?

Bumped this because I also had to bump BLOCKSUBSIDY. Just checked execution of the tests and confirmed that this was not needed. Added a commit on top to remove the bumping.

UdjinM6 · 2017-12-21T01:59:46Z

src/wallet/rpcwallet.cpp

            "    \"spendable\" : xxx,        (bool) Whether we have the private keys to spend this output\n"
-            "    \"solvable\" : xxx          (bool) Whether we know how to spend this output, ignoring the lack of keys\n"
+            "    \"solvable\" : xxx,         (bool) Whether we know how to spend this output, ignoring the lack of keys\n"
+            "    \"ps_rounds\" : n           (numeric) The number of PS round\n"


I don't understand why this was moved... and why the actual code wasn't changed to match the new field order here in help.

This is to avoid future conflicts for upcoming backports. Especially the ones that reformat all the RPCs help messages. Should have made that clear in the commit.

I added another commit on top that also rearranges the code.

I also have an item on my TODO list to go through all RPCs when we are done with backporting and fix formatting errors introduces by merge conflict resolution. Unfortunately it's not so easy to spot these when looking at the escaped strings or diffs.

Bumped unnecessarily 10x when backporting PRs

Avoids future conflicts in upcoming backports

codablock · 2017-12-21T06:07:45Z

Pushed fixes for everything except the PACKAGE_TARNAME thing. I currently prefer to revert this part to use a hardcoded dash string again to avoid any problems with the installer in the future.

UdjinM6 · 2017-12-21T13:02:04Z

New changes looks good 👍

Idea re dash in installer script:
Maybe we can apply these changes but also add DeleteRegKey HKCR "dash" next to WriteRegStrs in install section and keep both DeleteRegKeys in uninstall section? I think this should do it. At least we can try and fix/revert it later :D

codablock · 2017-12-21T13:48:28Z

Implemented it the way you suggested now.

UdjinM6

Slightly tested ACK

laanwj and others added 30 commits December 20, 2017 14:45

Merge bitcoin#7793: [doxygen] Fix member comments

738e1c5

fada0c4 [doc] Fix doxygen comments for members (MarcoFalke)

Merge bitcoin#7801: [qa] Remove misleading "errorString syntax"

a8aeff1

ffff866 [qa] Remove misleading "errorString syntax" (MarcoFalke)

Merge bitcoin#7570: Net: Add IPv6 Link-Local Address Support

b2d659f

eda3d92 Net: Add IPv6 Link-Local Address Support (mruddy)

Merge bitcoin#7786: Doc: Update isStandardTx comment

2a79710

03c77fd Doc: Update isStandardTx comment (Matthew English)

Merge bitcoin#7828: Trivial: Globals: Explicitly pass const CChainPar…

d983f1d

…ams& to ProcessMessage() bf477bc Trivial: Globals: Explicitly pass const CChainParams& to ProcessMessage() (Jorge Timón)

Merge bitcoin#7838: [Doc] Update gitian build guide to debian 8.4.0

e48f46c

4a1d5c1 [Doc] Update gitian build guide to debian 8.4.0 (fanquake)

Merge bitcoin#7796: [amount] Add support for negative fee rates

20cb9aa

facf5a4 [amount] tests: Fix off-by-one mistake (MarcoFalke) fa2da2c [amount] Add support for negative fee rates (MarcoFalke) 11114a6 [amount] test negative fee rates and full constructor (MarcoFalke)

Merge bitcoin#7855: [doc] gitian: Replace precise with trusty

5b1ad12

fa6399d [doc] gitian: Replace precise with trusty (MarcoFalke)

Merge bitcoin#7863: getblockchaininfo: make bip9_softforks an object,…

cc3a06b

… not an array. d12760b rpc-tests: handle KeyError nicely in test_framework.py (Rusty Russell) 85c807c getblockchaininfo: make bip9_softforks an object, not an array. (Rusty Russell)

Merge bitcoin#7847: doc: add arch linux build example

1ac8558

fe53a2a doc: add arch linux setup and build example [skip ci] (mruddy)

Merge bitcoin#7849: tests: add varints_bitpatterns test

116b14b

4521f00 tests: add varints_bitpatterns test (Wladimir J. van der Laan)

Merge bitcoin#7846: Clean up lockorder data of destroyed mutexes

f1f3fa3

5eeb913 Clean up lockorder data of destroyed mutexes (Pieter Wuille)

Merge bitcoin#7812: Tiny refactor of IsRBFOptIn, avoid exception

c176f6c

4f7c959 Refactor IsRBFOptIn, avoid exception (Jonas Schnelli)

Add missing changes from Bitcoin bitcoin#7853

ac53190

Missed due to conflict resolution in out-of-order backports

Merge bitcoin#7878: [test] bctest.py: Revert faa41ee

7080c27

fa7abe0 [test] bctest.py: Revert faa41ee (MarcoFalke)

Use BIP32_EXTKEY_SIZE instead of fixed constant

d532f22

This was missed in previous backports.

Merge bitcoin#7798: [travis] Print the commit which was evaluated

60159eb

fac9ca2 [travis] echo $TRAVIS_COMMIT_RANGE (MarcoFalke) faef3b7 [travis] Print the commit which was evaluated (MarcoFalke)

Merge bitcoin#7856: Only send one GetAddr response per connection.

24f8c24

66b0724 Only send one GetAddr response per connection. (Gregory Maxwell)

Merge bitcoin#7870: [contrib] Add MarcoFalke key and move all keys to…

f119747

… contrib/gitian-keys faf4c83 [gitian] Move keys to contrib/gitian-keys (MarcoFalke) fa93936 [gitian] Add marcofalke-key.pgp (MarcoFalke)

Merge bitcoin#7518: Add multiple options to fundrawtransaction

6c7d133

f2d0944 Add lockUnspents option to fundrawtransaction (João Barbosa) af4fe7f Add change options to fundrawtransaction (João Barbosa) 41e835d Add strict flag to RPCTypeCheckObj (João Barbosa)

Dashify new binary name variables

c172273

Merge bitcoin#7897: add missing newline

96f9a7c

dc0693f add missing newline (Chris Moore)

Merge bitcoin#7900: fix spelling mistake

1b17e94

3107c47 fix spelling mistake (Chris Moore)

Merge bitcoin#7827: Speed up getchaintips.

4f5bb79

87049e8 Speed up getchaintips. (mrbandrews)

Add missing parts from bitcoin PR bitcoin#7762

c3e5909

Merge bitcoin#7787: [Moveonly] Create ui_interface.cpp

bacc864

fa10ce6 Move ui_interface.cpp to libbitcoin_server_a_SOURCES (MarcoFalke) fabbf80 [ui] Move InitError, InitWarning, AmountErrMsg (MarcoFalke)

laanwj and others added 16 commits December 20, 2017 17:25

Merge bitcoin#7941: Fixing comment in script_test.json test case

d69bcb1

62a9abd Fixing comment in script_test.json test case (Chris Stewart)

Merge bitcoin#7939: qt: Make it possible to show details for multiple…

c8bb792

… transactions f135e3c qt: Add transaction hash to details window title (Wladimir J. van der Laan) 17a6a21 qt: Make it possible to show details for multiple transactions (Wladimir J. van der Laan)

Merge bitcoin#7952: Log invalid block hash to make debugging easier.

03507a7

61c0170 Log invalid block hash to make debugging easier. (Pavel Janík)

Merge bitcoin#7962: CalculateNextWorkRequired Cleanup

61227bb

c7aac2d Deprecating the remaining LogPrintf dependencies that were made obsolete in PR bitcoin#7459. (21E14)

Merge bitcoin#7807: Fixed miner test values, gave constants for less …

d975013

…error-prone values. f8536a6 Corrected values (instagibbs) 617deeb Gave miner test values constants for less error-prone values. (instagibbs)

Merge bitcoin#7964: Minor changes for c++11 consistency

a468803

07e4edb auto_ptr → unique_ptr (Wladimir J. van der Laan) 073225c chain: define enum used as bit field as uint32_t (Wladimir J. van der Laan)

Return from main instead of calling exit()

7c6dab0

Align with upstream

Merge bitcoin#7982: build: No need to check for leveldb atomics

6662e23

de98290 build: No need to check for leveldb atomics (Cory Fields)

Merge bitcoin#7975: [doc] Update bitcoin-core GitHub links

9bed9ac

faf3d11 [doc] Update bitcoin-core GitHub links (MarcoFalke)

Merge bitcoin#7974: More comments on the design of AttemptToEvictConn…

49c3127

…ection. d90351f More comments on the design of AttemptToEvictConnection. (Gregory Maxwell)

Merge bitcoin#8000: tinyformat: force USE_VARIADIC_TEMPLATES

d55b78e

08d7b56 util: switch LogPrint and error to variadic templates (Wladimir J. van der Laan) 9eaa0af tinyformat: force USE_VARIADIC_TEMPLATES (Wladimir J. van der Laan)

Merge bitcoin#8002: [depends] Add -stdlib=libc++ to darwin CXX flags

79fe8e4

47eda2d [depends] Add -stdlib=libc++ to darwin CXX flags (fanquake)

Merge bitcoin#7968: doc: Fedora build requirements

e6b2f91

0281678 doc: Fedora build requirements (Warren Togami)

Merge bitcoin#7977: [trivial] Add missing const qualifiers.

f8ad2ff

f7c4f79 [trivial] Add missing const qualifiers. (Daniel Kraft)

Dashify fundrawtransaction exception

2c63839

Fixes test failure

Fix failing fundrawtransaction tests

7d40461

codablock force-pushed the pr_backport_bitcoin_0.13-3 branch from 9495fbe to 7d40461 Compare December 20, 2017 20:43

UdjinM6 added this to the 12.3 milestone Dec 21, 2017

UdjinM6 reviewed Dec 21, 2017

View reviewed changes

codablock added 2 commits December 21, 2017 06:57

De-bump fees in miner_tests.cpp

15fc7f2

Bumped unnecessarily 10x when backporting PRs

Put ps_rounds to the bottom of the result of listunspent

da2de07

Avoids future conflicts in upcoming backports

Dashify help text of fundrawtransaction

b78bd5c

Delete old "dash" registry key when installing/uninstalling

233493b

codablock force-pushed the pr_backport_bitcoin_0.13-3 branch from c2455f5 to 233493b Compare December 21, 2017 13:32

UdjinM6 approved these changes Dec 21, 2017

View reviewed changes

UdjinM6 merged commit 0c5302e into dashpay:develop Dec 21, 2017

codablock deleted the pr_backport_bitcoin_0.13-3 branch December 21, 2017 16:27

Backport missing PRs from Bitcoin 0.13 - Part 3 #1795

Backport missing PRs from Bitcoin 0.13 - Part 3 #1795

Uh oh!

Conversation

codablock commented Dec 20, 2017

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

UdjinM6 Dec 21, 2017

Choose a reason for hiding this comment

Uh oh!

codablock Dec 21, 2017

Choose a reason for hiding this comment

Uh oh!

UdjinM6 Dec 21, 2017

Choose a reason for hiding this comment

Uh oh!

UdjinM6 Dec 21, 2017

Choose a reason for hiding this comment

Uh oh!

codablock Dec 21, 2017

Choose a reason for hiding this comment

Uh oh!

UdjinM6 Dec 21, 2017

Choose a reason for hiding this comment

Uh oh!

codablock Dec 21, 2017

Choose a reason for hiding this comment

Uh oh!

codablock commented Dec 21, 2017

Uh oh!

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

Uh oh!

Uh oh!

codablock commented Dec 21, 2017

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

UdjinM6 commented Dec 21, 2017 •

edited

Loading