Backport missing PRs from Bitcoin 0.14 - Part 5 #1851

codablock · 2018-01-13T13:26:56Z

Continuation of #1770

…atting of help 59daa58 RPC/Mining: getblocktemplate: Update and fix formatting of help (Luke Dashjr)

…e RPC request e7156ad [RPC] pass HTTP basic authentication username to the JSONRequest object (Jonas Schnelli) 69d1c25 [RPC] Give RPC commands more information about the RPC request (Jonas Schnelli) 23c32a9 rpc: Change JSONRPCRequest to JSONRPCRequestObj (Wladimir J. van der Laan)

fc14609 RPC: augment getblockchaininfo bip9_softforks data (mruddy)

178cd88 Qt/splash: Specifically keep track of which wallet(s) we are connected to for later disconnecting (Luke Dashjr) 1880aeb Qt: Get the private key for signing messages via WalletModel (Luke Dashjr)

215caba Add consistency check to RPC call importmulti (Pedro Branco) cb08fdb Add importmulti rpc call (Pedro Branco)

…rator!=, which is only in newer boost versions 7942d31 RPC: importmulti: Avoid using boost::variant::operator!=, which is only in newer boost versions (Luke Dashjr)

1ae5839 moveonly: move `coincontrol` to `src/wallet` (Wladimir J. van der Laan)

3a286ab Eliminating Inconsistencies in Textual Output (S. Matthew English)

…returned in txOut 1d8e12b Fix doxygen comment: the transaction is returned in txOut (Pavel Janík)

3421e74 Clarify `listenonion` (unsystemizer)

…ions. 515e264 Make connect=0 disable automatic outbound connections. (Gregory Maxwell)

…atch Linux 3f7581d [TRIVIAL] reorder Windows gitian build order to match Linux (Micha)

0334430 Add some missing includes (Pieter Wuille) 4100499 Return shared_ptr<CTransaction> from mempool removes (Pieter Wuille) 51f2783 Make removed and conflicted arguments optional to remove (Pieter Wuille) f48211b Bypass removeRecursive in removeForReorg (Pieter Wuille)

…sschnelli) 339c4b6 release: bump required osx version to 10.8. Credit jonasschnelli. (Cory Fields)

…essage 04c1c15 rpc: Remove invalid explanation from wallet fee message (Wladimir J. van der Laan)

…(fanquake) ba26d41 Update build notes for dropping osx 10.7 support (Michael Ford)

1c3ecc7 instance of 'mem pool' to 'mempool' (S. Matthew English)

169bdab Return useful error message on ATMP failure (instagibbs)

…nfirmation target cfe77ef [Qt] overhaul smart-fee slider, adjust default confirmation target (Jonas Schnelli) 6f02899 [Qt] Hide nTxConfirmTarget behind WalletModel (Jonas Schnelli) 004168d CoinControl: add option for custom confirmation target (Jonas Schnelli)

7f61b49 Change all instance of 'GMT epoch' to 'Unix epoch' (matthias)

3333e5a [qt] Return useful error message on ATMP failure (MarcoFalke)

582068a Add mempool.dat to doc/files.md (Pieter Wuille) 3f78562 Add DumpMempool and LoadMempool (Pieter Wuille) ced7c94 Add AcceptToMemoryPoolWithTime function (Pieter Wuille) c3efb58 Add feedelta to TxMempoolInfo (Pieter Wuille)

6c5cd9d test: Add format-dependent comparison to bctest (Wladimir J. van der Laan)

444c673 bench: Add benchmark for lockedpool allocation/deallocation (Wladimir J. van der Laan) 6567999 rpc: Add `getmemoryinfo` call (Wladimir J. van der Laan) 4536148 support: Add LockedPool (Wladimir J. van der Laan) f4d1fc2 wallet: Get rid of LockObject and UnlockObject calls in key.h (Wladimir J. van der Laan) 999e4c9 wallet: Change CCrypter to use vectors with secure allocator (Wladimir J. van der Laan)

…f MAP_ANONYMOUS is not defined 4a9f3c5 Do not shadow variable, use deprecated MAP_ANON if MAP_ANONYMOUS is not defined. (Pavel Janík)

…t headers in source files 159597a [devtools] script support for managing source file copyright headers (isle2983)

86029e7 Move CWalletDB::ReorderTransactions to CWallet (Patrick Strateman)

…oadBlockIndexDB() d0b01f3 Explicitly pass const CChainParams& to LoadBlockIndexDB() (Geoffrey Tsui)

…pt wtx, flush thread) cab1da7 [Wallet] Refactor wallet/init interaction (Reaccept wtx, flush thread) (Jonas Schnelli)

eedc461 Merge `doc/unit-tests.md` into `src/test/README.md` (Wladimir J. van der Laan)

0fdf810 wallet: Change default confirm target from 2 to 6 (Wladimir J. van der Laan)

2ca882a Declare wallet.h functions inline (Pieter Wuille)

…nistic randomness for the localnonce 59ac5c5 net: Use deterministic randomness for CNode's nonce, and make it const (Cory Fields) aff6584 net: constify a few CNode vars to indicate that they're threadsafe (Cory Fields)

…connection failure 8f329f9 Add common failure cases for rpc server connection failure (instagibbs)

2b175d4 Clean up bctest.py and bitcoin-util-test.py (John Newbery)

190fd32 Remove unused CTxOut::GetHash() (Matt Corallo)

b3ddc5e LockedPool: avoid quadratic-time allocation (Kaz Wesley) 0b59f80 LockedPool: fix explosion for illegal-sized alloc (Kaz Wesley) 21b8f3d LockedPool: test handling of invalid allocations (Kaz Wesley)

4b04e32 [copyright] copyright header style uniform (isle2983)

66ca6cd Enforcing consistency, 'gitian' to 'Gitian' (S. Matthew English)

… archived release notes faead5e [doc] release-process: Mention GitHub release and archived release notes (MarcoFalke)

…gers from contrib 1ee6f91 new var DIST_CONTRIB adds useful things for packagers from contrib/ to EXTRA_DIST (nomnombtc)

…izion Matches Bitcoins style and makes upcoming backports easier

…ttemptToEvict. d32036a Use RelevantServices instead of node_network in AttemptToEvict. (Gregory Maxwell)

…only. 1f951c6 Allow filterclear messages for enabling TX relay only. (R E Broadley)

0bd581a add release notes for removal of priority estimation (Alex Morcos) b2322e0 Remove priority estimation (Alex Morcos)

UdjinM6

👍

see inline comments

UdjinM6 · 2018-01-14T11:25:21Z

src/policy/fees.cpp

    feeStats.Read(filein);
-    priStats.Read(filein);
    nBestSeenHeight = nFileBestSeenHeight;
+    if (nFileVersion < 139900) {


UdjinM6 · 2018-01-14T11:27:53Z

src/txmempool.cpp

    try {
        LOCK(cs);
-        fileout << 120000; // version required to read: 0.12.00 or later
+        fileout << 120201; // version required to read: 0.12.00 or later


UdjinM6 · 2018-01-14T11:32:14Z

Makefile.am

 OSX_QT_TRANSLATIONS = da,de,es,hu,ru,uk,zh_CN,zh_TW

 DIST_DOCS = $(wildcard doc/*.md) $(wildcard doc/release-notes/*.md)
+DIST_CONTRIB = $(top_srcdir)/contrib/bitcoin-cli.bash-completion \


this block should be dashified

UdjinM6 · 2018-01-14T11:35:05Z

src/qt/sendcoinsdialog.cpp

        CoinControlDialog::coinControl->nMinimumTotalFee = 0;
+
+        // show the estimated reuquired time for confirmation
+        ui->confirmationTargetLabel->setText(GUIUtil::formatDurationStr(nConfirmTarget*600)+" / "+tr("%n block(s)", "", nConfirmTarget));


s/600/Params().GetConsensus().nPowTargetSpacing/

codablock · 2018-01-14T13:14:08Z

Pushed review fixes

UdjinM6

slightly tested ACK

laanwj and others added 30 commits January 13, 2018 12:21

Merge bitcoin#8951: RPC/Mining: getblocktemplate: Update and fix form…

b5b7cd7

…atting of help 59daa58 RPC/Mining: getblocktemplate: Update and fix formatting of help (Luke Dashjr)

Remove unnecessary function prototypes

3b084b2

Merge bitcoin#7948: RPC: augment getblockchaininfo bip9_softforks data

dc9556a

fc14609 RPC: augment getblockchaininfo bip9_softforks data (mruddy)

Merge bitcoin#8774: Qt refactors to better abstract wallet access

bd8e9fb

178cd88 Qt/splash: Specifically keep track of which wallet(s) we are connected to for later disconnecting (Luke Dashjr) 1880aeb Qt: Get the private key for signing messages via WalletModel (Luke Dashjr)

Merge bitcoin#7551: Add importmulti RPC call

efded3c

215caba Add consistency check to RPC call importmulti (Pedro Branco) cb08fdb Add importmulti rpc call (Pedro Branco)

Merge bitcoin#8980: RPC: importmulti: Avoid using boost::variant::ope…

6cacb79

…rator!=, which is only in newer boost versions 7942d31 RPC: importmulti: Avoid using boost::variant::operator!=, which is only in newer boost versions (Luke Dashjr)

Merge bitcoin#8990: moveonly: move coincontrol to src/wallet

beef6e7

1ae5839 moveonly: move `coincontrol` to `src/wallet` (Wladimir J. van der Laan)

Merge bitcoin#8982: Eliminating Inconsistencies in Textual Output

9be4217

3a286ab Eliminating Inconsistencies in Textual Output (S. Matthew English)

Merge bitcoin#8993: Trivial: Fix doxygen comment: the transaction is …

e9f250d

…returned in txOut 1d8e12b Fix doxygen comment: the transaction is returned in txOut (Pavel Janík)

Merge bitcoin#9004: Clarify listenonion

55cabaa

3421e74 Clarify `listenonion` (unsystemizer)

Merge bitcoin#9002: Make connect=0 disable automatic outbound connect…

00f4d88

…ions. 515e264 Make connect=0 disable automatic outbound connections. (Gregory Maxwell)

Merge bitcoin#8948: [TRIVIAL] reorder Windows gitian build order to m…

4d0f285

…atch Linux 3f7581d [TRIVIAL] reorder Windows gitian build order to match Linux (Micha)

Merge bitcoin#9015: release: bump required osx version to 10.8. (jona…

fd36484

…sschnelli) 339c4b6 release: bump required osx version to 10.8. Credit jonasschnelli. (Cory Fields)

Merge bitcoin#9020: rpc: Remove invalid explanation from wallet fee m…

d38c7f1

…essage 04c1c15 rpc: Remove invalid explanation from wallet fee message (Wladimir J. van der Laan)

doc: Add release notes for 0.13.1 release

2d72e91

Merge bitcoin#9033: Update build notes for dropping osx 10.7 support …

55208b7

…(fanquake) ba26d41 Update build notes for dropping osx 10.7 support (Michael Ford)

Merge bitcoin#9029: instance of 'mem pool' to 'mempool'

01389bc

1c3ecc7 instance of 'mem pool' to 'mempool' (S. Matthew English)

Merge bitcoin#9016: Return useful error message on ATMP failure

848f338

169bdab Return useful error message on ATMP failure (instagibbs)

Throw exception in gobject prepare when CommitTransaction fails

8d62e3f

Merge bitcoin#9041: keypoololdest denote Unix epoch, not GMT

ade67c9

7f61b49 Change all instance of 'GMT epoch' to 'Unix epoch' (matthias)

Merge bitcoin#9043: [qt] Return useful error message on ATMP failure

b222935

3333e5a [qt] Return useful error message on ATMP failure (MarcoFalke)

Merge bitcoin#9032: test: Add format-dependent comparison to bctest

88f9dc2

6c5cd9d test: Add format-dependent comparison to bctest (Wladimir J. van der Laan)

Merge bitcoin#9063: Do not shadow variable, use deprecated MAP_ANON i…

85c5aea

…f MAP_ANONYMOUS is not defined 4a9f3c5 Do not shadow variable, use deprecated MAP_ANON if MAP_ANONYMOUS is not defined. (Pavel Janík)

Merge bitcoin#8674: tools for analyzing, updating and adding copyrigh…

0b93a58

…t headers in source files 159597a [devtools] script support for managing source file copyright headers (isle2983)

Merge bitcoin#8828: Move CWalletDB::ReorderTransactions to CWallet

b720415

86029e7 Move CWalletDB::ReorderTransactions to CWallet (Patrick Strateman)

laanwj and others added 19 commits January 13, 2018 13:44

Merge bitcoin#9013: Trivial: Explicitly pass const CChainParams& to L…

2999d09

…oadBlockIndexDB() d0b01f3 Explicitly pass const CChainParams& to LoadBlockIndexDB() (Geoffrey Tsui)

Merge bitcoin#8977: [Wallet] Refactor wallet/init interaction (Reacce…

9b9f86a

…pt wtx, flush thread) cab1da7 [Wallet] Refactor wallet/init interaction (Reaccept wtx, flush thread) (Jonas Schnelli)

Merge bitcoin#9065: Merge doc/unit-tests.md into src/test/README.md

70c86db

eedc461 Merge `doc/unit-tests.md` into `src/test/README.md` (Wladimir J. van der Laan)

Merge bitcoin#9036: wallet: Change default confirm target from 2 to 6

cd7c5bd

0fdf810 wallet: Change default confirm target from 2 to 6 (Wladimir J. van der Laan)

Merge bitcoin#9071: Declare wallet.h functions inline

6f8720b

2ca882a Declare wallet.h functions inline (Pieter Wuille)

Merge bitcoin#9073: Trivial: Add common failure cases for rpc server …

5adb5b8

…connection failure 8f329f9 Add common failure cases for rpc server connection failure (instagibbs)

Merge bitcoin#9069: Clean up bctest.py and bitcoin-util-test.py

92f0f67

2b175d4 Clean up bctest.py and bitcoin-util-test.py (John Newbery)

Merge bitcoin#9085: Remove unused CTxOut::GetHash()

188a2d9

190fd32 Remove unused CTxOut::GetHash() (Matt Corallo)

Merge bitcoin#9070: Lockedpool fixes

921730d

b3ddc5e LockedPool: avoid quadratic-time allocation (Kaz Wesley) 0b59f80 LockedPool: fix explosion for illegal-sized alloc (Kaz Wesley) 21b8f3d LockedPool: test handling of invalid allocations (Kaz Wesley)

Merge bitcoin#8675: Make copyright header lines uniform

9d661f4

4b04e32 [copyright] copyright header style uniform (isle2983)

Merge bitcoin#9083: Enforcing consistency, 'gitian' to 'Gitian'

47a7ec7

66ca6cd Enforcing consistency, 'gitian' to 'Gitian' (S. Matthew English)

Merge bitcoin#9093: [doc] release-process: Mention GitHub release and…

1188dd2

… archived release notes faead5e [doc] release-process: Mention GitHub release and archived release notes (MarcoFalke)

Merge bitcoin#8568: new var DIST_CONTRIB adds useful things for packa…

05b34f4

…gers from contrib 1ee6f91 new var DIST_CONTRIB adds useful things for packagers from contrib/ to EXTRA_DIST (nomnombtc)

Remove NodeEvictionCandidate constructor and revert to struct initial…

29a59e5

…izion Matches Bitcoins style and makes upcoming backports easier

Merge bitcoin#9052: Use RelevantServices instead of node_network in A…

84559c0

…ttemptToEvict. d32036a Use RelevantServices instead of node_network in AttemptToEvict. (Gregory Maxwell)

Merge bitcoin#8709: Allow filterclear messages for enabling TX relay …

9be5928

…only. 1f951c6 Allow filterclear messages for enabling TX relay only. (R E Broadley)

Merge bitcoin#7730: Remove priority estimation

6eaafa8

0bd581a add release notes for removal of priority estimation (Alex Morcos) b2322e0 Remove priority estimation (Alex Morcos)

Dashify generatetoaddress help string

d452018

codablock force-pushed the pr_backport_bitcoin_0.14-5 branch from a5572c5 to d452018 Compare January 13, 2018 17:35

UdjinM6 requested changes Jan 14, 2018

View reviewed changes

codablock added 4 commits January 14, 2018 14:04

Dashify DIST_CONTRIB in Makefile.am

12d8ed4

Fix version check in CBlockPolicyEstimator::Read

c5bfd21

Use nPowTargetSpacing in SendCoinsDialog::updateGlobalFeeVariables

fc95cbb

Use correct version for fee estimates db

4a19af7

UdjinM6 approved these changes Jan 14, 2018

View reviewed changes

UdjinM6 added this to the 12.3 milestone Jan 14, 2018

UdjinM6 merged commit a3325fc into dashpay:develop Jan 14, 2018

codablock deleted the pr_backport_bitcoin_0.14-5 branch January 14, 2018 18:55

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Backport missing PRs from Bitcoin 0.14 - Part 5 #1851

Backport missing PRs from Bitcoin 0.14 - Part 5 #1851

Uh oh!

codablock commented Jan 13, 2018

Uh oh!

UdjinM6 left a comment

Uh oh!

UdjinM6 Jan 14, 2018

Uh oh!

UdjinM6 Jan 14, 2018

Uh oh!

UdjinM6 Jan 14, 2018

Uh oh!

UdjinM6 Jan 14, 2018

Uh oh!

codablock commented Jan 14, 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 5 #1851

Backport missing PRs from Bitcoin 0.14 - Part 5 #1851

Uh oh!

Conversation

codablock commented Jan 13, 2018

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

UdjinM6 Jan 14, 2018

Choose a reason for hiding this comment

Uh oh!

UdjinM6 Jan 14, 2018

Choose a reason for hiding this comment

Uh oh!

UdjinM6 Jan 14, 2018

Choose a reason for hiding this comment

Uh oh!

UdjinM6 Jan 14, 2018

Choose a reason for hiding this comment

Uh oh!

codablock commented Jan 14, 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