Backports 0.15 pr11 by PastaPastaPasta · Pull Request #2931 · dashpay/dash

PastaPastaPasta · 2019-05-22T15:17:51Z

~~based on #2918~~
Also, btw, this doesn't build atm

UdjinM6 · 2019-05-23T11:45:32Z

I propose to split this PR in 3 parts:

10090-10186 (i.e. up to validation interface changes)
9480-9942 (i.e. up to fee estimation changes)
10181-9951 (i.e. the rest of it including wallet db changes)

c0651cc Update bitcoin.conf with example for pruning (Kyle Honeycutt) Tree-SHA512: f27180ac5d5a4bd32c7a63de156ca14eb8068509e64d386ca84ee16d0dacfa8e1bab9a8e7b88175fae12c8d823f71f8705d413f224a15d5aa7cf059f416fa023

contrib/debian/examples/dash.conf

test/util/data/bitcoin-util-test.json

configure.ac

…thub b99fbad Fix init README format to render correctly on github (Jameson Lopp) Tree-SHA512: 52b8ed9661e48e830c9e0c0e9aa670fe8d1a3848426d2d854494b477a9926f286d87e0586c2bc63f433136f8e5acd2cab3ab1f616380fb517c5a8f9d34ed52da

PastaPastaPasta · 2019-05-23T14:33:48Z

dropped 10020 and 10030 and changed dash.conf

UdjinM6 · 2019-05-23T14:36:08Z

Pls also see UdjinM6@b382e67. I'm not yet 100% sure if it works correctly, still running tests https://travis-ci.org/UdjinM6/dash/builds/536320920. But at least it compiles locally.

src/instantsend.h

UdjinM6 · 2019-05-23T15:01:21Z

ehh... llmq-is-cl-conflicts.py fails locally :/

UdjinM6 · 2019-05-23T17:19:36Z

ok, let's try new version :) dfeffa09d12e797a325ad4881b2f72aeda62366b + d96c87859b390c9bc44d081193a37ffb538d730b, Travis https://travis-ci.org/UdjinM6/dash/builds/536378877 (make sure to drop a5aafd6 and 594e8a1 first).

UdjinM6

utACK

test failure is weird though, home it's not some new deadlock... https://travis-ci.org/dashpay/dash/jobs/536411285#L5794 (incomplete shutdown)

Found few more things to fix

UdjinM6 · 2019-05-24T14:46:19Z

Pls see UdjinM6@25189b0, Travis https://travis-ci.org/UdjinM6/dash/builds/536765016

UdjinM6

Can't reproduce the issue with tests locally, could be some Travis weirdness.

re-utACK

codablock · 2019-05-27T10:35:27Z

The whole backport of bitcoin#10133 should be removed from this PR, as it was already backported as part of #1697. Later backported PRs found in #1701 then changed some of the values/calculations which are now basically reverted by this re-backporting of bitcoin#10133

EDIT: Otherwise LGTM

f110272 Remove `namespace fs=fs` (Wladimir J. van der Laan) 75594bd torcontrol: Use fs::path instead of std::string for private key path (Wladimir J. van der Laan) 2a5f574 Use fsbridge for fopen and freopen (Wladimir J. van der Laan) bac5c9c Replace uses of boost::filesystem with fs (Wladimir J. van der Laan) 7d5172d Replace includes of boost/filesystem.h with fs.h (Wladimir J. van der Laan) 19e36bb Add fs.cpp/h (Wladimir J. van der Laan) Tree-SHA512: 2c34f059dfa6850b9323f3389e9090a6b5f839a457a2960d182c2ecfafd9883c956f5928bb796613402d3aad68ebc78259796a7a313f4a6cfa98aaf507a66842

45ce471 Reduce spammy test logging (John Newbery) Tree-SHA512: 64b2ce29fb62a4e738840bbaf93563559451c2ef078ba66ecfc1dbe34adefea61ad2ad2d768444cb2e0b30cb3cbe47e38ed818d4c91f7723a3d1ba9fdd0043f9

b1a6d4c Take a CTransactionRef in AddToWalletIfInvolvingMe to avoid a copy (Matt Corallo) 1c95e2f Use std::shared_ptr instead of boost::shared_ptr in ScriptForMining (Matt Corallo) 91f1e6c Remove dead-code tracking of requests for blocks we generated (Matt Corallo) acad82f Add override to functions using CValidationInterface methods (Matt Corallo) e6d5e6c Hold cs_wallet for whole block [dis]connection processing (Matt Corallo) 461e49f SyncTransaction->TxAddedToMempool/BlockConnected/Disconnected (Matt Corallo) f404334 Handle SyncTransaction in ActivateBestChain instead of ConnectTrace (Matt Corallo) a147687 Keep conflictedTxs in ConnectTrace per-block (Matt Corallo) d3167ba Handle conflicted transactions directly in ConnectTrace (Matt Corallo) 29e6e23 Make ConnectTrace::blocksConnected private, hide behind accessors (Matt Corallo) 822000c Add pblock to connectTrace at the end of ConnectTip, not start (Matt Corallo) f5e9a01 Include missing #include in zmqnotificationinterface.h (Matt Corallo) Tree-SHA512: 8893d47559da3b28d2ef7359768547cba8a4b43b6f891d80f5848f995a84b1517bfb0f706fdc8cd43f09a1350349eb440d9724a59363ab517dfcc4fcb31b2018

d0cd0bd Make CWallet::SyncTransactions() interface friendlier (John Newbery) 714e4ad AddToWalletIfInvolvingMe should test pIndex, not posInBlock (John Newbery) Tree-SHA512: d02e7ffce635c53f3e099c37cc5613b431f74e0e3ea189269132901a99fc539477849ddad0282ce721d46a4d794c2d46523d58b64f0c26c655f70b5808c745a5

Signed-off-by: Pasta <[email protected]>

…anges

PastaPastaPasta · 2019-05-27T14:03:59Z

removed 10133

UdjinM6

re-utACK

codablock

utACK 👍

I'm currently working on a partial re implementation of the signal handlers for chainlocks and InstantSend, which I'll create a PR for after this is merged.

PastaPastaPasta force-pushed the backports-0.15-pr11 branch 4 times, most recently from 0d2a329 to 1cb2957 Compare May 23, 2019 02:49

Merge bitcoin#10090: Update bitcoin.conf with example for pruning

c8a565d

c0651cc Update bitcoin.conf with example for pruning (Kyle Honeycutt) Tree-SHA512: f27180ac5d5a4bd32c7a63de156ca14eb8068509e64d386ca84ee16d0dacfa8e1bab9a8e7b88175fae12c8d823f71f8705d413f224a15d5aa7cf059f416fa023

PastaPastaPasta force-pushed the backports-0.15-pr11 branch from 1cb2957 to 17474fb Compare May 23, 2019 12:59

UdjinM6 requested changes May 23, 2019

View reviewed changes

contrib/debian/examples/dash.conf Outdated Show resolved Hide resolved

contrib/debian/examples/dash.conf Outdated Show resolved Hide resolved

test/util/data/bitcoin-util-test.json Outdated Show resolved Hide resolved

configure.ac Outdated Show resolved Hide resolved

PastaPastaPasta force-pushed the backports-0.15-pr11 branch from 17474fb to 3faed2e Compare May 23, 2019 14:33

PastaPastaPasta commented May 23, 2019

View reviewed changes

src/instantsend.h Outdated Show resolved Hide resolved

PastaPastaPasta force-pushed the backports-0.15-pr11 branch from 594e8a1 to cd85901 Compare May 23, 2019 17:42

UdjinM6 previously approved these changes May 24, 2019

View reviewed changes

UdjinM6 previously approved these changes May 26, 2019

View reviewed changes

UdjinM6 requested a review from codablock May 27, 2019 09:04

laanwj and others added 8 commits May 27, 2019 09:03

Merge bitcoin#10124: [test] Suppress test logging spam

f893ac6

45ce471 Reduce spammy test logging (John Newbery) Tree-SHA512: 64b2ce29fb62a4e738840bbaf93563559451c2ef078ba66ecfc1dbe34adefea61ad2ad2d768444cb2e0b30cb3cbe47e38ed818d4c91f7723a3d1ba9fdd0043f9

adjust examples/dash.conf

282d155

Signed-off-by: Pasta <[email protected]>

Pass block index via BlockDisconnected

d180061

Adjust CDSNotificationInterface to align with CValidationInterface ch…

2501951

…anges

More boost::filesystem->fs and some related cleanup

9b8a750

PastaPastaPasta dismissed UdjinM6’s stale review via 9b8a750 May 27, 2019 14:03

PastaPastaPasta force-pushed the backports-0.15-pr11 branch from 4701417 to 9b8a750 Compare May 27, 2019 14:03

UdjinM6 approved these changes May 27, 2019

View reviewed changes

codablock approved these changes May 27, 2019

View reviewed changes

UdjinM6 merged commit f4aaf56 into dashpay:develop May 27, 2019

codablock mentioned this pull request May 27, 2019

Refactor validation signals for ChainLocks, InstantSend and PrivateSend to get rid of SyncTransaction #2943

Merged

UdjinM6 added this to the 14.1 milestone May 28, 2019

PastaPastaPasta deleted the backports-0.15-pr11 branch May 30, 2019 00:23

codablock mentioned this pull request Nov 18, 2019

Also handle/resolve orphan TXs when parents appear in a block #3139

Merged

Conversation

PastaPastaPasta commented May 22, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

UdjinM6 commented May 23, 2019

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

PastaPastaPasta commented May 23, 2019

Uh oh!

UdjinM6 commented May 23, 2019

Uh oh!

Uh oh!

UdjinM6 commented May 23, 2019

Uh oh!

UdjinM6 commented May 23, 2019

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

UdjinM6 commented May 24, 2019

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

codablock commented May 27, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

PastaPastaPasta commented May 27, 2019

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

codablock left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

PastaPastaPasta commented May 22, 2019 •

edited

Loading

codablock commented May 27, 2019 •

edited

Loading